[Zope3-checkins] CVS: Zope3/src/zope/component/tests - placelesssetup.py:1.5 test_resources.py:1.5

[R. Sean Bowman]

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

Modified Files:
	placelesssetup.py test_resources.py 
Log Message:
moved non core CA service names to zope/app/services/servicenames.py,
renamed ResourceService to Resources


=== Zope3/src/zope/component/tests/placelesssetup.py 1.4 => 1.5 ===
--- Zope3/src/zope/component/tests/placelesssetup.py:1.4	Tue Feb 11 11:00:05 2003
+++ Zope3/src/zope/component/tests/placelesssetup.py	Tue Feb 11 21:17:43 2003
@@ -22,7 +22,7 @@
 from zope.testing.cleanup import CleanUp
 from zope.component import getServiceManager
 from zope.component.servicenames import Adapters, Skins, Utilities
-from zope.component.servicenames import ResourceService, Factories
+from zope.component.servicenames import Resources, Factories
 
 class PlacelessSetup(CleanUp):
     def setUp(self):
@@ -47,9 +47,9 @@
         provideService(Adapters, adapterService)
         # resource service
         from zope.component.interfaces import IResourceService
-        defineService(ResourceService,IResourceService)
+        defineService(Resources,IResourceService)
         from zope.component.resource import resourceService
-        provideService(ResourceService, resourceService)
+        provideService(Resources, resourceService)
         # skin service
         from zope.component.interfaces import ISkinService
         defineService(Skins,ISkinService)


=== Zope3/src/zope/component/tests/test_resources.py 1.4 => 1.5 ===
--- Zope3/src/zope/component/tests/test_resources.py:1.4	Tue Feb 11 11:00:05 2003
+++ Zope3/src/zope/component/tests/test_resources.py	Tue Feb 11 21:17:43 2003
@@ -22,7 +22,7 @@
 from zope.component.tests.placelesssetup import PlacelessSetup
 from zope.component import getResource, queryResource
 from zope.component.exceptions import ComponentLookupError
-from zope.component.servicenames import Skins, ResourceService
+from zope.component.servicenames import Skins, Resources
 from zope.interface import Interface
 from zope.component.tests.request import Request
 
@@ -35,13 +35,13 @@
             __implements__ = I2
         class C2(C1): pass
 
-        getService(None,ResourceService).provideResource('test', I2, C1)
+        getService(None,Resources).provideResource('test', I2, C1)
         self.assertEqual(getResource(None, 'test', Request(I2)).__class__, C1)
         getService(None,Skins).defineSkin('foo', I2, ('foo', 'default'))
         self.assertEqual(
             getResource(None, 'test', Request(I2, 'foo')).__class__,
             C1)
-        getService(None,ResourceService).provideResource('test', I2, C2,
+        getService(None,Resources).provideResource('test', I2, C2,
                                                      layer='foo')
         self.assertEqual(
             getResource(None, 'test', Request(I2, 'foo')).__class__,
@@ -56,7 +56,7 @@
         class C2(C1): pass
 
 
-        getService(None,ResourceService).provideResource('test', I2, C1)
+        getService(None,Resources).provideResource('test', I2, C1)
         self.assertEqual(
             getResource(None, 'test', Request(I2, 'default') ).__class__,
             C1)
@@ -64,7 +64,7 @@
         self.assertEqual(
             getResource(None, 'test', Request(I2, 'foo')).__class__,
             C1)
-        getService(None,ResourceService).provideResource('test', I2, C2,
+        getService(None,Resources).provideResource('test', I2, C2,
                                                      layer='foo')
         self.assertEqual(
             getResource(None, 'test', Request(I2, 'foo')).__class__,