Changeset 2534 in products for quintagroup.plonegooglesitemaps/branches/test_refactoring/quintagroup/plonegooglesitemaps/tests/testSitemaps.py

Timestamp:

Jun 15, 2010 6:36:40 PM (14 years ago)

Author:

mylan

Message:

#206: some cleanup, simplify tests

File:

• quintagroup.plonegooglesitemaps/branches/test_refactoring/quintagroup/plonegooglesitemaps/tests/testSitemaps.py (modified) (5 diffs)

quintagroup.plonegooglesitemaps/branches/test_refactoring/quintagroup/plonegooglesitemaps/tests/testSitemaps.py

@@ -11 +11 @@
     def afterSetUp(self):
         super(TestSitemapType, self).afterSetUp()
-        self.auth = 'admin:admin'
         self.contentSM = _createObjectByType('Sitemap', self.portal, id='google-sitemaps')
-        self.portal.portal_membership.addMember('admin', 'admin', ('Manager',), [])
 
     def testFields(self):
@@ -54 +52 @@
 
     def txestPingSetting(self):
-        pwf = self.portal.portal_workflow['plone_workflow']
+        pwf = self.workflow['plone_workflow']
         self.assertEqual(self.contentSM.getPingTransitions(), ())
 
@@ -76 +74 @@
     def afterSetUp(self):
         super(TestSettings, self).afterSetUp()
-
-        self.workflow = self.portal.portal_workflow
         self.gsm_props = self.portal.portal_properties['googlesitemap_properties']
-        self.auth = 'admin:admin'
         self.contentSM = _createObjectByType('Sitemap', self.portal, id='google-sitemaps')
-
         self.sitemapUrl = '/'+self.portal.absolute_url(1) + '/google-sitemaps'
-
-        self.portal.portal_membership.addMember('admin', 'admin', ('Manager',), [])
-
         # Add testing document to portal
-        my_doc = self.portal.invokeFactory('Document', id='my_doc')
-        self.my_doc = self.portal['my_doc']
+        self.my_doc = _createObjectByType('Document', self.portal, id='my_doc')
         self.my_doc.edit(text_format='plain', text='hello world')
         self.my_doc_url = self.my_doc.absolute_url()
@@ -157 +147 @@
     def afterSetUp(self):
         super(TestPinging, self).afterSetUp()
-
-        self.workflow = self.portal.portal_workflow
         self.workflow.setChainForPortalTypes(pt_names=('News Item','Document'),
                                              chain="simple_publication_workflow")
         self.gsm_props = self.portal.portal_properties['googlesitemap_properties']
-        self.auth = 'admin:admin'
-        self.portal.portal_membership.addMember('admin', 'admin', ('Manager',), [])
         # Add sitemaps
         self.contentSM = _createObjectByType('Sitemap', self.portal, id='google-sitemaps')
@@ -172 +158 @@
         self.sitemapUrl = '/'+self.portal.absolute_url(1) + '/google-sitemaps'
         # Add testing document to portal
-        my_doc = self.portal.invokeFactory('Document', id='my_doc')
-        self.my_doc = self.portal['my_doc']
-        my_news = self.portal.invokeFactory('News Item', id='my_news')
-        self.my_news = self.portal['my_news']
+        self.my_doc = _createObjectByType('Document', self.portal, id='my_doc')
+        self.my_news = _createObjectByType('News Item', self.portal, id='my_news')
 
     def testAutomatePinging(self):