- 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

16 files changed, 82 insertions, 81 deletions

diff --git a/test/sql/_base.py b/test/sql/_base.py
deleted file mode 100644
index 48879ae7e..000000000
--- a/test/sql/_base.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from test.engine import _base as engine_base
-
-
-TablesTest = engine_base.TablesTest
diff --git a/test/sql/test_case_statement.py b/test/sql/test_case_statement.py
index 4bb9cf0fc..994016c2f 100644
--- a/test/sql/test_case_statement.py
+++ b/test/sql/test_case_statement.py
@@ -6,7 +6,7 @@ from sqlalchemy import util, exc
 from sqlalchemy.sql import table, column
 
 
-class CaseTest(TestBase, AssertsCompiledSQL):
+class CaseTest(fixtures.TestBase, AssertsCompiledSQL):
     __dialect__ = 'default'
 
     @classmethod
diff --git a/test/sql/test_compiler.py b/test/sql/test_compiler.py
index 69765a4fa..412604c04 100644
--- a/test/sql/test_compiler.py
+++ b/test/sql/test_compiler.py
@@ -61,7 +61,7 @@ addresses = table('addresses',
     column('zip')
 )
 
-class SelectTest(TestBase, AssertsCompiledSQL):
+class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
     __dialect__ = 'default'
 
     def test_attribute_sanity(self):
@@ -2432,7 +2432,7 @@ class SelectTest(TestBase, AssertsCompiledSQL):
         )
 
 
-class CRUDTest(TestBase, AssertsCompiledSQL):
+class CRUDTest(fixtures.TestBase, AssertsCompiledSQL):
     __dialect__ = 'default'
 
     def test_insert(self):
@@ -2688,7 +2688,7 @@ class CRUDTest(TestBase, AssertsCompiledSQL):
             "UPDATE foo SET id=:id, foo_id=:foo_id WHERE foo.id = :foo_id_1"
         )
 
-class InlineDefaultTest(TestBase, AssertsCompiledSQL):
+class InlineDefaultTest(fixtures.TestBase, AssertsCompiledSQL):
     __dialect__ = 'default'
 
     def test_insert(self):
@@ -2722,7 +2722,7 @@ class InlineDefaultTest(TestBase, AssertsCompiledSQL):
                         "coalesce(max(foo.id)) AS coalesce_1 FROM foo), "
                         "col3=:col3")
 
-class SchemaTest(TestBase, AssertsCompiledSQL):
+class SchemaTest(fixtures.TestBase, AssertsCompiledSQL):
     __dialect__ = 'default'
 
     def test_select(self):
diff --git a/test/sql/test_constraints.py b/test/sql/test_constraints.py
index c5433fa9c..19aa7c171 100644
--- a/test/sql/test_constraints.py
+++ b/test/sql/test_constraints.py
@@ -8,7 +8,7 @@ from test.lib.testing import eq_
 from test.lib.assertsql import AllOf, RegexSQL, ExactSQL, CompiledSQL
 from sqlalchemy.dialects.postgresql import base as postgresql
 
-class ConstraintTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL):
+class ConstraintTest(fixtures.TestBase, AssertsExecutionResults, AssertsCompiledSQL):
 
     def setup(self):
         global metadata
@@ -255,7 +255,7 @@ class ConstraintTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL):
                 Index('bar', t1.c.x)
         )
 
-class ConstraintCompilationTest(TestBase, AssertsCompiledSQL):
+class ConstraintCompilationTest(fixtures.TestBase, AssertsCompiledSQL):
     __dialect__ = 'default'
 
     def _test_deferrable(self, constraint_factory):
diff --git a/test/sql/test_defaults.py b/test/sql/test_defaults.py
index 2ba131ddc..a28143f70 100644
--- a/test/sql/test_defaults.py
+++ b/test/sql/test_defaults.py
@@ -9,10 +9,10 @@ from sqlalchemy import MetaData, Integer, String, ForeignKey, Boolean, exc,\
 from sqlalchemy.types import TypeDecorator
 from test.lib.schema import Table, Column
 from test.lib.testing import eq_
