[CMF-checkins] SVN: CMF/branches/2.0/C Fixed test failures due to changes in TALES expression parsing under Zope 2.10.

[Tres Seaver]

Log message for revision 70887:
  Fixed test failures due to changes in TALES expression parsing under Zope 2.10.
  
  

Changed:
  U   CMF/branches/2.0/CHANGES.txt
  U   CMF/branches/2.0/CMFCore/tests/test_ActionInformation.py
  U   CMF/branches/2.0/CMFCore/tests/test_TypesTool.py

-=-
Modified: CMF/branches/2.0/CHANGES.txt
===================================================================
--- CMF/branches/2.0/CHANGES.txt	2006-10-23 07:29:49 UTC (rev 70886)
+++ CMF/branches/2.0/CHANGES.txt	2006-10-23 11:43:06 UTC (rev 70887)
@@ -2,6 +2,9 @@
 
   Bug Fixes
 
+    - Fixed test failures due to changes in TALES expression parsing under
+      Zope 2.10.
+
     - CMFCore.ActionInformation: don't use a fixed set of properties for
       ActionInformation. (http://www.zope.org/Collectors/CMF/232/)
 

Modified: CMF/branches/2.0/CMFCore/tests/test_ActionInformation.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_ActionInformation.py	2006-10-23 07:29:49 UTC (rev 70886)
+++ CMF/branches/2.0/CMFCore/tests/test_ActionInformation.py	2006-10-23 11:43:06 UTC (rev 70887)
@@ -29,9 +29,9 @@
 from Products.CMFCore.tests.base.dummy import DummyContent
 from Products.CMFCore.tests.base.dummy import DummySite
 from Products.CMFCore.tests.base.dummy import DummyTool as DummyMembershipTool
+from Products.CMFCore.tests.base.testcase import RequestTest
 from Products.CMFCore.tests.base.testcase import SecurityTest
 from Products.CMFCore.tests.base.testcase import setUpTraversing
-from Products.CMFCore.tests.base.testcase import TransactionalTest
 
 
 class ActionCategoryTests(unittest.TestCase):
@@ -323,11 +323,11 @@
         self.assertEqual( ai2['allowed'], True )
 
 
-class ActionInformationTests(TransactionalTest):
+class ActionInformationTests(RequestTest):
 
     def setUp(self):
         import Products.CMFCore
-        TransactionalTest.setUp(self)
+        RequestTest.setUp(self)
         setUpTraversing()
         zcml.load_config('permissions.zcml', Products.Five)
         zcml.load_config('configure.zcml', Products.CMFCore)
@@ -340,7 +340,7 @@
         self.object = DummyContent('bar', 'url_bar')
 
     def tearDown(self):
-        TransactionalTest.tearDown(self)
+        RequestTest.tearDown(self)
         cleanUp()
 
     def _makeOne(self, *args, **kw):

Modified: CMF/branches/2.0/CMFCore/tests/test_TypesTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_TypesTool.py	2006-10-23 07:29:49 UTC (rev 70886)
+++ CMF/branches/2.0/CMFCore/tests/test_TypesTool.py	2006-10-23 11:43:06 UTC (rev 70887)
@@ -39,7 +39,7 @@
 from Products.CMFCore.tests.base.dummy import DummyUserFolder
 from Products.CMFCore.tests.base.security import OmnipotentUser
 from Products.CMFCore.tests.base.security import UserWithRoles
-from Products.CMFCore.tests.base.testcase import SecurityTest
+from Products.CMFCore.tests.base.testcase import SecurityRequestTest
 from Products.CMFCore.tests.base.testcase import setUpTraversing
 from Products.CMFCore.tests.base.testcase import WarningInterceptor
 from Products.CMFCore.tests.base.tidata import FTIDATA_ACTIONS
@@ -48,7 +48,7 @@
 from Products.CMFCore.tests.base.tidata import STI_SCRIPT
 
 
-class TypesToolTests(SecurityTest, WarningInterceptor):
+class TypesToolTests(SecurityRequestTest, WarningInterceptor):
 
     def _makeOne(self):
         from Products.CMFCore.TypesTool import TypesTool
@@ -58,7 +58,7 @@
     def setUp(self):
         from Products.CMFCore.TypesTool import FactoryTypeInformation as FTI
 
-        SecurityTest.setUp(self)
+        SecurityRequestTest.setUp(self)
         setUpTraversing()
         zcml.load_config('permissions.zcml', Products.Five)
         zcml.load_config('configure.zcml', Products.Five.browser)
@@ -71,7 +71,7 @@
         self.ttool._setObject( 'Dummy Content', FTI(**fti) )
 
     def tearDown(self):
-        SecurityTest.tearDown(self)
+        SecurityRequestTest.tearDown(self)
         cleanUp()
         self._free_warning_output()