From edbd0df9a0f6a78fbe086b7f4e48a05918fc3bf5 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 2 Jan 2015 14:02:31 +0100 Subject: [PATCH] [FIX] account: test assuming specific currency rate Old demo data hardcoded the currency rate of USD to 1.5289 at the half of the year, introducting new year red runbot. Using assertAlmostEquals to avoid values like 32.730000000000004 --- addons/account/tests/test_reconciliation.py | 12 ++++++------ openerp/addons/base/base_demo.xml | 7 ------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/addons/account/tests/test_reconciliation.py b/addons/account/tests/test_reconciliation.py index 62d44198153..e0be5a7c8ae 100644 --- a/addons/account/tests/test_reconciliation.py +++ b/addons/account/tests/test_reconciliation.py @@ -73,7 +73,7 @@ class TestReconciliation(TransactionCase): checked_line = 0 for move_line in move_line_ids: if move_line.account_id.id == self.account_usd_id: - self.assertEquals(move_line.debit, 27.47) + self.assertAlmostEquals(move_line.debit, 32.73) self.assertEquals(move_line.credit, 0.0) self.assertEquals(move_line.amount_currency, 42) self.assertEquals(move_line.currency_id.id, self.currency_usd_id) @@ -81,13 +81,13 @@ class TestReconciliation(TransactionCase): continue if move_line.account_id.id == self.account_rcv_id: self.assertEquals(move_line.debit, 0.0) - self.assertEquals(move_line.credit, 38.21) + self.assertAlmostEquals(move_line.credit, 38.21) self.assertEquals(move_line.amount_currency, -50) self.assertEquals(move_line.currency_id.id, self.currency_swiss_id) checked_line += 1 continue if move_line.account_id.id == self.account_rsa_id: - self.assertEquals(move_line.debit, 10.74) + self.assertAlmostEquals(move_line.debit, 5.48) self.assertEquals(move_line.credit, 0.0) checked_line += 1 continue @@ -141,13 +141,13 @@ class TestReconciliation(TransactionCase): for move_line in move_line_ids: if move_line.account_id.id == self.account_usd_id: self.assertEquals(move_line.debit, 0.0) - self.assertEquals(move_line.credit, 27.47) + self.assertAlmostEquals(move_line.credit, 32.73) self.assertEquals(move_line.amount_currency, -42) self.assertEquals(move_line.currency_id.id, self.currency_usd_id) checked_line += 1 continue if move_line.account_id.id == self.account_rcv_id: - self.assertEquals(move_line.debit, 38.21) + self.assertAlmostEquals(move_line.debit, 38.21) self.assertEquals(move_line.credit, 0.0) self.assertEquals(move_line.amount_currency, 50) self.assertEquals(move_line.currency_id.id, self.currency_swiss_id) @@ -155,7 +155,7 @@ class TestReconciliation(TransactionCase): continue if move_line.account_id.id == self.account_rsa_id: self.assertEquals(move_line.debit, 0.0) - self.assertEquals(move_line.credit, 10.74) + self.assertAlmostEquals(move_line.credit, 5.48) checked_line += 1 continue self.assertEquals(checked_line, 3) diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml index 9258dcf3553..f9d6d06d5f8 100644 --- a/openerp/addons/base/base_demo.xml +++ b/openerp/addons/base/base_demo.xml @@ -46,12 +46,5 @@ Mr Demo - - - 1.5289 - - - -