-from test.sql import _base
 from sqlalchemy.dialects import sqlite
+from test.lib import fixtures
 
-class DefaultTest(testing.TestBase):
+class DefaultTest(fixtures.TestBase):
 
     @classmethod
     def setup_class(cls):
@@ -393,7 +393,7 @@ class DefaultTest(testing.TestBase):
         eq_(55, l['col3'])
 
 
-class PKDefaultTest(_base.TablesTest):
+class PKDefaultTest(fixtures.TablesTest):
     __requires__ = ('subqueries',)
 
     @classmethod
@@ -428,7 +428,7 @@ class PKDefaultTest(_base.TablesTest):
         r = engine.execute(t1.insert(), data='there')
         eq_([2], r.inserted_primary_key)
 
-class PKIncrementTest(_base.TablesTest):
+class PKIncrementTest(fixtures.TablesTest):
     run_define_tables = 'each'
 
     @classmethod
@@ -495,7 +495,7 @@ class PKIncrementTest(_base.TablesTest):
             con.close()
 
 
-class EmptyInsertTest(testing.TestBase):
+class EmptyInsertTest(fixtures.TestBase):
     @testing.exclude('sqlite', '<', (3, 3, 8), 'no empty insert support')
     @testing.fails_on('oracle', 'FIXME: unknown')
     def test_empty_insert(self):
@@ -511,7 +511,7 @@ class EmptyInsertTest(testing.TestBase):
         finally:
             metadata.drop_all()
 
-class AutoIncrementTest(_base.TablesTest):
+class AutoIncrementTest(fixtures.TablesTest):
     __requires__ = ('identity',)
     run_define_tables = 'each'
 
@@ -561,7 +561,7 @@ class AutoIncrementTest(_base.TablesTest):
 
         nonai.insert().execute(id=1, data='row 1')
 
-class SequenceDDLTest(testing.TestBase, testing.AssertsCompiledSQL):
+class SequenceDDLTest(fixtures.TestBase, testing.AssertsCompiledSQL):
     __dialect__ = 'default'
 
     def test_create_drop_ddl(self):
@@ -590,7 +590,7 @@ class SequenceDDLTest(testing.TestBase, testing.AssertsCompiledSQL):
             "DROP SEQUENCE foo_seq",
         )
 
-class SequenceExecTest(testing.TestBase):
+class SequenceExecTest(fixtures.TestBase):
     __requires__ = ('sequences',)
 
     @classmethod
@@ -720,7 +720,7 @@ class SequenceExecTest(testing.TestBase):
         )
         self._assert_seq_result(r.inserted_primary_key[0])
 
-class SequenceTest(testing.TestBase, testing.AssertsCompiledSQL):
+class SequenceTest(fixtures.TestBase, testing.AssertsCompiledSQL):
     __requires__ = ('sequences',)
 
     @testing.fails_on('firebird', 'no FB support for start/increment')
@@ -833,7 +833,7 @@ class SequenceTest(testing.TestBase, testing.AssertsCompiledSQL):
         assert not self._has_sequence('s2')
 
 
-class TableBoundSequenceTest(testing.TestBase):
+class TableBoundSequenceTest(fixtures.TestBase):
     __requires__ = ('sequences',)
 
     @classmethod
@@ -894,7 +894,7 @@ class TableBoundSequenceTest(testing.TestBase):
              (4, "name4", 4)])
 
 
