Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@xavierteres
xavierteres committed Nov 11, 2022
1 parent 1e4c751 commit 31e9522
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion generationkwh/investmentstate_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ def test_invoice(self):
self.assertChangesEqual(inv, """\
draft: false
""",
u"INVOICED: Facturada i remesada\n"
u"INVOICED: Facturada\n"
)

self.assertActionsEqual(inv, u"""
Expand Down
26 changes: 13 additions & 13 deletions som_generationkwh/test/investment_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ def test__mark_as_invoiced(self):
self.assertEqual(name_emission, "GenerationkWH")

self.assertLogEquals(log,
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
u'SIGN: Inversió signada amb data 2017-01-03\n'
u'ORDER: Formulari omplert des de la IP 10.10.23.123,'
u' Quantitat: 4000 €, IBAN: ES7712341234161234567890\n'
Expand Down Expand Up @@ -530,7 +530,7 @@ def test__mark_as_paid__singleInvestment(self):

self.assertLogEquals(log,
u'PAID: Pagament de 2000 € efectuat [None]\n'
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
u'SIGN: Inversió signada amb data 2017-01-03\n'
u'ORDER: Formulari omplert des de la IP 10.10.23.123,'
u' Quantitat: 2000 €, IBAN: ES7712341234161234567890\n'
Expand Down Expand Up @@ -617,14 +617,14 @@ def test__mark_as_paid__oldLogKept(self):

self.assertLogEquals(result[0]['log'],
u'PAID: Pagament de 2000 € efectuat [None]\n'
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
u'ORDER: Formulari omplert des de la IP 10.10.23.1,'
u' Quantitat: 2000 €, IBAN: ES7712341234161234567890\n'
)

self.assertLogEquals(result[1]['log'],
u'PAID: Pagament de 2000 € efectuat [None]\n'
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
u'ORDER: Formulari omplert des de la IP 10.10.23.2,'
u' Quantitat: 2000 €, IBAN: ES7712341234161234567890\n'
)
Expand Down Expand Up @@ -652,7 +652,7 @@ def test__mark_as_paid__alreadyPaid(self):

self.assertLogEquals(result['log'],
u'PAID: Pagament de 2000 € efectuat [None]\n'
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
u'ORDER: Formulari omplert des de la IP 10.10.23.1,'
u' Quantitat: 2000 €, IBAN: ES7712341234161234567890\n'
)
Expand Down Expand Up @@ -681,7 +681,7 @@ def test__mark_as_unpaid__singleInvestment(self):
self.assertLogEquals(log,
u'UNPAID: Devolució del pagament de 2000 € [None]\n'
u'PAID: Pagament de 2000 € efectuat [None]\n'
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
u'SIGN: Inversió signada amb data 2017-01-03\n'
u'ORDER: Formulari omplert des de la IP 10.10.23.123,'
u' Quantitat: 2000 €, IBAN: ES7712341234161234567890\n'
Expand Down Expand Up @@ -772,15 +772,15 @@ def test__mark_as_unpaid__oldLogKept(self):
self.assertLogEquals(result[0]['log'],
u'UNPAID: Devoluci\xf3 del pagament de 2000 € [None]\n'
u'PAID: Pagament de 2000 € efectuat [None]\n'
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
u'ORDER: Formulari omplert des de la IP 10.10.23.1,'
u' Quantitat: 2000 €, IBAN: ES7712341234161234567890\n'
)

self.assertLogEquals(result[1]['log'],
u'UNPAID: Devoluci\xf3 del pagament de 2000 € [None]\n'
u'PAID: Pagament de 2000 € efectuat [None]\n'
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
u'ORDER: Formulari omplert des de la IP 10.10.23.2,'
u' Quantitat: 2000 €, IBAN: ES7712341234161234567890\n'
)
Expand All @@ -804,7 +804,7 @@ def test__mark_as_unpaid__notPaid(self):
log = investment.pop('log')

self.assertLogEquals(log,
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
u'ORDER: Formulari omplert des de la IP 10.10.23.123,'
u' Quantitat: 2000 €, IBAN: ES7712341234161234567890\n'
)
Expand Down Expand Up @@ -1093,7 +1093,7 @@ def test__amortize__writes_log(self):
self.assertLogEquals(investment['log'],
u'AMORTIZATION: Generada amortització de 80.00 € pel 2002-01-05\n'
u'PAID: Pagament de 2000 € efectuat [None]\n'
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
u'ORDER: Formulari omplert des de la IP 10.10.23.1,'
u' Quantitat: 2000 €, IBAN: ES7712341234161234567890\n'
)
Expand All @@ -1115,7 +1115,7 @@ def test__amortize__writesLogTwiceSameInvestment(self):
u'AMORTIZATION: Generada amortització de 80.00 € pel 2003-01-05\n'
u'AMORTIZATION: Generada amortització de 80.00 € pel 2002-01-05\n'
u'PAID: Pagament de 2000 € efectuat [None]\n'
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
u'ORDER: Formulari omplert des de la IP 10.10.23.1,'
u' Quantitat: 2000 €, IBAN: ES7712341234161234567890\n'
)
Expand Down Expand Up @@ -1699,7 +1699,7 @@ def test__cancel__unpaid(self):
u'CANCEL: La inversió ha estat cancel·lada\n'
u'UNPAID: Devolució del pagament de 2000 € [None]\n'
u'PAID: Pagament de 2000 € efectuat [None]\n'
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
u'SIGN: Inversió signada amb data 2000-01-03\n'
u'ORDER: Formulari omplert des de la IP 10.10.23.1,'
u' Quantitat: 2000 €, IBAN: ES7712341234161234567890\n'
Expand Down Expand Up @@ -1750,7 +1750,7 @@ def test__resign__unpaid(self):
u'CANCEL: La inversió ha estat cancel·lada\n'
u'UNPAID: Devolució del pagament de 2000 € [None]\n'
u'PAID: Pagament de 2000 € efectuat [None]\n'
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
u'SIGN: Inversió signada amb data 2000-01-03\n'
u'ORDER: Formulari omplert des de la IP 10.10.23.1,'
u' Quantitat: 2000 €, IBAN: ES7712341234161234567890\n'
Expand Down
4 changes: 2 additions & 2 deletions som_generationkwh/tests/investment_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1545,7 +1545,7 @@ def test_mark_as_paid__allOk_APO(self):
inv_0001 = self.Investment.read(cursor, uid, inv_id)
self.assertLogEquals(inv_0001['log'],
u'PAID: Pagament de 1000 € efectuat [None]\n'
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
)
inv_0001.pop('actions_log')
inv_0001.pop('log')
Expand Down Expand Up @@ -1592,7 +1592,7 @@ def test_mark_as_paid__allOk_GKWH(self):
inv_0001 = self.Investment.read(cursor, uid, inv_id)
self.assertLogEquals(inv_0001['log'],
u'PAID: Pagament de 1000 € efectuat [None]\n'
u'INVOICED: Facturada i remesada\n'
u'INVOICED: Facturada\n'
)
inv_0001.pop('actions_log')
inv_0001.pop('log')
Expand Down

0 comments on commit 31e9522

Please sign in to comment.