[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/tests/ - synced view names with the names used in type Actions

[Yvo Schubbe]

Log message for revision 130269:
  - synced view names with the names used in type Actions

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/tests/base/tidata.py
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/base/tidata.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/base/tidata.py	2013-07-11 19:56:42 UTC (rev 130268)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/base/tidata.py	2013-07-11 19:56:54 UTC (rev 130269)
@@ -102,26 +102,25 @@
       , 'icon_expr' : 'string:${portal_url}/dummy_icon.gif'
       , 'product' : 'FooProduct'
       , 'factory' : 'addFoo'
-      , 'immediate_view' : 'metadata.html'
+      , 'immediate_view' : 'properties'
       , 'aliases' : {
            '(Default)':'dummy_view',
            'view':'dummy_view',
-           'view.html':'dummy_view',
-           'edit.html':'dummy_edit_form',
-           'metadata.html':'metadata_edit_form',
+           'edit':'dummy_edit_form',
+           'properties':'metadata_edit_form',
            'gethtml':'source_html'}
       , 'actions' : (
             { 'id':'view',
               'title': 'View',
-              'action':'string:${object_url}/view.html',
+              'action':'string:${object_url}',
               'permissions':(View,) }
           , { 'id':'edit',
               'title': 'Edit',
-              'action':'string:${object_url}/edit.html',
+              'action':'string:${object_url}/edit',
               'permissions':(ModifyPortalContent,) }
           , { 'id':'metadata',
               'title': 'Metadata',
-              'action':'string:${object_url}/metadata.html',
+              'action':'string:${object_url}/properties',
               'permissions':(ModifyPortalContent,) }
           )
       }

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py	2013-07-11 19:56:42 UTC (rev 130268)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py	2013-07-11 19:56:54 UTC (rev 130269)
@@ -486,9 +486,9 @@
         ttool._setObject('Dummy Content 15', FTI(**FTIDATA_CMF[0]))
         getSiteManager().registerUtility(ttool, ITypesTool)
         acl_users = self.site._setObject('acl_users', DummyUserFolder())
-        test._checkId('view.html')
+        test._checkId('view')
         newSecurityManager(None, acl_users.user_foo)
-        self.assertRaises(BadRequest, test._checkId, 'view.html')
+        self.assertRaises(BadRequest, test._checkId, 'view')
 
     def test__checkId_starting_with_dot(self):
         #
@@ -510,7 +510,7 @@
 
     def test__checkId_Five(self):
         test = self._makeOne('test')
-        self.assertRaises(BadRequest, test._checkId, '@@view.html')
+        self.assertRaises(BadRequest, test._checkId, '@@view')
         self.assertRaises(BadRequest, test._checkId, '++resource++icon.png')
 
     def test_checkIdAvailableCatchesBadRequest(self):

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py	2013-07-11 19:56:42 UTC (rev 130268)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py	2013-07-11 19:56:54 UTC (rev 130269)
@@ -380,7 +380,6 @@
         ti = self._makeOne(**FTIDATA_CMF[0])
         self.assertEqual(ti.getMethodAliases(), FTIDATA_CMF[0]['aliases'])
         self.assertEqual(ti.queryMethodID('view'), 'dummy_view')
-        self.assertEqual(ti.queryMethodID('view.html'), 'dummy_view')
 
         ti.setMethodAliases(ti.getMethodAliases())
         self.assertEqual(ti.getMethodAliases(), FTIDATA_CMF[0]['aliases'])