Changeset 245

Timestamp:

10/26/07 12:01:04 (6 years ago)

Author:

ged

Message:

made all tests work even if we changed autosetup to default to False. That is,

call setup_all wherever it is necessary.

Location:

elixir/trunk/tests

Files:

• test_autoload_nopk.py (modified) (1 diff)
• test_autosetup.py (modified) (5 diffs)
• test_encryption.py (modified) (2 diffs)
• test_events.py (modified) (1 diff)
• test_m2m.py (modified) (1 diff)
• test_nestedclass.py (modified) (2 diffs)
• test_o2m.py (modified) (1 diff)
• test_options.py (modified) (8 diffs)
• test_order_by.py (modified) (1 diff)
• test_packages.py (modified) (1 diff)
• test_properties.py (modified) (2 diffs)
• test_versioning.py (modified) (1 diff)

elixir/trunk/tests/test_autoload_nopk.py

@@ -28 +28 @@
             using_mapper_options(primary_key=['id'])
 
+        setup_all()
+
         barney = Person(id=1, name="Barney")
 

elixir/trunk/tests/test_autosetup.py

@@ -64 +64 @@
         class Person(Entity):
             name = Field(Unicode(30))
-            using_options(tablename='person')
+            using_options(autosetup=True, tablename='person')
 
         assert 'person' in metadata.tables
@@ -73 +73 @@
         class Person(Entity):
             name = Field(Unicode(30))
-            using_options(tablename='person')
+            using_options(autosetup=True, tablename='person')
 
         tablename = Person.table.name
@@ -82 +82 @@
         class Person(Entity):
             name = Field(Unicode(30))
-            using_options(tablename='person')
+            using_options(autosetup=True, tablename='person')
 
         create_all()
@@ -90 +90 @@
         class Person(Entity):
             name = Field(Unicode(30))
-            using_options(tablename='person')
+            using_options(autosetup=True, tablename='person')
 
         setup_all()
@@ -98 +98 @@
         class Person(Entity):
             name = Field(Unicode(30))
-            using_options(tablename='person')
+            using_options(autosetup=True, tablename='person')
 
         q = Person.query

elixir/trunk/tests/test_encryption.py

@@ -29 +29 @@
 class TestEncryption(object):
     def setup(self):
-        create_all()
+        setup_all(True)
     
     def teardown(self):
@@ -54 +54 @@
 
         p = Person.get_by(name='Jonathan LaCour')
+        print p.password
         assert p.password == 's3cr3tw0RD'
         assert p.ssn == '123-45-6789'

elixir/trunk/tests/test_events.py

@@ -57 +57 @@
     metadata.bind = 'sqlite:///'
 
+    setup_all()
+
 
 def teardown():

elixir/trunk/tests/test_m2m.py

@@ -69 +69 @@
             friends = ManyToMany('Person')
 
-        create_all()
+        setup_all(True)
 
         barney = Person(name="Barney")

elixir/trunk/tests/test_nestedclass.py

@@ -1 @@
-from elixir import Entity, Field, String
+from elixir import *
 
 def setup():
@@ -13 +13 @@
         
         other = Field(String(40))
+        
+    setup_all()        
     
 class TestNestedClass(object):
     def test_nestedclass(self):
+
         print "GLOBALS", globals().keys()
         assert 'name' in Thing.table.columns.keys()

elixir/trunk/tests/test_o2m.py

@@ -89 +89 @@
                 return s
 
-        create_all()
+        setup_all(True)
 
         node2 = TreeNode(name='node2')

elixir/trunk/tests/test_options.py

@@ -22 +22 @@
             using_options(version_id_col=True)
  
+        setup_all()
         Person.table.create()
  
@@ -62 +63 @@
         options_defaults['tablename'] = camel_to_underscore
 
-        setup_all(True)
-
         class MyEntity(Entity):
             name = Field(Unicode(30))
@@ -97 +96 @@
             surname = Field(Unicode(30))
 
+        setup_all()
         create_all(engine)
 
@@ -114 +114 @@
             surname = Field(Unicode(30))
 
+        setup_all()
         create_all(engine)
 
@@ -155 +156 @@
             surname = Field(Unicode(30))
 
+        setup_all()
         create_all(engine)
 
@@ -181 +183 @@
             surname = Field(Unicode(30))
 
+        setup_all()
         create_all(engine)
 
@@ -208 +211 @@
             surname = Field(Unicode(30))
 
+        setup_all()
         create_all(engine)
 
@@ -234 +238 @@
             using_table_options(UniqueConstraint('firstname', 'surname'))
 
-        create_all()
+        setup_all(True)
 
         homer = Person(firstname="Homer", surname='Simpson')

elixir/trunk/tests/test_order_by.py

@@ -30 +30 @@
 
     metadata.bind = 'sqlite:///'
-    create_all()
+    setup_all(True)
 
     # insert some data

elixir/trunk/tests/test_packages.py

@@ -18 +18 @@
         # all modules, including a and b. Then when any other test calls
         # setup_all(), A and B are also setup, but then the other test also
-        # calls cleanup_all(), so when we get here, A and B are already dead and
-        # reimporting their modules does nothing because they were already
+        # 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.
         sys.modules.pop('tests.a', None)

elixir/trunk/tests/test_properties.py

@@ -10 +10 @@
 
 
-class TestHasProperty(object):
+class TestSpecialProperties(object):
     def teardown(self):
         cleanup_all()
@@ -36 +36 @@
             has_many('tags', of_kind='Tag', lazy=False) 
 
-        create_all()
+        setup_all(True)
 
         u1 = User(name='joe', tags=[Tag(score1=5.0, score2=3.0), 

elixir/trunk/tests/test_versioning.py

@@ -32 +32 @@
         using_options(tablename='actors')
 
+    setup_all()
     metadata.bind = 'sqlite:///'