[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - test_objecthub.py:1.1.2.3

[Sidnei da Silva]

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

Modified Files:
      Tag: NameGeddon-branch
	test_objecthub.py 
Log Message:
Geez! This module was doomed. Looks like two test modules were merged.

=== Zope3/src/zope/app/services/tests/test_objecthub.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/test_objecthub.py:1.1.2.2	Tue Dec 24 07:51:18 2002
+++ Zope3/src/zope/app/services/tests/test_objecthub.py	Tue Dec 24 09:57:40 2002
@@ -33,7 +33,11 @@
      IObjectMovedHubEvent, IObjectRegisteredHubEvent, \
      IObjectUnregisteredHubEvent
 
-import zope.app.services.hub
+import zope.app.services.hub 
+from zope.app.services.hub \
+        import ObjectModifiedHubEvent, ObjectRemovedHubEvent, \
+        ObjectMovedHubEvent, ObjectRegisteredHubEvent, \
+        ObjectUnregisteredHubEvent
 
 from zope.exceptions import NotFoundError
 from types import StringTypes
@@ -134,15 +138,15 @@
 
 class TransmitObjectRemovedHubEventTest(TransmitHubEventTest):
     interface = IObjectRemovedHubEvent
-    klass = HubIdObjectEvent.ObjectRemovedHubEvent
+    klass = ObjectRemovedHubEvent
 
 class TransmitObjectModifiedHubEventTest(TransmitHubEventTest):
     interface = IObjectModifiedHubEvent
-    klass = HubIdObjectEvent.ObjectModifiedHubEvent
+    klass = ObjectModifiedHubEvent
 
 class TransmitObjectMovedHubEventTest(TransmitHubEventTest):
     interface = IObjectMovedHubEvent
-    klass = HubIdObjectEvent.ObjectMovedHubEvent
+    klass = ObjectMovedHubEvent
     
     def setUp(self):
         ObjectHubSetup.setUp(self)
@@ -155,11 +159,11 @@
 
 class TransmitObjectRegisteredHubEventTest(TransmitHubEventTest):
     interface = IObjectRegisteredHubEvent
-    klass = HubIdObjectEvent.ObjectRegisteredHubEvent
+    klass = ObjectRegisteredHubEvent
 
 class TransmitObjectUnregisteredHubEventTest(TransmitHubEventTest):
     interface = IObjectUnregisteredHubEvent
-    klass = HubIdObjectEvent.ObjectUnregisteredHubEvent
+    klass = ObjectUnregisteredHubEvent
 
 class BasicHubTest(ObjectHubSetup, unittest.TestCase):
     location = locationAsTuple('/foo/bar')