Changeset 448 for elixir/trunk/tests/test_dict.py

Timestamp:

03/23/09 11:56:17 (4 years ago)

Author:

ged

Message:

Fixed using to_dict with a ManyToOne relationship in the "deep" set and that
relationship being None in the entity being converted.

Files:

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

elixir/trunk/tests/test_dict.py

@@ -26 +26 @@
         tbl1 = ManyToOne(Table1)
 
-    setup_all(True)
+    setup_all()
 
 def teardown():
-    cleanup_all(True)
+    cleanup_all()
 
 class TestDeepSet(object):
+    def setup(self):
+        create_all()
+
+    def teardown(self):
+        session.close()
+        drop_all()
+
     def test_set_attr(self):
         t1 = Table1()
@@ -88 +95 @@
         session.commit()
         try:
-            t1.from_dict(dict(tbl2s=[{'t2id':t2.t2id+1}]))
+            t1.from_dict(dict(tbl2s=[{'t2id': t2.t2id+1}]))
             assert False
         except:
@@ -97 +104 @@
         assert t1.to_dict() == {'t1id': 50, 'name': 'test1'}
 
+    def test_to_deep_m2o(self):
+        t1 = Table1(t1id=1, name='test1')
+        t2 = Table2(t2id=1, name='test2', tbl1=t1)
+        session.flush()
+        assert t2.to_dict(deep={'tbl1': {}}) == \
+               {'t2id': 1, 'name': 'test2', 'tbl1_t1id': 1,
+                'tbl1': {'name': 'test1'}}
+
+    def test_to_deep_m2o_none(self):
+        t2 = Table2(t2id=1, name='test2')
+        session.flush()
+        assert t2.to_dict(deep={'tbl1': {}}) == \
+               {'t2id': 1, 'name': 'test2', 'tbl1_t1id': None, 'tbl1': None}
+
     def test_to_deep(self):
         t1 = Table1(t1id=51, name='test2')
-        assert t1.to_dict(deep={'tbl2s':{}}) == \
+        assert t1.to_dict(deep={'tbl2s': {}}) == \
                 {'t1id': 51, 'name': 'test2', 'tbl2s': []}
 
@@ -116 +137 @@
         t1.tbl3 = Table3(t3id=50, name='wobble')
         session.commit()
-        assert t1.to_dict(deep={'tbl3':{}}) == \
+        assert t1.to_dict(deep={'tbl3': {}}) == \
                 {'t1id': 53,
                  'name': 'test2',