Changeset 442

Timestamp:

01/07/09 16:45:21 (3 years ago)

Author:

ged

Message:

minor cleanups, additional comments and removed prints in tests

Location:

elixir/trunk/tests

Files:

• b.py (modified) (1 diff)
• test_autoload.py (modified) (4 diffs)
• test_collections.py (modified) (1 diff)
• test_inherit.py (modified) (1 diff)
• test_nestedclass.py (modified) (1 diff)
• test_o2m.py (modified) (4 diffs)
• test_options.py (modified) (2 diffs)
• test_order_by.py (modified) (3 diffs)
• test_packages.py (modified) (5 diffs)
• test_perform_ddl.py (modified) (2 diffs)

elixir/trunk/tests/b.py

@@ -3 +3 @@
 class B(Entity):
     name = Field(String(30))
-    as_ = OneToMany('tests.a.A')
+    many_a = OneToMany('tests.a.A')
 

elixir/trunk/tests/test_autoload.py

@@ -5 +5 @@
 from sqlalchemy import Table, Column, ForeignKey, MetaData
 from elixir import *
-from elixir import options # (not in __all__)
 import elixir
 
@@ -147 +146 @@
         grampa = Person.get_by(name="Abe")
 
-        print "Persons in the '%s' category: %s." % (
-                c.name,
-                ", ".join([p.name for p in c.persons]))
-
         assert len(c.persons) == 4
         assert c in grampa.categories
@@ -167 +162 @@
         assert homer in barney.isappreciatedby
 
+    # ----------------
     # overrides tests
+    # ----------------
 
     def test_override_pk_fails(self):
@@ -234 +231 @@
         table = Table('father', local_meta,
             Column('id', Integer, primary_key=True),
-            Column('row_type', options.POLYMORPHIC_COL_TYPE))
+            Column('row_type', elixir.options.POLYMORPHIC_COL_TYPE))
 
         local_meta.create_all()

elixir/trunk/tests/test_collections.py

@@ -68 +68 @@
         class A(Entity):
             name = Field(String(30))
-            using_options(autosetup=False, tablename='a')
+            using_options(tablename='a')
 
         setup_all()

elixir/trunk/tests/test_inherit.py

@@ -1 +1 @@
 """
-    simple test case
+test inheritance
 """
 

elixir/trunk/tests/test_nestedclass.py

@@ -18 +18 @@
 class TestNestedClass(object):
     def test_nestedclass(self):
-
-        print "GLOBALS", globals().keys()
         assert 'name' in Thing.table.columns.keys()
         assert 'type' in Thing.table.columns.keys()

elixir/trunk/tests/test_o2m.py

@@ -62 +62 @@
         p = Person.get_by(name="Homer")
 
-        print "%s is %s's child." % (p.name, p.father.name)
-        print "His children are: %s." % (
-                " and ".join([c.name for c in p.children]))
-
         assert p in p.father.children
         assert p.father is Person.get_by(name="Abe")
@@ -74 +70 @@
 
         class TreeNode(Entity):
+            using_options(order_by='name')
             name = Field(String(50), required=True)
 
@@ -80 +77 @@
             root = ManyToOne('TreeNode')
 
-            def __str__(self):
-                return self._getstring(0)
-
-            def _getstring(self, level):
-                s = '  ' * level + \
-                    "%s (%s,%s,%s, %d)" % (self.name, self.id, self.parent_id,
-                                           self.root_id, id(self)) + \
-                    '\n'
-                s += ''.join([n._getstring(level+1) for n in self.children])
-                return s
-
-        setup_all(True)
-
-        node2 = TreeNode(name='node2')
-        node2.children.append(TreeNode(name='subnode1'))
-        node2.children.append(TreeNode(name='subnode2'))
-        node = TreeNode(name='rootnode')
-        node.children.append(TreeNode(name='node1'))
-        node.children.append(node2)
-        node.children.append(TreeNode(name='node3'))
+        setup_all(True)
+
+        root = TreeNode(name='rootnode')
+        root.children.append(TreeNode(name='node1', root=root))
+        node2 = TreeNode(name='node2', root=root)
+        node2.children.append(TreeNode(name='subnode1', root=root))
+        node2.children.append(TreeNode(name='subnode2', root=root))
+        root.children.append(node2)
+        root.children.append(TreeNode(name='node3', root=root))
 
         session.commit()
