[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Workflow/tests - testWorkflowAction.py:1.1.2.9 testWorkflowProcessInstance.py:1.1.2.2 testWorkflowWorkitem.py:1.1.2.2

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/Workflow/tests
In directory cvs.zope.org:/tmp/cvs-serv2132/Zope/App/Workflow/tests

Modified Files:
      Tag: Zope-3x-branch
	testWorkflowAction.py testWorkflowProcessInstance.py 
	testWorkflowWorkitem.py 
Log Message:
Hold on to your butts!

Major refactoring of Interface package to clean up the interfaces and
module structure.

Note especially, to verify interface implementstions,
use verifyObject or verifyClass from the Interface.Verify module:

from Interface.Verify import verifyClass

verifyClass(ISomeInterface, SomeClass)



=== Zope3/lib/python/Zope/App/Workflow/tests/testWorkflowAction.py 1.1.2.8 => 1.1.2.9 ===
             import IWorkflowActionCreatedEvent
         from Zope.App.Workflow.WorkflowEvents import WorkflowActionCreatedEvent
-        from Interface import verify
+        from Interface.Verify import verifyClass
 
-        verify( IWorkflowEvent, WorkflowActionCreatedEvent )
-        verify( IWorkflowActionEvent, WorkflowActionCreatedEvent )
-        verify( IWorkflowActionCreatedEvent, WorkflowActionCreatedEvent )
+        verifyClass( IWorkflowEvent, WorkflowActionCreatedEvent )
+        verifyClass( IWorkflowActionEvent, WorkflowActionCreatedEvent )
+        verifyClass( IWorkflowActionCreatedEvent, WorkflowActionCreatedEvent )
 
     def _getEventClass( self ):
         from Zope.App.Workflow.WorkflowEvents import WorkflowActionCreatedEvent
@@ -40,11 +40,11 @@
             import IWorkflowActionAssignedEvent
         from Zope.App.Workflow.WorkflowEvents \
             import WorkflowActionAssignedEvent
-        from Interface import verify
+        from Interface.Verify import verifyClass
         
-        verify( IWorkflowEvent, WorkflowActionAssignedEvent )
-        verify( IWorkflowActionEvent, WorkflowActionAssignedEvent )
-        verify( IWorkflowActionAssignedEvent, WorkflowActionAssignedEvent )
+        verifyClass( IWorkflowEvent, WorkflowActionAssignedEvent )
+        verifyClass( IWorkflowActionEvent, WorkflowActionAssignedEvent )
+        verifyClass( IWorkflowActionAssignedEvent, WorkflowActionAssignedEvent )
 
     def _getEventClass( self ):
         from Zope.App.Workflow.WorkflowEvents import WorkflowActionAssignedEvent
@@ -58,11 +58,11 @@
         from Zope.App.Workflow.IWorkflowEvents import IWorkflowActionEvent
         from Zope.App.Workflow.IWorkflowEvents import IWorkflowActionBegunEvent
         from Zope.App.Workflow.WorkflowEvents import WorkflowActionBegunEvent
-        from Interface import verify
+        from Interface.Verify import verifyClass
         
-        verify( IWorkflowEvent, WorkflowActionBegunEvent )
-        verify( IWorkflowActionEvent, WorkflowActionBegunEvent )
-        verify( IWorkflowActionBegunEvent, WorkflowActionBegunEvent )
+        verifyClass( IWorkflowEvent, WorkflowActionBegunEvent )
+        verifyClass( IWorkflowActionEvent, WorkflowActionBegunEvent )
+        verifyClass( IWorkflowActionBegunEvent, WorkflowActionBegunEvent )
 
     def _getEventClass( self ):
         from Zope.App.Workflow.WorkflowEvents import WorkflowActionBegunEvent
@@ -78,11 +78,11 @@
              import IWorkflowActionSuspendedEvent
         from Zope.App.Workflow.WorkflowEvents \
              import WorkflowActionSuspendedEvent
-        from Interface import verify
+        from Interface.Verify import verifyClass
 
-        verify( IWorkflowEvent, WorkflowActionSuspendedEvent )
-        verify( IWorkflowActionEvent, WorkflowActionSuspendedEvent )
-        verify( IWorkflowActionSuspendedEvent, WorkflowActionSuspendedEvent )
+        verifyClass( IWorkflowEvent, WorkflowActionSuspendedEvent )
+        verifyClass( IWorkflowActionEvent, WorkflowActionSuspendedEvent )
+        verifyClass( IWorkflowActionSuspendedEvent, WorkflowActionSuspendedEvent )
 
     def _getEventClass( self ):
         from Zope.App.Workflow.WorkflowEvents \
@@ -99,11 +99,11 @@
             import IWorkflowActionCompletedEvent
         from Zope.App.Workflow.WorkflowEvents \
             import WorkflowActionCompletedEvent
-        from Interface import verify
+        from Interface.Verify import verifyClass
 
-        verify(IWorkflowEvent, WorkflowActionCompletedEvent)
-        verify(IWorkflowActionEvent, WorkflowActionCompletedEvent)
-        verify(IWorkflowActionCompletedEvent, WorkflowActionCompletedEvent)
+        verifyClass(IWorkflowEvent, WorkflowActionCompletedEvent)
+        verifyClass(IWorkflowActionEvent, WorkflowActionCompletedEvent)
+        verifyClass(IWorkflowActionCompletedEvent, WorkflowActionCompletedEvent)
 
     def _getEventClass( self ):
         from Zope.App.Workflow.WorkflowEvents \
@@ -120,11 +120,11 @@
             import IWorkflowActionExceptionEvent
         from Zope.App.Workflow.WorkflowEvents \
             import WorkflowActionExceptionEvent
-        from Interface import verify
+        from Interface.Verify import verifyClass
 
-        verify(IWorkflowEvent, WorkflowActionExceptionEvent)
-        verify(IWorkflowActionEvent, WorkflowActionExceptionEvent)
-        verify(IWorkflowActionExceptionEvent, WorkflowActionExceptionEvent)
+        verifyClass(IWorkflowEvent, WorkflowActionExceptionEvent)
+        verifyClass(IWorkflowActionEvent, WorkflowActionExceptionEvent)
+        verifyClass(IWorkflowActionExceptionEvent, WorkflowActionExceptionEvent)
 
     def _getEventClass( self ):
         from Zope.App.Workflow.WorkflowEvents \


=== Zope3/lib/python/Zope/App/Workflow/tests/testWorkflowProcessInstance.py 1.1.2.1 => 1.1.2.2 ===
 
     def testInterface( self ):
-        from Interface import verify
+        from Interface.Verify import verifyClass
         from Zope.App.Workflow.IWorkflowProcessInstance import IWorkflowProcessInstance
         from Zope.App.Workflow.WorkflowProcessInstance import WorkflowProcessInstance
 
-        verify( IWorkflowProcessInstance, WorkflowProcessInstance )
+        verifyClass( IWorkflowProcessInstance, WorkflowProcessInstance )
 
 
 


=== Zope3/lib/python/Zope/App/Workflow/tests/testWorkflowWorkitem.py 1.1.2.1 => 1.1.2.2 ===
-from Interface import verify
+from Interface.Verify import verifyClass
 
 class WorkflowWorkitemTests(unittest.TestCase):
     def testInterface(self):
         from Zope.App.Workflow.IWorkflowWorkitem import IWorkflowWorkitem
         from Zope.App.Workflow.WorkflowWorkitem import WorkflowWorkitem
 
-        verify(IWorkflowWorkitem, WorkflowWorkitem)
+        verifyClass(IWorkflowWorkitem, WorkflowWorkitem)
 
     def _getOne(self, *args, **kw):
         from Zope.App.Workflow.WorkflowWorkitem import WorkflowWorkitem