[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - test_interface.py:1.9.16.1 test_module.py:1.11.10.1 test_surrogates.py:1.2.4.1

[Jim Fulton]

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

Modified Files:
      Tag: zope3-zodb3-devel-branch
	test_interface.py test_module.py test_surrogates.py 
Log Message:
Various changes to get tests passing.


=== Zope3/src/zope/app/services/tests/test_interface.py 1.9 => 1.9.16.1 ===
--- Zope3/src/zope/app/services/tests/test_interface.py:1.9	Fri Aug 15 20:44:14 2003
+++ Zope3/src/zope/app/services/tests/test_interface.py	Fri Jan 16 10:43:32 2004
@@ -19,8 +19,7 @@
 
 from transaction import get_transaction
 
-from zodb.db import DB
-from zodb.storage.mapping import MappingStorage
+from ZODB.tests.util import DB
 from zodb.code.module import ManagedRegistry
 
 from zope.interface import Interface
@@ -41,7 +40,7 @@
 class PersistentInterfaceTest(unittest.TestCase):
 
     def setUp(self):
-        self.db = DB(MappingStorage())
+        self.db = DB()
         self.root = self.db.open().root()
         self.registry = ManagedRegistry()
         self.root["registry"] = self.registry


=== Zope3/src/zope/app/services/tests/test_module.py 1.11 => 1.11.10.1 ===
--- Zope3/src/zope/app/services/tests/test_module.py:1.11	Sun Sep 21 13:30:46 2003
+++ Zope3/src/zope/app/services/tests/test_module.py	Fri Jan 16 10:43:32 2004
@@ -23,8 +23,7 @@
 from zope.app.services.tests.placefulsetup import PlacefulSetup
 from zope.app.traversing import traverse
 from zope.app.services.module import Manager
-from zodb.storage.mapping import MappingStorage
-from zodb.db import DB
+from ZODB.tests.util import DB
 from transaction import get_transaction
 
 
@@ -65,7 +64,7 @@
         self.assertEqual(called, old_called + 1)
 
     def test_module_persistence(self):
-        db = DB(MappingStorage())
+        db = DB()
         conn = db.open()
         root = conn.root()
         root['Application'] = self.rootFolder


=== Zope3/src/zope/app/services/tests/test_surrogates.py 1.2 => 1.2.4.1 ===
--- Zope3/src/zope/app/services/tests/test_surrogates.py:1.2	Fri Nov 21 12:09:52 2003
+++ Zope3/src/zope/app/services/tests/test_surrogates.py	Fri Jan 16 10:43:32 2004
@@ -521,8 +521,7 @@
 
 def test_persistence():
     """
-    >>> storage = MemoryFullStorage('test')
-    >>> db = DB(storage)
+    >>> db = DB()
     >>> conn1 = db.open()
 
     >>> G = globalSurrogateRegistry
@@ -888,8 +887,7 @@
 from zope.app.services.surrogate import LocalSurrogateRegistry
 from zope.app.services.surrogate import LocalSurrogateBasedService
 import zope.interface
-from zodb.storage.memory import MemoryFullStorage
-from zodb.db import DB
+from ZODB.tests.util import DB
 from transaction import get_transaction
 from zope.app import zapi
 from zope.app.interfaces.services.registration import RegisteredStatus