-class SpecialTypePKTest(testing.TestBase):
+class SpecialTypePKTest(fixtures.TestBase):
     """test process_result_value in conjunction with primary key columns.
 
     Also tests that "autoincrement" checks are against column.type._type_affinity,
@@ -978,7 +978,7 @@ class SpecialTypePKTest(testing.TestBase):
     def test_server_default_no_implicit_returning(self):
         self._run_test(server_default='1', autoincrement=False)
 
-class ServerDefaultsOnPKTest(testing.TestBase):
+class ServerDefaultsOnPKTest(fixtures.TestBase):
     @testing.provide_metadata
     def test_string_default_none_on_insert(self):
         """Test that without implicit returning, we return None for 
@@ -1104,7 +1104,7 @@ class ServerDefaultsOnPKTest(testing.TestBase):
             [(5, 'data')]
         )
 
-class UnicodeDefaultsTest(testing.TestBase):
+class UnicodeDefaultsTest(fixtures.TestBase):
     def test_no_default(self):
         c = Column(Unicode(32))
 
diff --git a/test/sql/test_functions.py b/test/sql/test_functions.py
index 98d8d7a97..f08fde1f5 100644
--- a/test/sql/test_functions.py
+++ b/test/sql/test_functions.py
@@ -15,7 +15,7 @@ from test.lib import testing
 from sqlalchemy.databases import *
 
 
-class CompileTest(TestBase, AssertsCompiledSQL):
+class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
     __dialect__ = 'default'
 
     def test_compile(self):
@@ -190,7 +190,7 @@ class CompileTest(TestBase, AssertsCompiledSQL):
             , checkparams={'y_1': 45, 'x_1': 17, 'y_2': 12, 'x_2': 5})
 
 
-class ExecuteTest(TestBase):
+class ExecuteTest(fixtures.TestBase):
     @engines.close_first
     def tearDown(self):
         pass
diff --git a/test/sql/test_generative.py b/test/sql/test_generative.py
index 088162c8a..0634ded40 100644
--- a/test/sql/test_generative.py
+++ b/test/sql/test_generative.py
@@ -7,7 +7,7 @@ from sqlalchemy import util
 from sqlalchemy.sql import util as sql_util
 from test.lib.testing import eq_
 
-class TraversalTest(TestBase, AssertsExecutionResults):
+class TraversalTest(fixtures.TestBase, AssertsExecutionResults):
     """test ClauseVisitor's traversal, particularly its 
     ability to copy and modify a ClauseElement in place."""
 
@@ -166,7 +166,7 @@ class TraversalTest(TestBase, AssertsExecutionResults):
         s = set(ClauseVisitor().iterate(bin))
         assert set(ClauseVisitor().iterate(bin)) == set([foo, bar, bin])
 
-class ClauseTest(TestBase, AssertsCompiledSQL):
+class ClauseTest(fixtures.TestBase, AssertsCompiledSQL):
     """test copy-in-place behavior of various ClauseElements."""
 
     __dialect__ = 'default'
@@ -472,7 +472,7 @@ class ClauseTest(TestBase, AssertsCompiledSQL):
                             ':col1_1) AS anon_1 WHERE table1.col1 = '
                             'anon_1.col1')
 
-class ClauseAdapterTest(TestBase, AssertsCompiledSQL):
+class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL):
     __dialect__ = 'default'
 
     @classmethod
@@ -861,7 +861,7 @@ class ClauseAdapterTest(TestBase, AssertsCompiledSQL):
             "WHERE c.bid = anon_1.b_aid"
         )
 
-class SpliceJoinsTest(TestBase, AssertsCompiledSQL):
+class SpliceJoinsTest(fixtures.TestBase, AssertsCompiledSQL):
     __dialect__ = 'default'
 
     @classmethod
@@ -932,7 +932,7 @@ class SpliceJoinsTest(TestBase, AssertsCompiledSQL):
                             'table1.col3 = table4_1.col3')
 
 
-class SelectTest(TestBase, AssertsCompiledSQL):
+class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
     """tests the generative capability of Select"""
 
     __dialect__ = 'default'
