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

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	test_helpdirectives.py test_onlinehelp.py 
Log Message:
Checking in work in progress on parentgeddon-branch so Fred can help
me to get the tests passing.  Specific log entries will be provided
when we merge this into the head.


=== Zope3/src/zope/app/onlinehelp/tests/test_helpdirectives.py 1.5 => 1.5.10.1 ===
--- Zope3/src/zope/app/onlinehelp/tests/test_helpdirectives.py:1.5	Sat Aug  2 07:19:25 2003
+++ Zope3/src/zope/app/onlinehelp/tests/test_helpdirectives.py	Mon Sep  8 14:21:43 2003
@@ -17,12 +17,12 @@
 """
 import unittest
 
-from zope.app.interfaces.traversing import \
-     ITraverser, ITraversable, IPhysicallyLocatable
+from zope.app.interfaces.traversing import IPhysicallyLocatable
+from zope.app.interfaces.traversing import ITraverser, ITraversable
 from zope.app.onlinehelp import tests
 from zope.app.onlinehelp import help
-from zope.app.traversing.adapters import \
-     Traverser, DefaultTraversable, WrapperPhysicallyLocatable
+from zope.app.location import LocationPhysicallyLocatable
+from zope.app.traversing.adapters import Traverser, DefaultTraversable
 from zope.component.adapter import provideAdapter
 from zope.component.tests.placelesssetup import PlacelessSetup
 from zope.configuration import xmlconfig
@@ -39,7 +39,7 @@
         PlacelessSetup.setUp(self)
         provideAdapter(None, ITraverser, Traverser)
         provideAdapter(None, ITraversable, DefaultTraversable)
-        provideAdapter(None, IPhysicallyLocatable, WrapperPhysicallyLocatable)
+        provideAdapter(None, IPhysicallyLocatable, LocationPhysicallyLocatable)
 
     def test_register(self):
         self.assertEqual(help.keys(), [])


=== Zope3/src/zope/app/onlinehelp/tests/test_onlinehelp.py 1.4 => 1.4.10.1 ===
--- Zope3/src/zope/app/onlinehelp/tests/test_onlinehelp.py:1.4	Sat Aug  2 07:19:25 2003
+++ Zope3/src/zope/app/onlinehelp/tests/test_onlinehelp.py	Mon Sep  8 14:21:44 2003
@@ -23,10 +23,10 @@
 from zope.interface.verify import verifyObject
 from zope.app.onlinehelp import OnlineHelp
 from zope.app.interfaces.onlinehelp import IOnlineHelp
-from zope.app.interfaces.traversing import \
-     IContainmentRoot, ITraverser, ITraversable, IPhysicallyLocatable
-from zope.app.traversing.adapters import \
-     Traverser, DefaultTraversable, WrapperPhysicallyLocatable
+from zope.app.interfaces.traversing import ITraversable, IPhysicallyLocatable
+from zope.app.interfaces.traversing import IContainmentRoot, ITraverser
+from zope.app.location import LocationPhysicallyLocatable
+from zope.app.traversing.adapters import Traverser, DefaultTraversable
 from test_onlinehelptopic import TestOnlineHelpTopic, testdir
 
 class I1(Interface):
@@ -38,7 +38,7 @@
         PlacelessSetup.setUp(self)
         provideAdapter(None, ITraverser, Traverser)
         provideAdapter(None, ITraversable, DefaultTraversable)
-        provideAdapter(None, IPhysicallyLocatable, WrapperPhysicallyLocatable)
+        provideAdapter(None, IPhysicallyLocatable, LocationPhysicallyLocatable)
         path = os.path.join(testdir(), 'help.txt')
         self.topic = OnlineHelp('Help', path, 'txt')