[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-bank] 03/04: linting
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-bank] 03/04: linting |
|
Date: |
Fri, 03 Nov 2017 17:53:40 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository bank.
commit f25b6662bba5534abb7413d599ba31490fab4f74
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Nov 3 17:43:39 2017 +0100
linting
---
talerbank/app/tests.py | 303 ++++++++++++++++++++++++---------------------
talerbank/app/tests_alt.py | 13 +-
2 files changed, 161 insertions(+), 155 deletions(-)
diff --git a/talerbank/app/tests.py b/talerbank/app/tests.py
index 435fd7d..2e5a83b 100644
--- a/talerbank/app/tests.py
+++ b/talerbank/app/tests.py
@@ -14,6 +14,7 @@
#
# @author Marcello Stanisci
+import json
from django.test import TestCase, Client
from django.core.urlresolvers import reverse
from django.conf import settings
@@ -21,14 +22,9 @@ from django.contrib.auth.models import User
from .models import BankAccount, BankTransaction
from . import urls
from .views import wire_transfer
-import json
from .amount import Amount, CurrencyMismatch, BadFormatAmount
-import logging
-
-logger = logging.getLogger(__name__)
-
-def clearDb():
+def clear_db():
User.objects.all().delete()
BankAccount.objects.all().delete()
BankTransaction.objects.all().delete()
@@ -39,19 +35,19 @@ class RegisterTestCase(TestCase):
def setUp(self):
bank = User.objects.create_user(username='Bank')
- ba = BankAccount(user=bank)
- ba.account_no = 1
- ba.save()
+ bank_bankaccount = BankAccount(user=bank)
+ bank_bankaccount.account_no = 1
+ bank_bankaccount.save()
def tearDown(self):
- clearDb()
+ clear_db()
def test_register(self):
- c = Client()
- response = c.post(reverse("register", urlconf=urls),
- {"username": "test_register",
- "password": "test_register"},
- follow=True)
+ client = Client()
+ response = client.post(reverse("register", urlconf=urls),
+ {"username": "test_register",
+ "password": "test_register"},
+ follow=True)
self.assertIn(("/profile", 302), response.redirect_chain)
# this assertion tests "/profile""s view
self.assertEqual(200, response.status_code)
@@ -62,20 +58,20 @@ class RegisterWrongCurrencyTestCase(TestCase):
# Activating this user with a faulty currency.
def setUp(self):
- ba = BankAccount(user=User.objects.create_user(username='Bank'),
- amount=Amount('WRONGCURRENCY'))
- ba.account_no = 1
- ba.save()
+ user_bankaccount =
BankAccount(user=User.objects.create_user(username='Bank'),
+ amount=Amount('WRONGCURRENCY'))
+ user_bankaccount.account_no = 1
+ user_bankaccount.save()
def tearDown(self):
- clearDb()
+ clear_db()
def test_register(self):
- c = Client()
- response = c.post(reverse("register", urlconf=urls),
- {"username": "test_register",
- "password": "test_register"},
- follow=True)
+ client = Client()
+ response = client.post(reverse("register", urlconf=urls),
+ {"username": "test_register",
+ "password": "test_register"},
+ follow=True)
# A currency mismatch is expected when the 100 KUDOS will be
# attempted to be given to the new user.
# This scenario expects a 500 Internal server error response to
@@ -88,47 +84,47 @@ class LoginTestCase(TestCase):
def setUp(self):
user = User.objects.create_user(username="test_user",
password="test_password")
- user_account = BankAccount(user=user)
- user_account.save()
+ user_bankaccount = BankAccount(user=user)
+ user_bankaccount.save()
def tearDown(self):
- clearDb()
-
+ clear_db()
+
def test_login(self):
- c = Client()
- response = c.post(reverse("login", urlconf=urls),
- {"username": "test_user",
- "password": "test_password"},
- follow=True)
+ client = Client()
+ response = client.post(reverse("login", urlconf=urls),
+ {"username": "test_user",
+ "password": "test_password"},
+ follow=True)
self.assertIn(("/profile", 302), response.redirect_chain)
# Send wrong password
- response = c.post(reverse("login", urlconf=urls),
- {"username": "test_user",
- "password": "test_passwordoo"},
- follow=True)
+ response = client.post(reverse("login", urlconf=urls),
+ {"username": "test_user",
+ "password": "test_passwordoo"},
+ follow=True)
# The current logic -- django's default -- returns 200 OK
# even when the login didn't succeed.
# So the test here ensures that the bank just doesn't crash.
self.assertEqual(200, response.status_code)
class AmountTestCase(TestCase):
-
+
def test_cmp(self):
- a1 = Amount("X", 1)
- _a1 = Amount("X", 1)
- a2 = Amount("X", 2)
-
- self.assertEqual(-1, Amount.cmp(a1, a2))
- self.assertEqual(1, Amount.cmp(a2, a1))
- self.assertEqual(0, Amount.cmp(a1, _a1))
+ amount1 = Amount("X", 1)
+ _amount1 = Amount("X", 1)
+ amount2 = Amount("X", 2)
+
+ self.assertEqual(-1, Amount.cmp(amount1, amount2))
+ self.assertEqual(1, Amount.cmp(amount2, amount1))
+ self.assertEqual(0, Amount.cmp(amount1, _amount1))
# Trying to compare amount of different currencies
def test_cmp_diff_curr(self):
- a1 = Amount("X", 1)
- a2 = Amount("Y", 2)
+ amount1 = Amount("X", 1)
+ amount2 = Amount("Y", 2)
try:
- Amount.cmp(a1, a2)
+ Amount.cmp(amount1, amount2)
except CurrencyMismatch:
self.assertTrue(True)
return
@@ -150,10 +146,10 @@ class AddIncomingTestCase(TestCase):
user_account.save()
def tearDown(self):
- clearDb()
+ clear_db()
def test_add_incoming(self):
- c = Client()
+ client = Client()
data = '{"auth": {"type": "basic"}, \
"credit_account": 1, \
"wtid": "TESTWTID", \
@@ -163,10 +159,11 @@ class AddIncomingTestCase(TestCase):
"fraction": 0, \
"currency": "%s"}}' \
% settings.TALER_CURRENCY
- response = c.post(reverse("add-incoming", urlconf=urls),
- data=data,
- content_type="application/json",
- follow=True, **{"HTTP_X_TALER_BANK_USERNAME":
"user_user", "HTTP_X_TALER_BANK_PASSWORD": "user_password"})
+ response = client.post(reverse("add-incoming", urlconf=urls),
+ data=data,
+ content_type="application/json",
+ follow=True, **{"HTTP_X_TALER_BANK_USERNAME":
"user_user",
+ "HTTP_X_TALER_BANK_PASSWORD":
"user_password"})
self.assertEqual(200, response.status_code)
data = '{"auth": {"type": "basic"}, \
"credit_account": 1, \
@@ -177,10 +174,11 @@ class AddIncomingTestCase(TestCase):
"fraction": 0, \
"currency": "%s"}}' \
% "WRONGCURRENCY"
- response = c.post(reverse("add-incoming", urlconf=urls),
- data=data,
- content_type="application/json",
- follow=True, **{"HTTP_X_TALER_BANK_USERNAME":
"user_user", "HTTP_X_TALER_BANK_PASSWORD": "user_password"})
+ response = client.post(reverse("add-incoming", urlconf=urls),
+ data=data,
+ content_type="application/json",
+ follow=True, **{"HTTP_X_TALER_BANK_USERNAME":
"user_user",
+ "HTTP_X_TALER_BANK_PASSWORD":
"user_password"})
self.assertEqual(406, response.status_code)
# Try to go debit
@@ -193,149 +191,168 @@ class AddIncomingTestCase(TestCase):
"fraction": 1, \
"currency": "%s"}}' \
% settings.TALER_CURRENCY
- response = c.post(reverse("add-incoming", urlconf=urls),
- data=data,
- content_type="application/json",
- follow=True, **{"HTTP_X_TALER_BANK_USERNAME":
"user_user", "HTTP_X_TALER_BANK_PASSWORD": "user_password"})
+ response = client.post(reverse("add-incoming", urlconf=urls),
+ data=data,
+ content_type="application/json",
+ follow=True, **{"HTTP_X_TALER_BANK_USERNAME":
"user_user",
+ "HTTP_X_TALER_BANK_PASSWORD":
"user_password"})
self.assertEqual(403, response.status_code)
class HistoryTestCase(TestCase):
def setUp(self):
- user = User.objects.create_user(username='User', password="Password")
- ub = BankAccount(user=user, amount=Amount(settings.TALER_CURRENCY,
100))
- ub.account_no = 1
- ub.save()
- user_passive = User.objects.create_user(username='UserP',
password="PasswordP")
- ub_p = BankAccount(user=user_passive)
- ub_p.account_no = 2
- ub_p.save()
+ 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)
- wire_transfer(one, ub, ub_p, subject="a")
- wire_transfer(one, ub, ub_p, subject="b")
- wire_transfer(one, ub, ub_p, subject="c")
- wire_transfer(one, ub, ub_p, subject="d")
- wire_transfer(one, ub, ub_p, subject="e")
- wire_transfer(one, ub, ub_p, subject="f")
- wire_transfer(one, ub, ub_p, subject="g")
- wire_transfer(one, ub, ub_p, subject="h")
+ wire_transfer(one, user_bankaccount, user_bankaccount_p, subject="a")
+ wire_transfer(one, user_bankaccount, user_bankaccount_p, subject="b")
+ wire_transfer(one, user_bankaccount, user_bankaccount_p, subject="c")
+ wire_transfer(one, user_bankaccount, user_bankaccount_p, subject="d")
+ wire_transfer(one, user_bankaccount, user_bankaccount_p, subject="e")
+ wire_transfer(one, user_bankaccount, user_bankaccount_p, subject="f")
+ wire_transfer(one, user_bankaccount, user_bankaccount_p, subject="g")
+ wire_transfer(one, user_bankaccount, user_bankaccount_p, subject="h")
def tearDown(self):
- clearDb()
+ clear_db()
def test_history(self):
- c = Client()
+ client = Client()
- response = c.get(reverse("history", urlconf=urls), {"auth": "basic",
"delta": "+4"},
- **{"HTTP_X_TALER_BANK_USERNAME": "User",
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
+ response = client.get(reverse("history", urlconf=urls), {"auth":
"basic", "delta": "+4"},
+ **{"HTTP_X_TALER_BANK_USERNAME": "User",
+ "HTTP_X_TALER_BANK_PASSWORD": "Password"})
self.assertEqual(200, response.status_code)
# Get a delta=+1 record in the middle of the list
- response = c.get(reverse("history", urlconf=urls), {"auth": "basic",
"delta": "+1", "start": "5"},
- **{"HTTP_X_TALER_BANK_USERNAME": "User",
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
+ response = client.get(reverse("history", urlconf=urls),
+ {"auth": "basic", "delta": "+1", "start": "5"},
+ **{"HTTP_X_TALER_BANK_USERNAME": "User",
+ "HTTP_X_TALER_BANK_PASSWORD": "Password"})
data = response.content.decode("utf-8")
data = json.loads(data)
self.assertEqual(data["data"][0]["row_id"], 6)
# Get latest record
- response = c.get(reverse("history", urlconf=urls), {"auth": "basic",
"delta": "-1"},
- **{"HTTP_X_TALER_BANK_USERNAME": "User",
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
+ response = client.get(reverse("history", urlconf=urls),
+ {"auth": "basic", "delta": "-1"},
+ **{"HTTP_X_TALER_BANK_USERNAME": "User",
+ "HTTP_X_TALER_BANK_PASSWORD": "Password"})
data = response.content.decode("utf-8")
data = json.loads(data)
self.assertEqual(data["data"][0]["wt_subject"], "h")
- # Get non-existent record: the latest plus one in the future:
transaction "h" takes row_id 11
- response = c.get(reverse("history", urlconf=urls), {"auth": "basic",
"delta": "1", "start": "11"},
- **{"HTTP_X_TALER_BANK_USERNAME": "User",
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
- response_txt = response.content.decode("utf-8")
+ # Get non-existent record: the latest plus one in the future:
+ # transaction "h" takes row_id 11
+ response = client.get(reverse("history", urlconf=urls),
+ {"auth": "basic", "delta": "1", "start": "11"},
+ **{"HTTP_X_TALER_BANK_USERNAME": "User",
+ "HTTP_X_TALER_BANK_PASSWORD": "Password"})
self.assertEqual(204, response.status_code)
# Get credit records
- response = c.get(reverse("history", urlconf=urls), {"auth": "basic",
"delta": "+1", "direction": "credit"},
- **{"HTTP_X_TALER_BANK_USERNAME": "User",
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
+ response = client.get(reverse("history", urlconf=urls),
+ {"auth": "basic", "delta": "+1", "direction":
"credit"},
+ **{"HTTP_X_TALER_BANK_USERNAME": "User",
+ "HTTP_X_TALER_BANK_PASSWORD": "Password"})
self.assertEqual(204, response.status_code)
# Get debit records
- response = c.get(reverse("history", urlconf=urls), {"auth": "basic",
"delta": "+1", "direction": "debit"},
- **{"HTTP_X_TALER_BANK_USERNAME": "User",
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
+ response = client.get(reverse("history", urlconf=urls),
+ {"auth": "basic", "delta": "+1", "direction":
"debit"},
+ **{"HTTP_X_TALER_BANK_USERNAME": "User",
+ "HTTP_X_TALER_BANK_PASSWORD": "Password"})
self.assertNotEqual(204, response.status_code)
# Query about non-owned account
- response = c.get(reverse("history", urlconf=urls), {"auth": "basic",
"delta": "+1", "account_number": 2},
- **{"HTTP_X_TALER_BANK_USERNAME": "User",
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
+ response = client.get(reverse("history", urlconf=urls),
+ {"auth": "basic", "delta": "+1",
"account_number": 2},
+ **{"HTTP_X_TALER_BANK_USERNAME": "User",
+ "HTTP_X_TALER_BANK_PASSWORD": "Password"})
self.assertEqual(403, response.status_code)
# Query about non-existent account
- response = c.get(reverse("history", urlconf=urls), {"auth": "basic",
"delta": "-1", "account_number": 9},
- **{"HTTP_X_TALER_BANK_USERNAME": "User",
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
+ response = client.get(reverse("history", urlconf=urls),
+ {"auth": "basic", "delta": "-1",
"account_number": 9},
+ **{"HTTP_X_TALER_BANK_USERNAME": "User",
+ "HTTP_X_TALER_BANK_PASSWORD": "Password"})
self.assertEqual(404, response.status_code)
class DBAmountSubtraction(TestCase):
def setUp(self):
- a = BankAccount(user=User.objects.create_user(username='U'),
- amount=Amount(settings.TALER_CURRENCY, 3))
- a.save()
-
+ user_bankaccount =
BankAccount(user=User.objects.create_user(username='U'),
+ amount=Amount(settings.TALER_CURRENCY,
3))
+ user_bankaccount.save()
+
def test_subtraction(self):
- a = BankAccount.objects.get(user=User.objects.get(username='U'))
- a.amount.subtract(Amount(settings.TALER_CURRENCY, 2))
- self.assertEqual(0, Amount.cmp(Amount(settings.TALER_CURRENCY, 1),
a.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(TestCase):
- a = BankAccount(user=User.objects.create_user(username='U'))
- a.save()
+ def setUp(self):
+ user_bankaccount =
BankAccount(user=User.objects.create_user(username='U'))
+ user_bankaccount.save()
def test_exists(self):
- a = BankAccount.objects.get(user=User.objects.get(username='U'))
- self.assertTrue(isinstance(a.amount, Amount))
+ 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):
- ua = BankAccount(user=User.objects.create_user(username='U'))
- u0a = BankAccount(user=User.objects.create_user(username='U0'))
- ua.save()
- u0a.save()
+ 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.save()
def test_green(self):
- u = User.objects.get(username='U')
- ub = BankAccount.objects.get(user=u)
- self.assertEqual(False, ub.debit)
+ user_bankaccount =
BankAccount.objects.get(user=User.objects.get(username='U'))
+ self.assertEqual(False, user_bankaccount.debit)
def test_red(self):
- ub = BankAccount.objects.get(user=User.objects.get(username='U'))
- ub0 = 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),
- ub0,
- ub,
+ user_bankaccount0,
+ user_bankaccount,
"Go green")
tmp = Amount(settings.TALER_CURRENCY, 10)
- self.assertEqual(0, Amount.cmp(ub.amount, tmp))
- self.assertEqual(0, Amount.cmp(ub0.amount, tmp))
- self.assertFalse(ub.debit)
+ self.assertEqual(0, Amount.cmp(user_bankaccount.amount, tmp))
+ self.assertEqual(0, Amount.cmp(user_bankaccount0.amount, tmp))
+ self.assertFalse(user_bankaccount.debit)
- self.assertTrue(ub0.debit)
+ self.assertTrue(user_bankaccount0.debit)
wire_transfer(Amount(settings.TALER_CURRENCY, 11),
- ub,
- ub0,
+ user_bankaccount,
+ user_bankaccount0,
"Go red")
tmp.value = 1
- self.assertTrue(ub.debit)
- self.assertFalse(ub0.debit)
- self.assertEqual(0, Amount.cmp(ub.amount, tmp))
- self.assertEqual(0, Amount.cmp(ub0.amount, tmp))
+ self.assertTrue(user_bankaccount.debit)
+ self.assertFalse(user_bankaccount0.debit)
+ self.assertEqual(0, Amount.cmp(user_bankaccount.amount, tmp))
+ self.assertEqual(0, Amount.cmp(user_bankaccount0.amount, tmp))
class ParseAmountTestCase(TestCase):
- def test_parse_amount(self):
- ret = Amount.parse("KUDOS:4.0")
- self.assertJSONEqual('{"value": 4, "fraction": 0, "currency":
"KUDOS"}', ret.dump())
- ret = Amount.parse("KUDOS:4.3")
- self.assertJSONEqual('{"value": 4, "fraction": 30000000, "currency":
"KUDOS"}', ret.dump())
- try:
- Amount.parse("Buggy")
- except BadFormatAmount:
- return
- # make sure the control doesn't get here
- self.assertEqual(True, False)
+ def test_parse_amount(self):
+ ret = Amount.parse("KUDOS:4.0")
+ self.assertJSONEqual('{"value": 4, "fraction": 0, "currency":
"KUDOS"}', ret.dump())
+ ret = Amount.parse("KUDOS:4.3")
+ self.assertJSONEqual('{"value": 4, "fraction": 30000000, "currency":
"KUDOS"}', ret.dump())
+ try:
+ Amount.parse("Buggy")
+ except BadFormatAmount:
+ return
+ # make sure the control doesn't get here
+ self.assertEqual(True, False)
diff --git a/talerbank/app/tests_alt.py b/talerbank/app/tests_alt.py
index 4ab9b65..7d37586 100644
--- a/talerbank/app/tests_alt.py
+++ b/talerbank/app/tests_alt.py
@@ -13,20 +13,9 @@
# TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
#
# @author Marcello Stanisci
-
-from django.test import TestCase, Client
-from django.core.urlresolvers import reverse
+from django.test import TestCase
from django.conf import settings
-from django.contrib.auth.models import User
-from .models import BankAccount, BankTransaction
-from . import urls
from .amount import Amount, BadFormatAmount
-from .views import wire_transfer
-import json
-
-import logging
-
-logger = logging.getLogger(__name__)
class BadDatabaseStringTestCase(TestCase):
def test_baddbstring(self):
--
To stop receiving notification emails like this one, please contact
address@hidden