@@ -1088,7 +1088,7 @@ class SelectTest(TestBase, AssertsCompiledSQL):
         s = text('select 42', execution_options=dict(foo='bar'))
         assert s._execution_options == dict(foo='bar')
 
-class InsertTest(TestBase, AssertsCompiledSQL):
+class InsertTest(fixtures.TestBase, AssertsCompiledSQL):
     """Tests the generative capability of Insert"""
 
     __dialect__ = 'default'
diff --git a/test/sql/test_labels.py b/test/sql/test_labels.py
index 9160aa3ee..9f26d899f 100644
--- a/test/sql/test_labels.py
+++ b/test/sql/test_labels.py
@@ -6,7 +6,7 @@ from sqlalchemy.engine import default
 
 IDENT_LENGTH = 29
 
-class LabelTypeTest(TestBase):
+class LabelTypeTest(fixtures.TestBase):
     def test_type(self):
         m = MetaData()
         t = Table('sometable', m,
@@ -15,7 +15,7 @@ class LabelTypeTest(TestBase):
         assert isinstance(t.c.col1.label('hi').type, Integer)
         assert isinstance(select([t.c.col2]).as_scalar().label('lala').type, Float)
 
-class LongLabelsTest(TestBase, AssertsCompiledSQL):
+class LongLabelsTest(fixtures.TestBase, AssertsCompiledSQL):
     @classmethod
     def setup_class(cls):
         global metadata, table1, table2, maxlen
diff --git a/test/sql/test_metadata.py b/test/sql/test_metadata.py
index 7040cacff..77a75eb5f 100644
--- a/test/sql/test_metadata.py
+++ b/test/sql/test_metadata.py
@@ -10,11 +10,13 @@ from sqlalchemy import Integer, String, UniqueConstraint, \
 from test.lib.schema import Table, Column
 from sqlalchemy import schema, exc
 import sqlalchemy as tsa
-from test.lib import TestBase, ComparesTables, \
-    AssertsCompiledSQL, testing, engines
+from test.lib import fixtures
+from test.lib import testing
+from test.lib import engines
+from test.lib.testing import ComparesTables, AssertsCompiledSQL
 from test.lib.testing import eq_
 
-class MetaDataTest(TestBase, ComparesTables):
+class MetaDataTest(fixtures.TestBase, ComparesTables):
     def test_metadata_connect(self):
         metadata = MetaData()
         t1 = Table('table1', metadata, 
@@ -515,7 +517,7 @@ class MetaDataTest(TestBase, ComparesTables):
                           MetaData(testing.db), autoload=True)
 
 
-class TableTest(TestBase, AssertsCompiledSQL):
+class TableTest(fixtures.TestBase, AssertsCompiledSQL):
     def test_prefixes(self):
         table1 = Table("temporary_table_1", MetaData(),
                       Column("col1", Integer),
@@ -568,7 +570,7 @@ class TableTest(TestBase, AssertsCompiledSQL):
             assign
         )
 
-class ConstraintTest(TestBase):
+class ConstraintTest(fixtures.TestBase):
     def _single_fixture(self):
         m = MetaData()
 
@@ -615,7 +617,7 @@ class ConstraintTest(TestBase):
         assert s1.c.a.references(t1.c.a)
         assert not s1.c.a.references(t1.c.b)
 
-class ColumnDefinitionTest(AssertsCompiledSQL, TestBase):
+class ColumnDefinitionTest(AssertsCompiledSQL, fixtures.TestBase):
     """Test Column() construction."""
 
     __dialect__ = 'default'
@@ -739,7 +741,7 @@ class ColumnDefinitionTest(AssertsCompiledSQL, TestBase):
             getattr, select([t1.select().alias()]), 'c'
         )
 
-class ColumnOptionsTest(TestBase):
+class ColumnOptionsTest(fixtures.TestBase):
 
     def test_default_generators(self):
         g1, g2 = Sequence('foo_id_seq'), ColumnDefault('f5')
