[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_ Fixups after removing unittest.TestCase from mixin tests.
Tres Seaver
tseaver at palladion.com
Wed Sep 17 17:08:49 EDT 2008
Log message for revision 91219:
Fixups after removing unittest.TestCase from mixin tests.
Changed:
U Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_actions.py
U Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_cachingpolicymgr.py
U Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_contenttyperegistry.py
U Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_cookieauth.py
U Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_properties.py
U Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_skins.py
U Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_typeinfo.py
U Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_workflow.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_actions.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_actions.py 2008-09-17 21:06:55 UTC (rev 91218)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_actions.py 2008-09-17 21:08:48 UTC (rev 91219)
@@ -237,7 +237,7 @@
self._providers = [ x for x in self._providers if x != provider_name ]
-class ActionNodeAdapterTests(NodeAdapterTestCase):
+class ActionNodeAdapterTests(NodeAdapterTestCase, unittest.TestCase):
layer = ExportImportZCMLLayer
@@ -270,12 +270,11 @@
def setUp(self):
from Products.CMFCore.ActionInformation import Action
- NodeAdapterTestCase.setUp(self)
self._obj = Action('foo_action')
self._XML = _ACTION_XML
-class ActionCategoryNodeAdapterTests(NodeAdapterTestCase):
+class ActionCategoryNodeAdapterTests(NodeAdapterTestCase, unittest.TestCase):
layer = ExportImportZCMLLayer
@@ -297,12 +296,11 @@
def setUp(self):
from Products.CMFCore.ActionInformation import ActionCategory
- NodeAdapterTestCase.setUp(self)
self._obj = ActionCategory('foo_category')
self._XML = _ACTIONCATEGORY_XML
-class ActionsToolXMLAdapterTests(BodyAdapterTestCase):
+class ActionsToolXMLAdapterTests(BodyAdapterTestCase, unittest.TestCase):
layer = ExportImportZCMLLayer
@@ -330,7 +328,6 @@
def setUp(self):
from Products.CMFCore.ActionsTool import ActionsTool
- BodyAdapterTestCase.setUp(self)
site = DummySite('site')
site._setObject('portal_actions', ActionsTool('portal_actions'))
self._obj = site.portal_actions
Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_cachingpolicymgr.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_cachingpolicymgr.py 2008-09-17 21:06:55 UTC (rev 91218)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_cachingpolicymgr.py 2008-09-17 21:08:48 UTC (rev 91219)
@@ -49,7 +49,9 @@
"""
-class CachingPolicyNodeAdapterTests(NodeAdapterTestCase):
+class CachingPolicyNodeAdapterTests(NodeAdapterTestCase,
+ unittest.TestCase,
+ ):
layer = ExportImportZCMLLayer
@@ -62,12 +64,13 @@
def setUp(self):
from Products.CMFCore.CachingPolicyManager import CachingPolicy
- NodeAdapterTestCase.setUp(self)
self._obj = CachingPolicy('foo_policy', max_age_secs=0)
self._XML = _CP_XML
-class CachingPolicyManagerXMLAdapterTests(BodyAdapterTestCase):
+class CachingPolicyManagerXMLAdapterTests(BodyAdapterTestCase,
+ unittest.TestCase,
+ ):
layer = ExportImportZCMLLayer
@@ -85,7 +88,6 @@
def setUp(self):
from Products.CMFCore.CachingPolicyManager import CachingPolicyManager
- BodyAdapterTestCase.setUp(self)
self._obj = CachingPolicyManager()
self._BODY = _CPM_BODY
Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_contenttyperegistry.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_contenttyperegistry.py 2008-09-17 21:06:55 UTC (rev 91218)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_contenttyperegistry.py 2008-09-17 21:08:48 UTC (rev 91219)
@@ -58,7 +58,9 @@
"""
-class ContentTypeRegistryXMLAdapterTests(BodyAdapterTestCase):
+class ContentTypeRegistryXMLAdapterTests(BodyAdapterTestCase,
+ unittest.TestCase,
+ ):
layer = ExportImportZCMLLayer
@@ -85,7 +87,6 @@
def setUp(self):
from Products.CMFCore.ContentTypeRegistry import ContentTypeRegistry
- BodyAdapterTestCase.setUp(self)
self._obj = ContentTypeRegistry()
self._BODY = _CTR_BODY
Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_cookieauth.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_cookieauth.py 2008-09-17 21:06:55 UTC (rev 91218)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_cookieauth.py 2008-09-17 21:08:48 UTC (rev 91219)
@@ -77,7 +77,7 @@
"""
-class CookieCrumblerXMLAdapterTests(BodyAdapterTestCase):
+class CookieCrumblerXMLAdapterTests(BodyAdapterTestCase, unittest.TestCase):
layer = ExportImportZCMLLayer
@@ -88,7 +88,6 @@
return CookieCrumblerXMLAdapter
def setUp(self):
- BodyAdapterTestCase.setUp(self)
self._obj = CookieCrumbler('foo_cookiecrumbler')
self._BODY = _COOKIECRUMBLER_BODY
Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_properties.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_properties.py 2008-09-17 21:06:55 UTC (rev 91218)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_properties.py 2008-09-17 21:08:48 UTC (rev 91219)
@@ -59,7 +59,7 @@
"""
-class PropertiesXMLAdapterTests(BodyAdapterTestCase):
+class PropertiesXMLAdapterTests(BodyAdapterTestCase, unittest.TestCase):
layer = ExportImportZCMLLayer
@@ -89,7 +89,6 @@
def setUp(self):
from Products.CMFCore.PortalObject import PortalObjectBase
- BodyAdapterTestCase.setUp(self)
self._obj = PortalObjectBase('foo_site')
self._BODY = _PROPERTIES_BODY
Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_skins.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_skins.py 2008-09-17 21:06:55 UTC (rev 91218)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_skins.py 2008-09-17 21:08:48 UTC (rev 91219)
@@ -227,7 +227,10 @@
DirectoryView._dirreg = self._olddirreg
-class DirectoryViewAdapterTests(_DVRegistrySetup, NodeAdapterTestCase):
+class DirectoryViewAdapterTests(_DVRegistrySetup,
+ NodeAdapterTestCase,
+ unittest.TestCase,
+ ):
layer = ExportImportZCMLLayer
@@ -243,17 +246,18 @@
def setUp(self):
from Products.CMFCore.DirectoryView import DirectoryView
- NodeAdapterTestCase.setUp(self)
_DVRegistrySetup.setUp(self)
self._obj = DirectoryView('foo_directoryview').__of__(Folder())
self._XML = _DIRECTORYVIEW_XML
def tearDown(self):
_DVRegistrySetup.tearDown(self)
- NodeAdapterTestCase.tearDown(self)
-class SkinsToolXMLAdapterTests(_DVRegistrySetup, BodyAdapterTestCase):
+class SkinsToolXMLAdapterTests(_DVRegistrySetup,
+ BodyAdapterTestCase,
+ unittest.TestCase,
+ ):
layer = ExportImportZCMLLayer
@@ -277,14 +281,12 @@
from Products.CMFCore import DirectoryView
from Products.CMFCore.SkinsTool import SkinsTool
- BodyAdapterTestCase.setUp(self)
_DVRegistrySetup.setUp(self)
self._obj = SkinsTool()
self._BODY = _SKINSTOOL_BODY
def tearDown(self):
_DVRegistrySetup.tearDown(self)
- BodyAdapterTestCase.tearDown(self)
class _SkinsSetup(_DVRegistrySetup, BaseRegistryTests):
Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_typeinfo.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_typeinfo.py 2008-09-17 21:06:55 UTC (rev 91218)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_typeinfo.py 2008-09-17 21:08:48 UTC (rev 91219)
@@ -260,7 +260,7 @@
"""
-class TypeInformationXMLAdapterTests(BodyAdapterTestCase):
+class TypeInformationXMLAdapterTests(BodyAdapterTestCase, unittest.TestCase):
layer = ExportImportZCMLLayer
@@ -293,12 +293,11 @@
self.assertEqual(obj._actions[0].condition.text, 'python:1')
def setUp(self):
- BodyAdapterTestCase.setUp(self)
self._obj = FactoryTypeInformation('foo_fti')
self._BODY = _FTI_BODY
-class TypesToolXMLAdapterTests(BodyAdapterTestCase):
+class TypesToolXMLAdapterTests(BodyAdapterTestCase, unittest.TestCase):
layer = ExportImportZCMLLayer
@@ -312,7 +311,6 @@
obj._setObject('foo_type', FactoryTypeInformation('foo_type'))
def setUp(self):
- BodyAdapterTestCase.setUp(self)
self._obj = TypesTool()
self._BODY = _TYPESTOOL_BODY
Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_workflow.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_workflow.py 2008-09-17 21:06:55 UTC (rev 91218)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_workflow.py 2008-09-17 21:08:48 UTC (rev 91219)
@@ -134,7 +134,7 @@
self._chains_by_type[pt_name] = chain
-class WorkflowToolXMLAdapterTests(BodyAdapterTestCase):
+class WorkflowToolXMLAdapterTests(BodyAdapterTestCase, unittest.TestCase):
layer = ExportImportZCMLLayer
@@ -152,7 +152,6 @@
def setUp(self):
from Products.CMFCore.WorkflowTool import WorkflowTool
- BodyAdapterTestCase.setUp(self)
self._obj = WorkflowTool()
self._BODY = _WORKFLOWTOOL_BODY
More information about the Checkins
mailing list