[Zope3-checkins] CVS: Zope3/src/zope/app/onlinehelp/tests - test_helpdirectives.py:1.7 test_onlinehelp.py:1.6

[Jim Fulton]

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

Modified Files:
	test_helpdirectives.py test_onlinehelp.py 
Log Message:
Changed to use the new ztapi module, which provides handy functions
for setting up adapters and views for tests.  This is needed because
there are no-longer global adapter and view services sitting around as
module globals.


=== Zope3/src/zope/app/onlinehelp/tests/test_helpdirectives.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/onlinehelp/tests/test_helpdirectives.py:1.6	Sun Sep 21 13:32:31 2003
+++ Zope3/src/zope/app/onlinehelp/tests/test_helpdirectives.py	Fri Nov 21 12:12:08 2003
@@ -23,7 +23,7 @@
 from zope.app.onlinehelp import help
 from zope.app.location import LocationPhysicallyLocatable
 from zope.app.traversing.adapters import Traverser, DefaultTraversable
-from zope.component.adapter import provideAdapter
+from zope.app.tests import ztapi
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.configuration import xmlconfig
 from zope.interface import Interface
@@ -37,9 +37,10 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
-        provideAdapter(None, ITraverser, Traverser)
-        provideAdapter(None, ITraversable, DefaultTraversable)
-        provideAdapter(None, IPhysicallyLocatable, LocationPhysicallyLocatable)
+        ztapi.provideAdapter(None, ITraverser, Traverser)
+        ztapi.provideAdapter(None, ITraversable, DefaultTraversable)
+        ztapi.provideAdapter(None, IPhysicallyLocatable,
+                             LocationPhysicallyLocatable)
 
     def test_register(self):
         self.assertEqual(help.keys(), [])


=== Zope3/src/zope/app/onlinehelp/tests/test_onlinehelp.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/onlinehelp/tests/test_onlinehelp.py:1.5	Sun Sep 21 13:32:31 2003
+++ Zope3/src/zope/app/onlinehelp/tests/test_onlinehelp.py	Fri Nov 21 12:12:08 2003
@@ -17,7 +17,7 @@
 """
 import os
 from unittest import TestSuite, makeSuite
-from zope.component.adapter import provideAdapter
+from zope.app.tests import ztapi
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.interface import Interface
 from zope.interface.verify import verifyObject
@@ -36,9 +36,10 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
-        provideAdapter(None, ITraverser, Traverser)
-        provideAdapter(None, ITraversable, DefaultTraversable)
-        provideAdapter(None, IPhysicallyLocatable, LocationPhysicallyLocatable)
+        ztapi.provideAdapter(None, ITraverser, Traverser)
+        ztapi.provideAdapter(None, ITraversable, DefaultTraversable)
+        ztapi.provideAdapter(None, IPhysicallyLocatable,
+                             LocationPhysicallyLocatable)
         path = os.path.join(testdir(), 'help.txt')
         self.topic = OnlineHelp('Help', path, 'txt')