[SQL-CVS] r581 - trunk/SQLObject/sqlobject/tests

[<sub...@co...>]

Author: ianb
Date: 2005-02-09 05:18:31 +0000 (Wed, 09 Feb 2005)
New Revision: 581

Modified:
   trunk/SQLObject/sqlobject/tests/test_distinct.py
   trunk/SQLObject/sqlobject/tests/test_joins.py
   trunk/SQLObject/sqlobject/tests/test_style.py
Log:
More fixes to the tests to create/destroy classes in the right order.


Modified: trunk/SQLObject/sqlobject/tests/test_distinct.py
===================================================================
--- trunk/SQLObject/sqlobject/tests/test_distinct.py	2005-02-09 04:50:46 UTC (rev 580)
+++ trunk/SQLObject/sqlobject/tests/test_distinct.py	2005-02-09 05:18:31 UTC (rev 581)
@@ -18,8 +18,7 @@
     return result
 
 def test_distinct():
-    setupClass(Distinct1)
-    setupClass(Distinct2)
+    setupClass([Distinct1, Distinct2])
     obs = [Distinct1(n=i) for i in range(3)]
     Distinct2(other=obs[0])
     Distinct2(other=obs[0])

Modified: trunk/SQLObject/sqlobject/tests/test_joins.py
===================================================================
--- trunk/SQLObject/sqlobject/tests/test_joins.py	2005-02-09 04:50:46 UTC (rev 580)
+++ trunk/SQLObject/sqlobject/tests/test_joins.py	2005-02-09 05:18:31 UTC (rev 581)
@@ -76,8 +76,7 @@
 class TestJoin2:
 
     def setup_method(self, meth):
-        setupClass(PersonJoiner2)
-        setupClass(AddressJoiner2)
+        setupClass([PersonJoiner2, AddressJoiner2])
         p1 = PersonJoiner2(name='bob')
         p2 = PersonJoiner2(name='sally')
         for z in ['11111', '22222', '33333']:

Modified: trunk/SQLObject/sqlobject/tests/test_style.py
===================================================================
--- trunk/SQLObject/sqlobject/tests/test_style.py	2005-02-09 04:50:46 UTC (rev 580)
+++ trunk/SQLObject/sqlobject/tests/test_style.py	2005-02-09 05:18:31 UTC (rev 581)
@@ -19,8 +19,7 @@
     _style = AnotherStyle()
 
 def test_style():
-    setupClass(SOStyleTest2)
-    setupClass(SOStyleTest1)
+    setupClass([SOStyleTest2, SOStyleTest1])
     st1 = SOStyleTest1(a='something', st2=None)
     st2 = SOStyleTest2(b='whatever')
     st1.st2 = st2