[Zope-Checkins] CVS: Zope3/lib/python/Zope/Event/tests - testDirectives.py:1.3 testEventService.py:1.3 testLogger.py:1.3 testObjectEvent.py:1.3

[Jeremy Hylton]

Update of /cvs-repository/Zope3/lib/python/Zope/Event/tests
In directory cvs.zope.org:/tmp/cvs-serv5906/lib/python/Zope/Event/tests

Modified Files:
	testDirectives.py testEventService.py testLogger.py 
	testObjectEvent.py 
Log Message:
Simplify test_suite() implementations when there is only one class.


=== Zope3/lib/python/Zope/Event/tests/testDirectives.py 1.2 => 1.3 ===
         unsubscribe(subscriber)
 
 def test_suite():
-    return TestSuite((
-        makeSuite(Test),
-        ))
+    return makeSuite(Test)
 
 if __name__=='__main__':
     main(defaultTest='test_suite')


=== Zope3/lib/python/Zope/Event/tests/testEventService.py 1.2 => 1.3 ===
         self.service.publishEvent(event2)
         self.assertEqual(self.subscriber.notified, 6)
         self.assertEqual(subscriber2.notified, 2)
-        self.assertRaises(NotFoundError, self.service.unsubscribe, self.subscriber, IObjectAddedEvent)
+        self.assertRaises(NotFoundError, self.service.unsubscribe,
+                          self.subscriber, IObjectAddedEvent)
         self.service.unsubscribe(self.subscriber, IObjectAddedEvent, filter)
         self.service.publishEvent(self.event)
         self.assertEqual(self.subscriber.notified, 6)
@@ -274,24 +275,19 @@
     
     def testListSubscriptions2(self):
         "one subscription"
-        self.service.subscribe(
-            self.subscriber,
-            event_type=IObjectAddedEvent
-            )
-        self.assertEqual([(IObjectAddedEvent,None)], self.service.listSubscriptions(self.subscriber))
+        self.service.subscribe(self.subscriber, event_type=IObjectAddedEvent)
+        self.assertEqual([(IObjectAddedEvent, None)],
+                         self.service.listSubscriptions(self.subscriber))
     
     def testListSubscriptions3(self):
         "listing limited subscription"
-        self.service.subscribe(
-            self.subscriber,
-            event_type=IObjectAddedEvent
-            )
-        self.assertEqual([], self.service.listSubscriptions(self.subscriber, IObjectRemovedEvent))
+        self.service.subscribe(self.subscriber, event_type=IObjectAddedEvent)
+        L = self.service.listSubscriptions(self.subscriber,
+                                           IObjectRemovedEvent)
+        self.assertEqual([], L)
     
 def test_suite():
-    return unittest.TestSuite((
-        unittest.makeSuite(TestEventService),
-        ))
+    return unittest.makeSuite(TestEventService)
 
 if __name__=='__main__':
     unittest.main(defaultTest='test_suite')


=== Zope3/lib/python/Zope/Event/tests/testLogger.py 1.2 => 1.3 ===
             ])
 
 def test_suite():
-    return unittest.TestSuite((
-        unittest.makeSuite(TestLogger1),
-        unittest.makeSuite(TestLogger2),
-        ))
+    return unittest.TestSuite((unittest.makeSuite(TestLogger1),
+                               unittest.makeSuite(TestLogger2)))
 
 if __name__=='__main__':
     unittest.main(defaultTest='test_suite')


=== Zope3/lib/python/Zope/Event/tests/testObjectEvent.py 1.2 => 1.3 ===
         self.assertEqual(self.event.getFromLocation(),self.from_location)
         
 def test_suite():
-    return unittest.TestSuite((
-        unittest.makeSuite(TestObjectAddedEvent),
-        unittest.makeSuite(TestObjectModifiedEvent),
-        unittest.makeSuite(TestObjectRemovedEvent),
-        unittest.makeSuite(TestObjectMovedEvent),
-        ))
+    return unittest.TestSuite((unittest.makeSuite(TestObjectAddedEvent),
+                               unittest.makeSuite(TestObjectModifiedEvent),
+                               unittest.makeSuite(TestObjectRemovedEvent),
+                               unittest.makeSuite(TestObjectMovedEvent)))
 
 if __name__=='__main__':
     unittest.main(defaultTest='test_suite')