instantiate objects directly into the args list

1 files changed, 28 insertions, 24 deletions

diff --git a/talerbank/app/tests.py b/talerbank/app/tests.py
index d53e55b..e9c6cd8 100644
--- a/talerbank/app/tests.py
+++ b/talerbank/app/tests.py
@@ -29,14 +29,16 @@ def clear_db():
     BankAccount.objects.all().delete()
     BankTransaction.objects.all().delete()
 
+class WithdrawTestCase(TestCase):
+    pass
 
 class RegisterTestCase(TestCase):
     """User registration"""
 
     def setUp(self):
-        bank = User.objects.create_user(username='Bank')
-        bank_bankaccount = BankAccount(user=bank)
-        bank_bankaccount.account_no = 1
+        bank_bankaccount = BankAccount(
+            user=User.objects.create_user(username='Bank'),
+            account_no=1)
         bank_bankaccount.save()
 
     def tearDown(self):
@@ -58,9 +60,10 @@ class RegisterWrongCurrencyTestCase(TestCase):
 
     # Activating this user with a faulty currency.
     def setUp(self):
-        user_bankaccount = BankAccount(user=User.objects.create_user(username='Bank'),
-                                       amount=Amount('WRONGCURRENCY'))
-        user_bankaccount.account_no = 1
+        user_bankaccount = BankAccount(
+            user=User.objects.create_user(username='Bank'),
+            amount=Amount('WRONGCURRENCY'),
+            account_no=1)
         user_bankaccount.save()
 
     def tearDown(self):
@@ -82,9 +85,9 @@ class LoginTestCase(TestCase):
     """User login"""
 
     def setUp(self):
-        user = User.objects.create_user(username="test_user",
-                                        password="test_password")
-        user_bankaccount = BankAccount(user=user)
+        user_bankaccount = BankAccount(
+            user=User.objects.create_user(username="test_user",
+                                          password="test_password"))
         user_bankaccount.save()
 
     def tearDown(self):
@@ -139,10 +142,10 @@ class AddIncomingTestCase(TestCase):
         bank_account = BankAccount(user=User.objects.create_user(
             username="bank_user",
             password="bank_password"))
+        bank_account.save()
         user_account = BankAccount(user=User.objects.create_user(
             username="user_user",
             password="user_password"))
-        bank_account.save()
         user_account.save()
 
     def tearDown(self):
@@ -201,20 +204,21 @@ class AddIncomingTestCase(TestCase):
 class HistoryTestCase(TestCase):
 
     def setUp(self):
-        user = User.objects.create_user(username='User',
-                                        password="Password")
-        user_bankaccount = BankAccount(user=user,
-                                       amount=Amount(settings.TALER_CURRENCY, 100))
-        user_bankaccount.account_no = 1
-        user_bankaccount.save()
-        user_passive = User.objects.create_user(username='UserP',
-                                                password="PasswordP")
-        user_bankaccount_p = BankAccount(user=user_passive)
-        user_bankaccount_p.account_no = 2
-        user_bankaccount_p.save()
-        one = Amount(settings.TALER_CURRENCY, 1)
+        debit_account = BankAccount(
+            user=User.objects.create_user(username='User',
+                                          password="Password"),
+            amount=Amount(settings.TALER_CURRENCY, 100),
+            account_no=1)
+        debit_account.save()
+        credit_account = BankAccount(
+            user=User.objects.create_user(username='User0',
+                                          password="Password0"),
+            account_no=2)
+        credit_account.save()
         for subject in ("a", "b", "c", "d", "e", "f", "g", "h"):
-            wire_transfer(one, user_bankaccount, user_bankaccount_p, subject)
+            wire_transfer(Amount(settings.TALER_CURRENCY, 1),
+                          debit_account,
+                          credit_account, subject)
 
     def tearDown(self):
         clear_db()
@@ -303,8 +307,8 @@ class DebitTestCase(TestCase):
 
     def setUp(self):
         user_bankaccount = BankAccount(user=User.objects.create_user(username='U'))
-        user_bankaccount0 = BankAccount(user=User.objects.create_user(username='U0'))
         user_bankaccount.save()
+        user_bankaccount0 = BankAccount(user=User.objects.create_user(username='U0'))
         user_bankaccount0.save()
 
     def test_green(self):