Changeset 2410 in products

Timestamp:

May 31, 2010 2:44:34 PM (15 years ago)

Author:

mylan

Message:

#131: Remove needless tests in TestDynamicSchemaExtending?, update tests for news XML

File:

• quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/testNewsSitemaps.py (modified) (6 diffs)

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/testNewsSitemaps.py

@@ -71 +71 @@
     def test_naccess(self):
         # Test when access present
-        self.my_news._setProperty("gsm_access", "Registration")
+        self.my_news.edit(gsm_access="Registration")
         self.my_news.reindexObject()
         self.reParse()
@@ -77 +77 @@
         self.assert_("Registration" in self.data, "No 'Registration' in data")
 
-    def test_ngenres(self):
+    def test_ngenresSingle(self):
         # Test when genres present
-        self.my_news._setProperty("gsm_genres", "PressRelease")
+        self.my_news.edit(gsm_genres=("PressRelease",))
         self.my_news.reindexObject()
         self.reParse()
         self.assert_("n:genres" in self.start.keys())
         self.assert_("PressRelease" in self.data, "No 'PressRelease' in data")
+
+    def test_ngenresMultiple(self):
+        # Test multiple genres
+        self.my_news.edit(gsm_genres=("PressRelease", "Blog"))
+        self.my_news.reindexObject()
+        self.reParse()
+        self.assert_("n:genres" in self.start.keys())
+        self.assert_("PressRelease, Blog" in self.data, "No 'PressRelease, Blog' in data")
+
 
 
@@ -91 +100 @@
 from quintagroup.plonegooglesitemaps.utils import removeLocalSchemaExtenderAdapter
 
-class TestDynamicSchemaExtending(TestCase):
+class TestSchemaExtending(TestCase):
 
     def afterSetUp(self):
-        super(TestDynamicSchemaExtending, self).afterSetUp()
+        super(TestSchemaExtending, self).afterSetUp()
         self.loginAsPortalOwner()
         # Add testing news item to portal
@@ -102 +111 @@
         self.my_doc = self.portal["my_doc"]
 
-    def testNotExtendByDefault(self):
+    def testExtendNewsItemByDefault(self):
         # Neither of object has extended fields
-        self.assertEqual(self.my_news.getField("gsm_access"), None)
-        self.assertEqual(self.my_news.getField("gsm_genres"), None)
+        self.assertNotEqual(self.my_news.getField("gsm_access"), None)
+        self.assertNotEqual(self.my_news.getField("gsm_genres"), None)
         self.assertEqual(self.my_doc.getField("gsm_access"), None)
         self.assertEqual(self.my_doc.getField("gsm_genres"), None)
     
-    def testExtend(self):
-        addLocalSchemaExtenderAdapter(self.portal, IATNewsItem)
-        self.assertNotEqual(self.my_news.getField("gsm_access"), None)
-        self.assertNotEqual(self.my_news.getField("gsm_genres"), None)
-        # But for document schema should not extended
-        self.assertEqual(self.my_doc.getField("gsm_access"), None)
-        self.assertEqual(self.my_doc.getField("gsm_genres"), None)
-
-    def testRemoveExtend(self):
-        addLocalSchemaExtenderAdapter(self.portal, IATNewsItem)
-        self.assertNotEqual(self.my_news.getField("gsm_access"), None)
-        self.assertNotEqual(self.my_news.getField("gsm_genres"), None)
-        removeLocalSchemaExtenderAdapter(self.portal, IATNewsItem)
-        self.assertEqual(self.my_news.getField("gsm_access"), None)
-        self.assertEqual(self.my_news.getField("gsm_genres"), None)
-
     def testRegistrationOnLocalSM(self):
         """SchemaExtender adapters must be registered
@@ -131 +124 @@
         localsm = getSiteManager(self.portal)
         globalsm = getGlobalSiteManager()
-        # Check if by default neither site manger
-        # has ISchemaExtender adapter registered in.
-        self.assertNotEqual(localsm, globalsm)
-        self.assertEqual(localsm.queryAdapter(self.my_news, ISchemaExtender), None)
-        self.assertEqual(globalsm.queryAdapter(self.my_news, ISchemaExtender), None)
         # Now register SchemaExtender adapter and
         # check if it present in Local SiteManger only
-        addLocalSchemaExtenderAdapter(self.portal, IATNewsItem)
+        self.assertNotEqual(localsm, globalsm)
         self.assertNotEqual(localsm.queryAdapter(self.my_news, ISchemaExtender), None)
         self.assertEqual(globalsm.queryAdapter(self.my_news, ISchemaExtender), None)
@@ -147 +135 @@
     suite = TestSuite()
     suite.addTest(makeSuite(TestNewsSitemapsXML))
-    suite.addTest(makeSuite(TestDynamicSchemaExtending))
+    suite.addTest(makeSuite(TestSchemaExtending))
     return suite