Changeset 2530 in products

Timestamp:

Jun 14, 2010 7:39:39 PM (14 years ago)

Author:

mylan

Message:

#206: reorganize sitemap tests

Location:

quintagroup.plonegooglesitemaps/branches/test_refactoring/quintagroup/plonegooglesitemaps/tests

Files:

• testGoogleSitemaps.py (modified) (1 diff)
• testSitemaps.py (modified) (2 diffs)

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

@@ -140 +140 @@
 
 
-class TestSettings(FunctionalTestCase):
-
-    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.edit(text_format='plain', text='hello world')
-        self.my_doc_url = self.my_doc.absolute_url()
-
-    def testMetaTypeToDig(self):
-        self.workflow.doActionFor(self.my_doc, 'publish')
-        sitemap = self.publish(self.sitemapUrl, self.auth).getBody()
-        self.assert_(hasURL(sitemap, self.my_doc_url))
-
-        self.contentSM.setPortalTypes([])
-
-        sitemap = self.publish(self.sitemapUrl, self.auth).getBody()
-        self.assert_(not hasURL(sitemap, self.my_doc_url))
-
-        self.contentSM.setPortalTypes(['Document'])
-
-        sitemap = self.publish(self.sitemapUrl, self.auth).getBody()
-        self.assert_(hasURL(sitemap, self.my_doc_url))
-
-    def testStates(self):
-        self.workflow.doActionFor(self.my_doc, 'publish')
-        self.contentSM.setStates(['visible'])
-
-        sitemap = self.publish(self.sitemapUrl, self.auth).getBody()
-        self.assert_(not hasURL(sitemap, self.my_doc_url))
-
-        self.contentSM.setStates(['published'])
-
-        sitemap = self.publish(self.sitemapUrl, self.auth).getBody()
-        self.assert_(hasURL(sitemap, self.my_doc_url))
-
-    def test_blackout_entries(self):
-        self.workflow.doActionFor(self.my_doc, 'publish')
-        self.contentSM.setBlackout_list((self.my_doc.getId(),))
-
-        sitemap = self.publish(self.sitemapUrl, self.auth).getBody()
-        self.assert_(not hasURL(sitemap, self.my_doc_url))
-
-        self.contentSM.setBlackout_list([])
-        sitemap = self.publish(self.sitemapUrl, self.auth).getBody()
-        self.assert_(hasURL(sitemap, self.my_doc_url))
-
-    def test_regexp(self):
-        self.workflow.doActionFor(self.my_doc, 'publish')
-        sitemap = self.publish(self.sitemapUrl, self.auth).getBody()
-        self.assert_(not hasURL(sitemap, self.portal.absolute_url()))
-
-        regexp = "s/\/%s//"%self.my_doc.getId()
-        self.contentSM.setReg_exp([regexp])
-
-        sitemap = self.publish(self.sitemapUrl, self.auth).getBody()
-        self.assert_(hasURL(sitemap, self.portal.absolute_url()))
-
-    def test_add_urls(self):
-        self.contentSM.setUrls(['http://w1', 'w2', '/w3'])
-        w1_url = 'http://w1'
-        w2_url = self.portal.absolute_url() + '/w2'
-        w3_url = self.portal.getPhysicalRoot().absolute_url() + '/w3'
-        sitemap = self.publish(self.sitemapUrl, self.auth).getBody()
-
-        self.assert_(hasURL(sitemap, w1_url))
-        self.assert_(hasURL(sitemap, w2_url))
-        self.assert_(hasURL(sitemap, w3_url))
-
-
-class TestPinging(FunctionalTestCase):
-
-    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')
-        self.contentSM.setPingTransitions(('simple_publication_workflow#publish',))
-        self.newsSM = _createObjectByType('Sitemap', self.portal, id='news-sitemaps')
-        self.newsSM.setPortalTypes(('News Item','Document'))
-        self.newsSM.setPingTransitions(('simple_publication_workflow#publish',))
-        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']
-
-    def testAutomatePinging(self):
-        # 1. Check for pinging both sitemaps
-        back_out, myout = sys.stdout, StringIO()
-        sys.stdout = myout
-        try:
-            self.workflow.doActionFor(self.my_doc, 'publish')
-            myout.seek(0)
-            data = myout.read()
-        finally:
-            sys.stdout = back_out
-
-        self.assert_('Pinged %s sitemap to Google' % self.contentSM.absolute_url() in data,
-                     "Not pinged %s: '%s'" % (self.contentSM.id, data))
-        self.assert_('Pinged %s sitemap to Google' % self.newsSM.absolute_url() in data,
-                     "Not pinged %s: '%s'" % (self.newsSM.id, data))
-
-        # 2. Check for pinging only news-sitemap sitemaps
-        back_out, myout = sys.stdout, StringIO()
-        sys.stdout = myout
-        try:
-            self.workflow.doActionFor(self.my_news, 'publish')
-            myout.seek(0)
-            data = myout.read()
-        finally:
-            sys.stdout = back_out
-
-        self.assert_('Pinged %s sitemap to Google' % self.newsSM.absolute_url() in data,
-                     "Not pinged %s: '%s'" % (self.newsSM.id, data))
-        self.assert_(not 'Pinged %s sitemap to Google' % self.contentSM.absolute_url() in data,
-                     "Pinged %s on news: '%s'" % (self.contentSM.id, data))
-
-    def testPingingWithSetupForm(self):
-        # Ping news and content sitemaps
-        formUrl = '/'+self.portal.absolute_url(1) + '/prefs_gsm_settings'
-        qs = 'smselected:list=%s&smselected:list=%s&form.button.Ping=1&form.submitted=1' % \
-             (self.contentSM.id, self.newsSM.id)
-
-        back_out, myout = sys.stdout, StringIO()
-        sys.stdout = myout
-        try:
-            response = self.publish("%s?%s" % (formUrl, qs), basic=self.auth)
-            myout.seek(0)
-            data = myout.read()
-        finally:
-            sys.stdout = back_out
-
-        self.assert_('Pinged %s sitemap to Google' % self.contentSM.absolute_url() in data,
-                     "Not pinged %s: '%s'" % (self.contentSM.id, data))
-        self.assert_('Pinged %s sitemap to Google' % self.newsSM.absolute_url() in data,
-                     "Not pinged %s: '%s'" % (self.newsSM.id, data))
-
-
-
 def test_suite():
     from unittest import TestSuite, makeSuite

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

