[Checkins] SVN: GenericSetup/trunk/tests/test_components.py - don't populate the site manager in afterSetUp(), we want this only in test_body_get()

[Yvo Schubbe]

Log message for revision 73150:
  - don't populate the site manager in afterSetUp(), we want this only in test_body_get()

Changed:
  U   GenericSetup/trunk/tests/test_components.py

-=-
Modified: GenericSetup/trunk/tests/test_components.py
===================================================================
--- GenericSetup/trunk/tests/test_components.py	2007-03-12 15:37:37 UTC (rev 73149)
+++ GenericSetup/trunk/tests/test_components.py	2007-03-12 16:46:01 UTC (rev 73150)
@@ -62,6 +62,7 @@
     def verify(self):
         return True
 
+
 class DummyTool(SimpleItem):
     """A dummy tool."""
     implements(IDummyInterface)
@@ -74,6 +75,9 @@
     def verify(self):
         return True
 
+InitializeClass(DummyTool)
+
+
 class DummyTool2(SimpleItem):
     """A second dummy tool."""
     implements(IDummyInterface)
@@ -86,8 +90,8 @@
     def verify(self):
         return True
 
+InitializeClass(DummyTool2)
 
-InitializeClass(DummyTool)
 
 _COMPONENTS_BODY = """\
 <?xml version="1.0"?>
@@ -114,6 +118,16 @@
 
     layer = ExportImportZCMLLayer
 
+    def _populate(self, obj):
+        obj.registerUtility(DummyUtility(), IDummyInterface)
+        obj.registerUtility(DummyUtility(), IDummyInterface, name=u'foo')
+
+        tool = self.app['dummy_tool']
+        obj.registerUtility(tool, IDummyInterface, name=u'dummy tool name')
+
+        tool2 = self.folder['dummy_tool2']
+        obj.registerUtility(tool2, IDummyInterface, name=u'dummy tool name2')
+
     def test_body_get(self):
         self._populate(self._obj)
         context = DummyExportContext(self.app)
@@ -183,18 +197,11 @@
         setSite(self.app)
         sm = getSiteManager()
 
-        sm.registerUtility(DummyUtility(), IDummyInterface)
-        sm.registerUtility(DummyUtility(), IDummyInterface, name=u'foo')
-
         tool = DummyTool()
         self.app._setObject(tool.id, tool)
-        obj = self.app[tool.id]
-        sm.registerUtility(obj, IDummyInterface, name=u'dummy tool name')
 
         tool2 = DummyTool2()
         self.folder._setObject(tool2.id, tool2)
-        obj = self.folder[tool2.id]
-        sm.registerUtility(obj, IDummyInterface, name=u'dummy tool name2')
 
         self._obj = sm
         self._BODY = _COMPONENTS_BODY