[Plone-cvs] shh42 r5386 - CMFPlone/branches/tiran-atct-integration/tests

[<svn...@pl...>]

Author: shh42
Date: Mon Jun 21 11:59:07 2004
New Revision: 5386

Modified:
   CMFPlone/branches/tiran-atct-integration/tests/testContentTypeScripts.py
Log:
Fix coding style and reenable the topic edit test.


Modified: CMFPlone/branches/tiran-atct-integration/tests/testContentTypeScripts.py
==============================================================================
--- CMFPlone/branches/tiran-atct-integration/tests/testContentTypeScripts.py	(original)
+++ CMFPlone/branches/tiran-atct-integration/tests/testContentTypeScripts.py	Mon Jun 21 11:59:07 2004
@@ -13,7 +13,6 @@
 AddPortalTopics = 'Add portal topics'
 from DateTime import DateTime
 from Products.CMFPlone import LargePloneFolder
-from Products.CMFCore.utils import getToolByName
 
 
 #XXX NOTE
@@ -27,6 +26,7 @@
         perms = self.getPermissionsOfRole('Member')
         self.setPermissions(perms + [AddPortalTopics], 'Member')
         self.discussion = self.portal.portal_discussion
+        self.types = self.portal.portal_types
         self.request = self.app.REQUEST
         self.request.SESSION = dummy.Session()
 
@@ -83,8 +83,7 @@
         self.portal.bar.invokeFactory('Document', id='baz.html')
         self.setRoles(['Member'])
         # back to normal
-        ttool = getToolByName(self.portal, 'portal_types')
-        fti = ttool.getTypeInfo('Favorite')
+        fti = self.types.getTypeInfo('Favorite')
         fti.constructInstance(self.folder, id='favorite',
                                   remote_url='bar/baz.html',
                                   title='Foo')
@@ -94,8 +93,7 @@
 
     def testFavoriteEdit(self):
         # Note: link_edit does not traverse to remote_url
-        ttool = getToolByName(self.portal, 'portal_types')
-        fti = ttool.getTypeInfo('Favorite')
+        fti = self.types.getTypeInfo('Favorite')
         fti.constructInstance(self.folder, id='favorite')
         self.folder.favorite.link_edit('bar/baz.html', title='Foo')
         self.assertEqual(self.folder.favorite.getRemoteUrl(),
@@ -168,8 +166,7 @@
         self.folder.invokeFactory('Topic', id='topic', title='Foo')
         self.assertEqual(self.folder.topic.Title(), 'Foo')
 
-    def DISABLED_testTopicEditTopic(self):
-        # XXX 
+    def testTopicEditTopic(self):
         self.folder.invokeFactory('Topic', id='topic')
         self.folder.topic.topic_editTopic(1, 'topic', title='Foo')
         self.assertEqual(self.folder.topic.Title(), 'Foo')