- 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

7 files changed, 16 insertions, 16 deletions

diff --git a/test/aaa_profiling/test_compiler.py b/test/aaa_profiling/test_compiler.py
index 697ab5952..f68e82b07 100644
--- a/test/aaa_profiling/test_compiler.py
+++ b/test/aaa_profiling/test_compiler.py
@@ -2,7 +2,7 @@ from sqlalchemy import *
 from test.lib import *
 from sqlalchemy.engine import default
 
-class CompileTest(TestBase, AssertsExecutionResults):
+class CompileTest(fixtures.TestBase, AssertsExecutionResults):
     @classmethod
     def setup_class(cls):
 
diff --git a/test/aaa_profiling/test_memusage.py b/test/aaa_profiling/test_memusage.py
index 3e225ad08..80939376c 100644
--- a/test/aaa_profiling/test_memusage.py
+++ b/test/aaa_profiling/test_memusage.py
@@ -17,16 +17,16 @@ from test.lib.util import gc_collect
 from sqlalchemy.util.compat import decimal
 import gc
 import weakref
-from test.orm import _base
+from test.lib import fixtures
 
 if jython:
     from nose import SkipTest
     raise SkipTest("Profiling not supported on this platform")
 
 
-class A(_base.ComparableEntity):
+class A(fixtures.ComparableEntity):
     pass
-class B(_base.ComparableEntity):
+class B(fixtures.ComparableEntity):
     pass
 
 def profile_memory(func):
@@ -68,7 +68,7 @@ def assert_no_mappers():
     gc_collect()
     assert len(_mapper_registry) == 0
 
-class EnsureZeroed(_base.ORMTest):
+class EnsureZeroed(fixtures.ORMTest):
     def setup(self):
         _sessions.clear()
         _mapper_registry.clear()
@@ -388,7 +388,7 @@ class MemUsageTest(EnsureZeroed):
 
         @profile_memory
         def go():
-            class A(_base.ComparableEntity):
+            class A(fixtures.ComparableEntity):
                 pass
             class B(A):
                 pass
@@ -454,9 +454,9 @@ class MemUsageTest(EnsureZeroed):
 
         @profile_memory
         def go():
-            class A(_base.ComparableEntity):
+            class A(fixtures.ComparableEntity):
                 pass
-            class B(_base.ComparableEntity):
+            class B(fixtures.ComparableEntity):
                 pass
 
             mapper(A, table1, properties={
diff --git a/test/aaa_profiling/test_orm.py b/test/aaa_profiling/test_orm.py
index 96457a18a..b0b012861 100644
--- a/test/aaa_profiling/test_orm.py
+++ b/test/aaa_profiling/test_orm.py
@@ -4,11 +4,11 @@ from sqlalchemy import exc as sa_exc, util, Integer, String, ForeignKey
 from sqlalchemy.orm import exc as orm_exc, mapper, relationship, \
     sessionmaker, Session
 from test.lib import testing, profiling
-from test.orm import _base
+from test.lib import fixtures
 from test.lib.schema import Table, Column
 import sys
 
-class MergeTest(_base.MappedTest):
+class MergeTest(fixtures.MappedTest):
 
     @classmethod
     def define_tables(cls, metadata):
@@ -101,7 +101,7 @@ class MergeTest(_base.MappedTest):
         sess2 = sessionmaker()()
         self.assert_sql_count(testing.db, go, 2)
 
-class LoadManyToOneFromIdentityTest(_base.MappedTest):
+class LoadManyToOneFromIdentityTest(fixtures.MappedTest):
     """test overhead associated with many-to-one fetches.
 
     Prior to the refactor of LoadLazyAttribute and 
diff --git a/test/aaa_profiling/test_pool.py b/test/aaa_profiling/test_pool.py
index d0486fa0b..563f8fcb7 100644
--- a/test/aaa_profiling/test_pool.py
+++ b/test/aaa_profiling/test_pool.py
@@ -3,7 +3,7 @@ from test.lib import *
 from sqlalchemy.pool import QueuePool
 
 
-class QueuePoolTest(TestBase, AssertsExecutionResults):
+class QueuePoolTest(fixtures.TestBase, AssertsExecutionResults):
     class Connection(object):
         def rollback(self):
             pass
diff --git a/test/aaa_profiling/test_resultset.py b/test/aaa_profiling/test_resultset.py
index a0b16cb52..9ba3d6917 100644
--- a/test/aaa_profiling/test_resultset.py
+++ b/test/aaa_profiling/test_resultset.py
@@ -4,7 +4,7 @@ NUM_FIELDS = 10
 NUM_RECORDS = 1000
 
 
-class ResultSetTest(TestBase, AssertsExecutionResults):
+class ResultSetTest(fixtures.TestBase, AssertsExecutionResults):
 
     __only_on__ = 'sqlite'
 
@@ -52,7 +52,7 @@ class ResultSetTest(TestBase, AssertsExecutionResults):
     def test_unicode(self):
         [tuple(row) for row in t2.select().execute().fetchall()]
 
-class ExecutionTest(TestBase):
+class ExecutionTest(fixtures.TestBase):
     __only_on__ = 'sqlite'
 
     def test_minimal_connection_execute(self):
diff --git a/test/aaa_profiling/test_zoomark.py b/test/aaa_profiling/test_zoomark.py
index a201212b9..c44852916 100644
--- a/test/aaa_profiling/test_zoomark.py
+++ b/test/aaa_profiling/test_zoomark.py
@@ -13,7 +13,7 @@ dbapi_session = engines.ReplayableSession()
 metadata = None
 
 
-class ZooMarkTest(TestBase):
+class ZooMarkTest(fixtures.TestBase):
 
     """Runs the ZooMark and squawks if method counts vary from the norm.
 
diff --git a/test/aaa_profiling/test_zoomark_orm.py b/test/aaa_profiling/test_zoomark_orm.py
index 8479b7a40..2e7273e01 100644
--- a/test/aaa_profiling/test_zoomark_orm.py
+++ b/test/aaa_profiling/test_zoomark_orm.py
@@ -14,7 +14,7 @@ dbapi_session = engines.ReplayableSession()
 metadata = None
 
 
-class ZooMarkTest(TestBase):
+class ZooMarkTest(fixtures.TestBase):
 
     """Runs the ZooMark and squawks if method counts vary from the norm.