From 0cb0fec177ced93998af8cc231ed66c7427b2d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 10 Aug 2016 12:35:30 +0200 Subject: [PATCH] [MIG] hr_expense: migrate tests to new API --- addons/hr_expense/tests/test_expenses.py | 69 ++++++++++++++---------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/addons/hr_expense/tests/test_expenses.py b/addons/hr_expense/tests/test_expenses.py index 00362a8fb63..7695428319c 100644 --- a/addons/hr_expense/tests/test_expenses.py +++ b/addons/hr_expense/tests/test_expenses.py @@ -11,55 +11,68 @@ class TestCheckJournalEntry(TransactionCase): def setUp(self): super(TestCheckJournalEntry, self).setUp() - cr, uid = self.cr, self.uid - self.expense_obj = self.registry('hr.expense.sheet') - self.exp_line_obj = self.registry('hr.expense') - self.product_obj = self.registry('product.product') - self.tax_obj = self.registry('account.tax') - _, self.product_id = self.registry("ir.model.data").get_object_reference(cr, uid, "hr_expense", "air_ticket") - self.employee = self.registry("ir.model.data").xmlid_to_object(cr, uid, "hr.employee_mit") - self.tax_id = self.tax_obj.create(cr, uid, { + + self.tax = self.env['account.tax'].create({ 'name': 'Expense 10%', 'amount': 10, 'amount_type': 'percent', 'type_tax_use': 'purchase', 'price_include': True, }) - self.product_obj.write(cr, uid, self.product_id, {'supplier_taxes_id': [(6, 0, [self.tax_id])]}) + self.product = self.env.ref('hr_expense.air_ticket') + self.product.write({'supplier_taxes_id': [(6, 0, [self.tax.id])]}) + + self.employee = self.env.ref('hr.employee_mit') + # Create payable account for the expense - user_type_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'account', 'data_account_type_payable')[1] - account_payable_id = self.registry('account.account').create(cr, uid, {'code': 'X1111', 'name': 'HR Expense - Test Payable Account', 'user_type_id': user_type_id, 'reconcile': True}) - self.employee.address_home_id.property_account_payable_id = account_payable_id + user_type = self.env.ref('account.data_account_type_payable') + account_payable = self.env['account.account'].create({ + 'code': 'X1111', + 'name': 'HR Expense - Test Payable Account', + 'user_type_id': user_type.id, + 'reconcile': True + }) + self.employee.address_home_id.property_account_payable_id = account_payable.id + # Create expenses account for the expense - user_type_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'account', 'data_account_type_expenses')[1] - account_expense_id = self.registry('account.account').create(cr, uid, {'code': 'X2120', 'name': 'HR Expense - Test Purchase Account', 'user_type_id': user_type_id}) + user_type = self.env.ref('account.data_account_type_expenses') + account_expense = self.env['account.account'].create({ + 'code': 'X2120', + 'name': 'HR Expense - Test Purchase Account', + 'user_type_id': user_type.id + }) # Assign it to the air ticket product - self.registry('product.product').write(cr, uid, self.product_id, {'property_account_expense_id': account_expense_id}) + self.product.write({'property_account_expense_id': account_expense.id}) + # Create Sale Journal - company_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'main_company')[1] - self.registry('account.journal').create(cr, uid, {'name': 'Purchase Journal - Test', 'code': 'HRTPJ', 'type': 'purchase', 'company_id': company_id}) - self.expense_id = self.expense_obj.create(cr, uid, { + company = self.env.ref('base.main_company') + self.env['account.journal'].create({ + 'name': 'Purchase Journal - Test', + 'code': 'HRTPJ', + 'type': 'purchase', + 'company_id': company.id + }) + + self.expense = self.env['hr.expense.sheet'].create({ 'name': 'Expense for John Smith', 'employee_id': self.employee.id, }) - self.expense_line = self.exp_line_obj.create(cr, uid, { + self.expense_line = self.env['hr.expense'].create({ 'name': 'Car Travel Expenses', 'employee_id': self.employee.id, - 'product_id': self.product_id, + 'product_id': self.product.id, 'unit_amount': 700.00, - 'tax_ids': [(6, 0, [self.tax_id])], - 'sheet_id': self.expense_id, + 'tax_ids': [(6, 0, [self.tax.id])], + 'sheet_id': self.expense.id, }) def test_journal_entry(self): - cr, uid = self.cr, self.uid - self.expense = self.expense_obj.browse(cr, uid, self.expense_id) - #Submitted to Manager + # Submitted to Manager self.assertEquals(self.expense.state, 'submit', 'Expense is not in Reported state') - #Approve + # Approve self.expense.approve_expense_sheets() self.assertEquals(self.expense.state, 'approve', 'Expense is not in Approved state') - #Create Expense Entries + # Create Expense Entries self.expense.action_sheet_move_create() self.assertEquals(self.expense.state, 'post', 'Expense is not in Waiting Payment state') self.assertTrue(self.expense.account_move_id.id, 'Expense Journal Entry is not created') @@ -70,7 +83,7 @@ class TestCheckJournalEntry(TransactionCase): if line.credit: self.assertAlmostEquals(line.credit, 700.00) else: - if not line.tax_line_id.id == self.tax_id: + if not line.tax_line_id == self.tax: self.assertAlmostEquals(line.debit, 636.36) else: self.assertAlmostEquals(line.debit, 63.64)