From f7cbaca473ba2179d0d65409c78f435def6cf394 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Fri, 30 Jun 2023 12:46:13 +0000 Subject: [PATCH] [FIX] base, account: avoid messing up with implementation of Form Part-of: odoo/odoo#127400 --- addons/account/tests/test_account_payment.py | 4 +- .../tests/test_early_payment_discount.py | 4 +- odoo/addons/base/tests/test_res_users.py | 41 ++++++------------- 3 files changed, 17 insertions(+), 32 deletions(-) diff --git a/addons/account/tests/test_account_payment.py b/addons/account/tests/test_account_payment.py index 3b44fa87999..ea63e59b4a4 100644 --- a/addons/account/tests/test_account_payment.py +++ b/addons/account/tests/test_account_payment.py @@ -869,9 +869,9 @@ class TestAccountPayment(AccountTestInvoicingCommon): self.assertRegex(payment.name, r'BNK1/\d{4}/00001') with Form(AccountPayment.with_context(default_move_journal_types=('bank', 'cash'))) as payment_form: - self.assertEqual(payment_form._values['name'], '/') + self.assertEqual(payment_form.name, '/') payment_form.journal_id = self.company_data['default_journal_cash'] - self.assertRegex(payment_form._values['name'], r'CSH1/\d{4}/00001') + self.assertRegex(payment_form.name, r'CSH1/\d{4}/00001') payment_form.journal_id = self.company_data['default_journal_bank'] payment = payment_form.save() self.assertEqual(payment.name, '/') diff --git a/addons/account/tests/test_early_payment_discount.py b/addons/account/tests/test_early_payment_discount.py index 5f3a5fdad3e..c31a7ed5ca2 100644 --- a/addons/account/tests/test_early_payment_discount.py +++ b/addons/account/tests/test_early_payment_discount.py @@ -360,7 +360,7 @@ class TestAccountEarlyPaymentDiscount(AccountTestInvoicingCommon): line_form.quantity = 1 line_form.tax_ids.clear() line_form.tax_ids.add(tax) - self.assert_tax_totals(invoice._values['tax_totals'], { + self.assert_tax_totals(invoice.tax_totals, { 'amount_untaxed': 1000, 'amount_total': 1090, 'groups_by_subtotal': { @@ -545,7 +545,7 @@ class TestAccountEarlyPaymentDiscount(AccountTestInvoicingCommon): line_form.quantity = 1 line_form.tax_ids.clear() line_form.tax_ids.add(tax) - self.assert_tax_totals(invoice._values['tax_totals'], { + self.assert_tax_totals(invoice.tax_totals, { 'amount_untaxed': 100, 'amount_total': 120.58, 'groups_by_subtotal': { diff --git a/odoo/addons/base/tests/test_res_users.py b/odoo/addons/base/tests/test_res_users.py index ea3cc410c2b..e7b046db9b1 100644 --- a/odoo/addons/base/tests/test_res_users.py +++ b/odoo/addons/base/tests/test_res_users.py @@ -328,13 +328,13 @@ class TestUsers2(TransactionCase): user_form.login = "Test" self.assertFalse(user_form.share) - setattr(user_form, group_field_name, group_portal.id) + user_form[group_field_name] = group_portal.id self.assertTrue(user_form.share, 'The groups_id onchange should have been triggered') - setattr(user_form, group_field_name, group_user.id) + user_form[group_field_name] = group_user.id self.assertFalse(user_form.share, 'The groups_id onchange should have been triggered') - setattr(user_form, group_field_name, group_public.id) + user_form[group_field_name] = group_public.id self.assertTrue(user_form.share, 'The groups_id onchange should have been triggered') @@ -450,16 +450,13 @@ class TestUsersGroupWarning(TransactionCase): # 549 runbot enterprise with self.assertQueryCount(__system__=436), \ Form(self.test_group_user.with_context(show_user_group_warning=True), view='base.view_users_form') as UserForm: - UserForm._values[self.sales_categ_field] = False - UserForm._perform_onchange(self.sales_categ_field) - + UserForm[self.sales_categ_field] = False self.assertEqual( UserForm.user_group_warning, 'Since Test Group User is a/an "Field Service: Administrator", they will at least obtain the right "Sales: Administrator"' ) - UserForm._values[self.sales_categ_field] = self.group_sales_administrator.id - UserForm._perform_onchange(self.sales_categ_field) + UserForm[self.sales_categ_field] = self.group_sales_administrator.id self.assertFalse(UserForm.user_group_warning) def test_user_group_inheritance_warning(self): @@ -472,16 +469,13 @@ class TestUsersGroupWarning(TransactionCase): # 549 runbot enterprise with self.assertQueryCount(__system__=437), \ Form(self.test_group_user.with_context(show_user_group_warning=True), view='base.view_users_form') as UserForm: - UserForm._values[self.sales_categ_field] = self.group_sales_user.id - UserForm._perform_onchange(self.sales_categ_field) - + UserForm[self.sales_categ_field] = self.group_sales_user.id self.assertEqual( UserForm.user_group_warning, 'Since Test Group User is a/an "Field Service: Administrator", they will at least obtain the right "Sales: Administrator"' ) - UserForm._values[self.sales_categ_field] = self.group_sales_administrator.id - UserForm._perform_onchange(self.sales_categ_field) + UserForm[self.sales_categ_field] = self.group_sales_administrator.id self.assertFalse(UserForm.user_group_warning) def test_user_group_inheritance_warning_multi(self): @@ -496,18 +490,14 @@ class TestUsersGroupWarning(TransactionCase): # 553 runbot enterprise with self.assertQueryCount(__system__=438), \ Form(self.test_group_user.with_context(show_user_group_warning=True), view='base.view_users_form') as UserForm: - UserForm._values[self.sales_categ_field] = self.group_sales_user.id - UserForm._values[self.project_categ_field] = self.group_project_user.id - UserForm._perform_onchange(self.sales_categ_field) - + UserForm[self.sales_categ_field] = self.group_sales_user.id + UserForm[self.project_categ_field] = self.group_project_user.id self.assertTrue( UserForm.user_group_warning, 'Since Test Group User is a/an "Field Service: Administrator", they will at least obtain the right "Sales: Administrator", Project: Administrator"', ) - UserForm._values[self.sales_categ_field] = self.group_sales_administrator.id - UserForm._perform_onchange(self.sales_categ_field) - + UserForm[self.sales_categ_field] = self.group_sales_administrator.id self.assertEqual( UserForm.user_group_warning, 'Since Test Group User is a/an "Field Service: Administrator", they will at least obtain the right "Project: Administrator"' @@ -524,16 +514,13 @@ class TestUsersGroupWarning(TransactionCase): # 550 runbot enterprise with self.assertQueryCount(__system__=437), \ Form(self.test_group_user.with_context(show_user_group_warning=True), view='base.view_users_form') as UserForm: - UserForm._values[self.timesheets_categ_field] = self.group_timesheets_user_own_timesheet.id - UserForm._perform_onchange(self.timesheets_categ_field) - + UserForm[self.timesheets_categ_field] = self.group_timesheets_user_own_timesheet.id self.assertEqual( UserForm.user_group_warning, 'Since Test Group User is a/an "Project: Administrator", they will at least obtain the right "Timesheets: User: all timesheets"' ) - UserForm._values[self.timesheets_categ_field] = self.group_timesheets_user_all_timesheet.id - UserForm._perform_onchange(self.timesheets_categ_field) + UserForm[self.timesheets_categ_field] = self.group_timesheets_user_all_timesheet.id self.assertFalse(UserForm.user_group_warning) def test_user_group_parent_inheritance_no_warning(self): @@ -545,7 +532,5 @@ class TestUsersGroupWarning(TransactionCase): # 534 runbot enterprise with self.assertQueryCount(__system__=420), \ Form(self.test_group_user.with_context(show_user_group_warning=True), view='base.view_users_form') as UserForm: - UserForm._values[self.field_service_categ_field] = self.group_field_service_user.id - UserForm._perform_onchange(self.field_service_categ_field) - + UserForm[self.field_service_categ_field] = self.group_field_service_user.id self.assertFalse(UserForm.user_group_warning)