[SQL-CVS] r2052 - SQLObject/trunk/sqlobject/inheritance/tests

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

Author: phd
Date: 2006-10-30 12:45:28 -0700 (Mon, 30 Oct 2006)
New Revision: 2052

Added:
   SQLObject/trunk/sqlobject/inheritance/tests/test_foreignKey.py
Removed:
   SQLObject/trunk/sqlobject/inheritance/tests/test_inherited_foreignKey.py
Log:
Renamed test_inherited_foreignKey.py to test_foreignKey.py.


Copied: SQLObject/trunk/sqlobject/inheritance/tests/test_foreignKey.py (from rev 2049, SQLObject/trunk/sqlobject/inheritance/tests/test_inherited_foreignKey.py)
===================================================================
--- SQLObject/trunk/sqlobject/inheritance/tests/test_foreignKey.py	                        (rev 0)
+++ SQLObject/trunk/sqlobject/inheritance/tests/test_foreignKey.py	2006-10-30 19:45:28 UTC (rev 2052)
@@ -0,0 +1,85 @@
+from sqlobject import *
+from sqlobject.tests.dbtest import *
+from sqlobject.inheritance import InheritableSQLObject
+
+
+class Note(SQLObject):
+    text = StringCol()
+
+class PersonWithNotes(InheritableSQLObject):
+    firstName = StringCol()
+    lastName = StringCol()
+    note = ForeignKey("Note", default=None)
+
+class Paper(SQLObject):
+    content = StringCol()
+
+class EmployeeWithNotes(PersonWithNotes):
+    _inheritable = False
+    paper = ForeignKey("Paper", default=None)
+
+def test_foreignKey():
+    setupClass([Note, PersonWithNotes, Paper, EmployeeWithNotes])
+
+    note = Note(text="person")
+    PersonWithNotes(firstName='Oneof', lastName='Authors', note=note)
+    note = Note(text="employee")
+    EmployeeWithNotes(firstName='Project', lastName='Leader', note=note)
+
+    paper = Paper(content="secret")
+    EmployeeWithNotes(firstName='Senior', lastName='Clerk', paper=paper)
+    PersonWithNotes(firstName='Some', lastName='Person')
+
+
+    person = PersonWithNotes.get(1)
+    assert isinstance(person, PersonWithNotes) and not isinstance(person, EmployeeWithNotes)
+    assert person.note.text == "person"
+
+    employee = EmployeeWithNotes.get(2)
+    assert isinstance(employee, EmployeeWithNotes)
+    assert employee.note.text == "employee"
+    save_employee = employee
+
+    persons = PersonWithNotes.select(PersonWithNotes.q.noteID <> None)
+    assert persons.count() == 2
+
+    persons = PersonWithNotes.selectBy(noteID=person.note.id)
+    assert persons.count() == 1
+
+    employee = EmployeeWithNotes.select(PersonWithNotes.q.noteID <> None)
+    assert employee.count() == 1
+
+    persons = PersonWithNotes.selectBy(noteID=person.note.id)
+    assert persons.count() == 1
+
+    persons = PersonWithNotes.selectBy(note=person.note)
+    assert persons.count() == 1
+
+    persons = PersonWithNotes.selectBy(note=None)
+    assert persons.count() == 2
+
+    employee = EmployeeWithNotes.selectBy(paperID=None)
+    assert employee.count() == 1
+
+    employee = EmployeeWithNotes.selectBy(paper=None)
+    assert employee.count() == 1
+
+    employee = EmployeeWithNotes.selectBy(note=save_employee.note,
+                                         paper=save_employee.paper)
+    assert employee.count() == 1
+
+    employee = EmployeeWithNotes.selectBy()
+    assert employee.count() == 2
+
+
+class TestInheritableBase(InheritableSQLObject):
+    pass
+
+class TestInheritableForeignKey(TestInheritableBase):
+    base = ForeignKey("TestInheritableBase")
+
+def test_foreignKey2():
+    setupClass([TestInheritableBase, TestInheritableForeignKey])
+
+    test = TestInheritableBase()
+    object = TestInheritableForeignKey(base=test)

Deleted: SQLObject/trunk/sqlobject/inheritance/tests/test_inherited_foreignKey.py
===================================================================
--- SQLObject/trunk/sqlobject/inheritance/tests/test_inherited_foreignKey.py	2006-10-30 19:39:22 UTC (rev 2051)
+++ SQLObject/trunk/sqlobject/inheritance/tests/test_inherited_foreignKey.py	2006-10-30 19:45:28 UTC (rev 2052)
@@ -1,85 +0,0 @@
-from sqlobject import *
-from sqlobject.tests.dbtest import *
-from sqlobject.inheritance import InheritableSQLObject
-
-
-class Note(SQLObject):
-    text = StringCol()
-
-class PersonWithNotes(InheritableSQLObject):
-    firstName = StringCol()
-    lastName = StringCol()
-    note = ForeignKey("Note", default=None)
-
-class Paper(SQLObject):
-    content = StringCol()
-
-class EmployeeWithNotes(PersonWithNotes):
-    _inheritable = False
-    paper = ForeignKey("Paper", default=None)
-
-def test_foreignKey():
-    setupClass([Note, PersonWithNotes, Paper, EmployeeWithNotes])
-
-    note = Note(text="person")
-    PersonWithNotes(firstName='Oneof', lastName='Authors', note=note)
-    note = Note(text="employee")
-    EmployeeWithNotes(firstName='Project', lastName='Leader', note=note)
-
-    paper = Paper(content="secret")
-    EmployeeWithNotes(firstName='Senior', lastName='Clerk', paper=paper)
-    PersonWithNotes(firstName='Some', lastName='Person')
-
-
-    person = PersonWithNotes.get(1)
-    assert isinstance(person, PersonWithNotes) and not isinstance(person, EmployeeWithNotes)
-    assert person.note.text == "person"
-
-    employee = EmployeeWithNotes.get(2)
-    assert isinstance(employee, EmployeeWithNotes)
-    assert employee.note.text == "employee"
-    save_employee = employee
-
-    persons = PersonWithNotes.select(PersonWithNotes.q.noteID <> None)
-    assert persons.count() == 2
-
-    persons = PersonWithNotes.selectBy(noteID=person.note.id)
-    assert persons.count() == 1
-
-    employee = EmployeeWithNotes.select(PersonWithNotes.q.noteID <> None)
-    assert employee.count() == 1
-
-    persons = PersonWithNotes.selectBy(noteID=person.note.id)
-    assert persons.count() == 1
-
-    persons = PersonWithNotes.selectBy(note=person.note)
-    assert persons.count() == 1
-
-    persons = PersonWithNotes.selectBy(note=None)
-    assert persons.count() == 2
-
-    employee = EmployeeWithNotes.selectBy(paperID=None)
-    assert employee.count() == 1
-
-    employee = EmployeeWithNotes.selectBy(paper=None)
-    assert employee.count() == 1
-
-    employee = EmployeeWithNotes.selectBy(note=save_employee.note,
-                                         paper=save_employee.paper)
-    assert employee.count() == 1
-
-    employee = EmployeeWithNotes.selectBy()
-    assert employee.count() == 2
-
-
-class TestInheritableBase(InheritableSQLObject):
-    pass
-
-class TestInheritableForeignKey(TestInheritableBase):
-    base = ForeignKey("TestInheritableBase")
-
-def test_foreignKey2():
-    setupClass([TestInheritableBase, TestInheritableForeignKey])
-
-    test = TestInheritableBase()
-    object = TestInheritableForeignKey(base=test)