X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Ftests%2F__init__.py;h=cbc0ad459d5eade3873955a405ece11245b539e2;hb=7032113d23283d31c3b9146c5b749fcbed32031a;hp=7b5708ff422bf0a0108b4da89f8ef4a478f20296;hpb=848377c7d76f3592a1542ef7c5f330cb24841d3a;p=bluechips.git

diff --git a/bluechips/tests/__init__.py b/bluechips/tests/__init__.py
index 7b5708f..cbc0ad4 100644
--- a/bluechips/tests/__init__.py
+++ b/bluechips/tests/__init__.py
@@ -31,10 +31,7 @@ def setUpPackage():
     # Invoke websetup with the current config file
     SetupCommand('setup-app').run([config['__file__']])
     
-    test_user = bluechips.model.User()
-    test_user.username = u'root'
-    test_user.name = u'Charlie Root'
-    test_user.resident = False
+    test_user = bluechips.model.User(u'root', u'Charlie Root', False)
     meta.Session.save(test_user)
     meta.Session.commit()
 
@@ -52,10 +49,7 @@ def createUsers(n=None):
     if n is None:
         n = random.randint(2, 5)
     for i in xrange(n):
-        u = bluechips.model.User()
-        u.username = sample_users[i].lower()
-        u.name = sample_users[i]
-        u.resident = 1
+        u = bluechips.model.User(sample_users[i].lower(), resident=True)
         meta.Session.save(u)
     meta.Session.commit()
 
@@ -64,9 +58,8 @@ def createExpenditures(n=None):
         n = random.randint(5, 20)
     users = meta.Session.query(bluechips.model.User).all()
     for i in xrange(n):
-        e = bluechips.model.Expenditure()
-        e.spender = random.choice(users)
-        e.amount = Currency(random.randint(1000, 100000))
+        e = bluechips.model.Expenditure(random.choice(users),
+                                        Currency(random.randint(1000, 100000)))
         meta.Session.save(e)
         e.even_split()
     meta.Session.commit()