- remove test.sql._base, test.engine._base, test.orm._base, move those classes to a new test.lib.fixtures module

- move testing.TestBase to test.lib.fixtures
- massive search and replace

1 files changed, 7 insertions, 7 deletions

diff --git a/test/ext/test_mutable.py b/test/ext/test_mutable.py
index c3d5aecd8..236d711b2 100644
--- a/test/ext/test_mutable.py
+++ b/test/ext/test_mutable.py
@@ -7,11 +7,11 @@ from test.lib.schema import Table, Column
 from test.lib.testing import eq_
 from test.lib.util import picklers
 from test.lib import testing
-from test.orm import _base
+from test.lib import fixtures
 import sys
 import pickle
 
-class Foo(_base.BasicEntity):
+class Foo(fixtures.BasicEntity):
     pass
 
 class _MutableDictTestBase(object):
@@ -100,7 +100,7 @@ class _MutableDictTestBase(object):
 
         eq_(f1.non_mutable_data, {'a':'b'})
 
-class MutableWithScalarPickleTest(_MutableDictTestBase, _base.MappedTest):
+class MutableWithScalarPickleTest(_MutableDictTestBase, fixtures.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         MutationDict = cls._type_fixture()
@@ -114,7 +114,7 @@ class MutableWithScalarPickleTest(_MutableDictTestBase, _base.MappedTest):
     def test_non_mutable(self):
         self._test_non_mutable()
 
-class MutableWithScalarJSONTest(_MutableDictTestBase, _base.MappedTest):
+class MutableWithScalarJSONTest(_MutableDictTestBase, fixtures.MappedTest):
     # json introduced in 2.6
     __skip_if__ = lambda : sys.version_info < (2, 6),
 
@@ -147,7 +147,7 @@ class MutableWithScalarJSONTest(_MutableDictTestBase, _base.MappedTest):
     def test_non_mutable(self):
         self._test_non_mutable()
 
-class MutableAssociationScalarPickleTest(_MutableDictTestBase, _base.MappedTest):
+class MutableAssociationScalarPickleTest(_MutableDictTestBase, fixtures.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         MutationDict = cls._type_fixture()
@@ -158,7 +158,7 @@ class MutableAssociationScalarPickleTest(_MutableDictTestBase, _base.MappedTest)
             Column('data', PickleType)
         )
 
-class MutableAssociationScalarJSONTest(_MutableDictTestBase, _base.MappedTest):
+class MutableAssociationScalarJSONTest(_MutableDictTestBase, fixtures.MappedTest):
     # json introduced in 2.6
     __skip_if__ = lambda : sys.version_info < (2, 6),
 
@@ -204,7 +204,7 @@ class _CompositeTestBase(object):
         ClassManager.dispatch._clear()
         super(_CompositeTestBase, self).teardown()
 
-class MutableCompositesTest(_CompositeTestBase, _base.MappedTest):
+class MutableCompositesTest(_CompositeTestBase, fixtures.MappedTest):
 
     @classmethod
     def _type_fixture(cls):