[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - configurationregistry.py:1.1.2.2 eventsetup.py:1.1.2.3 iconfigurable.py:1.1.2.2 objecthubsetup.py:1.1.2.3 servicemanager.py:1.1.2.2 test_adapter.py:1.1.2.5 test_auth.py:1.1.2.2 test_cacheconfiguration.py:1.1.2.5 test_configurationregistry.py:1.1.2.4 test_configurations.py:1.1.2.5 test_objecthub.py:1.1.2.4 test_principalannotation.py:1.1.2.2 test_roleservice.py:1.1.2.2 test_servicemanager.py:1.1.2.5 test_user.py:1.1.2.2 test_view.py:1.1.2.5 test_viewpackage.py:1.1.2.3
Tim Peters
tim.one@comcast.net
Tue, 24 Dec 2002 21:21:51 -0500
Update of /cvs-repository/Zope3/src/zope/app/services/tests
In directory cvs.zope.org:/tmp/cvs-serv19240/src/zope/app/services/tests
Modified Files:
Tag: NameGeddon-branch
configurationregistry.py eventsetup.py iconfigurable.py
objecthubsetup.py servicemanager.py test_adapter.py
test_auth.py test_cacheconfiguration.py
test_configurationregistry.py test_configurations.py
test_objecthub.py test_principalannotation.py
test_roleservice.py test_servicemanager.py test_user.py
test_view.py test_viewpackage.py
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py. The
files are fixed-points of that script now. Fixed a few cases where
code relied on significant trailing whitespace (ouch).
=== Zope3/src/zope/app/services/tests/configurationregistry.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/configurationregistry.py:1.1.2.1 Tue Dec 24 10:21:53 2002
+++ Zope3/src/zope/app/services/tests/configurationregistry.py Tue Dec 24 21:20:49 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
__metaclass__ = type
@@ -20,7 +20,7 @@
def __eq__(self, other):
return self.id == getattr(other, 'id', 0)
-
+
class TestingConfigurationRegistry:
class_ = TestingConfiguration
@@ -80,7 +80,7 @@
def active(self):
if self._data:
return self.class_(self._data[0])
-
+
return None
def __nonzero__(self):
@@ -99,5 +99,5 @@
del result[0]
else:
result[0]['active'] = True
-
+
return result
=== Zope3/src/zope/app/services/tests/eventsetup.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/eventsetup.py:1.1.2.2 Tue Dec 24 07:51:18 2002
+++ Zope3/src/zope/app/services/tests/eventsetup.py Tue Dec 24 21:20:49 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
@@ -34,7 +34,7 @@
from zope.app.interfaces.services.configuration import Active
class EventSetup(PlacefulSetup):
-
+
def setUp(self):
PlacefulSetup.setUp(self)
self.buildFolders()
=== Zope3/src/zope/app/services/tests/iconfigurable.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/iconfigurable.py:1.1.2.1 Tue Dec 24 10:21:53 2002
+++ Zope3/src/zope/app/services/tests/iconfigurable.py Tue Dec 24 21:20:49 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""XXX short summary goes here.
=== Zope3/src/zope/app/services/tests/objecthubsetup.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/objecthubsetup.py:1.1.2.2 Tue Dec 24 07:51:18 2002
+++ Zope3/src/zope/app/services/tests/objecthubsetup.py Tue Dec 24 21:20:49 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
@@ -26,15 +26,15 @@
from zope.app.interfaces.services.configuration import Active
class ObjectHubSetup(EventSetup):
-
+
def setUp(self):
EventSetup.setUp(self)
-
+
from zope.app.interfaces.services.hub import IObjectHub
global_service_manager = getServiceManager(None)
global_service_manager.defineService("ObjectHub", IObjectHub)
self.createObjectHub()
-
+
def createObjectHub(self, path=None):
folder = self.rootFolder
if path is not None:
=== Zope3/src/zope/app/services/tests/servicemanager.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/servicemanager.py:1.1.2.1 Tue Dec 24 10:21:53 2002
+++ Zope3/src/zope/app/services/tests/servicemanager.py Tue Dec 24 21:20:49 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
$Id$
@@ -70,4 +70,3 @@
__doc__ = TestingServiceManager.__doc__ + __doc__
-
=== Zope3/src/zope/app/services/tests/test_adapter.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zope/app/services/tests/test_adapter.py:1.1.2.4 Tue Dec 24 10:21:53 2002
+++ Zope3/src/zope/app/services/tests/test_adapter.py Tue Dec 24 21:20:49 2002
@@ -123,7 +123,7 @@
__implements__ = I1
configuration.factory = A
-
+
registry = service.createConfigurationsFor(configuration)
registry.register(configuration)
registry.activate(configuration)
@@ -148,7 +148,7 @@
def test_queryAdapter_delegation(self):
service = self._service
-
+
self.buildFolders()
self.rootFolder.setServiceManager(ServiceManager())
@@ -173,7 +173,7 @@
class A2(A): pass
provideAdapter(I1, I4, A2)
-
+
adapter = service.queryAdapter(o, I4)
self.assertEqual(adapter.__class__, A2)
self.assertEqual(adapter.context, o)
@@ -189,7 +189,7 @@
class A2(A): pass
provideAdapter(I1, I4, A2)
-
+
adapter = service.queryAdapter(o, I4)
self.assertEqual(adapter.__class__, A2)
self.assertEqual(adapter.context, o)
@@ -209,7 +209,7 @@
def resolve(self, name):
if name == 'Foo.Bar.A':
return A
-
+
class TestAdapterConfiguration(PlacefulSetup, TestCase):
def setUp(self):
@@ -220,7 +220,7 @@
AdapterConfiguration(I1, I2, "Foo.Bar.A"),
rootFolder,
)
-
+
def test_getAdapter(self):
c = C()
adapter = self.configuration.getAdapter(c)
=== Zope3/src/zope/app/services/tests/test_auth.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_auth.py:1.1.2.1 Mon Dec 23 14:32:23 2002
+++ Zope3/src/zope/app/services/tests/test_auth.py Tue Dec 24 21:20:49 2002
@@ -60,7 +60,7 @@
auth.setObject('stevea', User('stevea', 'Steve', 'Alexander',
'stevea', 'hello3'))
self._auth = auth
-
+
def testGetPrincipalByLogin(self):
auth = self._auth
=== Zope3/src/zope/app/services/tests/test_cacheconfiguration.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zope/app/services/tests/test_cacheconfiguration.py:1.1.2.4 Tue Dec 24 07:51:18 2002
+++ Zope3/src/zope/app/services/tests/test_cacheconfiguration.py Tue Dec 24 21:20:49 2002
@@ -154,4 +154,3 @@
if __name__=='__main__':
main(defaultTest='test_suite')
-
=== Zope3/src/zope/app/services/tests/test_configurationregistry.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/services/tests/test_configurationregistry.py:1.1.2.3 Tue Dec 24 07:51:18 2002
+++ Zope3/src/zope/app/services/tests/test_configurationregistry.py Tue Dec 24 21:20:49 2002
@@ -50,7 +50,7 @@
def __config(self, name):
self.__default.setObject(name, Configuration())
return getItem(self.__default, name)
-
+
def test_register_and_registered_and_nonzero_and_active(self):
registry = self.__registry
@@ -72,7 +72,7 @@
self.failUnless(registry.registered(c2))
self.assertEqual(c2.active, 0)
-
+
def test_unregister_and_registered_and_nonzero(self):
# reuse registration test to set things up (more)
self.test_register_and_registered_and_nonzero_and_active()
@@ -88,11 +88,11 @@
registry.unregister(c2)
self.failIf(registry.registered(c2))
self.assertEqual(c2.active, 0)
-
+
self.failIf(registry)
def test_activate_and_active(self):
- # reuse registration test to set things up (more)
+ # reuse registration test to set things up (more)
self.test_register_and_registered_and_nonzero_and_active()
registry = self.__registry
@@ -100,21 +100,21 @@
c1 = self.__c1
c2 = self.__c2
-
+
registry.activate(c2)
self.assertEqual(c1.active, 0)
self.failUnless(registry.registered(c1))
self.assertEqual(c2.active, 1)
self.failUnless(registry.registered(c2))
self.assertEqual(registry.active(), c2)
-
+
registry.activate(c2)
self.assertEqual(c1.active, 0)
self.failUnless(registry.registered(c1))
self.assertEqual(c2.active, 1)
self.failUnless(registry.registered(c2))
self.assertEqual(registry.active(), c2)
-
+
registry.activate(c1)
self.assertEqual(c1.active, 1)
self.failUnless(registry.registered(c1))
@@ -127,7 +127,7 @@
self.assertRaises(ValueError, registry.activate, self.__config('3'))
self.test_activate_and_active()
self.assertRaises(ValueError, registry.activate, self.__config('4'))
-
+
def test_deactivate(self):
self.test_activate_and_active()
@@ -189,7 +189,7 @@
'configuration': c2,
},
])
-
+
registry.deactivate(c1)
info = registry.info()
=== Zope3/src/zope/app/services/tests/test_configurations.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zope/app/services/tests/test_configurations.py:1.1.2.4 Tue Dec 24 10:21:53 2002
+++ Zope3/src/zope/app/services/tests/test_configurations.py Tue Dec 24 21:20:49 2002
@@ -71,7 +71,7 @@
self.assertRaises(DependencyError, cfg.manage_beforeDelete, cfg,
container)
- # deletion of a registered configuration causes it to become
+ # deletion of a registered configuration causes it to become
# unregistered
cfg.status = Registered
cfg.manage_beforeDelete(cfg, container)
=== Zope3/src/zope/app/services/tests/test_objecthub.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/services/tests/test_objecthub.py:1.1.2.3 Tue Dec 24 09:57:40 2002
+++ Zope3/src/zope/app/services/tests/test_objecthub.py Tue Dec 24 21:20:49 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""testObjectHub
@@ -33,7 +33,7 @@
IObjectMovedHubEvent, IObjectRegisteredHubEvent, \
IObjectUnregisteredHubEvent
-import zope.app.services.hub
+import zope.app.services.hub
from zope.app.services.hub \
import ObjectModifiedHubEvent, ObjectRemovedHubEvent, \
ObjectMovedHubEvent, ObjectRegisteredHubEvent, \
@@ -58,10 +58,10 @@
# version of this in zope.app somewhere...
__implements__ = ISubscriber
-
+
def __init__(self):
self.events_received = []
-
+
def notify(self, event):
self.events_received.append(event)
@@ -69,9 +69,9 @@
# iterate through self.events_received and check
# that each one implements the interface that is
# in the same place, with the same location and hub id
-
+
testcase.assertEqual(len(event_spec_list), len(self.events_received))
-
+
for spec,event in zip(event_spec_list, self.events_received):
if len(spec)==4:
interface,hubid,location,obj = spec
@@ -86,10 +86,10 @@
testcase.assert_(interface.isImplementedBy(event),
'Interface %s' % interface.getName())
testcase.assertEqual(event.location, location)
-
+
if obj is not None:
testcase.assertEqual(event.object, obj)
-
+
# Sometimes, the test won't care about the hubid. In this case,
# it is passed into the spec as None.
if hubid is not None:
@@ -105,7 +105,7 @@
def notify(self, event):
LoggingSubscriber.notify(self, event)
if IObjectAddedEvent.isImplementedBy(event):
- self.hub.register(event.location)
+ self.hub.register(event.location)
class TransmitHubEventTest(ObjectHubSetup, unittest.TestCase):
@@ -116,7 +116,7 @@
# See below for testing subclasses / subinterfaces
# klass = HubEvent
# interface = IHubEvent
-
+
def setUp(self):
ObjectHubSetup.setUp(self)
self.object_hub = getService(self.rootFolder, "ObjectHub")
@@ -131,7 +131,7 @@
def testTransmittedEvent(self):
# Test that the HubEvents are transmitted by the notify method
self.object_hub.notify(self.hub_event)
-
+
self.subscriber.verifyEventsReceived(self, [
(self.interface, self.hubid, self.location)
])
@@ -147,7 +147,7 @@
class TransmitObjectMovedHubEventTest(TransmitHubEventTest):
interface = IObjectMovedHubEvent
klass = ObjectMovedHubEvent
-
+
def setUp(self):
ObjectHubSetup.setUp(self)
self.object_hub = getService(self.rootFolder, "ObjectHub")
@@ -283,7 +283,7 @@
provideAdapter(None, ITraverser, DummyTraverser)
object_hub = self.object_hub
-
+
location_hubid_object = [(locationAsTuple(location),
object_hub.register(location),
fake_object_for_location(location)
@@ -296,15 +296,15 @@
self.assertEqual(r, location_hubid_object)
class TestNoRegistration(BasicHubTest):
-
+
def testAddWithoutRegistration(self):
# Test that no HubIdEvents are generated if there is no registration
hub = self.object_hub
event = self.added_event
location = self.location
-
+
hub.notify(event)
-
+
self.subscriber.verifyEventsReceived(self, [
(IObjectAddedEvent, location),
])
@@ -317,16 +317,16 @@
self.setEvents()
self.subscriber = RegistrationSubscriber(self.object_hub)
self.object_hub.subscribe(self.subscriber)
-
+
def testLookingUpLocation(self):
hub = self.object_hub
event = self.created_event
location = None
-
+
hub.notify(event)
-
+
self.assertEqual(location_from_hub, location)
-
+
self.subscriber.verifyEventsReceived(self, [
(IObjectCreatedEvent, location),
])
@@ -336,10 +336,10 @@
hub = self.object_hub
event = self.added_event
location = self.location
-
+
# Do not add the location to the hub
# hub.notify(event)
-
+
self.assertRaises(NotFoundError, hub.getHubId, location)
self.subscriber.verifyEventsReceived(self, [])
@@ -351,7 +351,7 @@
self.setEvents()
self.subscriber = RegistrationSubscriber(self.object_hub)
self.object_hub.subscribe(self.subscriber)
-
+
def testLookingUpLocation(self):
# Test that the location is in the lookup
# Compare getHubIdForLocation and getLocationForHubId
@@ -359,17 +359,17 @@
hub = self.object_hub
event = self.added_event
location = self.location
-
+
hub.notify(event)
-
+
hubid = hub.getHubId(location)
# check that hub id is an int
self.failUnless(isinstance(hubid, int)) # int(hubid)
-
+
location_from_hub = hub.getLocation(hubid)
self.assertEqual(location_from_hub, location)
-
+
self.subscriber.verifyEventsReceived(self, [
(IObjectAddedEvent, location),
(IObjectRegisteredHubEvent, hubid, location),
@@ -380,10 +380,10 @@
hub = self.object_hub
event = self.added_event
location = self.location
-
+
# Do not add the location to the hub
# hub.notify(event)
-
+
self.assertRaises(NotFoundError, hub.getHubId, location)
self.subscriber.verifyEventsReceived(self, [])
@@ -392,17 +392,17 @@
# Test that we don't find a location for an hub id that isn't there.
hub = self.object_hub
event = self.added_event
-
+
# Do not add the location to the hub
# hub.notify(event)
-
+
absent_hubid = 12
-
+
self.assertRaises(NotFoundError, hub.getLocation, absent_hubid)
-
+
self.subscriber.verifyEventsReceived(self, [])
-
+
class TestObjectRemovedEvent(BasicHubTest):
def setUp(self):
ObjectHubSetup.setUp(self)
@@ -410,51 +410,51 @@
self.setEvents()
self.subscriber = RegistrationSubscriber(self.object_hub)
self.object_hub.subscribe(self.subscriber)
-
+
def testRemovedLocation(self):
- # Test that a location that is added then removed is actually gone.
+ # Test that a location that is added then removed is actually gone.
hub = self.object_hub
added_event = self.added_event
removed_event = self.removed_event
location = self.location
obj = self.obj
-
+
hub.notify(added_event)
-
+
hubid = hub.getHubId(location)
-
+
# check that hubid is an int
self.failUnless(isinstance(hubid, int)) # int(hubid)
-
+
hub.notify(removed_event)
-
+
self.assertRaises(NotFoundError, hub.getHubId, location)
self.assertRaises(NotFoundError, hub.getLocation, hubid)
-
+
self.subscriber.verifyEventsReceived(self, [
(IObjectAddedEvent, location),
(IObjectRegisteredHubEvent, hubid, location),
(IObjectRemovedEvent, location),
(IObjectRemovedHubEvent, hubid, location, obj),
])
-
-
+
+
def testRemovedAbsentLocation(self):
# Test that removing an absent location is silently ignored.
hub = self.object_hub
added_event = self.added_event
removed_event = self.removed_event
location = self.location
-
+
# Do not add location
# hub.notify(added_event)
-
+
hub.notify(removed_event)
self.subscriber.verifyEventsReceived(self, [
(IObjectRemovedEvent, location),
])
-
+
class TestObjectModifiedEvent(BasicHubTest):
def setUp(self):
@@ -470,24 +470,24 @@
added_event = self.added_event
modified_event = self.modified_event
location = self.location
-
+
hub.notify(added_event)
-
+
hubid = hub.getHubId(location)
# check that hubid is an int
self.failUnless(isinstance(hubid, int)) # int(hubid)
-
+
location_from_hub = hub.getLocation(hubid)
self.assertEqual(location_from_hub, location)
-
+
hub.notify(modified_event)
-
+
hubid2 = hub.getHubId(location)
location_from_hub2 = hub.getLocation(hubid2)
-
+
self.assertEqual(location_from_hub, location_from_hub2)
self.assertEqual(hubid, hubid2)
-
+
self.subscriber.verifyEventsReceived(self, [
(IObjectAddedEvent, location),
(IObjectRegisteredHubEvent, hubid, location),
@@ -495,7 +495,7 @@
(IObjectModifiedHubEvent, hubid, location)
])
-
+
def testModifiedAbsentLocation(self):
# Test that lookup state does not change after an object modify event.
# In this case, modify of an absent location is a noop.
@@ -503,13 +503,13 @@
added_event = self.added_event
modified_event = self.modified_event
location = self.location
-
+
# Do not add location
# hub.notify(added_event)
-
+
hub.notify(modified_event)
self.assertRaises(NotFoundError, hub.getHubId, location)
-
+
self.subscriber.verifyEventsReceived(self, [
(IObjectModifiedEvent, location),
])
@@ -530,20 +530,20 @@
moved_event = self.moved_event
location = self.location
new_location = self.new_location
-
+
hub.notify(added_event)
hubid = hub.getHubId(location)
-
+
hub.notify(moved_event)
-
+
location_from_hub = hub.getLocation(hubid)
-
+
self.assertEqual(location_from_hub, new_location)
self.assertRaises(NotFoundError, hub.getHubId, location)
-
+
hubid2 = hub.getHubId(new_location)
self.assertEqual(hubid2, hubid)
-
+
self.subscriber.verifyEventsReceived(self, [
(IObjectAddedEvent, location),
(IObjectRegisteredHubEvent, hubid, location),
@@ -559,14 +559,14 @@
moved_event = self.moved_event
location = self.location
new_location = self.new_location
-
+
# Do not add location
# hub.notify(added_event)
-
+
hub.notify(moved_event)
self.assertRaises(NotFoundError, hub.getHubId, location)
self.assertRaises(NotFoundError, hub.getHubId, new_location)
-
+
self.subscriber.verifyEventsReceived(self, [
(IObjectMovedEvent, new_location),
])
@@ -580,12 +580,12 @@
moved_event = self.moved_event
location = self.location
new_location = self.new_location
-
+
hub.notify(added_event)
hub.notify(added_event2)
-
+
self.assertRaises(ObjectHubError, hub.notify, moved_event)
-
+
self.subscriber.verifyEventsReceived(self, [
(IObjectAddedEvent, location),
(IObjectRegisteredHubEvent, None, location),
=== Zope3/src/zope/app/services/tests/test_principalannotation.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_principalannotation.py:1.1.2.1 Mon Dec 23 14:32:24 2002
+++ Zope3/src/zope/app/services/tests/test_principalannotation.py Tue Dec 24 21:20:49 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
@@ -31,7 +31,7 @@
class Principal:
__implements__ = IPrincipal
-
+
def __init__(self, id):
self.id = id
@@ -53,10 +53,10 @@
root_sm.provideService("PrincipalAnnotation", svc)
self.createServiceManager()
-
+
sm = getServiceManager(self.rootFolder)
sm.PrincipalAnnotation = svc
-
+
self.svc = getService(self.rootFolder, "PrincipalAnnotation")
def testGetSimple(self):
@@ -78,7 +78,7 @@
parentAnnotation = self.svc.getAnnotation(princeSomebody.getId())
self.assert_(self.svc.hasAnnotation(princeSomebody.getId()))
self.assert_(not subService.hasAnnotation(princeSomebody.getId()))
-
+
parentAnnotation['hair_color'] = 'blue'
subAnnotation = subService.getAnnotation(princeSomebody.getId())
@@ -97,7 +97,7 @@
annotations = getAdapter(p, IAnnotations)
self.assertEquals(annotations["test"], "bar")
-
+
def test_suite():
loader=TestLoader()
return loader.loadTestsFromTestCase(PrincipalAnnotationTests)
=== Zope3/src/zope/app/services/tests/test_roleservice.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_roleservice.py:1.1.2.1 Mon Dec 23 14:32:24 2002
+++ Zope3/src/zope/app/services/tests/test_roleservice.py Tue Dec 24 21:20:49 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
@@ -41,7 +41,7 @@
root_sm.provideService("Roles", roleRegistry)
self.createServiceManager()
-
+
sm = getServiceManager(self.rootFolder)
rs = RoleService()
sm.Roles = rs
@@ -50,7 +50,7 @@
def testGetRole(self):
self.roleRegistry.defineRole('Manager', 'Manager', '')
-
+
r = Role("Hacker","","")
self.rs.setObject("Hacker", r)
self.assertEqual(self.rs.getRole('Hacker').getId(), 'Hacker')
@@ -60,10 +60,10 @@
roles.sort()
self.assertEqual(roles, ['Anonymous', 'Hacker', 'Manager'])
-
+
def testGetRoleFromLayeredServices(self):
self.roleRegistry.defineRole('Manager', 'Manager', '')
-
+
r = Role("Hacker","","")
self.rs.setObject("Hacker", r)
@@ -75,7 +75,7 @@
r1 = Role("Reviewer",'','')
rs1.setObject("Reviewer", r1)
-
+
self.assertEqual(rs1.getRole('Hacker').getId(), 'Hacker')
self.assertEqual(rs1.getRole('Manager').getId(), 'Manager')
self.assertEqual(rs1.getRole('Reviewer').getId(), 'Reviewer')
@@ -84,9 +84,9 @@
roles.sort()
self.assertEqual(roles, ['Anonymous', 'Hacker', 'Manager','Reviewer'])
-
-
+
+
def test_suite():
loader=TestLoader()
return loader.loadTestsFromTestCase(RoleServiceTests)
=== Zope3/src/zope/app/services/tests/test_servicemanager.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zope/app/services/tests/test_servicemanager.py:1.1.2.4 Tue Dec 24 09:56:23 2002
+++ Zope3/src/zope/app/services/tests/test_servicemanager.py Tue Dec 24 21:20:49 2002
@@ -76,7 +76,7 @@
self.createServiceManager()
sm = traverse(self.rootFolder, '++etc++Services')
default = traverse(sm, 'Packages/default')
-
+
ts = TestService()
default.setObject('test_service1', ts)
configuration = ServiceConfiguration(
=== Zope3/src/zope/app/services/tests/test_user.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_user.py:1.1.2.1 Mon Dec 23 14:32:24 2002
+++ Zope3/src/zope/app/services/tests/test_user.py Tue Dec 24 21:20:49 2002
@@ -28,7 +28,7 @@
def testGetLogin(self):
user = self._user
self.assertEqual('srichter', user.getLogin())
-
+
def testGetRoles(self):
user = self._user
self.assertEqual([], user.getRoles())
=== Zope3/src/zope/app/services/tests/test_view.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zope/app/services/tests/test_view.py:1.1.2.4 Tue Dec 24 10:21:53 2002
+++ Zope3/src/zope/app/services/tests/test_view.py Tue Dec 24 21:20:49 2002
@@ -130,7 +130,7 @@
__implements__ = I1
configuration.factory = A
-
+
registry = service.createConfigurationsFor(configuration)
registry.register(configuration)
registry.activate(configuration)
@@ -150,7 +150,7 @@
def test_queryView_delegation(self):
service = self._service
-
+
self.buildFolders()
self.rootFolder.setServiceManager(ServiceManager())
@@ -170,7 +170,7 @@
class A2(A): pass
provideView(I1, 'test', IBrowserPresentation, A2)
-
+
view = service.queryView(o, 'test', request)
self.assertEqual(view.__class__, A2)
self.assertEqual(view.context, o)
@@ -191,7 +191,7 @@
def resolve(self, name):
if name == 'Foo.Bar.A':
return A
-
+
class TestViewConfiguration(PlacefulSetup, TestCase):
def setUp(self):
@@ -202,7 +202,7 @@
ViewConfiguration(I1, 'test', IBrowserPresentation, "Foo.Bar.A"),
rootFolder,
)
-
+
def test_getView(self):
c = C()
request = TestRequest()
@@ -216,7 +216,7 @@
class PhonyTemplate:
__implements__ = IZPTTemplate
-
+
class TestPageConfiguration(PlacefulSetup, TestCase):
def setUp(self):
@@ -233,7 +233,7 @@
),
rootFolder,
)
-
+
def test_getView(self):
c = C()
request = TestRequest()
=== Zope3/src/zope/app/services/tests/test_viewpackage.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/test_viewpackage.py:1.1.2.2 Tue Dec 24 07:51:18 2002
+++ Zope3/src/zope/app/services/tests/test_viewpackage.py Tue Dec 24 21:20:49 2002
@@ -57,7 +57,7 @@
self.assertRaises(TypeError,
views.setObject, 'bar.html', ViewPackage())
-
+
def test_suite():
return TestSuite((