Changeset 991

Timestamp:

10/17/07 06:43:54

Author:

crchemist

Message:

Added tests for Plone-2.5

Files:

• qSEOptimizer/trunk/overrides.zcml (modified) (1 diff)
• qSEOptimizer/trunk/tests/testQSEOptimizer.py (modified) (12 diffs)

qSEOptimizer/trunk/overrides.zcml

@@ -2 +2 @@
-    xmlns="http://namespaces.zope.org/zope"
-    xmlns:zcml="http://namespaces.zope.org/zcml">
-have
+installed
-             package=".browser" />
-

qSEOptimizer/trunk/tests/testQSEOptimizer.py

@@ -15 +15 @@
-except:
-    from Products.CMFCore.permissions import ManagePortal
+
+try:
+    from Products.CMFPlone.migrations import v2_5
+    HAS_PLONE_2_5 = True
+    del v2_5
+except ImportError:
+    HAS_PLONE_2_5 = False
-
-from AccessControl.SecurityManagement import newSecurityManager, noSecurityManager
@@ -41 +48 @@
-PloneTestCase.setupPloneSite()
-
-"""
-class TestBeforeInstall(PloneTestCase.FunctionalTestCase):
-
@@ -55 +61 @@
-        response = self.publish(self.portal_path, self.basic_auth)
-        self.assertEqual(response.getStatus(), 200)
-
+
-
-class TestInstallation(PloneTestCase.PloneTestCase):
@@ -233 +239 @@
-
-    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)
@@ -244 +246 @@
-
-    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)
-
-
-
-
-
-
+
-        self.my_doc.manage_addProperty('qSEO_keywords', ('foo',), 'lines')
-        metatags = self.pu.listMetaTags(self.my_doc)
@@ -261 +255 @@
-        self.assertEqual(keywords, 'foo')
-
-
-
-
-
-
+
-        self.my_doc.manage_addProperty('qSEO_keywords', ('foo', 'bar'), 'lines')
-        metatags = self.pu.listMetaTags(self.my_doc)
@@ -271 +261 @@
-        self.assertEqual(keywords, 'foo, bar')
-
-
-
-
-
-
+
-        self.sp.additional_keywords = ('foo',)
-        metatags = self.pu.listMetaTags(self.my_doc)
@@ -281 +267 @@
-
-    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',)
@@ -292 +274 @@
-
-    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')
@@ -303 +281 @@
-
-    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')
@@ -364 +338 @@
-
-
-AdditionalKeywords, Test
+
-
-def test_suite():
@@ -372 +346 @@
-        suite.addTest(makeSuite(suite_class))
-
+    if HAS_PLONE_2_5:
+        suite.addTest(makeSuite(TestBeforeInstall))
+        suite.addTest(makeSuite(TestAdditionalKeywords))
+
-    return suite
-