[Zope3-checkins] CVS: Zope3/src/zope/app/component/tests - test_nextservice.py:1.9.6.1

[Jim Fulton]

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

Modified Files:
      Tag: adaptergeddon-branch
	test_nextservice.py 
Log Message:
Changed local site managers (aka service managers) to have next and
subSites attributes.  Now local service managers are linked up to make
it easier to navigate related sites.


=== Zope3/src/zope/app/component/tests/test_nextservice.py 1.9 => 1.9.6.1 ===
--- Zope3/src/zope/app/component/tests/test_nextservice.py:1.9	Sun Sep 21 13:31:27 2003
+++ Zope3/src/zope/app/component/tests/test_nextservice.py	Tue Nov 11 12:27:53 2003
@@ -27,6 +27,7 @@
 
 
 class ServiceManager:
+    
     implements(IServiceService)
 
 class Folder:
@@ -58,10 +59,12 @@
 
         f1 = Wrapper(Folder(), root)
         sm1 = ServiceManager()
+        sm1.next = serviceManager
         f1.setSiteManager(sm1)
 
         f2 = Wrapper(Folder(), f1)
         sm2 = ServiceManager()
+        sm2.next = sm1
         f2.setSiteManager(sm2)
 
         self.root = root
@@ -85,15 +88,6 @@
                          serviceManager)
         self.assertEqual(getNextServiceManager(Wrapper(self.sm2, self.f2)),
                          self.sm1)
-
-    def test_getNextServiceManager_fails_w_bad_root(self):
-        root = Folder()
-        f1 = Wrapper(Folder(), root)
-        sm1 = ServiceManager()
-        f1.setSiteManager(sm1)
-        self.assertRaises(TypeError,
-                          getNextServiceManager, Wrapper(sm1, f1)
-                          )
 
 def test_suite():
     return makeSuite(Test)