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

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

Author: phd
Date: 2006-01-23 08:32:28 -0700 (Mon, 23 Jan 2006)
New Revision: 1532

Added:
   SQLObject/trunk/sqlobject/tests/test_foreignKey.py
Removed:
   SQLObject/trunk/sqlobject/tests/test_selectBy_foreignKey.py
Log:
Renamed test_selectBy_foreignKey.py to test_foreignKey.py.
Added a test for addColumn().


Copied: SQLObject/trunk/sqlobject/tests/test_foreignKey.py (from rev 1530, SQLObject/trunk/sqlobject/tests/test_selectBy_foreignKey.py)
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_selectBy_foreignKey.py	2006-01-23 12:56:29 UTC (rev 1530)
+++ SQLObject/trunk/sqlobject/tests/test_foreignKey.py	2006-01-23 15:32:28 UTC (rev 1532)
@@ -0,0 +1,39 @@
+from sqlobject import *
+from sqlobject.tests.dbtest import *
+
+class TestComposerKey(SQLObject):
+    name = StringCol()
+
+class TestWorkKey(SQLObject):
+    class sqlmeta:
+        idName = "work_id"
+
+    composer = ForeignKey('TestComposerKey', cascade=True)
+    title = StringCol()
+
+class TestWorkKey2(SQLObject):
+    title = StringCol()
+
+def test1():
+    setupClass([TestComposerKey, TestWorkKey])
+
+    c = TestComposerKey(name='Mahler, Gustav')
+    w1 = TestWorkKey(composer=c, title='Symphony No. 9')
+    w2 = TestWorkKey(composer=None, title=None)
+
+    # Select by usual way
+    s = TestWorkKey.selectBy(composerID=c.id, title='Symphony No. 9')
+    assert s[0]==w1
+    # selectBy object
+    s = TestWorkKey.selectBy(composer=c, title='Symphony No. 9')
+    assert s[0]==w1
+    # selectBy id
+    s = TestWorkKey.selectBy(id=w1.id)
+    assert s[0]==w1
+    # is None handled correctly?
+    s = TestWorkKey.selectBy(composer=None, title=None)
+    assert s[0]==w2
+
+def test2():
+    setupClass([TestComposerKey, TestWorkKey2])
+    TestWorkKey2.sqlmeta.addColumn(ForeignKey('TestComposerKey'), changeSchema=True)

Deleted: SQLObject/trunk/sqlobject/tests/test_selectBy_foreignKey.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_selectBy_foreignKey.py	2006-01-23 13:32:08 UTC (rev 1531)
+++ SQLObject/trunk/sqlobject/tests/test_selectBy_foreignKey.py	2006-01-23 15:32:28 UTC (rev 1532)
@@ -1,33 +0,0 @@
-from sqlobject import *
-from sqlobject.tests.dbtest import *
-
-class TestComposerKey(SQLObject):
-    name = StringCol()
-
-class TestWorkKey(SQLObject):
-    class sqlmeta:
-        idName = "work_id"
-
-    composer = ForeignKey('TestComposerKey')
-    title = StringCol()
-
-def test1():
-    setupClass([TestComposerKey,
-                TestWorkKey])
-
-    c = TestComposerKey(name='Mahler, Gustav')
-    w1 = TestWorkKey(composer=c, title='Symphony No. 9')
-    w2 = TestWorkKey(composer=None, title=None)
-
-    # Select by usual way
-    s = TestWorkKey.selectBy(composerID=c.id, title='Symphony No. 9')
-    assert s[0]==w1
-    # selectBy object
-    s = TestWorkKey.selectBy(composer=c, title='Symphony No. 9')
-    assert s[0]==w1
-    # selectBy id
-    s = TestWorkKey.selectBy(id=w1.id)
-    assert s[0]==w1
-    # is None handled correctly?
-    s = TestWorkKey.selectBy(composer=None, title=None)
-    assert s[0]==w2