Changeset 1897 in products

Timestamp:

Mar 11, 2010 8:28:48 PM (14 years ago)

Author:

mylan

Message:

#161: Use test cases with Installed and NotInstalled? layers

Location:

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests

Files:

• testInstallation.py (modified) (4 diffs)
• testMetaTagsDuplication.py (modified) (5 diffs)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests/testInstallation.py

@@ -7 +7 @@
 from zope.publisher.browser import TestRequest
 from zope.viewlet.interfaces import IViewletManager
-from plone.browserlayer import utils
+
 from quintagroup.seoptimizer.browser.interfaces import IPloneSEOLayer
 
@@ -28 +28 @@
 
 
-class TestBeforeInstallation(FunctionalTestCase):
-
-    def afterSetUp(self):
-        self.qi = self.portal.portal_quickinstaller
-        self.qi.uninstallProducts([PROJECT_NAME])
+class TestBeforeInstallation(FunctionalTestCaseNotInstalled):
+
+    def afterSetUp(self):
+        #self.qi = self.portal.portal_quickinstaller
+        #self.qi.uninstallProducts([PROJECT_NAME])
         self.basic_auth = 'mgr:mgrpw'
         self.portal_path = '/%s' % self.portal.absolute_url(1)
@@ -87 +87 @@
         
     def test_browser_layer(self):
+        from plone.browserlayer import utils
         self.assert_(IPloneSEOLayer in utils.registered_layers(),
                      "Not registered 'IPloneSEOLayer' browser layer")
@@ -143 +144 @@
 
     def test_browserlayer_uninstall(self):
+        from plone.browserlayer import utils
         self.assertEqual(IPloneSEOLayer in utils.registered_layers(), False,
-            "Not registered 'IPloneSEOLayer' browser layer")
+            "Still registered 'IPloneSEOLayer' browser layer")
 
     def test_jsregestry_uninstall(self):

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests/testMetaTagsDuplication.py

@@ -7 +7 @@
                          '(?:content=".*?"\s*)){2}/>)', re.S|re.M)
 
-class TestMetaTagsDuplication(FunctionalTestCase):
+class InstallMixin:
 
-    def afterSetUp(self):
-        self.qi = self.portal.portal_quickinstaller
+    def prepare(self):
         # Preparation for functional testing
         self.loginAsPortalOwner()
@@ -22 +21 @@
         self.html = self.publish(self.abs_path).getBody()
 
+
+class TestTagsDuplicationInstalled(InstallMixin, FunctionalTestCase):
+
+    def afterSetUp(self):
+        self.prepare()
+
     def test_GeneratorMetaSEOInstalled(self):
         lengen = len(GENERATOR.findall(self.html))
@@ -27 +32 @@
            "when seoptimizer installed" % lengen)
  
-    def test_GeneratorMetaSEOUninstalled(self):
-        self.qi.uninstallProducts([PROJECT_NAME,])
-        lengen = len(GENERATOR.findall(self.html))
-        self.assert_(lengen<=1, "There is %d generator meta tag(s) " \
-            "when seoptimizer uninstalled" % lengen)
-
     def test_DescriptionMetaSEOInstalled(self):
         lendesc = len(DESCRIPTION.findall(self.html))
@@ -38 +37 @@
            "when seoptimizer installed" % lendesc)
 
+
+class TestTagsDuplicationNotInstalled(InstallMixin,
+                                      FunctionalTestCaseNotInstalled):
+
+    def afterSetUp(self):
+        self.prepare()
+
+    def test_GeneratorMetaSEOUninstalled(self):
+        lengen = len(GENERATOR.findall(self.html))
+        self.assert_(lengen<=1, "There is %d generator meta tag(s) " \
+            "when seoptimizer uninstalled" % lengen)
+
     def test_DescriptionMetaSEOUninstalled(self):
-        self.qi.uninstallProducts([PROJECT_NAME,])
         lendesc = len(DESCRIPTION.findall(self.html))
         self.assert_(lendesc==1, "There is %d DESCRIPTION meta tag(s) " \
@@ -48 +58 @@
     from unittest import TestSuite, makeSuite
     suite = TestSuite()
-    suite.addTest(makeSuite(TestMetaTagsDuplication))
+    suite.addTest(makeSuite(TestTagsDuplicationInstalled))
+    suite.addTest(makeSuite(TestTagsDuplicationNotInstalled))
     return suite