Changeset 3437 in products for quintagroup.plonetabs/trunk/quintagroup/plonetabs/tests/base.py

Timestamp:

Apr 20, 2012 10:04:56 AM (12 years ago)

Author:

potar

Message:

Merged tests branch

Location:

quintagroup.plonetabs/trunk

Files:

• . (modified) (1 prop)
• quintagroup/plonetabs/tests/base.py (modified) (7 diffs)

quintagroup.plonetabs/trunk

@@ -1 +1 @@
 /quintagroup.plonetabs/branches/plone4:3076-3243
+/quintagroup.plonetabs/branches/tests:3394-3436

@@ -1 +1 @@
 /quintagroup.plonetabs/branches/plone4:3076-3243
+/quintagroup.plonetabs/branches/tests:3394-3436

quintagroup.plonetabs/trunk/quintagroup/plonetabs/tests/base.py

@@ -1 +1 @@
 try:
     from zope.annotation.interfaces import IAnnotations
+    IAnnotations  # pyflakes
 except ImportError:
     from zope.app.annotation.interfaces import IAnnotations
-
 from plone.browserlayer.layer import mark_layer
 
 from  Testing import ZopeTestCase as ztc
 from  Products.Five import zcml
-from  Products.Five import fiveconfigure
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore.interfaces import IAction, IActionCategory
 from Products.CMFCore.ActionInformation import Action, ActionCategory
 from  Products.PloneTestCase import PloneTestCase as ptc
@@ -18 +16 @@
 
 #ztc.installProduct('Zope2Product')
+
 
 @onsetup
@@ -27 +26 @@
 
 setup_package()
+if ptc.PLONE30:
+    ptc.setupPloneSite(products=["plone.browserlayer"])
 ptc.setupPloneSite(products=['quintagroup.plonetabs'])
 
 _marker = object()
 
+
 class PloneTabsTestCase(ptc.PloneTestCase):
     """Common test base class"""
-    
+
     def afterSetUp(self):
         # due to some reason plone.browserlayer is not marking REQUEST
         # with installed products layer interfaces
-        # so I'm doing it manually here 
+        # so I'm doing it manually here
         class DummyEvent(object):
             def __init__(self, request):
                 self.request = request
         mark_layer(self.portal, DummyEvent(self.portal.REQUEST))
-    
+
     def purgeCache(self, request):
         annotations = IAnnotations(request)
@@ -48 +50 @@
         if cache is not _marker:
             del annotations['plone.memoize']
-    
+
     def purgeActions(self):
         for obj in self.tool.objectValues():
@@ -56 +58 @@
             #elif IActionCategory.providedBy(obj):
                 #obj.manage_delObjects(ids=obj.objectIds())
-    
+
     def setupActions(self, parent, kids=PORTAL_ACTIONS):
         ids = parent.objectIds()
@@ -68 +70 @@
                 if child.get('children', {}):
                     self.setupActions(getattr(parent, id), child['children'])
-    
+
     def purgeContent(self):
         ids = [obj.id for obj in self.portal.listFolderContents()]
         self.portal.manage_delObjects(ids=ids)
-    
+
     def setupContent(self, parent, kids=PORTAL_CONTENT):
         ids = parent.objectIds()
@@ -80 +82 @@
             if child.get('children', {}) and id in ids:
                 self.setupContent(getattr(parent, id), child['children'])
-    
+
     def _createType(self, container, portal_type, id, **kwargs):
         """Helper method to create content objects"""
         ttool = getToolByName(container, 'portal_types')
-        portal_catalog =  getToolByName(container, 'portal_catalog')
-    
+        portal_catalog = getToolByName(container, 'portal_catalog')
+
         fti = ttool.getTypeInfo(portal_type)
         fti.constructInstance(container, id, **kwargs)
         obj = getattr(container.aq_inner.aq_explicit, id)
-    
+
         # publish and reindex
         #self._publish_item(portal, obj)

@@ -1 +1 @@
 /quintagroup.plonetabs/branches/plone4:3076-3243
+/quintagroup.plonetabs/branches/tests:3394-3436