From 61e1c5ad75c2a13947cb7ac8de93d3baa5a3a3f3 Mon Sep 17 00:00:00 2001 From: Andrea Date: Thu, 17 Jan 2019 10:37:09 +0100 Subject: [PATCH] Better tests --- .../tests/test_account_invoice_spread.py | 42 ++++----- .../tests/test_account_spread_cost_revenue.py | 90 ++++++++----------- 2 files changed, 51 insertions(+), 81 deletions(-) diff --git a/account_spread_cost_revenue/tests/test_account_invoice_spread.py b/account_spread_cost_revenue/tests/test_account_invoice_spread.py index 9f2d46c9..74864d8a 100644 --- a/account_spread_cost_revenue/tests/test_account_invoice_spread.py +++ b/account_spread_cost_revenue/tests/test_account_invoice_spread.py @@ -24,6 +24,7 @@ class TestAccountInvoiceSpread(common.TransactionCase): type_receivable = self.env.ref('account.data_account_type_receivable') type_payable = self.env.ref('account.data_account_type_payable') + type_revenue = self.env.ref('account.data_account_type_revenue') self.invoice_account = self.env['account.account'].create({ 'name': 'test_account_receivable', @@ -32,13 +33,22 @@ class TestAccountInvoiceSpread(common.TransactionCase): 'reconcile': True }) - self.invoice_line_account = self.env['account.account'].create({ + self.account_payable = self.env['account.account'].create({ 'name': 'test_account_payable', 'code': '321', 'user_type_id': type_payable.id, 'reconcile': True }) + self.account_revenue = self.env['account.account'].create({ + 'name': 'test_account_revenue', + 'code': '864', + 'user_type_id': type_revenue.id, + 'reconcile': True + }) + + self.invoice_line_account = self.account_payable + self.spread_account = self.env['account.account'].create({ 'name': 'test spread account_payable', 'code': '765', @@ -142,16 +152,8 @@ class TestAccountInvoiceSpread(common.TransactionCase): my_company = self.env.user.company_id Wizard = self.env['account.spread.invoice.line.link.wizard'] - account_revenue = self.env['account.account'].search([( - 'user_type_id', - '=', - self.env.ref('account.data_account_type_revenue').id)], - limit=1) - account_payable = self.env['account.account'].search([( - 'user_type_id', - '=', - self.env.ref('account.data_account_type_payable').id)], - limit=1) + account_revenue = self.account_revenue + account_payable = self.account_payable exp_journal = self.ref('account_spread_cost_revenue.expenses_journal') sales_journal = self.ref('account_spread_cost_revenue.sales_journal') my_company.default_spread_revenue_account_id = account_revenue @@ -222,11 +224,7 @@ class TestAccountInvoiceSpread(common.TransactionCase): ).create({}) self.assertEqual(wizard1.spread_action_type, 'link') - wizard1.spread_account_id = self.env['account.account'].search([( - 'user_type_id', - '=', - self.env.ref('account.data_account_type_revenue').id)], - limit=1) + wizard1.spread_account_id = self.account_revenue wizard1.spread_journal_id = self.ref( 'account_spread_cost_revenue.expenses_journal') wizard1.spread_id = self.spread @@ -267,11 +265,7 @@ class TestAccountInvoiceSpread(common.TransactionCase): my_company = self.env.user.company_id Wizard = self.env['account.spread.invoice.line.link.wizard'] - spread_account = self.env['account.account'].search([( - 'user_type_id', - '=', - self.env.ref('account.data_account_type_revenue').id)], - limit=1) + spread_account = self.account_revenue spread_journal_id = self.ref( 'account_spread_cost_revenue.expenses_journal') @@ -347,11 +341,7 @@ class TestAccountInvoiceSpread(common.TransactionCase): my_company = self.env.user.company_id Wizard = self.env['account.spread.invoice.line.link.wizard'] - spread_account = self.env['account.account'].search([( - 'user_type_id', - '=', - self.env.ref('account.data_account_type_payable').id)], - limit=1) + spread_account = self.account_payable self.assertTrue(spread_account) spread_journal_id = self.ref( 'account_spread_cost_revenue.expenses_journal') diff --git a/account_spread_cost_revenue/tests/test_account_spread_cost_revenue.py b/account_spread_cost_revenue/tests/test_account_spread_cost_revenue.py index b0e1def1..502f3847 100644 --- a/account_spread_cost_revenue/tests/test_account_spread_cost_revenue.py +++ b/account_spread_cost_revenue/tests/test_account_spread_cost_revenue.py @@ -26,20 +26,38 @@ class TestAccountSpreadCostRevenue(common.TransactionCase): type_receivable = self.env.ref('account.data_account_type_receivable') type_expenses = self.env.ref('account.data_account_type_expenses') + type_payable = self.env.ref('account.data_account_type_payable') + type_revenue = self.env.ref('account.data_account_type_revenue') - self.credit_account = self.env['account.account'].create({ + self.account_receivable = self.env['account.account'].create({ 'name': 'test_account_receivable', 'code': '123', 'user_type_id': type_receivable.id, 'reconcile': True }) + self.credit_account = self.account_receivable - self.debit_account = self.env['account.account'].create({ + self.account_expenses = self.env['account.account'].create({ 'name': 'test account_expenses', 'code': '765', 'user_type_id': type_expenses.id, 'reconcile': True }) + self.debit_account = self.account_expenses + + self.account_payable = self.env['account.account'].create({ + 'name': 'test_account_payable', + 'code': '321', + 'user_type_id': type_payable.id, + 'reconcile': True + }) + + self.account_revenue = self.env['account.account'].create({ + 'name': 'test_account_revenue', + 'code': '864', + 'user_type_id': type_revenue.id, + 'reconcile': True + }) def test_01_account_spread_defaults(self): this_year = datetime.date.today().year @@ -100,20 +118,11 @@ class TestAccountSpreadCostRevenue(common.TransactionCase): def test_05_config_settings(self): my_company = self.env.user.company_id - account_revenue = self.env['account.account'].search([( - 'user_type_id', - '=', - self.env.ref('account.data_account_type_revenue').id)], - limit=1) - account_payable = self.env['account.account'].search([( - 'user_type_id', - '=', - self.env.ref('account.data_account_type_payable').id)], - limit=1) + account_revenue = self.account_revenue exp_journal = self.ref('account_spread_cost_revenue.expenses_journal') sales_journal = self.ref('account_spread_cost_revenue.sales_journal') my_company.default_spread_revenue_account_id = account_revenue - my_company.default_spread_expense_account_id = account_payable + my_company.default_spread_expense_account_id = self.account_payable my_company.default_spread_revenue_journal_id = sales_journal my_company.default_spread_expense_journal_id = exp_journal @@ -153,22 +162,16 @@ class TestAccountSpreadCostRevenue(common.TransactionCase): spread.invoice_type = 'in_invoice' spread.onchange_invoice_type() - self.assertEqual(spread.credit_account_id, account_payable) + self.assertEqual(spread.credit_account_id, self.account_payable) self.assertEqual(spread.journal_id.id, exp_journal) self.assertEqual(spread.spread_type, 'purchase') def test_06_invoice_line_compute_spread_check(self): - invoice_account = self.env['account.account'].search([ - ('user_type_id', '=', self.env.ref( - 'account.data_account_type_receivable').id) - ], limit=1).id - invoice_line_account = self.env['account.account'].search([ - ('user_type_id', '=', self.env.ref( - 'account.data_account_type_expenses').id) - ], limit=1).id + invoice_account = self.account_receivable + invoice_line_account = self.account_expenses invoice = self.env['account.invoice'].create({ 'partner_id': self.env.ref('base.res_partner_2').id, - 'account_id': invoice_account, + 'account_id': invoice_account.id, 'type': 'in_invoice', }) invoice_line = self.env['account.invoice.line'].create({ @@ -177,7 +180,7 @@ class TestAccountSpreadCostRevenue(common.TransactionCase): 'price_unit': 100.0, 'invoice_id': invoice.id, 'name': 'product that cost 100', - 'account_id': invoice_line_account, + 'account_id': invoice_line_account.id, }) invoice_line2 = invoice_line.copy() @@ -203,16 +206,8 @@ class TestAccountSpreadCostRevenue(common.TransactionCase): self.assertEqual(invoice_line2.spread_check, 'unavailable') def test_07_create_spread_template(self): - account_revenue = self.env['account.account'].search([( - 'user_type_id', - '=', - self.env.ref('account.data_account_type_revenue').id)], - limit=1) - account_payable = self.env['account.account'].search([( - 'user_type_id', - '=', - self.env.ref('account.data_account_type_payable').id)], - limit=1) + account_revenue = self.account_revenue + account_payable = self.account_payable spread_template = self.env['account.spread.template'].create({ 'name': 'test', 'spread_type': 'sale', @@ -261,16 +256,7 @@ class TestAccountSpreadCostRevenue(common.TransactionCase): self.assertTrue(spread_vals['debit_account_id']) def test_08_check_template_invoice_type(self): - account_revenue = self.env['account.account'].search([( - 'user_type_id', - '=', - self.env.ref('account.data_account_type_revenue').id)], - limit=1) - account_payable = self.env['account.account'].search([( - 'user_type_id', - '=', - self.env.ref('account.data_account_type_payable').id)], - limit=1) + account_revenue = self.account_revenue template_sale = self.env['account.spread.template'].create({ 'name': 'test', 'spread_type': 'sale', @@ -279,7 +265,7 @@ class TestAccountSpreadCostRevenue(common.TransactionCase): template_purchase = self.env['account.spread.template'].create({ 'name': 'test', 'spread_type': 'purchase', - 'spread_account_id': account_payable.id, + 'spread_account_id': self.account_payable.id, }) spread = self.env['account.spread'].create({ 'name': 'test', @@ -326,17 +312,11 @@ class TestAccountSpreadCostRevenue(common.TransactionCase): self.assertEqual(spread.invoice_type, 'in_invoice') def test_09_wrong_invoice_type(self): - invoice_account = self.env['account.account'].search([ - ('user_type_id', '=', self.env.ref( - 'account.data_account_type_receivable').id) - ], limit=1).id - invoice_line_account = self.env['account.account'].search([ - ('user_type_id', '=', self.env.ref( - 'account.data_account_type_expenses').id) - ], limit=1).id + invoice_account = self.account_receivable + invoice_line_account = self.account_expenses invoice = self.env['account.invoice'].create({ 'partner_id': self.env.ref('base.res_partner_2').id, - 'account_id': invoice_account, + 'account_id': invoice_account.id, 'type': 'in_invoice', }) invoice_line = self.env['account.invoice.line'].create({ @@ -345,7 +325,7 @@ class TestAccountSpreadCostRevenue(common.TransactionCase): 'price_unit': 100.0, 'invoice_id': invoice.id, 'name': 'product that cost 100', - 'account_id': invoice_line_account, + 'account_id': invoice_line_account.id, }) spread = self.env['account.spread'].create({ 'name': 'test',