From 68a350d462b6840d6623a89565f8febf3a997830 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 27 Mar 2011 16:27:27 -0400 Subject: - 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 --- test/sql/test_metadata.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'test/sql/test_metadata.py') 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() -- cgit v1.2.1