[CMF-checkins] CVS: CMF/CMFSetup/tests - test_actions.py:1.5

[Tres Seaver]

Update of /cvs-repository/CMF/CMFSetup/tests
In directory cvs.zope.org:/tmp/cvs-serv32709/tests

Modified Files:
	test_actions.py 
Log Message:
 - Repair test breakage.


=== CMF/CMFSetup/tests/test_actions.py 1.4 => 1.5 ===
--- CMF/CMFSetup/tests/test_actions.py:1.4	Tue Jun  8 15:14:32 2004
+++ CMF/CMFSetup/tests/test_actions.py	Tue Jun  8 15:43:42 2004
@@ -164,28 +164,28 @@
         self.assertEqual( len( info[ 'actions' ] ), 1 )
 
         action = info[ 'actions' ][ 0 ]
-        self.assertEqual( action[ 'id' ], 'foo' )
-        self.assertEqual( action[ 'title' ], 'Foo' )
-        self.assertEqual( action[ 'expression' ]
+        self.assertEqual( action[ 'action_id' ], 'foo' )
+        self.assertEqual( action[ 'name' ], 'Foo' )
+        self.assertEqual( action[ 'action' ]
                         , 'string:${object_url}/foo' )
         self.assertEqual( action[ 'condition' ], 'python:1' )
-        self.assertEqual( action[ 'permissions' ], () )
+        self.assertEqual( action[ 'permission' ], '' )
         self.assertEqual( action[ 'category' ], 'dummy' )
-        self.failUnless( action[ 'visible' ] )
+        self.assertEqual( action[ 'visible' ], '1' )
 
         info = info_list[ 2 ]
         self.assertEqual( info[ 'id' ], 'portal_bar' )
         self.assertEqual( len( info[ 'actions' ] ), 1 )
 
         action = info[ 'actions' ][ 0 ]
-        self.assertEqual( action[ 'id' ], 'bar' )
-        self.assertEqual( action[ 'title' ], 'Bar' )
-        self.assertEqual( action[ 'expression' ]
+        self.assertEqual( action[ 'action_id' ], 'bar' )
+        self.assertEqual( action[ 'name' ], 'Bar' )
+        self.assertEqual( action[ 'action' ]
                         , 'string:${object_url}/bar' )
         self.assertEqual( action[ 'condition' ], 'python:0' )
-        self.assertEqual( action[ 'permissions' ], ( 'Manage portal', ) )
+        self.assertEqual( action[ 'permission' ], 'Manage portal' )
         self.assertEqual( action[ 'category' ], 'dummy' )
-        self.failIf( action[ 'visible' ] )
+        self.assertEqual( action[ 'visible' ], '0' )