Changeset 2339 in products

Timestamp:

May 19, 2010 7:54:46 AM (14 years ago)

Author:

mylan

Message:

Prevent changing security manager on tested content adding

Location:

quintagroup.referencedatagridfield/branches/plone4/quintagroup/referencedatagridfield/tests

Files:

• base.py (modified) (2 diffs)
• testField.py (modified) (2 diffs)

quintagroup.referencedatagridfield/branches/plone4/quintagroup/referencedatagridfield/tests/base.py

@@ -6 +6 @@
 from Products.Five import fiveconfigure
 from Testing import ZopeTestCase as ztc
+from AccessControl import getSecurityManager
+from AccessControl.SecurityManagement import setSecurityManager
 
 from Products.Archetypes.tests.utils import makeContent
@@ -42 +44 @@
     def createDemo(self):
         # Create tested content
+        sm = getSecurityManager()
         self.loginAsPortalOwner()
-        if not 'demo' in self.portal.objectIds():
-            makeContent(self.portal, portal_type='ReferenceDataGridDemoType', id='demo')
-            self.demo = self.portal.demo
-            self.demo.setTitle('Reference DataGrid Field Demo')
-            self.demo.reindexObject()
-        if not 'doc' in self.portal.objectIds():
-            makeContent(self.portal, portal_type='Document', id='doc')
-            self.doc = self.portal.doc
-            self.doc.setTitle('Test Document')
-            self.doc.reindexObject()
-        self.logout()
-
-    # def createDefaultStructure(self):
-    #     if 'layer1' not in self.portal.objectIds():
-    #         self.setRoles(['Manager'])
-    #         makeContent(self.portal, portal_type='Folder', id='layer1')
-    #         self.portal.layer1.setTitle('Layer1')
-    #         self.portal.layer1.reindexObject()
-    #         makeContent(self.portal.layer1, portal_type='Folder', id='layer2')
-    #         self.folder = self.portal.layer1.layer2
-    #         self.folder.setTitle('Layer2')
-    #         self.folder.reindexObject()
-    #         self.setRoles(['Member'])
-    #     return self.portal.layer1.layer2
-
-    # def removeDefaultStructure(self):
-    #     if 'layer1' in self.portal.objectIds():
-    #         self.portal._delObject('layer1')
-
+        try:
+            if not 'demo' in self.portal.objectIds():
+                makeContent(self.portal, portal_type='ReferenceDataGridDemoType', id='demo')
+                self.demo = self.portal.demo
+                self.demo.setTitle('Reference DataGrid Field Demo')
+                self.demo.reindexObject()
+            if not 'doc' in self.portal.objectIds():
+                makeContent(self.portal, portal_type='Document', id='doc')
+                self.doc = self.portal.doc
+                self.doc.setTitle('Test Document')
+                self.doc.reindexObject()
+        finally:
+            setSecurityManager(sm)
 
 class TestCase(MixIn, ptc.PloneTestCase):

quintagroup.referencedatagridfield/branches/plone4/quintagroup/referencedatagridfield/tests/testField.py

@@ -6 +6 @@
 
 
-class TestReferenceDataGridField(TestCase):
+class TestField(TestCase):
     """ ReferenceDataGridField unit tests """
 
     def afterSetUp(self):
+        self.loginAsPortalOwner()
         self.createDemo()
-        self.loginAsPortalOwner()
         self.refcat = self.portal.reference_catalog
         self.field = self.demo.getField('demo_rdgf')
@@ -117 +117 @@
 def test_suite():
     return unittest.TestSuite([
-        unittest.makeSuite(TestReferenceDataGridField),
+        unittest.makeSuite(TestField),
         ])