[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests -
test_adapter.py:1.21.6.2 test_eventservice.py:1.27.24.2
test_modulelookup.py:1.3.18.2 test_nameregistry.py:1.1.26.2
test_objecthub.py:1.12.8.2
Jim Fulton
jim at zope.com
Mon Sep 8 18:15:41 EDT 2003
Update of /cvs-repository/Zope3/src/zope/app/services/tests
In directory cvs.zope.org:/tmp/cvs-serv18062/src/zope/app/services/tests
Modified Files:
Tag: parentgeddon-branch
test_adapter.py test_eventservice.py test_modulelookup.py
test_nameregistry.py test_objecthub.py
Log Message:
Made a bunch of tests pass. :) Detailed messages will be provided
when merging to the head.
=== Zope3/src/zope/app/services/tests/test_adapter.py 1.21.6.1 => 1.21.6.2 ===
--- Zope3/src/zope/app/services/tests/test_adapter.py:1.21.6.1 Mon Sep 8 14:21:49 2003
+++ Zope3/src/zope/app/services/tests/test_adapter.py Mon Sep 8 17:15:10 2003
@@ -135,8 +135,8 @@
registration_manager = traverse(sm, 'default').getRegistrationManager()
registration = Registration()
- registration_manager.setObject('', registration)
- registration = traverse(registration_manager, '1')
+ name = registration_manager.setObject('', registration)
+ registration = traverse(registration_manager, name)
class O:
implements(I1)
@@ -223,8 +223,8 @@
registration_manager = traverse(sm, 'default').getRegistrationManager()
registration = Registration()
- registration_manager.setObject('', registration)
- registration = traverse(registration_manager, '1')
+ name = registration_manager.setObject('', registration)
+ registration = traverse(registration_manager, name)
class O:
implements(I1)
=== Zope3/src/zope/app/services/tests/test_eventservice.py 1.27.24.1 => 1.27.24.2 ===
--- Zope3/src/zope/app/services/tests/test_eventservice.py:1.27.24.1 Mon Sep 8 14:21:49 2003
+++ Zope3/src/zope/app/services/tests/test_eventservice.py Mon Sep 8 17:15:10 2003
@@ -39,7 +39,7 @@
from zope.app.interfaces.services.service import ISimpleService
from zope.app.services.event import EventService
from zope.app.tests import setup
-
+from zope.app.container.add import add
class UnpromotingEventService(EventService):
def isPromotableEvent(self, event):
@@ -249,7 +249,7 @@
# Now, put folder1Subscriber back. This incidentally fires off a
# ObjectAddedEvent, since self.folder1 is decorated with a context
# decorator.
- self.folder1.setObject('folder1Subscriber', folder1Subscriber)
+ add(self.folder1, 'folder1Subscriber', folder1Subscriber)
self.assertEqual(self.rootFolderSubscriber.notified, 2)
self.assertEqual(self.folder1Subscriber.notified, 0)
self.assertEqual(self.folder1_1Subscriber.notified, 2)
@@ -820,7 +820,7 @@
def _createAlternateService(self, service):
self.folder2.setObject("folder2Subscriber", DummySubscriber())
- self.folder2Subscriberself.folder2["folder2Subscriber"]
+ self.folder2Subscriber = self.folder2["folder2Subscriber"]
sm = self.makeSite('folder2')
setup.addService(sm, EventPublication, service);
=== Zope3/src/zope/app/services/tests/test_modulelookup.py 1.3.18.1 => 1.3.18.2 ===
--- Zope3/src/zope/app/services/tests/test_modulelookup.py:1.3.18.1 Mon Sep 8 14:21:49 2003
+++ Zope3/src/zope/app/services/tests/test_modulelookup.py Mon Sep 8 17:15:10 2003
@@ -24,6 +24,7 @@
from zope.app.services.registration import RegistrationManagerContainer
from zope.app.interfaces.services.module import IModuleManager
from zope.interface import implements
+from zope.app.container.contained import Contained, contained
class MyModuleManager(object):
@@ -35,9 +36,9 @@
def getModule(self):
return self.module
-class MyFolder(RegistrationManagerContainer, dict):
+class MyFolder(RegistrationManagerContainer, dict, Contained):
def setObject(self, name, object):
- self[name] = object
+ self[name] = contained(object, self, name)
return name
=== Zope3/src/zope/app/services/tests/test_nameregistry.py 1.1.26.1 => 1.1.26.2 ===
--- Zope3/src/zope/app/services/tests/test_nameregistry.py:1.1.26.1 Mon Sep 8 14:21:49 2003
+++ Zope3/src/zope/app/services/tests/test_nameregistry.py Mon Sep 8 17:15:10 2003
@@ -56,8 +56,7 @@
self.assertEquals(subject.queryRegistrationsFor(cfg), None)
self.assertEquals(subject.queryRegistrationsFor(cfg, 42), 42)
- registry = RegistryStub()
- subject._bindings["Foo"] = registry
+ registry = subject.createRegistrations("Foo")
result = subject.queryRegistrationsFor(cfg)
self.assertEquals(result, registry)
self.assertEquals(result.__parent__, subject)
@@ -69,8 +68,7 @@
self.assertEquals(subject.queryRegistrations("Foo"), None)
self.assertEquals(subject.queryRegistrations("Foo", 42), 42)
- registry = RegistryStub()
- subject._bindings["Foo"] = registry
+ registry = subject.createRegistrations("Foo")
result = subject.queryRegistrations("Foo")
self.assertEquals(result, registry)
self.assertEquals(result.__parent__, subject)
=== Zope3/src/zope/app/services/tests/test_objecthub.py 1.12.8.1 => 1.12.8.2 ===
--- Zope3/src/zope/app/services/tests/test_objecthub.py:1.12.8.1 Mon Sep 8 14:21:49 2003
+++ Zope3/src/zope/app/services/tests/test_objecthub.py Mon Sep 8 17:15:10 2003
@@ -43,6 +43,10 @@
from zope.interface import implements
+from zope.app.container.add import add
+
+from zope.app.container.contained import Contained
+
# while these tests don't really test much of the placeful aspect of the
# object hub, they do at least test basic functionality.
@@ -545,10 +549,10 @@
def setUp(self):
ObjectHubSetup.setUp(self)
- self.rootFolder.setObject('deleted', object())
+ add(self.rootFolder, 'deleted', Contained())
self.deleted_obj = self.rootFolder['deleted']
self.deleted_path = '/deleted'
- self.rootFolder.setObject('valid', object())
+ add(self.rootFolder, 'valid', Contained())
self.valid_obj = self.rootFolder['valid']
self.valid_path = '/valid'
@@ -581,7 +585,7 @@
def testGetHubId(self):
# no lazy unregistration
self.assert_(self.object_hub.getHubId(self.deleted_path))
- self.assert_(self.object_hub.getHubId(self.deleted_obj))
+ #self.assert_(self.object_hub.getHubId(self.deleted_obj))
self.assertEqual(self.object_hub.numRegistrations(), 2)
@@ -604,14 +608,19 @@
# for valid paths, so it doesn't make sense to unregister
self.assertRaises(ObjectHubError, self.object_hub.register,
self.deleted_path)
- self.assertRaises(ObjectHubError, self.object_hub.register,
- self.deleted_obj)
+ # The deleted object now (after parentgeddon) has no path, so
+ # this assertion no longer makes sense.
+## self.assertRaises(ObjectHubError, self.object_hub.register,
+## self.deleted_obj)
- def testUnregister(self):
- # no lazy unregistration
- self.object_hub.unregister(self.deleted_obj)
- self.assertEqual(self.object_hub.numRegistrations(), 1)
+
+ # We can't unregister an object *after* it has been deleted, because
+ # it has no location at that point.
+## def testUnregister(self):
+## # no lazy unregistration
+## self.object_hub.unregister(self.deleted_obj)
+## self.assertEqual(self.object_hub.numRegistrations(), 1)
def numRegistrations(self):
More information about the Zope3-Checkins
mailing list