added manytomany to alltests

name stuff in manytomany
columns test works against generic Types instead of ANSI-named types

diff --git a/test/alltests.py b/test/alltests.py
index c312cb177186501b639d3beac469c4840a1b84e4..db02f8a4c6be3279a8f009ca1edbc081847ae02c 100644 (file)
--- a/test/alltests.py
+++ b/test/alltests.py
@@ -4,7 +4,7 @@ import unittest
 testbase.echo = False
 
 def suite():
-    modules_to_test = ('attributes', 'historyarray', 'pool', 'engines', 'query', 'types', 'mapper', 'objectstore', 'dependency', 'sequence', 'select', 'columns')
+    modules_to_test = ('attributes', 'historyarray', 'pool', 'engines', 'query', 'columns', 'sequence', 'select', 'types', 'mapper', 'objectstore', 'manytomany', 'dependency')
 #    modules_to_test = ('engines', 'mapper')
     alltests = unittest.TestSuite()
     for module in map(__import__, modules_to_test):

diff --git a/test/columns.py b/test/columns.py
index 6196e1564937bc6db5d5f36354b478f86a68c859..0a386aa7d753cbf4b333f2ee0a97f2d5ab318400 100644 (file)
--- a/test/columns.py
+++ b/test/columns.py
@@ -19,10 +19,10 @@ class ColumnsTest(PersistTest):
 
     def _buildTestTable(self):
         testTable = Table('testColumns', self.db,
-            Column('int_column', INT),
-            Column('varchar_column', VARCHAR(20)),
+            Column('int_column', Integer),
+            Column('varchar_column', String(20)),
             Column('numeric_column', Numeric(12,3)),
-            Column('float_column', FLOAT(25)),
+            Column('float_column', Float(25)),
         )
         return testTable
 

diff --git a/test/manytomany.py b/test/manytomany.py
index 5c552700e996a02efa56294ecf8e3b390cf39ed8..cc521c9a89a1b6089cbc2b3e83831646b6a5ea9e 100644 (file)
--- a/test/manytomany.py
+++ b/test/manytomany.py
@@ -16,7 +16,7 @@ class Transition(object):
     def __repr__(self):
         return object.__repr__(self)+ " " + repr(self.inputs) + " " + repr(self.outputs)
         
-class DoubleTest(testbase.AssertMixin):
+class ManyToManyTest(testbase.AssertMixin):
     def setUpAll(self):
         db = testbase.db
         global place
@@ -60,6 +60,12 @@ class DoubleTest(testbase.AssertMixin):
         objectstore.clear()
         clear_mappers()
 
+    def tearDown(self):
+        place_input.delete().execute()
+        place_output.delete().execute()
+        transition.delete().execute()
+        place.delete().execute()
+
     def testdouble(self):
         """tests that a mapper can have two eager relations to the same table, via
         two different association tables.  aliases are required."""