Changeset 1619 in products

Timestamp:

Feb 2, 2010 12:39:23 PM (14 years ago)

Author:

mylan

Message:

Prepare package tests infrastructure. Fixed problem with five:registerPackage directive deferred initialization

Location:

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps

Files:

• tests.py (deleted)
• tests/framework.py (deleted)
• tests/runalltests.py (deleted)
• tests/testqPloneGoogleSitemaps.py (modified) (7 diffs)

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/testqPloneGoogleSitemaps.py

@@ -1 +1 @@
 #
-# Tests for qPloneGoogleSitemaps
+# Tests for quintagroup.plonegooglesitemaps
 #
+
 import re, sys
 from urllib import urlencode
 from StringIO import StringIO
+import unittest
+
+from zope.testing import doctestunit
+from zope.component import testing
+from Testing import ZopeTestCase as ztc
 
 from Products.Five import zcml
 from Products.Five import fiveconfigure
-from Products.PloneTestCase import PloneTestCase
-
+
+from Products.PloneTestCase import PloneTestCase as ptc
+from Products.PloneTestCase.layer import PloneSite
 from Products.CMFPlone.utils import _createObjectByType
+
+from XMLParser import parse, hasURL
 
 import quintagroup.plonegooglesitemaps
 from quintagroup.plonegooglesitemaps.config import ping_googlesitemap
 
-from XMLParser import parse, hasURL
 quintagroup.plonegooglesitemaps.config.testing = 1
 
-PRODUCT = 'qPloneGoogleSitemaps'
-PRODUCTS = (PRODUCT,)
-
-# Import configure.zcml for qPloneGoogleSitemaps
+class MixinTestCase:
+    """ Define layer and common afterSetup method with package installation.
+        Package installation on plone site setup impossible because of
+        five's registerPackage directive not recognized on module initializing.
+    """
+    layer = PloneSite
+
+    def afterSetUp(self):
+        self.loginAsPortalOwner()
+
+
+class TestCase(MixinTestCase, ptc.PloneTestCase):
+    """ For unit tests """
+
+class FunctionalTestCase(MixinTestCase, ptc.FunctionalTestCase):
+    """ For functional tests """
+
+# Initialize all needed zcml directives
 fiveconfigure.debug_mode = True
+from Products import Five, CMFCore, GenericSetup
+zcml.load_config('meta.zcml', Five)
+zcml.load_config('meta.zcml', CMFCore)
+zcml.load_config('meta.zcml', GenericSetup)
+zcml.load_config('permissions.zcml', Five)
+
+# Force quintagroup.plonegooglesitemaps zcml initialization
 zcml.load_config('configure.zcml', quintagroup.plonegooglesitemaps)
 fiveconfigure.debug_mode = False
 
-PloneTestCase.installProduct(PRODUCT)
-PloneTestCase.setupPloneSite(extension_profiles=("Products.%s:default" % PRODUCT,))
-
-class TestqPloneGoogleSitemapsInstallation(PloneTestCase.PloneTestCase):
-
-    def afterSetUp(self):
-        self.loginAsPortalOwner()
+# Install quintagroup.plonegooglesitemaps package and Plone site
+# with the default profile for the package
+PRODUCT = 'quintagroup.plonegooglesitemaps'
+ptc.installPackage(PRODUCT)
+ptc.setupPloneSite( extension_profiles=("%s:default" % PRODUCT,))
+
+
+class TestGoogleSitemapsInstallation(TestCase):
 
     def testType(self):
@@ -66 +96 @@
     def testSkins(self):
         ps = self.portal.portal_skins
-        self.assert_('qPloneGoogleSitemaps' in ps.objectIds(), 
-            'No "qPloneGoogleSitemaps" skin layer in portal_skins')
-        self.assert_('qPloneGoogleSitemaps' in ps.getSkinPath(ps.getDefaultSkin()),
-            'No "qPloneGoogleSitemaps" skin layer in default skin')
+        self.assert_('plonegooglesitemaps' in ps.objectIds(), 
+            'No "plonegooglesitemaps" skin layer in portal_skins')
+        self.assert_('plonegooglesitemaps' in ps.getSkinPath(ps.getDefaultSkin()),
+            'No "plonegooglesitemaps" skin layer in default skin')
 
     def testConfiglet(self):
         cp = self.portal.portal_controlpanel
-        self.assert_([1 for ai in cp.listActionInfos() if ai['id']=='qPloneGoogleSitemaps'], 
-            'No "qPloneGoogleSitemaps" configlet added to plone control panel')
+        self.assert_([1 for ai in cp.listActionInfos() if ai['id']=='GoogleSitemaps'], 
+            'No "GoogleSitemaps" configlet added to plone control panel')
 
     def testCatalog(self):
@@ -82 +112 @@
 
 
-class TestSitemapType(PloneTestCase.FunctionalTestCase):
+class TestSitemapType(FunctionalTestCase):
 
     def afterSetUp(self):
-        self.loginAsPortalOwner()
+        super(TestSitemapType, self).afterSetUp()
         self.auth = 'admin:admin'
         self.contentSM = _createObjectByType('Sitemap', self.portal, id='google-sitemaps')
@@ -137 +167 @@
 
 
-class TestqPloneGoogleSitemaps(PloneTestCase.FunctionalTestCase):
+class TestGoogleSitemaps(FunctionalTestCase):
 
     def afterSetUp(self):
-        self.loginAsPortalOwner()
+        super(TestGoogleSitemaps, self).afterSetUp()
 
         self.workflow = self.portal.portal_workflow
@@ -234 +264 @@
 
 
-class TestSettings(PloneTestCase.FunctionalTestCase):
+class TestSettings(FunctionalTestCase):
 
     def afterSetUp(self):
-        self.loginAsPortalOwner()
+        super(TestSettings, self).afterSetUp()
 
         self.workflow = self.portal.portal_workflow
@@ -315 +345 @@
 
 
-class TestPinging(PloneTestCase.FunctionalTestCase):
+class TestPinging(FunctionalTestCase):
 
     def afterSetUp(self):
-        self.loginAsPortalOwner()
+        super(TestPinging, self).afterSetUp()
 
         self.workflow = self.portal.portal_workflow
@@ -386 +416 @@
     from unittest import TestSuite, makeSuite
     suite = TestSuite()
-    suite.addTest(makeSuite(TestqPloneGoogleSitemapsInstallation))
+    suite.addTest(makeSuite(TestGoogleSitemapsInstallation))
     suite.addTest(makeSuite(TestSitemapType))
-    suite.addTest(makeSuite(TestqPloneGoogleSitemaps))
+    suite.addTest(makeSuite(TestGoogleSitemaps))
     suite.addTest(makeSuite(TestSettings))
     suite.addTest(makeSuite(TestPinging))
-
     return suite
 
 if __name__ == '__main__':
-    framework()
+    unittest.main(defaultTest='test_suite')
+#    framework()