(no commit message)

diff --git a/test/select.py b/test/select.py
index b55d414b884ae45bd67421b5d9dfab38bff1c479..884044c78d6683e94dccdf596f79f185837bc315 100644 (file)
--- a/test/select.py
+++ b/test/select.py
@@ -268,12 +268,12 @@ EXISTS (select yay from foo where boo = lar)",
             engine = postgres.engine())
 
 
-#        self.runtest(query, 
-#            "SELECT mytable.myid, mytable.name, mytable.description, myothertable.otherid, myothertable.othername \
-#FROM mytable, myothertable WHERE mytable.myid = myothertable.otherid(+) AND \
-#mytable.name = :mytable_name AND mytable.myid = :mytable_myid AND \
-#myothertable.othername != :myothertable_othername AND EXISTS (select yay from foo where boo = lar)",
-#            engine = oracle.engine(use_ansi = False))
+        self.runtest(query, 
+            "SELECT mytable.myid, mytable.name, mytable.description, myothertable.otherid, myothertable.othername \
+FROM mytable, myothertable WHERE mytable.myid = myothertable.otherid(+) AND \
+mytable.name = :mytable_name AND mytable.myid = :mytable_myid AND \
+myothertable.othername != :myothertable_othername AND EXISTS (select yay from foo where boo = lar)",
+            engine = oracle.engine(use_ansi = False))
 
     def testbindparam(self):
         self.runtest(select(

diff --git a/test/testbase.py b/test/testbase.py
index 5a65fe02d85024d15b1321a7af926a2b5f0f8156..58bf2725327b985d81efbf9860ae26bcacccca90 100644 (file)
--- a/test/testbase.py
+++ b/test/testbase.py
@@ -6,6 +6,25 @@ class PersistTest(unittest.TestCase):
         unittest.TestCase.__init__(self, *args, **params)
         
 
+class AssertMixin(PersistTest):
+    def assert_result(self, result, class_, *objects):
+        print repr(result)
+        self.assert_list(result, class_, objects)
+    def assert_list(self, result, class_, list):
+        self.assert_(len(result) == len(list), "result list is not the same size as test list")
+        for i in range(0, len(list)):
+            self.assert_row(class_, result[i], list[i])
+    def assert_row(self, class_, rowobj, desc):
+        self.assert_(rowobj.__class__ is class_, "item class is not " + repr(class_))
+        for key, value in desc.iteritems():
+            if isinstance(value, tuple):
+                if isinstance(value[1], list):
+                    self.assert_list(getattr(rowobj, key), value[0], value[1])
+                else:
+                    self.assert_row(value[0], getattr(rowobj, key), value[1])
+            else:
+                self.assert_(getattr(rowobj, key) == value, "attribute %s value %s does not match %s" % (key, getattr(rowobj, key), value))
+
 def runTests(suite):
     runner = unittest.TextTestRunner(verbosity = 2, descriptions =1)
     runner.run(suite)