[CMF-checkins] CVS: CMF/CMFCore/tests - test_ActionInformation.py:1.4.4.1

Yvo Schubbe schubbe@web.de
Thu, 8 May 2003 15:01:05 -0400


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

Modified Files:
      Tag: yuppie-collector152-branch
	test_ActionInformation.py 
Log Message:
this should do the right thing with oldstyle content type actions

=== CMF/CMFCore/tests/test_ActionInformation.py 1.4 => 1.4.4.1 ===
--- CMF/CMFCore/tests/test_ActionInformation.py:1.4	Thu Apr 24 10:11:18 2003
+++ CMF/CMFCore/tests/test_ActionInformation.py	Thu May  8 15:01:04 2003
@@ -1,6 +1,12 @@
-import Zope
 from unittest import TestSuite, makeSuite, main
 
+import Zope
+try:
+    Zope.startup()
+except AttributeError:
+    # for Zope versions before 2.6.1
+    pass
+
 from Products.CMFCore.tests.base.testcase import \
      TransactionalTest
 
@@ -48,7 +54,7 @@
         self.assertEqual(ai.Title(), 'View')
         self.assertEqual(ai.Description(), '')
         self.assertEqual(ai.getCondition(), 'member')
-        self.assertEqual(ai.getActionExpression(), 'string:view')
+        self.assertEqual(ai.getActionExpression(), 'string:${object_url}/view')
         self.assertEqual(ai.getVisibility(), 0)
         self.assertEqual(ai.getCategory(), 'global')
         self.assertEqual(ai.getPermissions(), ())