@@ -776,7 +778,7 @@ class ColumnOptionsTest(TestBase):
             assert c.info['bar'] == 'zip'
 
 
-class CatchAllEventsTest(TestBase):
+class CatchAllEventsTest(fixtures.TestBase):
 
     def teardown(self):
         events.SchemaEventTarget.dispatch._clear()
diff --git a/test/sql/test_query.py b/test/sql/test_query.py
index da5b05d0a..2edf9e72d 100644
--- a/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@ -6,7 +6,7 @@ from sqlalchemy.engine import default, base
 from test.lib import *
 from test.lib.schema import Table, Column
 
-class QueryTest(TestBase):
+class QueryTest(fixtures.TestBase):
 
     @classmethod
     def setup_class(cls):
@@ -1029,7 +1029,7 @@ class QueryTest(TestBase):
         r = s.execute().fetchall()
         assert len(r) == 1
 
-class PercentSchemaNamesTest(TestBase):
+class PercentSchemaNamesTest(fixtures.TestBase):
     """tests using percent signs, spaces in table and column names.
 
     Doesn't pass for mysql, postgresql, but this is really a 
@@ -1129,7 +1129,7 @@ class PercentSchemaNamesTest(TestBase):
 
 
 
-class LimitTest(TestBase):
+class LimitTest(fixtures.TestBase):
 
     @classmethod
     def setup_class(cls):
@@ -1202,7 +1202,7 @@ class LimitTest(TestBase):
         self.assert_(len(r) == 3, repr(r))
         self.assert_(r[0] != r[1] and r[1] != r[2], repr(r))
 
-class CompoundTest(TestBase):
+class CompoundTest(fixtures.TestBase):
     """test compound statements like UNION, INTERSECT, particularly their ability to nest on
     different databases."""
     @classmethod
@@ -1494,7 +1494,7 @@ class CompoundTest(TestBase):
         eq_(found, wanted)
 
 
-class JoinTest(TestBase):
+class JoinTest(fixtures.TestBase):
     """Tests join execution.
 
     The compiled SQL emitted by the dialect might be ANSI joins or
@@ -1766,7 +1766,7 @@ class JoinTest(TestBase):
             self.assertRows(expr, [(10, 20, 30)])
 
 
-class OperatorTest(TestBase):
+class OperatorTest(fixtures.TestBase):
     @classmethod
     def setup_class(cls):
         global metadata, flds
diff --git a/test/sql/test_quote.py b/test/sql/test_quote.py
index b31e7dfb4..6caf55d91 100644
--- a/test/sql/test_quote.py
+++ b/test/sql/test_quote.py
@@ -3,7 +3,7 @@ from sqlalchemy import sql, schema
 from sqlalchemy.sql import compiler
 from test.lib import *
 
-class QuoteTest(TestBase, AssertsCompiledSQL):
+class QuoteTest(fixtures.TestBase, AssertsCompiledSQL):
     __dialect__ = 'default'
 
     @classmethod
@@ -182,7 +182,7 @@ class QuoteTest(TestBase, AssertsCompiledSQL):
             '''SELECT "ImATable".col1, "ImATable"."from", "ImATable".louisville, "ImATable"."order" FROM "ImATable"''')
         
 
-class PreparerTest(TestBase):
+class PreparerTest(fixtures.TestBase):
     """Test the db-agnostic quoting services of IdentifierPreparer."""
 
     def test_unformat(self):
diff --git a/test/sql/test_returning.py b/test/sql/test_returning.py
index 8c4e2ac3c..3ef6dc9d9 100644
--- a/test/sql/test_returning.py
+++ b/test/sql/test_returning.py
@@ -3,8 +3,9 @@ from sqlalchemy import *
 from test.lib import *
 from test.lib.schema import Table, Column
 from sqlalchemy.types import TypeDecorator
+from test.lib import fixtures
 
