Improve Payto parser

1 files changed, 20 insertions, 9 deletions

diff --git a/talerbank/app/tests.py b/talerbank/app/tests.py
index b5c926e..86e5998 100644
--- a/talerbank/app/tests.py
+++ b/talerbank/app/tests.py
@@ -336,17 +336,28 @@ class ReservePubExtractionTestCase(TestCase):
 
 
 class PaytoParseTestCase(TestCase):
-    def test_payto_parse(self):
+    def test_payto_wrong_protocol(self):
+        self.assertRaises(Exception, PaytoParse, "http://foo/bar")
+    def test_payto_with_port_number(self):
+        parsed = PaytoParse("payto://iban/localhost:1234/account")
+        self.assertEqual(parsed.bank, "localhost:1234")
+    def test_payto_malformed(self):
+        self.assertRaises(Exception, PaytoParse, "payto:foo/bar")
+    def test_payto_noamount(self):
         parsed = PaytoParse(
-            "payto://x-taler-bank/bank.int.taler.net/Exchange?subject=0T096A11M57GWGG0P6ZM9Z8G5829BFJFH2AN9R5T80FJ931DX7GG&amount=EUR:1"
-        )
-        self.assertTrue("Exchange" == parsed.account)
-        self.assertTrue(
-            "0T096A11M57GWGG0P6ZM9Z8G5829BFJFH2AN9R5T80FJ931DX7GG" == parsed.subject
+            "payto://x-taler-bank/bank.int.taler.net/Exchange?message=0T096A11M57GWGG0P6ZM9Z8G5829BFJFH2AN9R5T80FJ931DX7GG"
         )
-        self.assertTrue(parsed.amount.value == 1)
-        self.assertTrue(parsed.amount.fraction == 0)
-        self.assertTrue(parsed.amount.currency == "EUR")
+    def test_payto_parse(self):
+        parsed = PaytoParse(
+            "payto://x-taler-bank/bank.int.taler.net/Exchange?message=0T096A11M57GWGG0P6ZM9Z8G5829BFJFH2AN9R5T80FJ931DX7GG&amount=EUR:1"
+        )
+        self.assertEqual("Exchange", parsed.target)
+        self.assertEqual("0T096A11M57GWGG0P6ZM9Z8G5829BFJFH2AN9R5T80FJ931DX7GG", parsed.message)
+        self.assertEqual(parsed.amount.value, 1)
+        self.assertEqual(parsed.amount.fraction, 0)
+        self.assertEqual(parsed.amount.currency, "EUR")
+        self.assertEqual(parsed.authority, "x-taler-bank")
+        self.assertEqual(parsed.bank, "bank.int.taler.net")
 
 
 class PublicAccountsTestCase(TestCase):