moved 'float' test into types test, renamed typetest to overrride test

diff --git a/test/columns.py b/test/columns.py
deleted file mode 100644 (file)
index 0a386aa..0000000
--- a/test/columns.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from testbase import PersistTest
-import testbase
-import unittest, sys, datetime
-
-import sqlalchemy.databases.sqlite as sqllite
-
-from sqlalchemy import *
-
-class ColumnsTest(PersistTest):
-
-    defaultExpectedResults = { 'int_column': 'int_column INTEGER',
-                               'varchar_column': 'varchar_column VARCHAR(20)',
-                               'numeric_column': 'numeric_column NUMERIC(12, 3)',
-                               'float_column': 'float_column NUMERIC(25, 2)'
-                             }
-    
-    def setUp(self):
-        pass
-
-    def _buildTestTable(self):
-        testTable = Table('testColumns', self.db,
-            Column('int_column', Integer),
-            Column('varchar_column', String(20)),
-            Column('numeric_column', Numeric(12,3)),
-            Column('float_column', Float(25)),
-        )
-        return testTable
-
-    def _doTest(self, expectedResults):
-        testTable = self._buildTestTable()
-        for aCol in testTable.c:
-            self.assertEquals(expectedResults[aCol.name], self.db.schemagenerator(None).get_column_specification(aCol))
-        
-    def testSqliteColumns(self):
-        self.db = create_engine('sqlite', {'filename':':memory:'})
-        self._doTest(self.defaultExpectedResults)
-
-    def testPostgresColumns(self):
-        self.db = engine.create_engine('postgres', {'database':'test', 'host':'127.0.0.1', 'user':'scott', 'password':'tiger'}, echo=False)
-        expectedResults = self.defaultExpectedResults.copy()
-        expectedResults['float_column'] = 'float_column FLOAT(25)'
-        self._doTest(expectedResults)
-
-    def testMySqlColumns(self):
-        self.db = engine.create_engine('mysql', {'db':'test', 'host':'127.0.0.1', 'user':'scott', 'passwd':'tiger'}, echo=False)
-        expectedResults = self.defaultExpectedResults.copy()
-        expectedResults['float_column'] = 'float_column FLOAT(25)'
-        self._doTest(expectedResults)
-    
-if __name__ == "__main__":
-    unittest.main()        

diff --git a/test/types.py b/test/types.py
index 8c1f0992602a16c55ac9936949845f30a39e710b..eabf01d1d74e14fed4e749a0c1cec2b6656031fb 100644 (file)
--- a/test/types.py
+++ b/test/types.py
@@ -5,7 +5,9 @@ import testbase
     
 db = testbase.db
 
-class TypesTest(PersistTest):
+
+
+class OverrideTest(PersistTest):
 
     def testprocessing(self):
         class MyType(types.TypeEngine):
@@ -39,6 +41,30 @@ class TypesTest(PersistTest):
         print repr(l)
         self.assert_(l == [(2, u'BIND_INjackBIND_OUT'), (3, u'BIND_INlalaBIND_OUT'), (4, u'BIND_INfredBIND_OUT')])
 
+
+class ColumnsTest(AssertMixin):
+
+    def testcolumns(self):
+        defaultExpectedResults = { 'int_column': 'int_column INTEGER',
+                                   'varchar_column': 'varchar_column VARCHAR(20)',
+                                   'numeric_column': 'numeric_column NUMERIC(12, 3)',
+                                   'float_column': 'float_column NUMERIC(25, 2)'
+                                 }
+
+        if db.engine.__module__ != 'sqlite':
+            expectedResults['float_column'] = 'float_column FLOAT(25)'
+    
+        testTable = Table('testColumns', db,
+            Column('int_column', Integer),
+            Column('varchar_column', String(20)),
+            Column('numeric_column', Numeric(12,3)),
+            Column('float_column', Float(25)),
+        )
+
+        for aCol in testTable.c:
+            self.assertEquals(expectedResults[aCol.name], self.db.schemagenerator(None).get_column_specification(aCol))
+        
+
 class BinaryTest(AssertMixin):
     def setUpAll(self):
         global binary_table