Changeset 2538 in products for quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests

Timestamp:

Jun 16, 2010 2:28:02 PM (14 years ago)

Author:

mylan

Message:

Merged revisions 3566-3575 via svnmerge from
​http://svn.quintagroup.com/products/quintagroup.plonegooglesitemaps/branches/test_refactoring

........

r3566 | mylan | 2010-06-14 12:24:52 +0300 (Mon, 14 Jun 2010) | 1 line

#206: Split single testqPloneGoogleSitemaps module into several specific one

........

r3567 | mylan | 2010-06-14 16:14:34 +0300 (Mon, 14 Jun 2010) | 1 line

#206: Improve code coverage - remove useless BBB code from interfaces.

........

r3568 | mylan | 2010-06-14 20:24:25 +0300 (Mon, 14 Jun 2010) | 1 line

#206: Improve code coverage - added test for MobileSitemap?, MobileSitemapView?.

........

r3569 | mylan | 2010-06-14 22:39:39 +0300 (Mon, 14 Jun 2010) | 1 line

#206: reorganize sitemap tests

........

r3570 | mylan | 2010-06-14 22:40:12 +0300 (Mon, 14 Jun 2010) | 1 line

#206: Added configlet tests

........

r3571 | mylan | 2010-06-14 23:05:19 +0300 (Mon, 14 Jun 2010) | 1 line

#206: remove BBB code for plone<3.0

........

r3572 | mylan | 2010-06-14 23:12:00 +0300 (Mon, 14 Jun 2010) | 1 line

#206: added workflow vocabularies tests for SitemapTypes?

........

r3573 | mylan | 2010-06-15 21:36:40 +0300 (Tue, 15 Jun 2010) | 1 line

#206: some cleanup, simplify tests

........

r3574 | mylan | 2010-06-16 16:35:31 +0300 (Wed, 16 Jun 2010) | 1 line

#206: move mobile sitemap code preparation into base module

........

r3575 | mylan | 2010-06-16 16:37:14 +0300 (Wed, 16 Jun 2010) | 1 line

#206: Added security tests

........

Location:

quintagroup.plonegooglesitemaps/trunk

Files:

• . (modified) (2 props)
• quintagroup/plonegooglesitemaps/tests/base.py (modified) (5 diffs)
• quintagroup/plonegooglesitemaps/tests/testConfiglet.py (copied) (copied from quintagroup.plonegooglesitemaps/branches/test_refactoring/quintagroup/plonegooglesitemaps/tests/testConfiglet.py)
• quintagroup/plonegooglesitemaps/tests/testGoogleSitemaps.py (copied) (copied from quintagroup.plonegooglesitemaps/branches/test_refactoring/quintagroup/plonegooglesitemaps/tests/testGoogleSitemaps.py)
• quintagroup/plonegooglesitemaps/tests/testInstallation.py (copied) (copied from quintagroup.plonegooglesitemaps/branches/test_refactoring/quintagroup/plonegooglesitemaps/tests/testInstallation.py)
• quintagroup/plonegooglesitemaps/tests/testMobileSitemaps.py (copied) (copied from quintagroup.plonegooglesitemaps/branches/test_refactoring/quintagroup/plonegooglesitemaps/tests/testMobileSitemaps.py)
• quintagroup/plonegooglesitemaps/tests/testNewsSitemaps.py (modified) (4 diffs)
• quintagroup/plonegooglesitemaps/tests/testPinging.py (copied) (copied from quintagroup.plonegooglesitemaps/branches/test_refactoring/quintagroup/plonegooglesitemaps/tests/testPinging.py)
• quintagroup/plonegooglesitemaps/tests/testSecurity.py (copied) (copied from quintagroup.plonegooglesitemaps/branches/test_refactoring/quintagroup/plonegooglesitemaps/tests/testSecurity.py)
• quintagroup/plonegooglesitemaps/tests/testSitemaps.py (copied) (copied from quintagroup.plonegooglesitemaps/branches/test_refactoring/quintagroup/plonegooglesitemaps/tests/testSitemaps.py)
• quintagroup/plonegooglesitemaps/tests/testUpgrade.py (modified) (1 diff)
• quintagroup/plonegooglesitemaps/tests/testqPloneGoogleSitemaps.py (deleted)

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/base.py

@@ -9 +9 @@
 
 from zope.testing import doctestunit
+from zope.interface import Interface
 from zope.component import testing
 from Testing import ZopeTestCase as ztc
@@ -25 +26 @@
 from quintagroup.plonegooglesitemaps.config import PROJECTNAME
 from quintagroup.plonegooglesitemaps.config import ping_googlesitemap
