Ticket #1764: r1764.ken.patch

setup.py

@@ -33 +33 @@
-]
-
-sqlobject = [
-7.1
+8.0
-]
-
-exp = ["TGFastData"]

turbogears/testutil.py

@@ -275 +275 @@
-    return output, response
-
-
-
+
+
-
+    Creates and destroys your database before and after each unit test.  You must set the 
+    model attribute in order for this class to function correctly.
+    """
-    model = None
-
+    def setUp(self):
+        raise NotImplementedError()
+
+    def tearDown(self):
+        raise NotImplementedError()
+
+class DBTestSO(AbstractDBTest):
-    def _get_soClasses(self):
-        try:
-            return [self.model.__dict__[x] for x in self.model.soClasses]
@@ -289 +300 @@
-        if not self.model:
-            self.model = get_model()
-            if not self.model:
-
-
+
-        for item in self._get_soClasses():
-            if isinstance(item, types.TypeType) and issubclass(item,
-                sqlobject.SQLObject) and item != sqlobject.SQLObject \
@@ -305 +315 @@
-                and item != InheritableSQLObject:
-                item.dropTable(ifExists=True, cascade=True)
-
+class DBTestSA(AbstractDBTest):
+    def setUp(self):
+        database.get_engine()
+        database.metadata.create_all()
+
+    def tearDown(self):
+        database.metadata.drop_all()
+
+
+#Determine which class to use for "DBTest".  Setup & teardown should behave 
+#simularly regardless of which ORM you choose.
+if config.get("sqlobject.dburi"):
+    DBTest = DBTestSO
+elif config.get("sqlalchemy.dburi"):
+    DBTest = DBTestSA
+else:
+    raise Exception("Unable to find sqlalchemy or sqlobject dburi")
+
+
-def unmount():
-    """Remove an application from the object traversal tree."""
-    # There's no clean way to remove a subtree under CP2, so the only use case