@@ -105 +91 @@
 
         root = TreeNode.get_by(name='rootnode')
-        print root
+        sub2 = TreeNode.get_by(name='subnode2')
+        assert sub2 in root.children[1].children
+        assert sub2.root == root
 
     def test_viewonly(self):

elixir/trunk/tests/test_options.py

@@ -13 +13 @@
 
     def teardown(self):
-        cleanup_all()
+        cleanup_all(True)
 
     # this test is a rip-off SQLAlchemy's activemapper's update test
@@ -22 +22 @@
             using_options(version_id_col=True)
 
-        setup_all()
-        Person.table.create()
+        setup_all(True)
 
         p1 = Person(name='Daniel')

elixir/trunk/tests/test_order_by.py

@@ -66 +66 @@
         records = Record.query.all()
 
-        print "-year, +title"
-        for record in records:
-            print record
-
         assert records[0].year == 2005
         assert records[2].year >= records[5].year
@@ -77 +73 @@
     def test_o2m_order_by(self):
         records = Artist.get_by(name="Dream Theater").records
-
-        print "+year, -title"
-        for record in records:
-            print record
 
         assert records[0].year == 1989
@@ -91 +83 @@
         records = Genre.get_by(name="Progressive metal").records
 
-        print "-title"
-        for record in records:
-            print record
-
         assert records[0].year == 1989
         assert records[2].title >= records[5].title

elixir/trunk/tests/test_packages.py

@@ -9 +9 @@
 def setup():
     metadata.bind = 'sqlite:///'
+    sys.modules.pop('tests.a', None)
+    sys.modules.pop('tests.b', None)
+
 
 class TestPackages(object):
     def teardown(self):
-        cleanup_all(True)
-
-    def test_full_entity_path(self):
         # This is an ugly workaround because when nosetest is run globally (ie
         # either on the tests directory or in the "trunk" directory, it imports
@@ -21 +21 @@
         # calls cleanup_all(), so when we get here, A and B are already dead
         # and reimporting their modules does nothing because they were already
-        # imported.
-
+        # imported. Additionally, if I remove the __init__.py file from the
+        # tests/ directory, nosetests doesn't import all modules, but does
+        # import a and b (probably because they are not prefixed with "test_").
+        # the result is almost the same, even if less messy.
         sys.modules.pop('tests.a', None)
         sys.modules.pop('tests.b', None)
+        cleanup_all(True)
 
+    def test_full_entity_path(self):
         from tests.a import A
         from tests.b import B
@@ -31 +35 @@
         setup_all(True)
 
-        b1 = B(name='b1', as_=[A(name='a1')])
+        b1 = B(name='b1', many_a=[A(name='a1')])
 
         session.commit()
@@ -38 +42 @@
         a = A.query.one()
 
-        assert a in a.b.as_
+        assert a in a.b.many_a
 
     def test_ref_to_imported_entity_using_class(self):
-        sys.modules.pop('tests.a', None)
-        sys.modules.pop('tests.b', None)
-
         from tests.a import A
         from tests.b import B
@@ -56 +57 @@
 
     def test_ref_to_imported_entity_using_name(self):
-        sys.modules.pop('tests.a', None)
-        sys.modules.pop('tests.b', None)
-
         from tests.a import A
         from tests.b import B

elixir/trunk/tests/test_perform_ddl.py

@@ -2 +2 @@
 from elixir.ext.perform_ddl import perform_ddl, preload_data
 
+
 def setup():
     metadata.bind = "sqlite:///"
+
 
 class TestPerformDDL(object):
@@ -37 +39 @@
 
 class TestPreloadData(object):
+    def teardown(self):
+        cleanup_all(True)
+
     def test_several(self):
         class Movie(Entity):