From 6f7ae3c8b6e452d3e85c8e444745f28f7591e848 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 3 Dec 2005 05:16:25 +0000
Subject: [PATCH] added manytomany to alltests name stuff in manytomany columns
 test works against generic Types instead of ANSI-named types

---
 test/alltests.py   | 2 +-
 test/columns.py    | 6 +++---
 test/manytomany.py | 8 +++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/test/alltests.py b/test/alltests.py
index c312cb1771..db02f8a4c6 100644
--- 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 6196e15649..0a386aa7d7 100644
--- 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 5c552700e9..cc521c9a89 100644
--- 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."""
-- 
2.47.2