[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - test_connectionservice.py:1.14

[Bjorn Tillenius]

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

Modified Files:
	test_connectionservice.py 
Log Message:
getConnection and queryConnection should return a connection, not a
database adapter.


=== Zope3/src/zope/app/services/tests/test_connectionservice.py 1.13 => 1.14 ===
--- Zope3/src/zope/app/services/tests/test_connectionservice.py:1.13	Tue Aug 19 03:09:57 2003
+++ Zope3/src/zope/app/services/tests/test_connectionservice.py	Thu Aug 21 08:01:21 2003
@@ -90,30 +90,30 @@
         conn = addConnection(mgr, 'conn4', DAStub(4))
 
     def testGetConnection(self):
-        self.assertEqual('DA #1', self.service.getConnection('conn1')())
-        self.assertEqual('DA #2', self.service.getConnection('conn2')())
+        self.assertEqual('DA #1', self.service.getConnection('conn1'))
+        self.assertEqual('DA #2', self.service.getConnection('conn2'))
         self.assertRaises(KeyError, self.service.getConnection, 'conn3')
         self.assertRaises(KeyError, self.service.getConnection, 'conn4')
 
-        self.assertEqual('DA #3', self.service1.getConnection('conn1')())
-        self.assertEqual('DA #2', self.service1.getConnection('conn2')())
+        self.assertEqual('DA #3', self.service1.getConnection('conn1'))
+        self.assertEqual('DA #2', self.service1.getConnection('conn2'))
         self.assertRaises(KeyError, self.service1.getConnection, 'conn3')
-        self.assertEqual('DA #4', self.service1.getConnection('conn4')())
+        self.assertEqual('DA #4', self.service1.getConnection('conn4'))
         self.assertRaises(KeyError, self.service1.getConnection, 'conn5')
 
     def testQueryConnection(self):
-        self.assertEqual('DA #1', self.service.queryConnection('conn1')())
-        self.assertEqual('DA #2', self.service.queryConnection('conn2')())
+        self.assertEqual('DA #1', self.service.queryConnection('conn1'))
+        self.assertEqual('DA #2', self.service.queryConnection('conn2'))
         self.assertEqual(None, self.service.queryConnection('conn3'))
         self.assertEqual('xx', self.service.queryConnection('conn3', 'xx'))
         self.assertEqual(None, self.service.queryConnection('conn4'))
         self.assertEqual('xx', self.service.queryConnection('conn4', 'xx'))
 
-        self.assertEqual('DA #3', self.service1.queryConnection('conn1')())
-        self.assertEqual('DA #2', self.service1.queryConnection('conn2')())
+        self.assertEqual('DA #3', self.service1.queryConnection('conn1'))
+        self.assertEqual('DA #2', self.service1.queryConnection('conn2'))
         self.assertEqual(None, self.service1.queryConnection('conn3'))
         self.assertEqual('xx', self.service1.queryConnection('conn3', 'xx'))
-        self.assertEqual('DA #4', self.service1.queryConnection('conn4')())
+        self.assertEqual('DA #4', self.service1.queryConnection('conn4'))
         self.assertEqual(None, self.service1.queryConnection('conn5'))
         self.assertEqual('xx', self.service1.queryConnection('conn5', 'xx'))