[Zope3-checkins] CVS: Zope3/src/zope/component/tests - placelesssetup.py:1.1.2.2 test_providefactory.py:1.1.2.2 test_utilityservice.py:1.1.2.2 test_components.py:NONE test_factory.py:NONE test_views.py:NONE

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/component/tests
In directory cvs.zope.org:/tmp/cvs-serv32757/tests

Modified Files:
      Tag: NameGeddon-branch
	placelesssetup.py test_providefactory.py 
	test_utilityservice.py 
Removed Files:
      Tag: NameGeddon-branch
	test_components.py test_factory.py test_views.py 
Log Message:
Got tests passing

=== Zope3/src/zope/component/tests/placelesssetup.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/component/tests/placelesssetup.py:1.1.2.1	Mon Dec 23 14:32:41 2002
+++ Zope3/src/zope/component/tests/placelesssetup.py	Mon Dec 23 15:18:03 2002
@@ -31,38 +31,32 @@
         # factory service
         from zope.component.interfaces import IFactoryService
         defineService('Factories',IFactoryService)
-        from zope.component.GlobalFactoryService import\
-             factoryService
+        from zope.component.factory import factoryService
         provideService('Factories', factoryService)
         # utility service
         from zope.component.interfaces import IUtilityService
         defineService('Utilities',IUtilityService)
-        from zope.component.GlobalUtilityService import\
-             utilityService
+        from zope.component.utility import utilityService
         provideService('Utilities', utilityService)
         # adapter service
         from zope.component.interfaces import IAdapterService
         defineService('Adapters',IAdapterService)
-        from zope.component.GlobalAdapterService import\
-             adapterService
+        from zope.component.adapter import adapterService
         provideService('Adapters', adapterService)
         # resource service
         from zope.component.interfaces import IResourceService
         defineService('Resources',IResourceService)
-        from zope.component.GlobalResourceService import\
-             resourceService
+        from zope.component.resource import resourceService
         provideService('Resources', resourceService)
         # skin service
         from zope.component.interfaces import ISkinService
         defineService('Skins',ISkinService)
-        from zope.component.GlobalSkinService import\
-             skinService
+        from zope.component.skin import skinService
         provideService('Skins', skinService)
         # view service
         from zope.component.interfaces import IViewService
         defineService('Views',IViewService)
-        from zope.component.GlobalViewService import\
-             viewService
+        from zope.component.view import viewService
         provideService('Views', viewService)
     def tearDown(self):
         CleanUp.tearDown(self)


=== Zope3/src/zope/component/tests/test_providefactory.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/component/tests/test_providefactory.py:1.1.2.1	Mon Dec 23 14:32:41 2002
+++ Zope3/src/zope/component/tests/test_providefactory.py	Mon Dec 23 15:18:03 2002
@@ -25,7 +25,7 @@
 
     def test_provide_factory(self):
         from zope.component import getService, createObject
-        from zope.component.tests.test_factory import f, X, IX
+        from zope.component.tests.factory import f, X, IX
         factories=getService(None, 'Factories')
         factories.provideFactory("Some.Object", f)
         thing = createObject(None,"Some.Object")


=== Zope3/src/zope/component/tests/test_utilityservice.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/component/tests/test_utilityservice.py:1.1.2.1	Mon Dec 23 14:32:41 2002
+++ Zope3/src/zope/component/tests/test_utilityservice.py	Mon Dec 23 15:18:03 2002
@@ -42,8 +42,7 @@
         provideService=sm.provideService
         from zope.component.interfaces import IUtilityService
         defineService('Utilities',IUtilityService)
-        from zope.component.GlobalUtilityService import\
-             utilityService
+        from zope.component.utility import utilityService
         provideService('Utilities', utilityService)
     
     def testGetUtility(self):

=== Removed File Zope3/src/zope/component/tests/test_components.py ===

=== Removed File Zope3/src/zope/component/tests/test_factory.py ===

=== Removed File Zope3/src/zope/component/tests/test_views.py ===