[Zope3-checkins] CVS: Zope3/src/zope/app/process/tests - test_bootstrap.py:1.8

[Anthony Baxter]

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

Modified Files:
	test_bootstrap.py 
Log Message:
SiteManager objects implemented their own name selection code. This
has been replaced with the standard NameChooser code. A shallow 
difference is that while services were created as ServiceName-1,
ServiceName-2, ..., they're now ServiceName, ServiceName-2, 
ServiceName-3. 


=== Zope3/src/zope/app/process/tests/test_bootstrap.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/process/tests/test_bootstrap.py:1.7	Mon Sep 22 15:45:39 2003
+++ Zope3/src/zope/app/process/tests/test_bootstrap.py	Sat Feb  7 02:21:26 2004
@@ -103,7 +103,7 @@
             name = bs.ensureService(ErrorLogging, ErrorReportingService)
 
             if i == 0:
-                self.assertEqual(name, 'ErrorLogging-1')
+                self.assertEqual(name, 'ErrorLogging')
             else:
                 self.assertEqual(name, None)
 
@@ -114,7 +114,7 @@
             package = traverse(root_folder, package_name)
 
             self.assert_(IErrorReportingService.isImplementedBy(
-                traverse(package, 'ErrorLogging-1')))
+                traverse(package, 'ErrorLogging')))
             get_transaction().commit()
             cx.close()
 
@@ -133,16 +133,16 @@
         package = traverse(root_folder, package_name)
 
         self.assert_(IEventService.isImplementedBy(
-            traverse(package, 'EventPublication-1')))
+            traverse(package, 'EventPublication')))
 
         self.assert_(IObjectHub.isImplementedBy(
-            traverse(package, 'HubIds-1')))
+            traverse(package, 'HubIds')))
 
         self.assert_(IErrorReportingService.isImplementedBy(
-            traverse(package, 'ErrorLogging-1')))
+            traverse(package, 'ErrorLogging')))
 
         self.assert_(IPrincipalAnnotationService.isImplementedBy(
-            traverse(package, 'PrincipalAnnotation-1')))
+            traverse(package, 'PrincipalAnnotation')))
 
         cx.close()
 
@@ -166,22 +166,22 @@
         package = traverse(root_folder, package_name)
 
         self.assert_(IEventService.isImplementedBy(
-            traverse(package, 'EventPublication-1')))
+            traverse(package, 'EventPublication')))
 
         self.assert_(IObjectHub.isImplementedBy(
-            traverse(package, 'HubIds-1')))
+            traverse(package, 'HubIds')))
 
         self.assertRaises(NotFoundError, traverse, root_folder,
-                          '/++etc++site/default/ErrorLogging-1')
+                          '/++etc++site/default/ErrorLogging')
 
         self.assert_(IErrorReportingService.isImplementedBy(
-            traverse(package, 'Errors-1')))
+            traverse(package, 'Errors')))
 
         self.assert_(IEventService.isImplementedBy(
-            traverse(package, 'EventPublication-1')))
+            traverse(package, 'EventPublication')))
 
         self.assert_(IPrincipalAnnotationService.isImplementedBy(
-            traverse(package, 'PrincipalAnnotation-1')))
+            traverse(package, 'PrincipalAnnotation')))
 
         cx.close()
 
@@ -201,7 +201,7 @@
         package = traverse(root_folder, package_name)
 
         self.assert_(IInterfaceService.isImplementedBy(
-            traverse(package, 'Interfaces-1')))
+            traverse(package, 'Interfaces')))
 
         cx.close()