[Zope-CVS] CVS: Products/Ape/lib/apelib/tests - testzope2fs.py:1.3.2.3 testzope2sql.py:1.5.2.2

[Shane Hathaway]

Update of /cvs-repository/Products/Ape/lib/apelib/tests
In directory cvs.zope.org:/tmp/cvs-serv7805/lib/apelib/tests

Modified Files:
      Tag: ape-newconf-branch
	testzope2fs.py testzope2sql.py 
Log Message:
Consolidated Zope 2 mapper configuration in a single module.

Also made Ape look for apeconf.xml files in all products, renamed the
root Zope 2 mapper to simply "root", and made variants extend the
default configuration implicitly.


=== Products/Ape/lib/apelib/tests/testzope2fs.py 1.3.2.2 => 1.3.2.3 ===
--- Products/Ape/lib/apelib/tests/testzope2fs.py:1.3.2.2	Mon Jul  7 23:58:12 2003
+++ Products/Ape/lib/apelib/tests/testzope2fs.py	Tue Jul  8 22:10:43 2003
@@ -31,7 +31,7 @@
 from apelib.zodb3.db import ApeDB
 from apelib.zodb3.storage import ApeStorage
 from apelib.zodb3.resource import StaticResource
-from apelib.zope2.fsmapper import createAbstractMapper
+from apelib.zope2.mapper import createMapper
 from apelib.fs.exceptions import FSWriteError
 from apelib.fs.connection import FSConnection
 from zope2testbase import Zope2TestBase, Folder
@@ -44,7 +44,7 @@
 
 tmpdir = mktemp()
 
-root_mapper = createAbstractMapper()
+root_mapper = createMapper('filesystem')
 
 
 class Zope2FSTests (unittest.TestCase, Zope2TestBase):


=== Products/Ape/lib/apelib/tests/testzope2sql.py 1.5.2.1 => 1.5.2.2 ===
--- Products/Ape/lib/apelib/tests/testzope2sql.py:1.5.2.1	Mon Jul  7 23:58:12 2003
+++ Products/Ape/lib/apelib/tests/testzope2sql.py	Tue Jul  8 22:10:43 2003
@@ -23,11 +23,11 @@
 from apelib.zodb3.db import ApeDB
 from apelib.zodb3.storage import ApeStorage
 from apelib.zodb3.resource import StaticResource
-from apelib.zope2.sqlmapper import createAbstractMapper
+from apelib.zope2.mapper import createMapper
 from zope2testbase import Zope2TestBase
 
 
-root_mapper = createAbstractMapper()
+root_mapper = createMapper('sql')
 
 class Zope2SQLTests (Zope2TestBase):