Changeset 2993 in products for quintagroup.plonegooglesitemaps/branches

Timestamp:

Nov 10, 2010 11:48:47 AM (14 years ago)

Author:

mylan

Message:

#228: Switch to use collective.testcaselayer

Location:

quintagroup.plonegooglesitemaps/branches/blacklist

Files:

• quintagroup/plonegooglesitemaps/tests/base.py (modified) (4 diffs)
• setup.py (modified) (3 diffs)

quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/tests/base.py

@@ -32 +32 @@
 from quintagroup.plonegooglesitemaps.interfaces import IGoogleSitemapsLayer
 
+from collective.testcaselayer.ptc import BasePTCLayer, ptc_layer
+
 quintagroup.plonegooglesitemaps.config.testing = 1
 quintagroup.plonegooglesitemaps.config.UPDATE_CATALOG = True
@@ -37 +39 @@
 PRODUCT = 'quintagroup.plonegooglesitemaps'
 
-@onsetup
-def setup_product():
-    """Set up the package and its dependencies.
 
-    The @onsetup decorator causes the execution of this body to be
-    deferred until the setup of the Plone site testing layer. We could
-    have created our own layer, but this is the easiest way for Plone
-    integration tests.
+class NotInstalled(BasePTCLayer):
+    """Initialize the package, without installation into portal
     """
-    fiveconfigure.debug_mode = True
-    import quintagroup.plonegooglesitemaps
-    zcml.load_config('configure.zcml', quintagroup.plonegooglesitemaps)
-    zcml.load_config('overrides.zcml', quintagroup.plonegooglesitemaps)
-    fiveconfigure.debug_mode = False
+    def afterSetUp(self):
+        fiveconfigure.debug_mode = True
+        import quintagroup.plonegooglesitemaps
+        zcml.load_config('configure.zcml', quintagroup.plonegooglesitemaps)
+        zcml.load_config('overrides.zcml', quintagroup.plonegooglesitemaps)
+        fiveconfigure.debug_mode = False
 
-    if not ptc.PLONE31:
-        ztc.installPackage("plone.browserlayer")
+        if not ptc.PLONE31:
+            ztc.installProduct("plone.browserlayer")
 
-    ztc.installPackage(PRODUCT)
+        ztc.installPackage(PRODUCT)
 
-setup_product()
-ptc.setupPloneSite( products=(PRODUCT,))
+
+class Installed(BasePTCLayer):
+    """ Install product into the portal
+    """
+    def afterSetUp(self):
+        if not ptc.PLONE31:
+            self.addProduct("plone.browserlayer")
+        self.addProduct(PRODUCT)
+
+class UnInstalled(BasePTCLayer):
+    """ UnInstall product from the portal
+    """
+    def afterSetUp(self):
+        qi = getattr(self.portal, 'portal_quickinstaller', None)
+        qi.uninstallProducts(products=[PRODUCT,])
+
+
+NotInstalledLayer = NotInstalled([ptc_layer,])
+InstalledLayer = Installed([NotInstalledLayer,])
+UnInstalledLayer = UnInstalled([InstalledLayer,])
 
 
@@ -70 +86 @@
         five's registerPackage directive not recognized on module initializing.
     """
-    layer = PloneSite
-
     def afterSetUp(self):
         self.loginAsPortalOwner()
@@ -88 +102 @@
 
 
-class TestCase(MixinTestCase, ptc.PloneTestCase):
-    """ For unit tests """
-    
+class TestCaseNotInstalled(ptc.PloneTestCase):
+    layer = NotInstalledLayer
+
+class TestCase(ptc.PloneTestCase, MixinTestCase):
+    layer = InstalledLayer
+
     def afterSetUp(self):
+        ptc.PloneTestCase.afterSetUp(self)
         MixinTestCase.afterSetUp(self)
-        ptc.PloneTestCase.afterSetUp(self)
 
     def beforeTearDown(self):
+        ptc.PloneTestCase.beforeTearDown(self)
         MixinTestCase.beforeTearDown(self)
-        ptc.PloneTestCase.beforeTearDown(self)
 
 
+class TestCaseUnInstalled(ptc.PloneTestCase):
+    layer = UnInstalledLayer
 
-class FunctionalTestCase(MixinTestCase, ptc.FunctionalTestCase):
-    """ For functional tests """
+
+class FunctionalTestCaseNotInstalled(ptc.FunctionalTestCase):
+    layer = NotInstalledLayer
+
+class FunctionalTestCase(ptc.FunctionalTestCase, MixinTestCase):
+    layer = InstalledLayer
 
     def afterSetUp(self):
+        ptc.FunctionalTestCase.afterSetUp(self)
         MixinTestCase.afterSetUp(self)
-        ptc.FunctionalTestCase.afterSetUp(self)
         self.auth = "%s:%s" % (portal_owner, default_password)
 
     def beforeTearDown(self):
+        ptc.FunctionalTestCase.beforeTearDown(self)
         MixinTestCase.beforeTearDown(self)
-        ptc.FunctionalTestCase.beforeTearDown(self)
 
+class FunctionalTestCaseUnInstalled(ptc.FunctionalTestCase):
+    layer = UnInstalledLayer

quintagroup.plonegooglesitemaps/branches/blacklist/setup.py

@@ -4 +4 @@
 
 version = '1.5.6'
+
+tests_require=['zope.testing'
+               'collective.testcaselayer']
 
 setup(name='quintagroup.plonegooglesitemaps',
@@ -32 +35 @@
           # -*- Extra requirements: -*-
       ],
+      tests_require=tests_require,
+      extras_require=dict(tests=tests_require),
       entry_points="""
       # -*- Entry points: -*-
@@ -38 +43 @@
       target = plone
       """,
-      setup_requires=["PasteScript"],
       paster_plugins = ["ZopeSkel"],
       )