-class ReturningTest(TestBase, AssertsExecutionResults):
+class ReturningTest(fixtures.TestBase, AssertsExecutionResults):
     __requires__ = 'returning',
 
     def setup(self):
@@ -141,7 +142,7 @@ class ReturningTest(TestBase, AssertsExecutionResults):
         result2 = select([table.c.id, table.c.full]).order_by(table.c.id).execute()
         eq_(result2.fetchall(), [(2,False),])
 
-class SequenceReturningTest(TestBase):
+class SequenceReturningTest(fixtures.TestBase):
     __requires__ = 'returning',
 
     def setup(self):
@@ -162,7 +163,7 @@ class SequenceReturningTest(TestBase):
         assert r.first() == (1, )
         assert seq.execute() == 2
 
-class KeyReturningTest(TestBase, AssertsExecutionResults):
+class KeyReturningTest(fixtures.TestBase, AssertsExecutionResults):
     """test returning() works with columns that define 'key'."""
 
     __requires__ = 'returning',
@@ -191,7 +192,7 @@ class KeyReturningTest(TestBase, AssertsExecutionResults):
         assert row[table.c.foo_id] == row['id'] == 1
 
 
-class ImplicitReturningFlag(TestBase):
+class ImplicitReturningFlag(fixtures.TestBase):
     def test_flag_turned_off(self):
         e = engines.testing_engine(options={'implicit_returning':False})
         assert e.dialect.implicit_returning is False
diff --git a/test/sql/test_rowcount.py b/test/sql/test_rowcount.py
index fc74e8467..5d95baa81 100644
--- a/test/sql/test_rowcount.py
+++ b/test/sql/test_rowcount.py
@@ -2,7 +2,7 @@ from sqlalchemy import *
 from test.lib import *
 
 
-class FoundRowsTest(TestBase, AssertsExecutionResults):
+class FoundRowsTest(fixtures.TestBase, AssertsExecutionResults):
     """tests rowcount functionality"""
 
     __requires__ = ('sane_rowcount', )
diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py
index 243c56dcf..0e98a430a 100644
--- a/test/sql/test_selectable.py
+++ b/test/sql/test_selectable.py
@@ -8,6 +8,7 @@ from sqlalchemy.sql import util as sql_util, visitors
 from sqlalchemy import exc
 from sqlalchemy.sql import table, column, null
 from sqlalchemy import util
+from test.lib import fixtures
 
 metadata = MetaData()
 table1 = Table('table1', metadata,
@@ -26,7 +27,7 @@ table2 = Table('table2', metadata,
 )
 
 
-class SelectableTest(TestBase, AssertsExecutionResults):
+class SelectableTest(fixtures.TestBase, AssertsExecutionResults):
 
     def test_indirect_correspondence_on_labels(self):
         # this test depends upon 'distance' to
@@ -372,7 +373,7 @@ class SelectableTest(TestBase, AssertsExecutionResults):
                               t1t2.join, t2t3.select(use_labels=True))
 
 
