brought up to date with latest sqlalchemy conventions

[bluechips.git] / bluechips / tests / __init__.py

diff --git a/bluechips/tests/__init__.py b/bluechips/tests/__init__.py
index 6e4b52cc577a235e71849379473f5921bc3695b5..79de0195e99cd1c0acd7427958b35de768fef66c 100644 (file)
--- a/bluechips/tests/__init__.py
+++ b/bluechips/tests/__init__.py
@@ -15,7 +15,7 @@ from paste.script.appinstall import SetupCommand
 from pylons import config
 from routes import url_for
 
-from bluechips import model
+import bluechips.model
 from bluechips.model import meta
 from bluechips.model.types import Currency
 
@@ -31,11 +31,8 @@ def setUpPackage():
     # Invoke websetup with the current config file
     SetupCommand('setup-app').run([config['__file__']])
     
-    test_user = model.User()
-    test_user.username = u'root'
-    test_user.name = u'Charlie Root'
-    test_user.resident = True
-    meta.Session.save(test_user)
+    test_user = bluechips.model.User(u'root', u'Charlie Root', False)
+    meta.Session.add(test_user)
     meta.Session.commit()
 
 def tearDownPackage():
@@ -48,27 +45,27 @@ class TestController(TestCase):
         self.app = TestApp(wsgiapp)
         TestCase.__init__(self, *args, **kwargs)
 
-def createUsers():
-    for i in xrange(random.randint(2, 5)):
-        u = model.User()
-        u.username = sample_users[i].lower()
-        u.name = sample_users[i]
-        u.resident = 1
-        meta.Session.save(u)
+def createUsers(n=None):
+    if n is None:
+        n = random.randint(2, 5)
+    for i in xrange(n):
+        u = bluechips.model.User(sample_users[i].lower(), resident=True)
+        meta.Session.add(u)
     meta.Session.commit()
 
-def createExpenditures():
-    users = meta.Session.query(model.User).all()
-    for i in xrange(random.randint(5, 20)):
-        e = model.Expenditure()
-        e.spender = random.choice(users)
-        e.amount = Currency(random.randint(1000, 100000))
-        meta.Session.save(e)
+def createExpenditures(n=None):
+    if n is None:
+        n = random.randint(5, 20)
+    users = meta.Session.query(bluechips.model.User).all()
+    for i in xrange(n):
+        e = bluechips.model.Expenditure(random.choice(users),
+                                        Currency(random.randint(1000, 100000)))
+        meta.Session.add(e)
         e.even_split()
     meta.Session.commit()
 
 def deleteUsers():
-    map(meta.Session.delete, meta.Session.query(model.User))
+    map(meta.Session.delete, meta.Session.query(bluechips.model.User))
 
 def deleteExpenditures():
-    map(meta.Session.delete, meta.Session.query(model.Expenditure))
+    map(meta.Session.delete, meta.Session.query(bluechips.model.Expenditure))