[CMF-checkins] SVN: CMF/branches/1.6/CMFCore/exportimport/tests/test_ backported r40452 from trunk:

[Yvo Schubbe]

Log message for revision 40453:
  backported r40452 from trunk:
  - small node adapter test refactoring

Changed:
  U   CMF/branches/1.6/CMFCore/exportimport/tests/test_cachingpolicymgr.py
  U   CMF/branches/1.6/CMFCore/exportimport/tests/test_content.py
  U   CMF/branches/1.6/CMFCore/exportimport/tests/test_skins.py

-=-
Modified: CMF/branches/1.6/CMFCore/exportimport/tests/test_cachingpolicymgr.py
===================================================================
--- CMF/branches/1.6/CMFCore/exportimport/tests/test_cachingpolicymgr.py	2005-12-01 18:20:45 UTC (rev 40452)
+++ CMF/branches/1.6/CMFCore/exportimport/tests/test_cachingpolicymgr.py	2005-12-01 18:29:26 UTC (rev 40453)
@@ -51,7 +51,7 @@
 """
 
 
-class CachingPolicyNodeAdapterTests(PlacelessSetup, NodeAdapterTestCase):
+class CachingPolicyNodeAdapterTests(NodeAdapterTestCase):
 
     def _getTargetClass(self):
         from Products.CMFCore.exportimport.cachingpolicymgr \
@@ -60,13 +60,10 @@
         return CachingPolicyNodeAdapter
 
     def setUp(self):
-        from Products.CMFCore.CachingPolicyManager import CachingPolicy
         import Products.CMFCore.exportimport
-        import Products.Five
-        from Products.Five import zcml
+        from Products.CMFCore.CachingPolicyManager import CachingPolicy
 
-        PlacelessSetup.setUp(self)
-        zcml.load_config('meta.zcml', Products.Five)
+        NodeAdapterTestCase.setUp(self)
         zcml.load_config('configure.zcml', Products.CMFCore.exportimport)
 
         self._obj = CachingPolicy('foo_policy', max_age_secs=0)

Modified: CMF/branches/1.6/CMFCore/exportimport/tests/test_content.py
===================================================================
--- CMF/branches/1.6/CMFCore/exportimport/tests/test_content.py	2005-12-01 18:20:45 UTC (rev 40452)
+++ CMF/branches/1.6/CMFCore/exportimport/tests/test_content.py	2005-12-01 18:29:26 UTC (rev 40453)
@@ -26,7 +26,6 @@
 from Products.GenericSetup.tests.common import DummyExportContext
 from Products.GenericSetup.tests.common import DummyImportContext
 
-from conformance import ConformsToIFilesystemExporter
 from conformance import ConformsToIFilesystemImporter
 
 

Modified: CMF/branches/1.6/CMFCore/exportimport/tests/test_skins.py
===================================================================
--- CMF/branches/1.6/CMFCore/exportimport/tests/test_skins.py	2005-12-01 18:20:45 UTC (rev 40452)
+++ CMF/branches/1.6/CMFCore/exportimport/tests/test_skins.py	2005-12-01 18:29:26 UTC (rev 40453)
@@ -261,8 +261,7 @@
         DirectoryView._dirreg = self._olddirreg
 
 
-class DirectoryViewAdapterTests(_DVRegistrySetup, PlacelessSetup,
-                                NodeAdapterTestCase):
+class DirectoryViewAdapterTests(_DVRegistrySetup, NodeAdapterTestCase):
 
     def _getTargetClass(self):
         from Products.CMFCore.exportimport.skins \
@@ -275,12 +274,10 @@
 
     def setUp(self):
         import Products.CMFCore.exportimport
-        import Products.Five
         from Products.CMFCore.DirectoryView import DirectoryView
 
-        PlacelessSetup.setUp(self)
+        NodeAdapterTestCase.setUp(self)
         _DVRegistrySetup.setUp(self)
-        zcml.load_config('meta.zcml', Products.Five)
         zcml.load_config('configure.zcml', Products.CMFCore.exportimport)
 
         self._obj = DirectoryView('foo_directoryview').__of__(Folder())
@@ -288,7 +285,7 @@
 
     def tearDown(self):
         _DVRegistrySetup.tearDown(self)
-        PlacelessSetup.tearDown(self)
+        NodeAdapterTestCase.tearDown(self)
 
 
 class SkinsToolXMLAdapterTests(_DVRegistrySetup, BodyAdapterTestCase):
@@ -323,7 +320,7 @@
 
     def tearDown(self):
         _DVRegistrySetup.tearDown(self)
-        PlacelessSetup.tearDown(self)
+        BodyAdapterTestCase.tearDown(self)
 
 
 class _SkinsSetup(_DVRegistrySetup, PlacelessSetup, BaseRegistryTests):