[Checkins] SVN: GenericSetup/trunk/tests/ - more test cleanup
Yvo Schubbe
y.2006_ at wcm-solutions.de
Tue Nov 21 08:15:06 EST 2006
Log message for revision 71241:
- more test cleanup
Changed:
U GenericSetup/trunk/tests/common.py
U GenericSetup/trunk/tests/test_context.py
U GenericSetup/trunk/tests/test_differ.py
U GenericSetup/trunk/tests/test_registry.py
U GenericSetup/trunk/tests/test_rolemap.py
U GenericSetup/trunk/tests/test_tool.py
-=-
Modified: GenericSetup/trunk/tests/common.py
===================================================================
--- GenericSetup/trunk/tests/common.py 2006-11-21 13:14:15 UTC (rev 71240)
+++ GenericSetup/trunk/tests/common.py 2006-11-21 13:15:05 UTC (rev 71241)
@@ -19,7 +19,8 @@
import shutil
from tarfile import TarFile
-from Acquisition import Implicit
+from AccessControl.SecurityManagement import newSecurityManager
+from AccessControl.User import UnrestrictedUser
from Testing.ZopeTestCase import ZopeTestCase
from zope.interface import implements
@@ -28,40 +29,6 @@
from Products.GenericSetup.testing import DummyLogger
-class OmnipotentUser(Implicit):
- """ Omnipotent User for unit testing purposes.
- """
- def getId(self):
- return 'all_powerful_Oz'
-
- getUserName = getId
-
- def getRoles(self):
- return ('Manager',)
-
- def allowed(self, object, object_roles=None):
- return 1
-
- def getRolesInContext(self, object):
- return ('Manager',)
-
-
-class SecurityRequestTest(ZopeTestCase):
-
- def setUp(self):
- from AccessControl.SecurityManagement import newSecurityManager
-
- ZopeTestCase.setUp(self)
- self.root = self.app
- newSecurityManager(None, OmnipotentUser().__of__(self.app.acl_users))
-
- def tearDown(self):
- from AccessControl.SecurityManagement import noSecurityManager
-
- noSecurityManager()
- ZopeTestCase.tearDown(self)
-
-
class DOMComparator:
def _compareDOM( self, found_text, expected_text, debug=False ):
@@ -98,10 +65,13 @@
self.assertEqual( found.toxml(), expected.toxml() )
-class BaseRegistryTests( SecurityRequestTest, DOMComparator ):
+class BaseRegistryTests(ZopeTestCase, DOMComparator):
- def _makeOne( self, *args, **kw ):
+ def afterSetUp(self):
+ self.root = self.app
+ newSecurityManager(None, UnrestrictedUser('god', '', ['Manager'], ''))
+ def _makeOne( self, *args, **kw ):
# Derived classes must implement _getTargetClass
return self._getTargetClass()( *args, **kw )
@@ -128,31 +98,18 @@
return fqpath
-class FilesystemTestBase( SecurityRequestTest ):
+class FilesystemTestBase(ZopeTestCase):
- def _makeOne( self, *args, **kw ):
+ def _makeOne(self, *args, **kw):
+ return self._getTargetClass()(*args, **kw)
- return self._getTargetClass()( *args, **kw )
+ def beforeTearDown(self):
+ _clearTestDirectory(self._PROFILE_PATH)
- def setUp( self ):
+ def _makeFile(self, filename, contents):
+ return _makeTestFile(filename, self._PROFILE_PATH, contents)
- SecurityRequestTest.setUp( self )
- self._clearTempDir()
- def tearDown( self ):
-
- self._clearTempDir()
- SecurityRequestTest.tearDown( self )
-
- def _clearTempDir( self ):
-
- _clearTestDirectory( self._PROFILE_PATH )
-
- def _makeFile( self, filename, contents ):
-
- return _makeTestFile( filename, self._PROFILE_PATH, contents )
-
-
class TarballTester( DOMComparator ):
def _verifyTarballContents( self, fileish, toc_list, when=None ):
Modified: GenericSetup/trunk/tests/test_context.py
===================================================================
--- GenericSetup/trunk/tests/test_context.py 2006-11-21 13:14:15 UTC (rev 71240)
+++ GenericSetup/trunk/tests/test_context.py 2006-11-21 13:15:05 UTC (rev 71241)
@@ -16,7 +16,7 @@
"""
import unittest
-import Testing
+from Testing.ZopeTestCase import ZopeTestCase
import logging
import os
@@ -30,9 +30,7 @@
from OFS.Image import File
from common import FilesystemTestBase
-from common import SecurityRequestTest
from common import TarballTester
-from common import _makeTestFile
from conformance import ConformsToISetupContext
from conformance import ConformsToIImportContext
from conformance import ConformsToIExportContext
@@ -61,7 +59,7 @@
def test_getLogger( self ):
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
self.assertEqual( len( ctx.listNotes() ), 0 )
@@ -81,7 +79,7 @@
FILENAME = 'nonesuch.txt'
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
self.assertEqual( ctx.readDataFile( FILENAME ), None )
@@ -93,7 +91,7 @@
FILENAME = 'simple.txt'
self._makeFile( FILENAME, printable )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
self.assertEqual( ctx.readDataFile( FILENAME ), printable )
@@ -105,7 +103,7 @@
FILENAME = 'subdir/nested.txt'
self._makeFile( FILENAME, printable )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
self.assertEqual( ctx.readDataFile( FILENAME ), printable )
@@ -114,7 +112,7 @@
FILENAME = 'nonesuch.txt'
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
self.assertEqual( ctx.getLastModified( FILENAME ), None )
@@ -127,7 +125,7 @@
fqpath = self._makeFile( FILENAME, printable )
timestamp = os.path.getmtime( fqpath )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
lm = ctx.getLastModified( FILENAME )
@@ -143,7 +141,7 @@
fqpath = self._makeFile( FILENAME, printable )
timestamp = os.path.getmtime( fqpath )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
lm = ctx.getLastModified( FILENAME )
@@ -160,7 +158,7 @@
path, file = os.path.split( fqpath )
timestamp = os.path.getmtime( path )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
lm = ctx.getLastModified( SUBDIR )
@@ -171,7 +169,7 @@
FILENAME = 'nonesuch.txt'
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
self.assertEqual( ctx.isDirectory( FILENAME ), None )
@@ -183,7 +181,7 @@
FILENAME = 'simple.txt'
fqpath = self._makeFile( FILENAME, printable )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
self.assertEqual( ctx.isDirectory( FILENAME ), False )
@@ -196,7 +194,7 @@
FILENAME = os.path.join( SUBDIR, 'nested.txt' )
fqpath = self._makeFile( FILENAME, printable )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
self.assertEqual( ctx.isDirectory( FILENAME ), False )
@@ -209,7 +207,7 @@
FILENAME = os.path.join( SUBDIR, 'nested.txt' )
fqpath = self._makeFile( FILENAME, printable )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
self.assertEqual( ctx.isDirectory( SUBDIR ), True )
@@ -218,7 +216,7 @@
FILENAME = 'nonesuch.txt'
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
self.assertEqual( ctx.listDirectory( FILENAME ), None )
@@ -227,7 +225,7 @@
from string import printable
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
FILENAME = 'simple.txt'
@@ -243,7 +241,7 @@
FILENAME = 'simple.txt'
self._makeFile( FILENAME, printable )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
self.assertEqual( ctx.listDirectory( FILENAME ), None )
@@ -256,7 +254,7 @@
FILENAME = os.path.join( SUBDIR, 'nested.txt' )
self._makeFile( FILENAME, printable )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
self.assertEqual( ctx.listDirectory( FILENAME ), None )
@@ -269,7 +267,7 @@
FILENAME = os.path.join( SUBDIR, 'nested.txt' )
self._makeFile( FILENAME, printable )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
names = ctx.listDirectory( SUBDIR )
@@ -284,7 +282,7 @@
self._makeFile( FILENAME, printable )
self._makeFile( os.path.join( SUBDIR, 'another.txt' ), 'ABC' )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
names = ctx.listDirectory( SUBDIR )
@@ -303,7 +301,7 @@
self._makeFile( os.path.join( SUBDIR, 'CVS/skip.txt' ), 'DEF' )
self._makeFile( os.path.join( SUBDIR, '.svn/skip.txt' ), 'GHI' )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
names = ctx.listDirectory( SUBDIR )
@@ -325,7 +323,7 @@
self._makeFile( os.path.join( SUBDIR, 'CVS/skip.txt' ), 'DEF' )
self._makeFile( os.path.join( SUBDIR, '.svn/skip.txt' ), 'GHI' )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
names = ctx.listDirectory(SUBDIR, skip=('nested.txt',),
@@ -352,7 +350,7 @@
def test_getLogger( self ):
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
self.assertEqual( len( ctx.listNotes() ), 0 )
@@ -374,7 +372,7 @@
FILENAME = 'simple.txt'
fqname = self._makeFile( FILENAME, printable )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
ctx.writeDataFile( FILENAME, digits, 'text/plain' )
@@ -388,7 +386,7 @@
FILENAME = 'nested.txt'
fqname = os.path.join( self._PROFILE_PATH, SUBDIR, FILENAME )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
ctx.writeDataFile( FILENAME, digits, 'text/plain', SUBDIR )
@@ -403,7 +401,7 @@
fqname = self._makeFile( os.path.join( SUBDIR, FILENAME )
, printable )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
ctx.writeDataFile( FILENAME, digits, 'text/plain', SUBDIR )
@@ -418,7 +416,7 @@
self._makeFile( os.path.join( SUBDIR, 'another.txt' ), printable )
fqname = os.path.join( self._PROFILE_PATH, SUBDIR, FILENAME )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._makeOne( site, self._PROFILE_PATH )
ctx.writeDataFile( FILENAME, digits, 'text/plain', SUBDIR )
@@ -426,10 +424,8 @@
self.assertEqual( open( fqname, 'rb' ).read(), digits )
-class TarballImportContextTests( SecurityRequestTest
- , ConformsToISetupContext
- , ConformsToIImportContext
- ):
+class TarballImportContextTests(ZopeTestCase, ConformsToISetupContext,
+ ConformsToIImportContext):
def _getTargetClass( self ):
@@ -472,7 +468,7 @@
archive.close()
bits = archive_stream.getvalue()
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
site._setObject( 'setup_tool', Folder( 'setup_tool' ) )
tool = site._getOb( 'setup_tool' )
@@ -741,14 +737,9 @@
self.failIf( FILENAME3 in names )
-class TarballExportContextTests( FilesystemTestBase
- , TarballTester
- , ConformsToISetupContext
- , ConformsToIExportContext
- ):
+class TarballExportContextTests(ZopeTestCase, ConformsToISetupContext,
+ ConformsToIExportContext, TarballTester):
- _PROFILE_PATH = '/tmp/TECT_tests'
-
def _getTargetClass( self ):
from Products.GenericSetup.context import TarballExportContext
@@ -756,7 +747,7 @@
def test_getLogger( self ):
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._getTargetClass()( site )
self.assertEqual( len( ctx.listNotes() ), 0 )
@@ -778,7 +769,7 @@
from string import printable
now = long( time.time() )
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._getTargetClass()( site )
ctx.writeDataFile( 'foo.txt', printable, 'text/plain' )
@@ -793,7 +784,7 @@
from string import printable
from string import digits
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._getTargetClass()( site )
ctx.writeDataFile( 'foo.txt', printable, 'text/plain' )
@@ -810,7 +801,7 @@
from string import printable
from string import digits
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
ctx = self._getTargetClass()( site )
ctx.writeDataFile( 'foo.txt', printable, 'text/plain' )
@@ -823,10 +814,8 @@
self._verifyTarballEntry( fileish, 'bar/baz.txt', digits )
-class SnapshotExportContextTests( SecurityRequestTest
- , ConformsToISetupContext
- , ConformsToIExportContext
- ):
+class SnapshotExportContextTests(ZopeTestCase, ConformsToISetupContext,
+ ConformsToIExportContext):
def _getTargetClass( self ):
@@ -839,7 +828,7 @@
def test_getLogger( self ):
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
site.setup_tool = DummyTool( 'setup_tool' )
tool = site.setup_tool
ctx = self._makeOne( tool, 'simple' )
@@ -869,7 +858,7 @@
png_data = png_file.read()
png_file.close()
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
site.setup_tool = DummyTool( 'setup_tool' )
tool = site.setup_tool
ctx = self._makeOne( tool, 'simple' )
@@ -895,7 +884,7 @@
FILENAME = 'simple.txt'
CONTENT_TYPE = 'text/plain'
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
site.setup_tool = DummyTool( 'setup_tool' )
tool = site.setup_tool
ctx = self._makeOne( tool, 'simple' )
@@ -922,7 +911,7 @@
CONTENT_TYPE = 'text/plain'
CONTENT = u'Unicode, with non-ASCII: %s.' % unichr(150)
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
site.setup_tool = DummyTool( 'setup_tool' )
tool = site.setup_tool
ctx = self._makeOne( tool, 'simple', 'latin_1' )
@@ -949,7 +938,7 @@
CONTENT_TYPE = 'text/xml'
_XML = """<?xml version="1.0"?><simple />"""
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
site.setup_tool = DummyTool( 'setup_tool' )
tool = site.setup_tool
ctx = self._makeOne( tool, 'simple' )
@@ -975,7 +964,7 @@
CONTENT_TYPE = 'text/xml'
_XML = u"""<?xml version="1.0"?><simple />"""
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
site.setup_tool = DummyTool( 'setup_tool' )
tool = site.setup_tool
ctx = self._makeOne( tool, 'simple' )
@@ -1001,7 +990,7 @@
CONTENT_TYPE = 'text/html'
_HTML = """<html><body><h1>HTML</h1></body></html>"""
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
site.setup_tool = DummyTool( 'setup_tool' )
tool = site.setup_tool
ctx = self._makeOne( tool, 'simple' )
@@ -1030,7 +1019,7 @@
CONTENT_TYPE = 'text/html'
_HTML = """<html><body><h1>HTML</h1></body></html>"""
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
site.setup_tool = DummyTool( 'setup_tool' )
tool = site.setup_tool
ctx = self._makeOne( tool, 'simple' )
@@ -1056,7 +1045,7 @@
from string import printable
from string import digits
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
site.setup_tool = DummyTool( 'setup_tool' )
tool = site.setup_tool
ctx = self._makeOne( tool, 'multiple' )
@@ -1072,10 +1061,8 @@
self.failUnless( id in snapshot.objectIds() )
-class SnapshotImportContextTests( SecurityRequestTest
- , ConformsToISetupContext
- , ConformsToIImportContext
- ):
+class SnapshotImportContextTests(ZopeTestCase, ConformsToISetupContext,
+ ConformsToIImportContext):
def _getTargetClass( self ):
@@ -1084,7 +1071,7 @@
def _makeOne( self, context_id, *args, **kw ):
- site = DummySite( 'site' ).__of__( self.root )
+ site = DummySite('site').__of__(self.app)
site._setObject( 'setup_tool', Folder( 'setup_tool' ) )
tool = site._getOb( 'setup_tool' )
Modified: GenericSetup/trunk/tests/test_differ.py
===================================================================
--- GenericSetup/trunk/tests/test_differ.py 2006-11-21 13:14:15 UTC (rev 71240)
+++ GenericSetup/trunk/tests/test_differ.py 2006-11-21 13:15:05 UTC (rev 71241)
@@ -16,16 +16,13 @@
"""
import unittest
-import Testing
+from Testing.ZopeTestCase import ZopeTestCase
+from DateTime.DateTime import DateTime
from OFS.Folder import Folder
from OFS.Image import File
-from DateTime.DateTime import DateTime
-from common import SecurityRequestTest
-
-
class DummySite( Folder ):
pass
@@ -96,7 +93,7 @@
four\
"""
-class ConfigDiffTests( SecurityRequestTest ):
+class ConfigDiffTests(ZopeTestCase):
site = None
tool = None
@@ -115,7 +112,7 @@
if self.site is not None:
return
- site = self.site = DummySite( 'site' ).__of__( self.root )
+ site = self.site = DummySite('site').__of__(self.app)
site._setObject( 'setup_tool', Folder( 'setup_tool' ) )
self.tool = tool = site._getOb( 'setup_tool' )
Modified: GenericSetup/trunk/tests/test_registry.py
===================================================================
--- GenericSetup/trunk/tests/test_registry.py 2006-11-21 13:14:15 UTC (rev 71240)
+++ GenericSetup/trunk/tests/test_registry.py 2006-11-21 13:15:05 UTC (rev 71241)
@@ -448,7 +448,7 @@
def test_generateXML_empty( self ):
- registry = self._makeOne().__of__( self.root )
+ registry = self._makeOne().__of__(self.app)
xml = registry.generateXML()
@@ -456,7 +456,7 @@
def test_generateXML_single( self ):
- registry = self._makeOne().__of__( self.root )
+ registry = self._makeOne().__of__(self.app)
registry.registerStep( id='one'
, version='1'
@@ -470,7 +470,7 @@
def test_generateXML_ordered( self ):
- registry = self._makeOne().__of__( self.root )
+ registry = self._makeOne().__of__(self.app)
registry.registerStep( id='one'
, version='1'
@@ -500,7 +500,7 @@
def test_parseXML_empty( self ):
- registry = self._makeOne().__of__( self.root )
+ registry = self._makeOne().__of__(self.app)
registry.registerStep( id='one'
, version='1'
@@ -515,7 +515,7 @@
def test_parseXML_single( self ):
- registry = self._makeOne().__of__( self.root )
+ registry = self._makeOne().__of__(self.app)
registry.registerStep( id='two'
, version='2'
@@ -691,7 +691,7 @@
def test_generateXML_empty( self ):
- registry = self._makeOne().__of__( self.root )
+ registry = self._makeOne().__of__(self.app)
xml = registry.generateXML()
@@ -699,7 +699,7 @@
def test_generateXML_single( self ):
- registry = self._makeOne().__of__( self.root )
+ registry = self._makeOne().__of__(self.app)
registry.registerStep( id='one'
, handler=ONE_FUNC
@@ -711,7 +711,7 @@
def test_generateXML_ordered( self ):
- registry = self._makeOne().__of__( self.root )
+ registry = self._makeOne().__of__(self.app)
registry.registerStep( id='one'
, handler=ONE_FUNC
@@ -735,7 +735,7 @@
def test_parseXML_empty( self ):
- registry = self._makeOne().__of__( self.root )
+ registry = self._makeOne().__of__(self.app)
registry.registerStep( id='one'
, handler=ONE_FUNC
@@ -748,7 +748,7 @@
def test_parseXML_single( self ):
- registry = self._makeOne().__of__( self.root )
+ registry = self._makeOne().__of__(self.app)
registry.registerStep( id='two'
, handler=TWO_FUNC
@@ -768,7 +768,7 @@
def test_parseXML_single_as_ascii( self ):
- registry = self._makeOne().__of__( self.root )
+ registry = self._makeOne().__of__(self.app)
registry.registerStep( id='two'
, handler=TWO_FUNC
@@ -841,8 +841,8 @@
def _initSite( self ):
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
return site
Modified: GenericSetup/trunk/tests/test_rolemap.py
===================================================================
--- GenericSetup/trunk/tests/test_rolemap.py 2006-11-21 13:14:15 UTC (rev 71240)
+++ GenericSetup/trunk/tests/test_rolemap.py 2006-11-21 13:15:05 UTC (rev 71241)
@@ -38,8 +38,8 @@
def test_listRoles_normal( self ):
EXPECTED = [ 'Anonymous', 'Authenticated', 'Manager', 'Owner' ]
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
configurator = self._makeOne( site )
roles = list( configurator.listRoles() )
@@ -53,8 +53,8 @@
def test_listRoles_added( self ):
EXPECTED = [ 'Anonymous', 'Authenticated', 'Manager', 'Owner', 'ZZZ' ]
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
existing_roles = list( getattr( site, '__ac_roles__', [] ) )[:]
existing_roles.append( 'ZZZ' )
site.__ac_roles__ = existing_roles
@@ -71,15 +71,15 @@
def test_listPermissions_nooverrides( self ):
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
configurator = self._makeOne( site )
self.assertEqual( len( configurator.listPermissions() ), 0 )
def test_listPermissions_nooverrides( self ):
- site = Folder( id='site' ).__of__( self.root )
+ site = Folder(id='site').__of__(self.app)
configurator = self._makeOne( site )
self.assertEqual( len( configurator.listPermissions() ), 0 )
@@ -89,7 +89,7 @@
ACI = 'Access contents information'
ROLES = [ 'Manager', 'Owner' ]
- site = Folder( id='site' ).__of__( self.root )
+ site = Folder(id='site').__of__(self.app)
site.manage_permission( ACI, ROLES, acquire=1 )
configurator = self._makeOne( site )
@@ -104,7 +104,7 @@
ACI = 'Access contents information'
ROLES = [ 'Manager', 'Owner' ]
- site = Folder( id='site' ).__of__( self.root )
+ site = Folder(id='site').__of__(self.app)
site.manage_permission( ACI, ROLES )
configurator = self._makeOne( site )
@@ -116,16 +116,16 @@
def test_generateXML_empty( self ):
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
configurator = self._makeOne( site ).__of__( site )
self._compareDOM( configurator.generateXML(), _EMPTY_EXPORT )
def test_generateXML_added_role( self ):
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
existing_roles = list( getattr( site, '__ac_roles__', [] ) )[:]
existing_roles.append( 'ZZZ' )
site.__ac_roles__ = existing_roles
@@ -138,7 +138,7 @@
ACI = 'Access contents information'
ROLES = [ 'Manager', 'Owner' ]
- site = Folder( id='site' ).__of__( self.root )
+ site = Folder(id='site').__of__(self.app)
site.manage_permission( ACI, ROLES, acquire=1 )
configurator = self._makeOne( site ).__of__( site )
@@ -149,7 +149,7 @@
ACI = 'Access contents information'
ROLES = [ 'Manager', 'Owner', 'ZZZ' ]
- site = Folder( id='site' ).__of__( self.root )
+ site = Folder(id='site').__of__(self.app)
existing_roles = list( getattr( site, '__ac_roles__', [] ) )[:]
existing_roles.append( 'ZZZ' )
site.__ac_roles__ = existing_roles
@@ -163,7 +163,7 @@
ACI = 'Access contents information'
ROLES = [ 'Manager', 'Owner' ]
- site = Folder( id='site' ).__of__( self.root )
+ site = Folder(id='site').__of__(self.app)
site.manage_permission( ACI, ROLES )
configurator = self._makeOne( site ).__of__( site )
@@ -181,8 +181,8 @@
def test_parseXML_empty( self ):
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
existing_roles = list( getattr( site, '__ac_roles__', [] ) )[:]
configurator = self._makeOne( site )
@@ -193,8 +193,8 @@
def test_parseXML_added_role( self ):
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
configurator = self._makeOne( site )
rolemap_info = configurator.parseXML( _ADDED_ROLE_EXPORT )
@@ -211,8 +211,8 @@
ACI = 'Access contents information'
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
configurator = self._makeOne( site )
rolemap_info = configurator.parseXML( _ACQUIRED_EXPORT )
@@ -232,8 +232,8 @@
ACI = 'Access contents information'
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
configurator = self._makeOne( site )
rolemap_info = configurator.parseXML( _UNACQUIRED_EXPORT )
@@ -253,8 +253,8 @@
ACI = 'Access contents information'
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
configurator = self._makeOne( site )
rolemap_info = configurator.parseXML( _COMBINED_EXPORT )
@@ -375,8 +375,8 @@
def test_unchanged( self ):
- self.root.site = Folder( 'site' )
- site = self.root.site
+ self.app.site = Folder('site')
+ site = self.app.site
context = DummyExportContext( site )
@@ -391,8 +391,8 @@
def test_added_role( self ):
- self.root.site = Folder( 'site' )
- site = self.root.site
+ self.app.site = Folder('site')
+ site = self.app.site
existing_roles = list( getattr( site, '__ac_roles__', [] ) )[:]
existing_roles.append( 'ZZZ' )
site.__ac_roles__ = existing_roles
@@ -414,8 +414,8 @@
ACI = 'Access contents information'
ROLES = [ 'Manager', 'Owner' ]
- self.root.site = Folder( 'site' )
- site = self.root.site
+ self.app.site = Folder('site')
+ site = self.app.site
site.manage_permission( ACI, ROLES, acquire=1 )
context = DummyExportContext( site )
@@ -434,8 +434,8 @@
ACI = 'Access contents information'
ROLES = [ 'Manager', 'Owner', 'ZZZ' ]
- self.root.site = Folder( 'site' )
- site = self.root.site
+ self.app.site = Folder('site')
+ site = self.app.site
existing_roles = list( getattr( site, '__ac_roles__', [] ) )[:]
existing_roles.append( 'ZZZ' )
site.__ac_roles__ = existing_roles
@@ -457,8 +457,8 @@
ACI = 'Access contents information'
ROLES = [ 'Manager', 'Owner' ]
- self.root.site = Folder( 'site' )
- site = self.root.site
+ self.app.site = Folder('site')
+ site = self.app.site
site.manage_permission( ACI, ROLES )
context = DummyExportContext( site )
@@ -479,8 +479,8 @@
def test_empty_default_purge( self ):
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
original_roles = list( getattr( site, '__ac_roles__', [] ) )[:]
modified_roles = original_roles[:]
modified_roles.append( 'ZZZ' )
@@ -501,8 +501,8 @@
def test_empty_explicit_purge( self ):
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
original_roles = list( getattr( site, '__ac_roles__', [] ) )[:]
modified_roles = original_roles[:]
modified_roles.append( 'ZZZ' )
@@ -523,8 +523,8 @@
def test_empty_skip_purge( self ):
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
original_roles = list( getattr( site, '__ac_roles__', [] ) )[:]
modified_roles = original_roles[:]
modified_roles.append( 'ZZZ' )
@@ -548,8 +548,8 @@
ACI = 'Access contents information'
VIEW = 'View'
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
site.manage_permission( ACI, () )
site.manage_permission( VIEW, () )
@@ -583,8 +583,8 @@
ACI = 'Access contents information'
VIEW = 'View'
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
site.manage_permission( ACI, () )
site.manage_permission( VIEW, () )
@@ -617,8 +617,8 @@
ACI = 'Access contents information'
VIEW = 'View'
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
site.manage_permission( VIEW, () )
existing_allowed = [ x[ 'name' ]
@@ -650,8 +650,8 @@
ACI = 'Access contents information'
VIEW = 'View'
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
site.manage_permission( VIEW, () )
existing_allowed = [ x[ 'name' ]
@@ -683,8 +683,8 @@
ACI = 'Access contents information'
VIEW = 'View'
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
site.manage_permission( VIEW, () )
existing_allowed = [ x[ 'name' ]
@@ -720,8 +720,8 @@
ACI = 'Access contents information'
VIEW = 'View'
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
site.manage_permission( VIEW, () )
existing_allowed = [ x[ 'name' ]
@@ -757,8 +757,8 @@
ACI = 'Access contents information'
VIEW = 'View'
- self.root.site = Folder( id='site' )
- site = self.root.site
+ self.app.site = Folder(id='site')
+ site = self.app.site
site.manage_permission( VIEW, () )
existing_allowed = [ x[ 'name' ]
Modified: GenericSetup/trunk/tests/test_tool.py
===================================================================
--- GenericSetup/trunk/tests/test_tool.py 2006-11-21 13:14:15 UTC (rev 71240)
+++ GenericSetup/trunk/tests/test_tool.py 2006-11-21 13:15:05 UTC (rev 71241)
@@ -26,55 +26,43 @@
from Products.GenericSetup import profile_registry
from Products.GenericSetup.testing import ExportImportZCMLLayer
-from common import DOMComparator
+from common import BaseRegistryTests
from common import DummyExportContext
from common import DummyImportContext
from common import FilesystemTestBase
-
-from common import SecurityRequestTest
from common import TarballTester
from conformance import ConformsToISetupTool
-class SetupToolTests( FilesystemTestBase
- , TarballTester
- , ConformsToISetupTool
- ):
+class SetupToolTests(FilesystemTestBase, TarballTester, ConformsToISetupTool):
layer = ExportImportZCMLLayer
_PROFILE_PATH = '/tmp/STT_test'
- def setUp( self ):
-
- FilesystemTestBase.setUp( self )
+ def afterSetUp(self):
self._profile_registry_info = profile_registry._profile_info
self._profile_registry_ids = profile_registry._profile_ids
profile_registry.clear()
- def tearDown( self ):
-
+ def beforeTearDown(self):
profile_registry._profile_info = self._profile_registry_info
profile_registry._profile_ids = self._profile_registry_ids
- FilesystemTestBase.tearDown( self )
+ FilesystemTestBase.beforeTearDown(self)
- def _getTargetClass( self ):
-
+ def _getTargetClass(self):
from Products.GenericSetup.tool import SetupTool
+
return SetupTool
- def _makeOne( self, *args, **kw ):
-
- return self._getTargetClass()( *args, **kw )
-
def _makeSite( self, title="Don't care" ):
site = Folder()
site._setId( 'site' )
site.title = title
- self.root._setObject( 'site', site )
- return self.root._getOb( 'site' )
+ self.app._setObject( 'site', site )
+ return self.app._getOb( 'site' )
def test_empty( self ):
@@ -102,25 +90,13 @@
from test_registry import _EMPTY_IMPORT_XML
from test_registry import _EMPTY_EXPORT_XML
from test_registry import _EMPTY_TOOLSET_XML
- from common import _makeTestFile
tool = self._makeOne('setup_tool')
- _makeTestFile( IMPORT_STEPS_XML
- , self._PROFILE_PATH
- , _EMPTY_IMPORT_XML
- )
+ self._makeFile(IMPORT_STEPS_XML, _EMPTY_IMPORT_XML)
+ self._makeFile(EXPORT_STEPS_XML, _EMPTY_EXPORT_XML)
+ self._makeFile(TOOLSET_XML, _EMPTY_TOOLSET_XML)
- _makeTestFile( EXPORT_STEPS_XML
- , self._PROFILE_PATH
- , _EMPTY_EXPORT_XML
- )
-
- _makeTestFile( TOOLSET_XML
- , self._PROFILE_PATH
- , _EMPTY_TOOLSET_XML
- )
-
profile_registry.registerProfile('foo', 'Foo', '', self._PROFILE_PATH)
tool.setImportContext('profile-other:foo')
@@ -144,26 +120,14 @@
from test_registry import _SINGLE_EXPORT_XML
from test_registry import _NORMAL_TOOLSET_XML
from test_registry import ONE_FUNC
- from common import _makeTestFile
tool = self._makeOne('setup_tool')
tool.getExportStepRegistry().clear()
- _makeTestFile( IMPORT_STEPS_XML
- , self._PROFILE_PATH
- , _SINGLE_IMPORT_XML
- )
+ self._makeFile(IMPORT_STEPS_XML, _SINGLE_IMPORT_XML)
+ self._makeFile(EXPORT_STEPS_XML, _SINGLE_EXPORT_XML)
+ self._makeFile(TOOLSET_XML, _NORMAL_TOOLSET_XML)
- _makeTestFile( EXPORT_STEPS_XML
- , self._PROFILE_PATH
- , _SINGLE_EXPORT_XML
- )
-
- _makeTestFile( TOOLSET_XML
- , self._PROFILE_PATH
- , _NORMAL_TOOLSET_XML
- )
-
profile_registry.registerProfile('foo', 'Foo', '', self._PROFILE_PATH)
tool.setImportContext('profile-other:foo')
@@ -738,22 +702,20 @@
return 'Exported properties'
-class _ToolsetSetup( SecurityRequestTest ):
+class _ToolsetSetup(BaseRegistryTests):
def _initSite( self ):
from Products.GenericSetup.tool import SetupTool
site = Folder()
site._setId( 'site' )
- self.root._setObject( 'site', site )
- site = self.root._getOb( 'site' )
+ self.app._setObject( 'site', site )
+ site = self.app._getOb( 'site' )
site._setObject('setup_tool', SetupTool('setup_tool'))
return site
-class Test_exportToolset( _ToolsetSetup
- , DOMComparator
- ):
+class Test_exportToolset(_ToolsetSetup):
layer = ExportImportZCMLLayer
@@ -795,7 +757,7 @@
self.assertEqual( content_type, 'text/xml' )
-class Test_importToolset( _ToolsetSetup ):
+class Test_importToolset(_ToolsetSetup):
layer = ExportImportZCMLLayer
More information about the Checkins
mailing list