Changeset 452 for elixir

Timestamp:

05/14/09 17:23:03 (3 years ago)

Author:

ged

Message:

simplified some tests

Location:

elixir/trunk/tests

Files:

• test_custombase.py (modified) (1 diff)
• test_nestedclass.py (modified) (1 diff)

elixir/trunk/tests/test_custombase.py

@@ -93 +93 @@
         setup_all(True)
 
-        assert 'name' in A.table.columns.keys()
-        assert 'common' in A.table.columns.keys()
-        assert 'common' in B.table.columns.keys()
+        assert 'name' in A.table.columns
+        assert 'common' in A.table.columns
+        assert 'common' in B.table.columns
 
     def test_base_with_fields_in_parent(self):

elixir/trunk/tests/test_nestedclass.py

@@ -18 +18 @@
 class TestNestedClass(object):
     def test_nestedclass(self):
-        assert 'name' in Thing.table.columns.keys()
-        assert 'type' in Thing.table.columns.keys()
-        assert 'other' in Thing.table.columns.keys()
-        assert 'ping' not in Thing.table.columns.keys()
-        assert 'pong' not in Thing.table.columns.keys()
+        assert 'name' in Thing.table.columns
+        assert 'type' in Thing.table.columns
+        assert 'other' in Thing.table.columns
+        assert 'ping' not in Thing.table.columns
+        assert 'pong' not in Thing.table.columns
 
-        assert 'name' not in Thing.Stuff.table.columns.keys()
-        assert 'type' not in Thing.Stuff.table.columns.keys()
-        assert 'other' not in Thing.Stuff.table.columns.keys()
-        assert 'ping' in Thing.Stuff.table.columns.keys()
-        assert 'pong' in Thing.Stuff.table.columns.keys()
+        assert 'name' not in Thing.Stuff.table.columns
+        assert 'type' not in Thing.Stuff.table.columns
+        assert 'other' not in Thing.Stuff.table.columns
+        assert 'ping' in Thing.Stuff.table.columns
+        assert 'pong' in Thing.Stuff.table.columns