-class PrimaryKeyTest(TestBase, AssertsExecutionResults):
+class PrimaryKeyTest(fixtures.TestBase, AssertsExecutionResults):
 
     def test_join_pk_collapse_implicit(self):
         """test that redundant columns in a join get 'collapsed' into a
@@ -476,7 +477,7 @@ class PrimaryKeyTest(TestBase, AssertsExecutionResults):
             util.column_set([employee.c.id]))
 
 
-class ReduceTest(TestBase, AssertsExecutionResults):
+class ReduceTest(fixtures.TestBase, AssertsExecutionResults):
     def test_reduce(self):
         meta = MetaData()
         t1 = Table('t1', meta,
@@ -635,7 +636,7 @@ class ReduceTest(TestBase, AssertsExecutionResults):
             pjoin.c.page_id, pjoin.c.magazine_page_id])),
             util.column_set([pjoin.c.id]))
 
-class DerivedTest(TestBase, AssertsExecutionResults):
+class DerivedTest(fixtures.TestBase, AssertsExecutionResults):
     def test_table(self):
         meta = MetaData()
 
@@ -677,7 +678,7 @@ class DerivedTest(TestBase, AssertsExecutionResults):
         assert select([t1, t2]).alias('foo').is_derived_from(t1)
         assert not t2.select().alias('foo').is_derived_from(t1)
 
-class AnnotationsTest(TestBase):
+class AnnotationsTest(fixtures.TestBase):
     def test_custom_constructions(self):
         from sqlalchemy.schema import Column
         class MyColumn(Column):
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 9c8f66328..6aeac9b64 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -14,9 +14,9 @@ from test.lib import *
 from test.lib.util import picklers
 from sqlalchemy.util.compat import decimal
 from test.lib.util import round_decimal
-from test.engine import _base
+from test.lib import fixtures
 
-class AdaptTest(TestBase):
+class AdaptTest(fixtures.TestBase):
     def _all_dialect_modules(self):
         return [
             getattr(dialects, d)
@@ -131,7 +131,7 @@ class AdaptTest(TestBase):
                 typ, 11
             )
 
-class TypeAffinityTest(TestBase):
+class TypeAffinityTest(fixtures.TestBase):
     def test_type_affinity(self):
         for type_, affin in [
             (String(), String),
@@ -154,7 +154,7 @@ class TypeAffinityTest(TestBase):
         ]:
             eq_(t1._compare_type_affinity(t2), comp, "%s %s" % (t1, t2))
 
-class PickleMetadataTest(TestBase):
+class PickleMetadataTest(fixtures.TestBase):
     def testmeta(self):
         for loads, dumps in picklers():
             column_types = [
@@ -183,7 +183,7 @@ class PickleMetadataTest(TestBase):
                 mt = loads(dumps(meta))
 
 
-class UserDefinedTest(_base.TablesTest, AssertsCompiledSQL):
+class UserDefinedTest(fixtures.TablesTest, AssertsCompiledSQL):
     """tests user-defined types."""
 
     def test_processing(self):
@@ -423,7 +423,7 @@ class UserDefinedTest(_base.TablesTest, AssertsCompiledSQL):
         )
 
 
-class UnicodeTest(TestBase, AssertsExecutionResults):
+class UnicodeTest(fixtures.TestBase, AssertsExecutionResults):
     """tests the Unicode type.  also tests the TypeDecorator with instances in the types package."""
 
     @classmethod
@@ -680,7 +680,7 @@ class UnicodeTest(TestBase, AssertsExecutionResults):
             m.drop_all(engine)
 
 
-class EnumTest(TestBase):
+class EnumTest(fixtures.TestBase):
     @classmethod
     def setup_class(cls):
         global enum_table, non_native_enum_table, metadata
@@ -770,7 +770,7 @@ class EnumTest(TestBase):
             {'id':4, 'someenum':'four'}
         )
 
-class BinaryTest(TestBase, AssertsExecutionResults):
+class BinaryTest(fixtures.TestBase, AssertsExecutionResults):
     __excluded_on__ = (
         ('mysql', '<', (4, 1, 1)),  # screwy varbinary types
         )
@@ -873,7 +873,7 @@ class BinaryTest(TestBase, AssertsExecutionResults):
         f = os.path.join(os.path.dirname(__file__), "..", name)
         return open(f, mode='rb').read()
 
-class ExpressionTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL):
+class ExpressionTest(fixtures.TestBase, AssertsExecutionResults, AssertsCompiledSQL):
     __dialect__ = 'default'
 
     @classmethod
@@ -1140,7 +1140,7 @@ class ExpressionTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL):
         assert distinct(test_table.c.data).type == test_table.c.data.type
         assert test_table.c.data.distinct().type == test_table.c.data.type
 
-class CompileTest(TestBase, AssertsCompiledSQL):
+class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
     def test_default_compile(self):
         """test that the base dialect of the type object is used
         for default compilation.