+from quintagroup.plonegooglesitemaps.browser import mobilesitemapview
 
 quintagroup.plonegooglesitemaps.config.testing = 1
@@ -30 +32 @@
 
 
-class MixinTestCase:
+class IMobileMarker(Interface):
+    """Test Marker interface for mobile objects"""
+
+
+class MixinTestCase(object):
     """ Define layer and common afterSetup method with package installation.
         Package installation on plone site setup impossible because of
@@ -39 +45 @@
     def afterSetUp(self):
         self.loginAsPortalOwner()
+        self.workflow = self.portal.portal_workflow
+        self.orig_mobile_ifaces = None
+
+    def patchMobile(self):
+        # patch mobile sitemap view
+        self.orig_mobile_ifaces = mobilesitemapview.MOBILE_INTERFACES
+        mobilesitemapview.MOBILE_INTERFACES = [IMobileMarker.__identifier__,]
+
+    def beforeTearDown(self):
+        if self.orig_mobile_ifaces is not None:
+            mobilesitemapview.MOBILE_INTERFACES = self.orig_mobile_ifaces
 
 
@@ -44 +61 @@
     """ For unit tests """
 
+
 class FunctionalTestCase(MixinTestCase, ptc.FunctionalTestCase):
     """ For functional tests """
+
+    def afterSetUp(self):
+        super(FunctionalTestCase, self).afterSetUp()
+        self.auth = "%s:%s" % (portal_owner, default_password)
 
 # Initialize all needed zcml directives

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/testNewsSitemaps.py

@@ -17 +17 @@
         # Add testing news item to portal
         self.pubdate = (DateTime()+1).strftime("%Y-%m-%d")
-        my_news = self.portal.invokeFactory("News Item", id="my_news")
-        self.my_news = self.portal["my_news"]
+        self.my_news = _createObjectByType('News Item', self.portal, id='my_news')
         self.my_news.edit(text="Test news item", title="First news (test)", language="ua",
                           effectiveDate=self.pubdate, gsm_access="Registration",
                           gsm_genres=("PressRelease",), gsm_stock="NASDAQ:AMAT, BOM:500325")
-        self.portal.portal_workflow.doActionFor(self.my_news, "publish")
+        self.workflow.doActionFor(self.my_news, "publish")
         self.reParse()
 
@@ -91 +90 @@
     def test_ngenresForNotExtended(self):
         # No genres should present for not extended content type
-        self.portal.invokeFactory("Document", id="my_doc")
-        my_doc = getattr(self.portal, "my_doc")
+        my_doc = _createObjectByType('Document', self.portal, id='my_doc')
+        #self.portal.invokeFactory("Document", id="my_doc")
+        #my_doc = getattr(self.portal, "my_doc")
         my_doc.edit(text="Test document")
-        self.portal.portal_workflow.doActionFor(my_doc, "publish")
+        self.workflow.doActionFor(my_doc, "publish")
         self.portal["news-sitemaps"].edit(portalTypes=("Document",))
         self.reParse()
@@ -116 +116 @@
         # Add minimal testing news item to portal
         self.pubdate = (DateTime()+1).strftime("%Y-%m-%d")
-        my_news = self.portal.invokeFactory("News Item", id="my_news")
-        self.my_news = self.portal["my_news"]
+        self.my_news = _createObjectByType('News Item', self.portal, id='my_news')
         self.my_news.edit(effectiveDate=self.pubdate)
-        self.portal.portal_workflow.doActionFor(self.my_news, "publish")
+        self.workflow.doActionFor(self.my_news, "publish")
         self.reParse()
 
@@ -168 +167 @@
     def afterSetUp(self):
         super(TestSchemaExtending, self).afterSetUp()
-        self.loginAsPortalOwner()
-        # Add testing news item to portal
-        my_news = self.portal.invokeFactory("News Item", id="my_news")
-        self.my_news = self.portal["my_news"]
-        my_doc = self.portal.invokeFactory("Document", id="my_doc")
-        self.my_doc = self.portal["my_doc"]
+        self.my_doc = _createObjectByType('Document', self.portal, id='my_doc')
+        self.my_news = _createObjectByType('News Item', self.portal, id='my_news')
 
     def testExtendNewsItemByDefault(self):

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/testUpgrade.py

@@ -18 +18 @@
 
     def afterSetUp(self):
+        super(TestUpgrade, self).afterSetUp()
         self.setup = self.portal.portal_setup
         self.profile = "quintagroup.plonegooglesitemaps:default"