From 9e6e55e35b20a2349cf978c99c141a10aeb970dc Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Thu, 28 Apr 2016 12:04:37 +0200 Subject: [PATCH] Correct test --- account_statement_base_import/models/account_move.py | 8 ++++---- .../tests/test_base_import.py | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/account_statement_base_import/models/account_move.py b/account_statement_base_import/models/account_move.py index 2f328a90..cec5f5ec 100644 --- a/account_statement_base_import/models/account_move.py +++ b/account_statement_base_import/models/account_move.py @@ -177,9 +177,9 @@ class AccountMoveCompletionRule(models.Model): partners = partner_obj.browse([x[0] for x in partner_ids]) if partners: if len(partners) > 1: - msg = (_('Line named "%s" (Ref:%s) was matched by more than ' + msg = (_('Line named "%s" was matched by more than ' 'one partner while looking on partner label: %s') % - (line.name, line.ref, + (line.name, ','.join([x.name for x in partners]))) raise ErrorTooManyPartner(msg) res['partner_id'] = partners[0].id @@ -223,9 +223,9 @@ class AccountMoveCompletionRule(models.Model): if result: if len(result) > 1: raise ErrorTooManyPartner( - _('Line named "%s" (Ref:%s) was matched by more than one ' + _('Line named "%s" was matched by more than one ' 'partner while looking on partner by name') % - (line.name, line.ref)) + line.name) res['partner_id'] = result[0][0] return res diff --git a/account_statement_base_import/tests/test_base_import.py b/account_statement_base_import/tests/test_base_import.py index 1b8e1f85..326437ec 100644 --- a/account_statement_base_import/tests/test_base_import.py +++ b/account_statement_base_import/tests/test_base_import.py @@ -22,6 +22,7 @@ import base64 import inspect import os +from operator import attrgetter from openerp.tests import common from openerp import tools from openerp.modules import get_module_resource @@ -87,8 +88,9 @@ class TestCodaImport(common.TransactionCase): def _validate_imported_move(self, move): self.assertEqual("/", move.name) self.assertEqual(5, len(move.line_ids)) - move_line = move.line_ids[4] + move_line = sorted(move.line_ids, + key=attrgetter('date_maturity'))[2] # common infos - self.assertEqual(move_line.date_maturity, "2011-03-02") - self.assertEqual(move_line.credit, 189.0) - self.assertEqual(move_line.name, "label b") + self.assertEqual(move_line.date_maturity, "2011-03-07") + self.assertEqual(move_line.credit, 118.4) + self.assertEqual(move_line.name, "label a")