@@ -142 +142 @@
 
 
+class TestPinging(FunctionalTestCase):
+
+    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')
+        self.contentSM.setPingTransitions(('simple_publication_workflow#publish',))
+        self.newsSM = _createObjectByType('Sitemap', self.portal, id='news-sitemaps')
+        self.newsSM.setPortalTypes(('News Item','Document'))
+        self.newsSM.setPingTransitions(('simple_publication_workflow#publish',))
+        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']
+
+    def testAutomatePinging(self):
+        # 1. Check for pinging both sitemaps
+        back_out, myout = sys.stdout, StringIO()
+        sys.stdout = myout
+        try:
+            self.workflow.doActionFor(self.my_doc, 'publish')
+            myout.seek(0)
+            data = myout.read()
+        finally:
+            sys.stdout = back_out
+
+        self.assert_('Pinged %s sitemap to Google' % self.contentSM.absolute_url() in data,
+                     "Not pinged %s: '%s'" % (self.contentSM.id, data))
+        self.assert_('Pinged %s sitemap to Google' % self.newsSM.absolute_url() in data,
+                     "Not pinged %s: '%s'" % (self.newsSM.id, data))
+
+        # 2. Check for pinging only news-sitemap sitemaps
+        back_out, myout = sys.stdout, StringIO()
+        sys.stdout = myout
+        try:
+            self.workflow.doActionFor(self.my_news, 'publish')
+            myout.seek(0)
+            data = myout.read()
+        finally:
+            sys.stdout = back_out
+
+        self.assert_('Pinged %s sitemap to Google' % self.newsSM.absolute_url() in data,
+                     "Not pinged %s: '%s'" % (self.newsSM.id, data))
+        self.assert_(not 'Pinged %s sitemap to Google' % self.contentSM.absolute_url() in data,
+                     "Pinged %s on news: '%s'" % (self.contentSM.id, data))
+
+    def testPingingWithSetupForm(self):
+        # Ping news and content sitemaps
+        formUrl = '/'+self.portal.absolute_url(1) + '/prefs_gsm_settings'
+        qs = 'smselected:list=%s&smselected:list=%s&form.button.Ping=1&form.submitted=1' % \
+             (self.contentSM.id, self.newsSM.id)
+
+        back_out, myout = sys.stdout, StringIO()
+        sys.stdout = myout
+        try:
+            response = self.publish("%s?%s" % (formUrl, qs), basic=self.auth)
+            myout.seek(0)
+            data = myout.read()
+        finally:
+            sys.stdout = back_out
+
+        self.assert_('Pinged %s sitemap to Google' % self.contentSM.absolute_url() in data,
+                     "Not pinged %s: '%s'" % (self.contentSM.id, data))
+        self.assert_('Pinged %s sitemap to Google' % self.newsSM.absolute_url() in data,
+                     "Not pinged %s: '%s'" % (self.newsSM.id, data))
+
+
+
 def test_suite():
     from unittest import TestSuite, makeSuite
@@ -147 +224 @@
     suite.addTest(makeSuite(TestSitemapType))
     suite.addTest(makeSuite(TestSettings))
+    suite.addTest(makeSuite(TestPinging))
     return suite