Changeset 449

Timestamp:

03/23/09 12:31:16 (4 years ago)

Author:

ged

Message:

renamed a few tests and added a test for to_dict with a nested deep

Files:

• elixir/trunk/tests/test_dict.py (modified) (4 diffs)

elixir/trunk/tests/test_dict.py

@@ -108 +108 @@
         t2 = Table2(t2id=1, name='test2', tbl1=t1)
         session.flush()
+
         assert t2.to_dict(deep={'tbl1': {}}) == \
                {'t2id': 1, 'name': 'test2', 'tbl1_t1id': 1,
@@ -118 +119 @@
                {'t2id': 1, 'name': 'test2', 'tbl1_t1id': None, 'tbl1': None}
 
-    def test_to_deep(self):
+    def test_to_deep_o2m_empty(self):
         t1 = Table1(t1id=51, name='test2')
         assert t1.to_dict(deep={'tbl2s': {}}) == \
                 {'t1id': 51, 'name': 'test2', 'tbl2s': []}
 
-    def test_to_deep2(self):
+    def test_to_deep_o2m(self):
         t1 = Table1(t1id=52, name='test3')
         t2 = Table2(t2id=50, name='test4')
@@ -133 +134 @@
                  'tbl2s': [{'t2id': 50, 'name': 'test4'}]}
 
-    def test_to_deep3(self):
+    def test_to_deep_o2o(self):
         t1 = Table1(t1id=53, name='test2')
         t1.tbl3 = Table3(t3id=50, name='wobble')
@@ -141 +142 @@
                  'name': 'test2',
                  'tbl3': {'t3id': 50, 'name': 'wobble'}}
+
+    def test_to_deep_nested(self):
+        t3 = Table3(t3id=1, name='test3')
+        t1 = Table1(t1id=1, name='test1', tbl3=t3)
+        t2 = Table2(t2id=1, name='test2', tbl1=t1)
+        session.flush()
+        assert t2.to_dict(deep={'tbl1': {'tbl3': {}}}) == \
+               {'t2id': 1,
+                'name': 'test2',
+                'tbl1_t1id': 1,
+                'tbl1': {'name': 'test1',
+                         'tbl3': {'t3id': 1,
+                                  'name': 'test3'}}}
 
 class TestSetOnAliasedColumn(object):