[GNUnet-SVN] [taler-bank] branch master updated: shortening testcase where possible

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository bank.

The following commit(s) were added to refs/heads/master by this push:
     new 2f89247  shortening testcase where possible
2f89247 is described below

commit 2f89247d08d9c837e9b82cc4f72f7a7fd639fe9d
Author: Marcello Stanisci <address@hidden>
AuthorDate: Tue Dec 5 17:53:05 2017 +0100

    shortening testcase where possible
---
 talerbank/app/tests.py | 88 +++++++++++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 41 deletions(-)

diff --git a/talerbank/app/tests.py b/talerbank/app/tests.py
index 3a74f5f..0ea1192 100644
--- a/talerbank/app/tests.py
+++ b/talerbank/app/tests.py
@@ -131,10 +131,9 @@ class RegisterTestCase(TestCase):
     """User registration"""
 
     def setUp(self):
-        bank_bankaccount = BankAccount(
+        BankAccount(
             user=User.objects.create_user(username='Bank'),
-            account_no=1)
-        bank_bankaccount.save()
+            account_no=1).save()
 
     def tearDown(self):
         clear_db()
@@ -155,11 +154,10 @@ class RegisterWrongCurrencyTestCase(TestCase):
 
     def setUp(self):
         # Note, config has KUDOS as currency.
-        user_bankaccount = BankAccount(
+        BankAccount(
             user=User.objects.create_user(username='Bank'),
             amount=Amount('WRONGCURRENCY'),
-            account_no=1)
-        user_bankaccount.save()
+            account_no=1).save()
 
     def tearDown(self):
         clear_db()
@@ -176,10 +174,10 @@ class LoginTestCase(TestCase):
     """User login"""
 
     def setUp(self):
-        user_bankaccount = BankAccount(
-            user=User.objects.create_user(username="test_user",
-                                          password="test_password"))
-        user_bankaccount.save()
+        BankAccount(
+            user=User.objects.create_user(
+                username="test_user",
+                password="test_password")).save()
 
     def tearDown(self):
         clear_db()
@@ -213,14 +211,12 @@ class AddIncomingTestCase(TestCase):
     """Test money transfer's API"""
 
     def setUp(self):
-        bank_account = BankAccount(user=User.objects.create_user(
+        BankAccount(user=User.objects.create_user(
             username="bank_user",
-            password="bank_password"))
-        bank_account.save()
-        user_account = BankAccount(user=User.objects.create_user(
+            password="bank_password")).save()
+        BankAccount(user=User.objects.create_user(
             username="user_user",
-            password="user_password"))
-        user_account.save()
+            password="user_password")).save()
 
     def tearDown(self):
         clear_db()
@@ -286,14 +282,16 @@ class HistoryTestCase(TestCase):
 
     def setUp(self):
         debit_account = BankAccount(
-            user=User.objects.create_user(username='User',
-                                          password="Password"),
+            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"),
+            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"):
@@ -336,43 +334,50 @@ class HistoryTestCase(TestCase):
 
 class DBAmountSubtraction(TestCase):
     def setUp(self):
-        user_bankaccount = 
BankAccount(user=User.objects.create_user(username='U'),
-                                       amount=Amount(settings.TALER_CURRENCY, 
3))
-        user_bankaccount.save()
+        BankAccount(user=User.objects.create_user(username='U'),
+                    amount=Amount(settings.TALER_CURRENCY, 3)).save()
 
     def test_subtraction(self):
-        user_bankaccount = 
BankAccount.objects.get(user=User.objects.get(username='U'))
-        user_bankaccount.amount.subtract(Amount(settings.TALER_CURRENCY, 2))
-        self.assertEqual(0, Amount.cmp(Amount(settings.TALER_CURRENCY, 1),
-                                       user_bankaccount.amount))
+        user_bankaccount = BankAccount.objects.get(
+            user=User.objects.get(username='U'))
+        user_bankaccount.amount.subtract(
+            Amount(settings.TALER_CURRENCY, 2))
+        self.assertEqual(
+            0,
+            Amount.cmp(Amount(settings.TALER_CURRENCY, 1),
+                              user_bankaccount.amount))
 
 
 class DBCustomColumnTestCase(TestCase):
 
     def setUp(self):
-        user_bankaccount = 
BankAccount(user=User.objects.create_user(username='U'))
-        user_bankaccount.save()
+        BankAccount(
+            user=User.objects.create_user(username='U')).save()
 
     def test_exists(self):
-        user_bankaccount = 
BankAccount.objects.get(user=User.objects.get(username='U'))
+        user_bankaccount = BankAccount.objects.get(
+            user=User.objects.get(username='U'))
         self.assertTrue(isinstance(user_bankaccount.amount, Amount))
 
 # This tests whether a bank account goes debit and then goes >=0  again
 class DebitTestCase(TestCase):
 
     def setUp(self):
-        user_bankaccount = 
BankAccount(user=User.objects.create_user(username='U'))
-        user_bankaccount.save()
-        user_bankaccount0 = 
BankAccount(user=User.objects.create_user(username='U0'))
-        user_bankaccount0.save()
+        BankAccount(
+            user=User.objects.create_user(username='U')).save()
+        BankAccount(
+            user=User.objects.create_user(username='U0')).save()
 
     def test_green(self):
-        user_bankaccount = 
BankAccount.objects.get(user=User.objects.get(username='U'))
+        user_bankaccount = BankAccount.objects.get(
+            user=User.objects.get(username='U'))
         self.assertEqual(False, user_bankaccount.debit)
 
     def test_red(self):
-        user_bankaccount = 
BankAccount.objects.get(user=User.objects.get(username='U'))
-        user_bankaccount0 = 
BankAccount.objects.get(user=User.objects.get(username='U0'))
+        user_bankaccount = BankAccount.objects.get(
+            user=User.objects.get(username='U'))
+        user_bankaccount0 = BankAccount.objects.get(
+            user=User.objects.get(username='U0'))
 
         wire_transfer(Amount(settings.TALER_CURRENCY, 10, 0),
                       user_bankaccount0,
@@ -415,11 +420,12 @@ class MeasureHistory(TestCase):
         self.user_bankaccount0 = BankAccount(
             user=User.objects.create_user(username='U0'),
             amount=Amount(settings.TALER_CURRENCY, 3000))
-        self.user_bankaccount = BankAccount(
-            user=User.objects.create_user(username='U'))
-        self.user_bankaccount.save()
         self.user_bankaccount0.save()
 
+        user_bankaccount = BankAccount(
+            user=User.objects.create_user(username='U'))
+        user_bankaccount.save()
+
         self.ntransfers = 1000
 
         # Make sure logging level is WARNING, otherwise the loop
@@ -428,7 +434,7 @@ class MeasureHistory(TestCase):
             del i # to pacify PEP checkers
             wire_transfer(Amount(settings.TALER_CURRENCY, 1),
                           self.user_bankaccount0,
-                          self.user_bankaccount,
+                          user_bankaccount,
                           "bulk")
 
     def test_extract_history(self):

-- 
To stop receiving notification emails like this one, please contact
address@hidden