@@ -1159,7 +1159,7 @@ class CompileTest(TestBase, AssertsCompiledSQL):
             self.assert_compile(type_, expected,
                                 allow_dialect_select=True)
 
-class DateTest(TestBase, AssertsExecutionResults):
+class DateTest(fixtures.TestBase, AssertsExecutionResults):
     @classmethod
     def setup_class(cls):
         global users_with_date, insert_data
@@ -1294,7 +1294,7 @@ class DateTest(TestBase, AssertsExecutionResults):
         finally:
             t.drop(checkfirst=True)
 
-class StringTest(TestBase):
+class StringTest(fixtures.TestBase):
 
     @testing.requires.unbounded_varchar
     def test_nolength_string(self):
@@ -1304,7 +1304,7 @@ class StringTest(TestBase):
         foo.create()
         foo.drop()
 
-class NumericTest(TestBase):
+class NumericTest(fixtures.TestBase):
     def setup(self):
         global metadata
         metadata = MetaData(testing.db)
@@ -1443,7 +1443,7 @@ class NumericTest(TestBase):
             numbers
         )
 
-class NumericRawSQLTest(TestBase):
+class NumericRawSQLTest(fixtures.TestBase):
     """Test what DBAPIs and dialects return without any typing
     information supplied at the SQLA level.
 
@@ -1497,7 +1497,7 @@ class NumericRawSQLTest(TestBase):
 
 
 
-class IntervalTest(TestBase, AssertsExecutionResults):
+class IntervalTest(fixtures.TestBase, AssertsExecutionResults):
     @classmethod
     def setup_class(cls):
         global interval_table, metadata
@@ -1550,7 +1550,7 @@ class IntervalTest(TestBase, AssertsExecutionResults):
         eq_(row['non_native_interval'], None)
 
 
-class BooleanTest(TestBase, AssertsExecutionResults):
+class BooleanTest(fixtures.TestBase, AssertsExecutionResults):
     @classmethod
     def setup_class(cls):
         global bool_table
@@ -1612,7 +1612,7 @@ class BooleanTest(TestBase, AssertsExecutionResults):
         testing.db.execute(
             "insert into booltest (id, unconstrained_value) values (1, 5)")
 
-class PickleTest(TestBase):
+class PickleTest(fixtures.TestBase):
     def test_eq_comparison(self):
         p1 = PickleType()
 
@@ -1638,7 +1638,7 @@ class PickleTest(TestBase):
         ):
             assert p1.compare_values(p1.copy_value(obj), obj)
 
-class CallableTest(TestBase):
+class CallableTest(fixtures.TestBase):
     @classmethod
     def setup_class(cls):
         global meta
diff --git a/test/sql/test_unicode.py b/test/sql/test_unicode.py
index d6757caf1..19f672f77 100644
--- a/test/sql/test_unicode.py
+++ b/test/sql/test_unicode.py
@@ -2,11 +2,12 @@
 """verrrrry basic unicode column name testing"""
 
 from sqlalchemy import *
-from test.lib import *
+from test.lib import fixtures, engines, testing
 from test.lib.engines import utf8_engine
 from sqlalchemy.sql import column
+from test.lib.schema import Table, Column
 
-class UnicodeSchemaTest(TestBase):
+class UnicodeSchemaTest(fixtures.TestBase):
     __requires__ = ('unicode_ddl',)
 
     @classmethod
@@ -111,7 +112,7 @@ class UnicodeSchemaTest(TestBase):
         meta.drop_all()
         metadata.create_all()
 
-class EscapesDefaultsTest(testing.TestBase):
+class EscapesDefaultsTest(fixtures.TestBase):
     def test_default_exec(self):
         metadata = MetaData(testing.db)
         t1 = Table('t1', metadata,