[CMF-checkins] CVS: CMF/CMFCore/tests - test_ActionProviderBase.py:1.1.6.1 test_Expression.py:1.2.14.2 test_TypesTool.py:1.12.2.8

[Chris Withers]

Update of /cvs-repository/CMF/CMFCore/tests
In directory cvs.zope.org:/tmp/cvs-serv2930

Modified Files:
      Tag: ChrisW-refactor_tests-branch
	test_ActionProviderBase.py test_Expression.py 
	test_TypesTool.py 
Log Message:
Done ActionProviderBase

=== CMF/CMFCore/tests/test_ActionProviderBase.py 1.1 => 1.1.6.1 ===
+import Zope
+from unittest import TestCase, TestSuite, makeSuite, main
 
-class DummyAction:
-    def __init__( self, **kw ):
-        self.__dict__.update( kw )
+from Products.CMFCore.tests.base.dummy import \
+     DummyTool
 
-class ActionProviderBaseTests(unittest.TestCase):
+from Products.CMFCore.ActionProviderBase import ActionProviderBase
+
+class ActionProviderBaseTests(TestCase):
     
     def _makeProvider( self ):
 
-        from Products.CMFCore.ActionProviderBase import ActionProviderBase
         return ActionProviderBase()
 
     def test_addAction( self ):
@@ -28,12 +29,6 @@
 
     def test_changeActions( self ):
 
-        from Products.CMFCore.ActionProviderBase import ActionProviderBase
-
-        class DummyTool( ActionProviderBase ):
-            _actions = [ DummyAction()
-                       , DummyAction()
-                       ]
 
         apb = DummyTool()
         old_actions = apb._actions
@@ -91,12 +86,9 @@
         self.assertEqual( apb._actions, ['1'] )
 
 def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(ActionProviderBaseTests))
-    return suite
-
-def run():
-    unittest.TextTestRunner().run(test_suite())
+    return TestSuite((
+        makeSuite(ActionProviderBaseTests),
+        ))
 
 if __name__ == '__main__':
-    run()
+    main(defaultTest='test_suite')


=== CMF/CMFCore/tests/test_Expression.py 1.2.14.1 => 1.2.14.2 ===
 
 from Products.CMFCore.tests.base.dummy import \
-     DummyContent, DummyMembershipTool
+     DummyContent, DummyTool as DummyMembershipTool
 
 from Products.CMFCore.ActionInformation import ActionInformation
 from Products.CMFCore.Expression import Expression, createExprContext


=== CMF/CMFCore/tests/test_TypesTool.py 1.12.2.7 => 1.12.2.8 ===
      OmnipotentUser, UserWithRoles
 from Products.CMFCore.tests.base.dummy import \
-     DummyMethod, addDummy, DummyTypeInfo,\
+     DummyObject, addDummy, DummyTypeInfo,\
      DummyFolder, DummyFTI
 
 from AccessControl.SecurityManagement import newSecurityManager
@@ -45,9 +45,9 @@
         dummy = portal._getOb( 'actions_dummy' )
 
         # so we can traverse to it:
-        dummy.view = DummyMethod("view")
-        dummy.view2 = DummyMethod("view2")
-        dummy.edit = DummyMethod("edit")
+        dummy.view = DummyObject("view")
+        dummy.view2 = DummyObject("view2")
+        dummy.edit = DummyObject("edit")
 
         default_view = dummy()
         custom_view = _getViewFor( dummy, view='view2' )()