[Zope3-checkins] CVS: Zope3/src/zope/app/cache/tests - test_annotationcacheable.py:1.3 test_caching.py:1.3

R. Sean Bowman sean.bowman@acm.org
Thu, 6 Feb 2003 01:50:24 -0500


Update of /cvs-repository/Zope3/src/zope/app/cache/tests
In directory cvs.zope.org:/tmp/cvs-serv18167/zope/app/cache/tests

Modified Files:
	test_annotationcacheable.py test_caching.py 
Log Message:
finished changing service names to use strings defined in
zope/component/servicenames.py, changed the name of
ErrorReportingService to ErrorReports and Resources to ResourceService


=== Zope3/src/zope/app/cache/tests/test_annotationcacheable.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/cache/tests/test_annotationcacheable.py:1.2	Wed Dec 25 09:12:45 2002
+++ Zope3/src/zope/app/cache/tests/test_annotationcacheable.py	Thu Feb  6 01:49:19 2003
@@ -19,6 +19,7 @@
 from unittest import TestCase, TestSuite, main, makeSuite
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.component import getService
+from zope.component.servicenames import Adapters
 from zope.app.interfaces.annotation import IAnnotations
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.app.attributeannotations import AttributeAnnotations
@@ -52,7 +53,7 @@
 class TestAnnotationCacheable(PlacelessSetup, TestCase):
     def setUp(self):
         PlacelessSetup.setUp(self)
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
             IAttributeAnnotatable, IAnnotations,
             AttributeAnnotations)
         self.service = CachingServiceStub()


=== Zope3/src/zope/app/cache/tests/test_caching.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/cache/tests/test_caching.py:1.2	Wed Dec 25 09:12:45 2002
+++ Zope3/src/zope/app/cache/tests/test_caching.py	Thu Feb  6 01:49:19 2003
@@ -27,6 +27,7 @@
 from zope.app.attributeannotations import AttributeAnnotations
 from zope.component import getAdapter
 from zope.component import getService
+from zope.component.servicenames import Adapters
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.component.service import \
      serviceManager as sm
@@ -51,10 +52,10 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
             IAttributeAnnotatable, IAnnotations,
             AttributeAnnotations)
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
             IAnnotatable, ICacheable,
             AnnotationCacheable)
         self.service = CachingServiceStub()