Changeset 985

Timestamp:

10/01/07 08:20:27

Author:

crchemist

Message:

Fix tests.

Files:

• qSEOptimizer/branches/additional-keywords/__init__.py (modified) (2 diffs)
• qSEOptimizer/branches/additional-keywords/tests/testQSEOptimizer.py (modified) (10 diffs)

qSEOptimizer/branches/additional-keywords/__init__.py

@@ -7 +7 @@
-
-from Products.qSEOptimizer import config
-
+
+
+
+
+
+
-
-allow_module('Products.qSEOptimizer.util')
@@ -62 +67 @@
-
-        # Set the additional matching keywords, if any
-
-
-
-
-
+
+
+
+
+
+
-
-        return metaTags

qSEOptimizer/branches/additional-keywords/tests/testQSEOptimizer.py

@@ -41 +41 @@
-PloneTestCase.setupPloneSite()
-
-
+
-class TestBeforeInstall(PloneTestCase.FunctionalTestCase):
-
@@ -55 +55 @@
-        response = self.publish(self.portal_path, self.basic_auth)
-        self.assertEqual(response.getStatus(), 200)
-
+
-
-class TestInstallation(PloneTestCase.PloneTestCase):
@@ -233 +233 @@
-
-    def test_additional_keywords_in_configlet(self):
+        mtool = getToolByName(self.portal, 'portal_migration')
+        if mtool.getFileSystemVersion() < "2.5":
+            return
+        
-        path = self.portal.id+'/prefs_qseo_setup?additionalKeywords=foo\nbar'
-        self.publish(path, self.basic_auth)
@@ -240 +244 @@
-
-    def test_listMetaTags_empty(self):
+        mtool = getToolByName(self.portal, 'portal_migration')
+        if mtool.getFileSystemVersion() < "2.5":
+            return
+        
-        metatags = self.pu.listMetaTags(self.my_doc)
-        self.assert_('keywords' not in metatags)
-
-    def test_listMetaTags_one(self):
+        mtool = getToolByName(self.portal, 'portal_migration')
+        if mtool.getFileSystemVersion() < "2.5":
+            return
+        
-        self.my_doc.manage_addProperty('qSEO_keywords', ('foo',), 'lines')
-        metatags = self.pu.listMetaTags(self.my_doc)
@@ -250 +262 @@
-
-    def test_listMetaTags_two(self):
+        mtool = getToolByName(self.portal, 'portal_migration')
+        if mtool.getFileSystemVersion() < "2.5":
+            return
+        
-        self.my_doc.manage_addProperty('qSEO_keywords', ('foo', 'bar'), 'lines')
-        metatags = self.pu.listMetaTags(self.my_doc)
@@ -256 +272 @@
-
-    def test_additional_keywords_in_listMetaTags_empty(self):
+        mtool = getToolByName(self.portal, 'portal_migration')
+        if mtool.getFileSystemVersion() < "2.5":
+            return
+        
-        self.sp.additional_keywords = ('foo',)
-        metatags = self.pu.listMetaTags(self.my_doc)
@@ -261 +281 @@
-
-    def test_additional_keywords_in_listMetaTags_one(self):
+        mtool = getToolByName(self.portal, 'portal_migration')
+        if mtool.getFileSystemVersion() < "2.5":
+            return
+        
-        self.my_doc.setText('<p>foo</p>')
-        self.sp.additional_keywords = ('foo',)
@@ -268 +292 @@
-
-    def test_additional_keywords_in_listMetaTags_two(self):
+        mtool = getToolByName(self.portal, 'portal_migration')
+        if mtool.getFileSystemVersion() < "2.5":
+            return
+        
-        self.my_doc.setText('<p>foo bar</p>')
-        self.sp.additional_keywords = ('foo', 'bar')
@@ -275 +303 @@
-
-    def test_additional_keywords_in_listMetaTags_merge(self):
+        mtool = getToolByName(self.portal, 'portal_migration')
+        if mtool.getFileSystemVersion() < "2.5":
+            return
+        
-        self.my_doc.setText('<p>foo bar</p>')
-        self.sp.additional_keywords = ('foo', 'bar')
@@ -332 +364 @@
-
-
-BeforeInstall, Test
+
-
-def test_suite():
-    from unittest import TestSuite, makeSuite
-    suite = TestSuite()
-
-
-
-
-
+
+
+
-    return suite
-
-if __name__ == '__main__':
-    framework()
-