[CMF-checkins] CVS: Products/CMFCore/tests - test_PortalContent.py:1.4.14.2 test_PortalFolder.py:1.35.2.6

[Yvo Schubbe]

Update of /cvs-repository/Products/CMFCore/tests
In directory cvs.zope.org:/tmp/cvs-serv3869/CMFCore/tests

Modified Files:
      Tag: CMF-1_5-branch
	test_PortalContent.py test_PortalFolder.py 
Log Message:
- replaced get_transaction() by the transaction API used in Zope 2.8
- added utils.transaction for Zope 2.7 compatibility
- replaced commit() by commit(1) in test_PortalFolder.py
- related import and whitespace cleanup


=== Products/CMFCore/tests/test_PortalContent.py 1.4.14.1 => 1.4.14.2 ===
--- Products/CMFCore/tests/test_PortalContent.py:1.4.14.1	Fri Sep  3 12:12:03 2004
+++ Products/CMFCore/tests/test_PortalContent.py	Tue Apr  5 05:25:20 2005
@@ -1,15 +1,42 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for PortalContent module.
+
+$Id$
+"""
+
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except ImportError:
+    # BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 from Interface.Verify import verifyClass
 
-from Acquisition import aq_base
-from Products.CMFCore.tests.base.testcase import RequestTest
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import noSecurityManager
 from AccessControl.User import UnrestrictedUser
+from Acquisition import aq_base
+try:
+    import transaction
+except ImportError:
+    # BBB: for Zope 2.7
+    from Products.CMFCore.utils import transaction
+
 from Products.CMFCore.PortalContent import PortalContent
+from Products.CMFCore.tests.base.testcase import RequestTest
 
 
 class PortalContentTests(TestCase):
@@ -34,7 +61,7 @@
             newSecurityManager(None, UnrestrictedUser('manager', '', ['Manager'], []))
             self.root.manage_addProduct['CMFDefault'].manage_addCMFSite('cmf')
             self.site = self.root.cmf
-            get_transaction().commit(1) # Make sure we have _p_jars
+            transaction.commit(1) # Make sure we have _p_jars
         except:
             self.tearDown()
             raise
@@ -78,8 +105,8 @@
 
 def test_suite():
     return TestSuite((
-        makeSuite( PortalContentTests ),
-        makeSuite( TestContentCopyPaste),
+        makeSuite(PortalContentTests),
+        makeSuite(TestContentCopyPaste),
         ))
 
 if __name__ == '__main__':


=== Products/CMFCore/tests/test_PortalFolder.py 1.35.2.5 => 1.35.2.6 ===
--- Products/CMFCore/tests/test_PortalFolder.py:1.35.2.5	Wed Mar  9 16:33:01 2005
+++ Products/CMFCore/tests/test_PortalFolder.py	Tue Apr  5 05:25:20 2005
@@ -17,8 +17,12 @@
 
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except ImportError:
+    # BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 from Interface.Verify import verifyClass
 
 import cStringIO
@@ -32,6 +36,11 @@
 from OFS.Image import manage_addFile
 from OFS.tests.testCopySupport import makeConnection
 from Testing.makerequest import makerequest
+try:
+    import transaction
+except ImportError:
+    # BBB: for Zope 2.7
+    from Products.CMFCore.utils import transaction
 
 from Products.CMFCore.CatalogTool import CatalogTool
 from Products.CMFCore.exceptions import BadRequest
@@ -409,7 +418,7 @@
         self.failUnless( has_path(ctool._catalog,
                                   '/bar/site/folder/sub/foo') )
 
-        get_transaction().commit(1)
+        transaction.commit(1)
         folder.manage_renameObject(id='sub', new_id='new_sub')
         self.assertEqual( len(ctool), 1 )
         self.failUnless( 'foo' in ctool.uniqueValuesFor('getId') )
@@ -428,7 +437,7 @@
         sub2.all_meta_types.extend( sub2.all_meta_types )
         sub2.all_meta_types.extend( extra_meta_types() )
 
-        get_transaction().commit(1)
+        transaction.commit(1)
         cookie = folder.manage_cutObjects(ids=['bar'])
         sub2.manage_pasteObjects(cookie)
 
@@ -478,7 +487,7 @@
         self.failUnless( has_path(ctool._catalog, '/bar/site/sub2/dummy') )
         self.failIf( has_path(ctool._catalog, '/bar/site/sub3/dummy') )
 
-        get_transaction().commit(1)
+        transaction.commit(1)
         cookie = sub1.manage_cutObjects( ids = ('dummy',) )
         # Waaa! force sub2 to allow paste of Dummy object.
         sub3.all_meta_types = []
@@ -833,18 +842,16 @@
             # Hack, we need a _p_mtime for the file, so we make sure that it
             # has one. We use a subtransaction, which means we can rollback
             # later and pretend we didn't touch the ZODB.
-            get_transaction().commit()
+            transaction.commit(1)
         except:
             self.connection.close()
             raise
-        get_transaction().begin()
 
         return self.app._getOb( 'folder1' ), self.app._getOb( 'folder2' )
 
     def _cleanApp( self ):
 
-        get_transaction().abort()
-        self.app._p_jar.sync()
+        transaction.abort()
         self.connection.close()
         del self.app
         del self.responseOut
@@ -1061,7 +1068,7 @@
         folder1.manage_permission( DeleteObjects, roles=(), acquire=0 )
 
         folder1._setObject( 'sub', PortalFolder( 'sub' ) )
-        get_transaction().commit() # get a _p_jar for 'sub'
+        transaction.commit(1) # get a _p_jar for 'sub'
 
         FOLDER_CTOR = 'manage_addProducts/CMFCore/manage_addPortalFolder'
         folder2.all_meta_types = ( { 'name'        : 'CMF Core Content'