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

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

Author: phd
Date: 2009-02-21 11:14:44 -0700 (Sat, 21 Feb 2009)
New Revision: 3791

Modified:
   SQLObject/trunk/sqlobject/tests/test_events.py
Log:
Merged revision 3789 from the branch 0.9: minor refactoring.


Modified: SQLObject/trunk/sqlobject/tests/test_events.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_events.py	2009-02-21 18:13:38 UTC (rev 3790)
+++ SQLObject/trunk/sqlobject/tests/test_events.py	2009-02-21 18:14:44 UTC (rev 3791)
@@ -75,28 +75,24 @@
     assert watcher.log[1] == expect
 
 
-class A(InheritableSQLObject):
+class InheritableEventTestA(InheritableSQLObject):
     a = IntCol()
 
-class B(A):
+class InheritableEventTestB(InheritableEventTestA):
     b = IntCol()
 
-class C(B):
+class InheritableEventTestC(InheritableEventTestB):
     c = IntCol()
 
+def _query(instance):
+    InheritableEventTestA.get(instance.id)
 
+def _signal(kwargs, postfuncs):
+    postfuncs.append(_query)
+
 def test_inheritance_row_created():
-    setupClass(A)
-    setupClass(B)
-    setupClass(C)
+    setupClass([InheritableEventTestA, InheritableEventTestB, InheritableEventTestC])
 
-    def test_query(instance):
-        id = instance.id
-        A.get(id)
+    events.listen(_signal, InheritableEventTestA, events.RowCreatedSignal)
 
-    def signal(kwargs, postfuncs):
-        postfuncs.append(test_query)
-
-    events.listen(signal, A, events.RowCreatedSignal)
-
-    C(a=1, b=2, c=3)
+    InheritableEventTestC(a=1, b=2, c=3)