From 410c8c47b32def08ce420587d0b801a433c9caec Mon Sep 17 00:00:00 2001 From: "Laurent Mignon (aka lmi)" Date: Wed, 6 Aug 2014 16:17:36 +0200 Subject: [PATCH] [FIX] conflicts incorrectly resolved when merging upstream/7.0 --- .../tests/test_base_completion.py | 98 ++++++++++++------- .../tests/test_regex_account_completion.py | 59 ++++++----- 2 files changed, 95 insertions(+), 62 deletions(-) diff --git a/account_statement_base_completion/tests/test_base_completion.py b/account_statement_base_completion/tests/test_base_completion.py index 19319567..40dbf6ef 100644 --- a/account_statement_base_completion/tests/test_base_completion.py +++ b/account_statement_base_completion/tests/test_base_completion.py @@ -23,22 +23,28 @@ from openerp.tests import common import time from collections import namedtuple -name_completion_case = namedtuple("name_completion_case", ["partner_name", "line_label", "should_match"]) +name_completion_case = namedtuple( + "name_completion_case", ["partner_name", "line_label", "should_match"]) NAMES_COMPLETION_CASES = [ - name_completion_case("Acsone", "Line for Acsone SA", True), - name_completion_case("Acsone", "Line for Acsone", True), - name_completion_case("Acsone", "Acsone for line", True), - name_completion_case("acsone", "Acsone for line", True), - name_completion_case("Acsone SA", "Line for Acsone SA test", True), - name_completion_case("Ac..ne", "Acsone for line", False), - name_completion_case("é@|r{}", "Acsone é@|r{} for line", True), - name_completion_case("Acsone", "A..one for line", False), - name_completion_case("A.one SA", "A.one SA for line", True), - name_completion_case("Acsone SA", "Line for Acsone ([^a-zA-Z0-9 -]) SA test", False), - name_completion_case("Acsone ([^a-zA-Z0-9 -]) SA", "Line for Acsone ([^a-zA-Z0-9 -]) SA test", True), - name_completion_case(r"Acsone (.^$*+?()[{\| -]\) SA", r"Line for Acsone (.^$*+?()[{\| -]\) SA test", True), - name_completion_case("Acšone SA", "Line for Acšone SA test", True), - ] + name_completion_case("Acsone", "Line for Acsone SA", True), + name_completion_case("Acsone", "Line for Acsone", True), + name_completion_case("Acsone", "Acsone for line", True), + name_completion_case("acsone", "Acsone for line", True), + name_completion_case("Acsone SA", "Line for Acsone SA test", True), + name_completion_case("Ac..ne", "Acsone for line", False), + name_completion_case("é@|r{}", "Acsone é@|r{} for line", True), + name_completion_case("Acsone", "A..one for line", False), + name_completion_case("A.one SA", "A.one SA for line", True), + name_completion_case( + "Acsone SA", "Line for Acsone ([^a-zA-Z0-9 -]) SA test", False), + name_completion_case( + "Acsone ([^a-zA-Z0-9 -]) SA", "Line for Acsone ([^a-zA-Z0-9 -]) SA " + "test", True), + name_completion_case( + r"Acsone (.^$*+?()[{\| -]\) SA", r"Line for Acsone (.^$*+?()[{\| -]\) " + r"SA test", True), + name_completion_case("Acšone SA", "Line for Acšone SA test", True), +] class base_completion(common.TransactionCase): @@ -48,8 +54,10 @@ class base_completion(common.TransactionCase): self.company_a = self.browse_ref('base.main_company') self.profile_obj = self.registry("account.statement.profile") self.partner_obj = self.registry("res.partner") - self.account_bank_statement_obj = self.registry("account.bank.statement") - self.acc_bk_stmt_line_obj = self.registry("account.bank.statement.line") + self.account_bank_statement_obj = self.registry( + "account.bank.statement") + self.account_bank_statement_line_obj = self.registry( + "account.bank.statement.line") self.journal_id = self.ref("account.bank_journal") self.partner_id = self.ref('base.main_partner') self.account_id = self.ref("account.a_recv") @@ -57,10 +65,12 @@ class base_completion(common.TransactionCase): def test_name_completion(self): """Test complete partner_id from statement line label - Test the automatic completion of the partner_id based if the name of the partner appears in - the statement line label + Test the automatic completion of the partner_id based if the name of the + partner appears in the statement line label """ - self.completion_rule_id = self.ref('account_statement_base_completion.bank_statement_completion_rule_3') + self.completion_rule_id = self.ref( + 'account_statement_base_completion.' + 'bank_statement_completion_rule_3') # Create the profile self.profile_id = self.profile_obj.create(self.cr, self.uid, { "name": "TEST", @@ -68,30 +78,44 @@ class base_completion(common.TransactionCase): "journal_id": self.journal_id, "rule_ids": [(6, 0, [self.completion_rule_id])]}) # Create a bank statement - self.statement_id = self.account_bank_statement_obj.create(self.cr, self.uid, { - "balance_end_real": 0.0, - "balance_start": 0.0, - "date": time.strftime('%Y-%m-%d'), - "journal_id": self.journal_id, - "profile_id": self.profile_id - }) + self.statement_id = self.account_bank_statement_obj.create( + self.cr, self.uid, { + "balance_end_real": 0.0, + "balance_start": 0.0, + "date": time.strftime('%Y-%m-%d'), + "journal_id": self.journal_id, + "profile_id": self.profile_id + }) for case in NAMES_COMPLETION_CASES: - self.partner_obj.write(self.cr, self.uid, self.partner_id, {'name': case.partner_name}) - statement_line_id = self.acc_bk_stmt_line_obj.create(self.cr, self.uid, { + self.partner_obj.write( + self.cr, self.uid, self.partner_id, {'name': case.partner_name}) + statement_line_id = self.account_bank_statement_line_obj.create( + self.cr, self.uid, { 'amount': 1000.0, 'name': case.line_label, 'ref': 'My ref', 'statement_id': self.statement_id, }) - statement_line = self.acc_bk_stmt_line_obj.browse(self.cr, self.uid, statement_line_id) - self.assertFalse(statement_line.partner_id, "Partner_id must be blank before completion") - statement_obj = self.account_bank_statement_obj.browse(self.cr, self.uid, self.statement_id) + statement_line = self.account_bank_statement_line_obj.browse( + self.cr, self.uid, statement_line_id) + self.assertFalse( + statement_line.partner_id, + "Partner_id must be blank before completion") + statement_obj = self.account_bank_statement_obj.browse( + self.cr, self.uid, self.statement_id) statement_obj.button_auto_completion() - statement_line = self.acc_bk_stmt_line_obj.browse(self.cr, self.uid, statement_line_id) + statement_line = self.account_bank_statement_line_obj.browse( + self.cr, self.uid, statement_line_id) if case.should_match: - self.assertEquals(self.partner_id, statement_line.partner_id['id'], - "Missing expected partner id after completion (partner_name: %s, line_name: %s)" % (case.partner_name, case.line_label)) + self.assertEquals( + self.partner_id, statement_line.partner_id['id'], + "Missing expected partner id after completion " + "(partner_name: %s, line_name: %s)" % + (case.partner_name, case.line_label)) else: - self.assertNotEquals(self.partner_id, statement_line.partner_id['id'], - "Partner id should be empty after completion(partner_name: %s, line_name: %s)" % (case.partner_name, case.line_label)) + self.assertNotEquals( + self.partner_id, statement_line.partner_id['id'], + "Partner id should be empty after completion(partner_name: " + "%s, line_name: %s)" % (case.partner_name, case.line_label)) + diff --git a/account_statement_regex_account_completion/tests/test_regex_account_completion.py b/account_statement_regex_account_completion/tests/test_regex_account_completion.py index cfe66848..ea3af52c 100644 --- a/account_statement_regex_account_completion/tests/test_regex_account_completion.py +++ b/account_statement_regex_account_completion/tests/test_regex_account_completion.py @@ -36,34 +36,38 @@ ACC_NUMBER = "BE38733040385372" class test_regex_account_completion(common.TransactionCase): def prepare(self): - self.account_bank_statement_obj = self.registry("account.bank.statement") - self.acc_bk_stmt_line_obj = self.registry("account.bank.statement.line") + self.st_obj = self.registry( + "account.bank.statement") + self.st_line_obj = self.registry( + "account.bank.statement.line") self.account_id = self.ref('account.a_expense') # create the completion rule rule_vals = {'function_to_call': 'set_account', 'regex': '^My statement', 'account_id': self.account_id} - completion_rule_id = self.registry("account.statement.completion.rule").create(self.cr, self.uid, rule_vals) - + completion_rule_id = self.registry( + "account.statement.completion.rule").create( + self.cr, self.uid, rule_vals) # Create the profile journal_id = self.ref("account.bank_journal") - profile_id = self.registry("account.statement.profile").create(self.cr, self.uid, { - "name": "TEST", - "commission_account_id": self.ref("account.a_recv"), - "journal_id": journal_id, - "rule_ids": [(6, 0, [completion_rule_id])]}) - + profile_id = self.registry("account.statement.profile").create( + self.cr, self.uid, { + "name": "TEST", + "commission_account_id": self.ref("account.a_recv"), + "journal_id": journal_id, + "rule_ids": [(6, 0, [completion_rule_id])] + }) # Create a bank statement - self.statement_id = self.account_bank_statement_obj.create(self.cr, self.uid, { - "balance_end_real": 0.0, - "balance_start": 0.0, - "date": time.strftime('%Y-%m-%d'), - "journal_id": journal_id, - "profile_id": profile_id - }) - + self.statement_id = self.st_obj.create( + self.cr, self.uid, { + "balance_end_real": 0.0, + "balance_start": 0.0, + "date": time.strftime('%Y-%m-%d'), + "journal_id": journal_id, + "profile_id": profile_id + }) # Create two bank statement lines - self.statement_line1_id = self.acc_bk_stmt_line_obj.create(self.cr, self.uid, { + self.statement_line1_id = self.st_line_obj.create(self.cr, self.uid, { 'amount': 1000.0, 'name': 'My statement', 'ref': 'My ref', @@ -71,7 +75,7 @@ class test_regex_account_completion(common.TransactionCase): 'partner_acc_number': ACC_NUMBER }) - self.statement_line2_id = self.acc_bk_stmt_line_obj.create(self.cr, self.uid, { + self.statement_line2_id = self.st_line_obj.create(self.cr, self.uid, { 'amount': 2000.0, 'name': 'My second statement', 'ref': 'My second ref', @@ -83,9 +87,14 @@ class test_regex_account_completion(common.TransactionCase): """Test the automatic completion on account """ self.prepare() - statement_obj = self.account_bank_statement_obj.browse(self.cr, self.uid, self.statement_id) + statement_obj = self.st_obj.browse(self.cr, self.uid, self.statement_id) statement_obj.button_auto_completion() - statement_line1 = self.acc_bk_stmt_line_obj.browse(self.cr, self.uid, self.statement_line1_id) - self.assertEquals(self.account_id, statement_line1.account_id.id, "The account should be the account of the completion") - statement_line2 = self.acc_bk_stmt_line_obj.browse(self.cr, self.uid, self.statement_line2_id) - self.assertNotEqual(self.account_id, statement_line2.account_id.id, "The account should be not the account of the completion") + statement_line1 = self.st_line_obj.browse( + self.cr, self.uid, self.statement_line1_id) + self.assertEquals(self.account_id, statement_line1.account_id.id, + "The account should be the account of the completion") + statement_line2 = self.st_line_obj.browse( + self.cr, self.uid, self.statement_line2_id) + self.assertNotEqual(self.account_id, statement_line2.account_id.id, + "The account should be not the account of the " + "completion")