Changeset 3504 in products for quintagroup.plonegooglesitemaps/branches/sitemap_date/quintagroup/plonegooglesitemaps/tests/testSitemaps.py

Timestamp:

Aug 14, 2012 3:35:43 PM (12 years ago)

Author:

potar

Message:

added compability with Plone 3

File:

• quintagroup.plonegooglesitemaps/branches/sitemap_date/quintagroup/plonegooglesitemaps/tests/testSitemaps.py (modified) (9 diffs)

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

@@ -52 +52 @@
 
     def testAutoSetLayout(self):
-        response = self.publish('/%s/createObject?type_name=Sitemap' \
+        response = self.publish('/%s/createObject?type_name=Sitemap'
                                 % self.portal.absolute_url(1), basic=self.auth)
         location = response.getHeader('location')
@@ -87 +87 @@
         wftrans = self.contentSM.getWorkflowTransitions()
         self.assertEqual(isinstance(wftrans, atapi.DisplayList), True)
-        self.assertEqual("simple_publication_workflow#publish" in \
+        self.assertEqual("simple_publication_workflow#publish" in
                          wftrans.keys(), True)
 
@@ -95 +95 @@
         self.contentSM.edit(blackout_list=bolist)
         value = self.contentSM.getBlackout_list()
-        self.assertTrue(value == expect, "Blackout list was not cleaned "\
-             "up from whitespaces: %s" % str(value))
+        self.assertTrue(value == expect, "Blackout list was not cleaned "
+                                         "up from whitespaces: %s"
+                                         % str(value))
 
 
@@ -179 +180 @@
     def afterSetUp(self):
         super(TestPinging, self).afterSetUp()
+        workflow = "simple_publication_workflow"
         self.workflow.setChainForPortalTypes(pt_names=('News Item',
-                 'Document'), chain="simple_publication_workflow")
+                                                       'Document'),
+                                             chain=workflow)
         gsm_properties = 'googlesitemap_properties'
         self.gsm_props = self.portal.portal_properties[gsm_properties]
@@ -210 +213 @@
             sys.stdout = back_out
 
-        self.assert_('Pinged %s sitemap to Google' \
+        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.assert_('Pinged %s sitemap to Google'
                      % self.newsSM.absolute_url() in data,
                      "Not pinged %s: '%s'" % (self.newsSM.id, data))
@@ -227 +230 @@
             sys.stdout = back_out
 
-        self.assert_('Pinged %s sitemap to Google' \
+        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.assert_(not 'Pinged %s sitemap to Google'
                      % self.contentSM.absolute_url() in data,
                      "Pinged %s on news: '%s'" % (self.contentSM.id, data))
@@ -249 +252 @@
             sys.stdout = back_out
 
-        self.assert_('Pinged %s sitemap to Google' \
+        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.assert_('Pinged %s sitemap to Google'
                      % self.newsSM.absolute_url() in data,
                      "Not pinged %s: '%s'" % (self.newsSM.id, data))
@@ -285 +288 @@
         filtered = SitemapView(self.sm, TestRequest()).getFilteredObjects()
         self.assertEqual(map(lambda x: x.getPath(), filtered),
-                        [self.inner_path, ])
+                         [self.inner_path, ])
 
     def testNewsSitemap(self):
@@ -318 +321 @@
         sleep(1)
         self.folder2 = _createObjectByType("Folder", self.folder1,
-                                            id="test-folder2")
+                                           id="test-folder2")
         sleep(1)
         self.page = _createObjectByType("Document", self.folder2,
                                         id="index_html")
 
-    def getSitemapDate(self, obj):
-        """ Method get sitemap_date from portal_portal """
+    def getCatalogSitemapDate(self, obj):
+        """ Method gets sitemap_date from portal_catalog """
         return self.portal.portal_catalog(id=obj.id)[0].sitemap_date
+
+    def getIndexerSitemapDate(self, obj):
+        """  Method gets modification date from
+            function sitemap_date (indexer)
+        """
+        from quintagroup.plonegooglesitemaps.indexers import sitemap_date
+
+        modification_date = sitemap_date(obj)
+        # you have had to use '__call__' since Plone 3.3
+        if callable(modification_date):
+            modification_date = modification_date()
+        return modification_date
 
     def testReindexParentObjects(self):
         """ Method tests handler (reindexParentObjects) """
-        from quintagroup.plonegooglesitemaps.handlers import \
-                                                        reindexParentObjects
+        from quintagroup.plonegooglesitemaps.handlers \
+            import reindexParentObjects
+
         # set default page
         self.folder2.setDefaultPage("index_html")
         reindexParentObjects(self.page, None)
 
-        self.assertEqual(self.getSitemapDate(self.page),
-                         self.getSitemapDate(self.folder2))
-        self.assertNotEqual(self.getSitemapDate(self.page),
-                            self.getSitemapDate(self.folder1))
+        self.assertEqual(self.getCatalogSitemapDate(self.page),
+                         self.getCatalogSitemapDate(self.folder2))
+        self.assertNotEqual(self.getCatalogSitemapDate(self.page),
+                            self.getCatalogSitemapDate(self.folder1))
 
         # set default page
         self.folder1.setDefaultPage("test-folder2")
         reindexParentObjects(self.folder2, None)
-        self.assertEqual(self.getSitemapDate(self.page),
-                         self.getSitemapDate(self.folder1))
-
-    def testSitemapIndex(self):
+        self.assertEqual(self.getCatalogSitemapDate(self.page),
+                         self.getCatalogSitemapDate(self.folder1))
+
+    def testSitemapDateIndexer(self):
         """ Method tests index (sitemap_date) """
-        from quintagroup.plonegooglesitemaps.indexers import sitemap_date
-
-        last_date = self.getSitemapDate(self.folder1)
-        sitemap_func = sitemap_date(self.folder1)
-        self.assertEqual(last_date,
-                         sitemap_func())
-
-        # set default page
+        last_date = self.getCatalogSitemapDate(self.folder1)
+        self.assertEqual(last_date, self.getIndexerSitemapDate(self.folder1))
         self.folder1.setDefaultPage("test-folder2")
         self.assertNotEqual(last_date,
-                            sitemap_func())
+                            self.getIndexerSitemapDate(self.folder1))