[Zope3-checkins] CVS: Zope3/src/zope/app/workflow/stateful/tests - test_contentworkflow.py:1.12 test_instance.py:1.12

[Stephan Richter]

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

Modified Files:
	test_contentworkflow.py test_instance.py 
Log Message:


Converted process definitions from being arbitrary registerable components to
be local utilities. This drastically simplified the local workflow and process
definition implementation, since they do not have to worry about any
registration stuff anymore. What an improvement!


=== Zope3/src/zope/app/workflow/stateful/tests/test_contentworkflow.py 1.11 => 1.12 ===
--- Zope3/src/zope/app/workflow/stateful/tests/test_contentworkflow.py:1.11	Tue Mar  2 13:51:08 2004
+++ Zope3/src/zope/app/workflow/stateful/tests/test_contentworkflow.py	Wed Mar  3 15:20:35 2004
@@ -29,14 +29,15 @@
 from zope.app.event.interfaces import IObjectCreatedEvent
 from zope.app.services.event import EventService
 from zope.app.services.servicenames import EventSubscription
+from zope.app.services.utility import UtilityRegistration
 from zope.app.interfaces.services.event import ISubscriptionService
 from zope.app.interfaces.services.registration import ActiveStatus
 
+from zope.app.workflow.interfaces import IProcessDefinition
 from zope.app.workflow.interfaces import IProcessInstanceContainerAdaptable
 from zope.app.workflow.interfaces import IProcessInstanceContainer
 from zope.app.workflow.interfaces.stateful import IContentWorkflowsManager
 from zope.app.workflow.instance import ProcessInstanceContainerAdapter
-from zope.app.workflow.service import ProcessDefinitionRegistration
 from zope.app.workflow.stateful.contentworkflow import ContentWorkflowsManager
 from zope.app.workflow.tests.workflowsetup import WorkflowSetup
 from zope.app.workflow.tests.test_service import DummyProcessDefinition
@@ -164,13 +165,13 @@
         self.default['pd2'] = DummyProcessDefinition(2)
 
         id = self.cm.addRegistration(
-            ProcessDefinitionRegistration('definition1',
-                                          '/++etc++site/default/pd1'))
+            UtilityRegistration('definition1', IProcessDefinition,
+                                '/++etc++site/default/pd1'))
         zapi.traverse(self.default.getRegistrationManager(),
                       id).status = ActiveStatus
         id = self.cm.addRegistration(
-            ProcessDefinitionRegistration('definition2',
-                                          '/++etc++site/default/pd2'))
+            UtilityRegistration('definition2', IProcessDefinition,
+                                '/++etc++site/default/pd2'))
         zapi.traverse(self.default.getRegistrationManager(),
                       id).status = ActiveStatus
         manager = self.getManager()


=== Zope3/src/zope/app/workflow/stateful/tests/test_instance.py 1.11 => 1.12 ===
--- Zope3/src/zope/app/workflow/stateful/tests/test_instance.py:1.11	Fri Feb 27 11:50:40 2004
+++ Zope3/src/zope/app/workflow/stateful/tests/test_instance.py	Wed Mar  3 15:20:35 2004
@@ -15,7 +15,6 @@
 
 $Id$
 """
-
 import unittest
 
 from zope.interface import Interface, implements
@@ -38,7 +37,7 @@
 from zope.app.interfaces.services.registration import ActiveStatus
 
 from zope.app.workflow.tests.workflowsetup import WorkflowSetup
-from zope.app.workflow.service import ProcessDefinitionRegistration
+from zope.app.workflow.interfaces import IProcessDefinition
 from zope.app.workflow.interfaces.stateful \
      import IStatefulProcessInstance
 from zope.app.workflow.interfaces.stateful import \
@@ -52,15 +51,13 @@
      import StatefulProcessInstance, StateChangeInfo
 from zope.app import zapi
 from zope.app.container.contained import contained
+from zope.app.services.utility import UtilityRegistration
 
 
 # define and create ProcessDefinition (PD) for tests
 class TestProcessDefinition(StatefulProcessDefinition):
-    implements(IAttributeAnnotatable, IRegisterable, IRegistered)
+    implements(IAttributeAnnotatable)
 
-    # Incompletely implementing IRegistered
-    def addUsage(self, location):
-        pass
 
 class ITestDataSchema(Interface):
 
@@ -98,8 +95,8 @@
         self.default['pd1'] = pd 
 
         name = self.cm.addRegistration(
-            ProcessDefinitionRegistration('definition1',
-                                          '/++etc++site/default/pd1'))
+            UtilityRegistration('definition1', IProcessDefinition,
+                                '/++etc++site/default/pd1'))
         zapi.traverse(self.default.getRegistrationManager(),
                       name).status = ActiveStatus
 
@@ -210,8 +207,8 @@
         self.default['pd1'] = pd 
 
         n = self.cm.addRegistration(
-            ProcessDefinitionRegistration('definition1',
-                                          '/++etc++site/default/pd1'))
+            UtilityRegistration('definition1', IProcessDefinition,
+                                '/++etc++site/default/pd1'))
         zapi.traverse(self.default.getRegistrationManager(), n
                       ).status = ActiveStatus
 
@@ -296,8 +293,8 @@
         self.default['pd1'] = pd 
 
         k = self.cm.addRegistration(
-            ProcessDefinitionRegistration('definition1',
-                                          '/++etc++site/default/pd1'))
+            UtilityRegistration('definition1', IProcessDefinition,
+                                '/++etc++site/default/pd1'))
         zapi.traverse(self.default.getRegistrationManager(),
                       k).status = ActiveStatus
 
@@ -384,8 +381,8 @@
         self.default['pd1'] = pd 
 
         k = self.cm.addRegistration(
-            ProcessDefinitionRegistration('definition1',
-                                          '/++etc++site/default/pd1'))
+            UtilityRegistration('definition1', IProcessDefinition,
+                                '/++etc++site/default/pd1'))
         zapi.traverse(self.default.getRegistrationManager(),
                       k).status = ActiveStatus