[Zope3-checkins] CVS: Zope3/src/zope/app/workflow/tests - test_instance.py:1.2.24.1 test_service.py:1.5.24.2

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/workflow/tests
In directory cvs.zope.org:/tmp/cvs-serv13470/src/zope/app/workflow/tests

Modified Files:
      Tag: parentgeddon-branch
	test_instance.py test_service.py 
Log Message:
Can't have the tests passing, can we?

=== Zope3/src/zope/app/workflow/tests/test_instance.py 1.2 => 1.2.24.1 ===
--- Zope3/src/zope/app/workflow/tests/test_instance.py:1.2	Fri Jun  6 15:29:08 2003
+++ Zope3/src/zope/app/workflow/tests/test_instance.py	Fri Sep 12 15:15:40 2003
@@ -57,9 +57,9 @@
         self.assertEqual(pica.items(), [])
         self.assertEqual(pica.values(), [])
         self.assertEqual(pica.get('nothing', 1), 1)
-        self.assertRaises(TypeError, pica.setObject, 123, None)
+        self.assertRaises(TypeError, pica.__setitem__, 123, None)
 
-        pica.setObject('dummy', di)
+        pica['dummy'] = di
         self.assertEqual(len(pica), 1)
         self.assertEqual(pica.keys(), ['dummy'])
         self.assertEqual(pica.values(), [di])


=== Zope3/src/zope/app/workflow/tests/test_service.py 1.5.24.1 => 1.5.24.2 ===
--- Zope3/src/zope/app/workflow/tests/test_service.py:1.5.24.1	Tue Sep  9 14:08:22 2003
+++ Zope3/src/zope/app/workflow/tests/test_service.py	Fri Sep 12 15:15:40 2003
@@ -66,22 +66,21 @@
     def setUp(self):
         WorkflowSetup.setUp(self)
         # setup ProcessDefinitions
-        self.default.setObject('pd1', DummyProcessDefinition(1))
-        self.default.setObject('pd2', DummyProcessDefinition(2))
+        self.default['pd1'] = DummyProcessDefinition(1)
+        self.default['pd2'] = DummyProcessDefinition(2)
 
-        n = self.cm.setObject(
-            '',
+        n = self.cm.addRegistration(
             ProcessDefinitionRegistration('definition1',
                                           '/++etc++site/default/pd1'))
         zapi.traverse(self.default.getRegistrationManager(),
                       n).status = ActiveStatus
-        n = self.cm.setObject(
-            '', ProcessDefinitionRegistration('definition2',
-                                              '/++etc++site/default/pd2'))
+        n = self.cm.addregistration(
+            ProcessDefinitionRegistration('definition2',
+                                          '/++etc++site/default/pd2'))
         zapi.traverse(self.default.getRegistrationManager(),
                       n).status = ActiveStatus
-        n = self.cm.setObject(
-            '', ProcessDefinitionRegistration('definition3',
+        n = self.cm.addregistration(
+            ProcessDefinitionRegistration('definition3',
                                               '/++etc++site/default/pd1'))
         zapi.traverse(self.default.getRegistrationManager(),
                  n).status = RegisteredStatus
@@ -89,18 +88,17 @@
         # Now self.service has definition1 and definition2 available
         # and knows about definition3
 
-        self.default1.setObject('pd3', DummyProcessDefinition(3))
-        self.default1.setObject('pd4', DummyProcessDefinition(4))
+        self.default1['pd3'] = DummyProcessDefinition(3)
+        self.default1['pd4'] = DummyProcessDefinition(4)
 
-        n = self.cm1.setObject(
-            '',
+        n = self.cm1.addRegistration(
             ProcessDefinitionRegistration(
                 'definition1',
                 '/folder1/++etc++site/default/pd3'))
         zapi.traverse(self.default1.getRegistrationManager(),
                       n).status = ActiveStatus
-        n = self.cm1.setObject(
-            '', ProcessDefinitionRegistration(
+        n = self.cm1.addRegistration(
+            ProcessDefinitionRegistration(
                      'definition4',
                      '/folder1/++etc++site/default/pd4'))
         zapi.traverse(self.default1.getRegistrationManager(),