From b913ad45d8d10a0fa6f0bcdc874317ca069d6bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 29 Dec 2023 19:02:08 +0100 Subject: [PATCH] Add assert methods to test tools Closes #12879 --- .../tests/scenario_account_reconcile.rst | 5 +- .../tests/scenario_account_reconciliation.rst | 18 ++-- ...ount_reconciliation_alternate_currency.rst | 7 +- .../account/tests/scenario_move_cancel.rst | 16 +-- .../tests/scenario_move_line_delegate.rst | 5 +- .../tests/scenario_move_line_group.rst | 8 +- .../tests/scenario_move_line_reschedule.rst | 32 +++--- .../account/tests/scenario_move_template.rst | 19 ++-- .../tests/scenario_renew_fiscalyear.rst | 5 +- .../tests/scenario_account_asset.rst | 32 +++--- .../tests/scenario_purchase_asset.rst | 8 +- .../tests/scenario_invoice.rst | 8 +- .../tests/scenario_account_dunning.rst | 42 +++----- .../tests/scenario_account_dunning_email.rst | 8 +- .../account_es/tests/scenario_reporting.rst | 17 ++-- .../scenario_reporting_alternate_currency.rst | 11 +-- .../tests/scenario_reporting_compensate.rst | 5 +- .../scenario_reporting_surcharge_tax.rst | 11 +-- modules/account_fr/tests/scenario_fec.rst | 8 +- .../tests/scenario_invoice.rst | 24 ++--- ..._invoice_alternate_currency_lower_rate.rst | 5 +- ...invoice_alternate_currency_rate_change.rst | 5 +- .../scenario_invoice_alternative_payee.rst | 5 +- .../tests/scenario_renew_fiscalyear.rst | 10 +- .../tests/scenario_account_invoice_defer.rst | 11 +-- .../tests/scenario_account_payment.rst | 29 ++---- .../scenario_account_payment_direct_debit.rst | 14 +-- .../scenario_account_payment_dunning.rst | 8 +- .../scenario_account_payment_planning.rst | 8 +- .../scenario_account_payment_braintree.rst | 15 ++- .../scenario_account_payment_clearing.rst | 23 ++--- ...nario_account_payment_stripe_identical.rst | 8 +- .../tests/scenario_account_rule.rst | 11 +-- .../tests/scenario_account_statement.rst | 17 ++-- .../tests/scenario_statement_origin.rst | 11 +-- .../scenario_statement_origin_invoices.rst | 14 +-- .../scenario_account_statement_aeb43.rst | 5 +- .../scenario_account_statement_mt940.rst | 5 +- .../tests/scenario_account_statement_ofx.rst | 5 +- .../tests/scenario_account_statement_rule.rst | 8 +- ...nt_statement_rule_keyword_bank_account.rst | 11 +-- ...enario_account_statement_rule_keywords.rst | 8 +- .../tests/scenario_account_statement_sepa.rst | 5 +- .../scenario_account_stock_eu_arrival.rst | 11 +-- .../scenario_account_stock_eu_dispatch.rst | 11 +-- .../tests/scenario_analytic_account.rst | 14 +-- .../tests/scenario_analytic_budget.rst | 8 +- .../tests/scenario_analytic_invoice.rst | 5 +- .../tests/scenario_analytic_invoice_defer.rst | 11 +-- .../tests/scenario_analytic_purchase.rst | 8 +- .../tests/scenario_analytic_sale.rst | 8 +- .../attendance/tests/scenario_attendance.rst | 12 +-- .../tests/scenario_attendance_timesheet.rst | 7 +- .../tests/scenario_carrier_carriage.rst | 8 +- ...percentage_with_purchase_shipment_cost.rst | 23 ++--- .../tests/scenario_carrier_subdivision.rst | 8 +- ...enario_carrier_subdivision_postal_code.rst | 8 +- .../tests/scenario_carrier_weight.rst | 23 ++--- .../tests/scenario_agent_selection.rst | 11 +-- .../commission/tests/scenario_commission.rst | 18 ++-- .../tests/scenario_document_incoming.rst | 5 +- .../scenario_document_incoming_invoice.rst | 5 +- ...scenario_document_incoming_ocr_typless.rst | 11 +-- modules/incoterm/tests/scenario_incoterm.rst | 8 +- .../tests/scenario_marketing_automation.rst | 27 ++--- ...io_marketing_automation_unsubscribable.rst | 8 +- .../scenario_marketing_campaign_sale.rst | 5 +- modules/party/tests/scenario_party_erase.rst | 8 +- .../party/tests/scenario_party_replace.rst | 18 ++-- .../tests/scenario_product_cost_history.rst | 7 +- .../tests/scenario_product_kit_purchase.rst | 5 +- .../tests/scenario_product_kit_sale.rst | 5 +- .../production/tests/scenario_production.rst | 23 ++--- .../tests/scenario_production_outsourcing.rst | 11 +-- .../scenario_stock_supply_production.rst | 5 +- .../tests/scenario_production_work.rst | 23 ++--- .../project/tests/scenario_project_status.rst | 11 +-- modules/purchase/tests/scenario_purchase.rst | 36 +++---- ...enario_purchase_copy_product_suppliers.rst | 5 +- .../tests/scenario_purchase_default_taxes.rst | 8 +- .../tests/scenario_purchase_modify_header.rst | 5 +- .../tests/scenario_purchase_reporting.rst | 34 +++---- .../tests/scenario_purchase_return_wizard.rst | 5 +- .../tests/scenario_purchase_amendment.rst | 20 ++-- .../scenario_purchase_blanket_agreement.rst | 5 +- .../scenario_purchase_product_quantity.rst | 8 +- .../tests/scenario_purchase_request.rst | 11 +-- .../scenario_purchase_request_quotation.rst | 8 +- .../tests/scenario_purchase_requisition.rst | 20 ++-- ...chase_blanket_agreement_secondary_unit.rst | 14 +-- ...io_purchase_requisition_secondary_unit.rst | 5 +- .../scenario_purchase_secondary_unit.rst | 8 +- .../tests/scenario_purchase_shipment_cost.rst | 5 +- ...chase_shipment_cost_with_account_stock.rst | 5 +- ...nt_cost_with_account_stock_anglo_saxon.rst | 5 +- modules/sale/tests/scenario_sale.rst | 45 +++------ .../tests/scenario_sale_default_taxes.rst | 8 +- .../tests/scenario_sale_modify_header.rst | 5 +- .../sale/tests/scenario_sale_reporting.rst | 98 ++++++++----------- .../tests/scenario_advance_payment.rst | 29 ++---- .../tests/scenario_sale_amendment.rst | 20 ++-- .../tests/scenario_sale_blanket_agreement.rst | 5 +- .../tests/scenario_sale_gift_card.rst | 14 +-- .../tests/scenario_sale_gift_card_goods.rst | 5 +- .../tests/scenario_sale_point_gift_card.rst | 8 +- .../tests/scenario_sale_invoice_date.rst | 8 +- .../tests/scenario_sale_opportunity.rst | 8 +- .../sale_point/tests/scenario_sale_point.rst | 14 +-- .../tests/scenario_sale_point_return.rst | 11 +-- .../tests/scenario_sale_price_list.rst | 8 +- .../scenario_sale_copy_product_customer.rst | 5 +- ..._sale_blanket_agreement_secondary_unit.rst | 14 +-- .../tests/scenario_sale_secondary_unit.rst | 11 +-- .../tests/scenario_sale_shipment_cost.rst | 25 ++--- ...enario_sale_shipment_cost_modify_price.rst | 11 +-- .../tests/scenario_sale_subscription.rst | 5 +- .../scenario_sale_subscription_asset.rst | 5 +- .../scenario_sale_supply_drop_shipment.rst | 8 +- .../tests/scenario_sale_supply_production.rst | 11 +-- .../stock/tests/scenario_stock_inventory.rst | 14 +-- ...cenario_stock_inventory_empty_quantity.rst | 8 +- ..._stock_product_quantities_by_warehouse.rst | 17 ++-- ...rio_stock_recompute_average_cost_price.rst | 9 +- .../tests/scenario_stock_reporting_margin.rst | 38 ++++--- .../scenario_stock_shipment_in_return.rst | 5 +- .../scenario_stock_shipment_internal.rst | 11 +-- ...enario_stock_shipment_internal_transit.rst | 29 ++---- .../tests/scenario_stock_shipment_out.rst | 42 +++----- .../tests/scenario_stock_assign_manual.rst | 10 +- .../tests/scenario_stock_consignment.rst | 26 ++--- ...io_stock_consignment_supplier_customer.rst | 20 ++-- .../tests/scenario_stock_inventories.rst | 5 +- .../tests/scenario_stock_location_move.rst | 17 ++-- .../tests/scenario_stock_lot_move_add.rst | 11 +-- .../tests/scenario_stock_lot_number.rst | 5 +- .../tests/scenario_stock_lot_shipment_in.rst | 5 +- .../tests/scenario_stock_lot_shipment_out.rst | 14 +-- ...enario_stock_lot_shipment_out_internal.rst | 17 ++-- .../tests/scenario_stock_lot_unit.rst | 5 +- .../scenario_stock_lot_unit_move_add.rst | 5 +- .../tests/scenario_shipping_ups.rst | 5 +- .../tests/scenario_product_copy_locations.rst | 5 +- .../tests/scenario_stock_product_location.rst | 8 +- ...ario_stock_product_location_consumable.rst | 5 +- ...ario_stock_product_location_production.rst | 20 ++-- ...enario_stock_product_location_template.rst | 8 +- ...scenario_stock_quantity_early_planning.rst | 20 ++-- ...stock_quantity_early_planning_incoming.rst | 11 +-- .../tests/scenario_stock_quantity_issue.rst | 5 +- .../tests/scenario_stock_split_shipment.rst | 8 +- ...enario_stock_internal_supply_lead_time.rst | 20 ++-- ...cenario_stock_internal_supply_overflow.rst | 20 ++-- ...scenario_stock_supply_purchase_request.rst | 11 +-- .../tests/scenario_stock_supply_forecast.rst | 5 +- .../scenario_stock_supply_production.rst | 17 ++-- .../user_role/tests/scenario_user_role.rst | 5 +- .../tests/scenario_web_shop_shopify.rst | 8 +- ...enario_web_shop_shopify_secondary_unit.rst | 8 +- trytond/CHANGELOG | 1 + trytond/doc/ref/tests.rst | 3 + trytond/trytond/tests/tools.py | 10 ++ 161 files changed, 773 insertions(+), 1240 deletions(-) diff --git a/modules/account/tests/scenario_account_reconcile.rst b/modules/account/tests/scenario_account_reconcile.rst index 33427ed071..26c3b82a5c 100644 --- a/modules/account/tests/scenario_account_reconcile.rst +++ b/modules/account/tests/scenario_account_reconcile.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -116,8 +116,7 @@ Run Reconcile wizard:: >>> reconcile = Wizard('account.reconcile') >>> reconcile.execute('next_') - >>> reconcile.form.party == (customer if party_required else None) - True + >>> assertEqual(reconcile.form.party, (customer if party_required else None)) >>> reconcile.form.write_off_amount Decimal('0.00') >>> len(reconcile.form.lines) diff --git a/modules/account/tests/scenario_account_reconciliation.rst b/modules/account/tests/scenario_account_reconciliation.rst index 5eeef791ed..51c58d3d50 100644 --- a/modules/account/tests/scenario_account_reconciliation.rst +++ b/modules/account/tests/scenario_account_reconciliation.rst @@ -6,7 +6,8 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import ( + ... activate_modules, assertEqual, assertTrue) >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -89,8 +90,8 @@ Reconcile Lines without writeoff:: 'end' >>> reconcile1.reload() >>> reconcile2.reload() - >>> reconcile1.reconciliation == reconcile2.reconciliation != None - True + >>> assertEqual(reconcile1.reconciliation, reconcile2.reconciliation) + >>> assertTrue(reconcile1.reconciliation) >>> len(reconcile1.reconciliation.lines) 2 @@ -115,8 +116,8 @@ Reconcile general ledger lines:: 'end' >>> gl_reconcile1.reload() >>> gl_reconcile2.reload() - >>> gl_reconcile1.reconciliation == gl_reconcile2.reconciliation != None - True + >>> assertEqual(gl_reconcile1.reconciliation, gl_reconcile2.reconciliation) + >>> assertTrue(gl_reconcile1.reconciliation) Unreconcile general ledger, lines:: @@ -184,15 +185,14 @@ Reconcile Lines with write-off:: >>> reconcile_lines.execute('reconcile') >>> reconcile1.reload() >>> reconcile2.reload() - >>> reconcile1.reconciliation == reconcile2.reconciliation != None - True + >>> assertEqual(reconcile1.reconciliation, reconcile2.reconciliation) + >>> assertTrue(reconcile1.reconciliation) >>> len(reconcile1.reconciliation.lines) 3 >>> writeoff_line1, = [l for l in reconcile1.reconciliation.lines ... if l.credit == Decimal(3)] >>> writeoff_line2, = [l for l in writeoff_line1.move.lines ... if l != writeoff_line1] - >>> writeoff_line2.account == expense - True + >>> assertEqual(writeoff_line2.account, expense) >>> writeoff_line2.debit Decimal('3.0') diff --git a/modules/account/tests/scenario_account_reconciliation_alternate_currency.rst b/modules/account/tests/scenario_account_reconciliation_alternate_currency.rst index b88c59bbd3..1963934493 100644 --- a/modules/account/tests/scenario_account_reconciliation_alternate_currency.rst +++ b/modules/account/tests/scenario_account_reconciliation_alternate_currency.rst @@ -6,7 +6,8 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import ( + ... activate_modules, assertEqual, assertTrue) >>> from trytond.modules.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import create_company >>> from trytond.modules.account.tests.tools import ( @@ -107,8 +108,8 @@ Reconcile lines:: >>> reconcile_lines.state 'end' - >>> reconcile1.reconciliation == reconcile2.reconciliation != None - True + >>> assertEqual(reconcile1.reconciliation, reconcile2.reconciliation) + >>> assertTrue(reconcile1.reconciliation) >>> reconciliation, = Reconciliation.find([]) >>> len(reconciliation.lines) 3 diff --git a/modules/account/tests/scenario_move_cancel.rst b/modules/account/tests/scenario_move_cancel.rst index 8df55a49f9..fd71cec436 100644 --- a/modules/account/tests/scenario_move_cancel.rst +++ b/modules/account/tests/scenario_move_cancel.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -94,13 +94,10 @@ Cancel reversal Move:: >>> line, _ = [l for l in move.lines if l.account == receivable] >>> cancel_move, = [l.move for l in line.reconciliation.lines ... if l.move != move] - >>> cancel_move.origin == move - True + >>> assertEqual(cancel_move.origin, move) >>> cancel_move.description 'Reversal' - >>> sorted([l.origin.id for l in cancel_move.lines]) == \ - ... sorted(map(int, move.lines)) - True + >>> assertEqual({l.origin for l in cancel_move.lines}, set(move.lines)) >>> revenue.reload() >>> revenue.credit Decimal('42.00') @@ -132,13 +129,10 @@ Cancel Move:: >>> line, _ = [l for l in move.lines if l.account == receivable] >>> cancel_move, = [l.move for l in line.reconciliation.lines ... if l.move != move] - >>> cancel_move.origin == move - True + >>> assertEqual(cancel_move.origin, move) >>> cancel_move.description 'Cancel' - >>> sorted([l.origin.id for l in cancel_move.lines]) == \ - ... sorted(map(int, move.lines)) - True + >>> assertEqual({l.origin for l in cancel_move.lines}, set(move.lines)) >>> revenue.reload() >>> revenue.credit Decimal('0.00') diff --git a/modules/account/tests/scenario_move_line_delegate.rst b/modules/account/tests/scenario_move_line_delegate.rst index 389eddfadc..6088de0085 100644 --- a/modules/account/tests/scenario_move_line_delegate.rst +++ b/modules/account/tests/scenario_move_line_delegate.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -86,8 +86,7 @@ Create lines to delegate:: Delegate lines:: >>> delegate = Wizard('account.move.line.delegate', receivable_lines) - >>> delegate.form.journal == journal - True + >>> assertEqual(delegate.form.journal, journal) >>> delegate.form.party = party2 >>> delegate.form.description = "Delegate lines" >>> delegate.execute('delegate') diff --git a/modules/account/tests/scenario_move_line_group.rst b/modules/account/tests/scenario_move_line_group.rst index f03eb9ebb1..5b7770f101 100644 --- a/modules/account/tests/scenario_move_line_group.rst +++ b/modules/account/tests/scenario_move_line_group.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -132,12 +132,10 @@ Group lines:: >>> all(r.delegate_to for r in reconciliations) True >>> delegate_to = reconciliations[0].delegate_to - >>> delegate_to.account == receivable - True + >>> assertEqual(delegate_to.account, receivable) >>> delegate_to.debit Decimal('50') - >>> delegate_to.maturity_date == period.start_date + dt.timedelta(days=2) - True + >>> assertEqual(delegate_to.maturity_date, period.start_date + dt.timedelta(days=2)) >>> delegate_to.move_description_used 'Group lines' diff --git a/modules/account/tests/scenario_move_line_reschedule.rst b/modules/account/tests/scenario_move_line_reschedule.rst index bac2d96152..a3b2832e1b 100644 --- a/modules/account/tests/scenario_move_line_reschedule.rst +++ b/modules/account/tests/scenario_move_line_reschedule.rst @@ -10,7 +10,7 @@ Imports:: >>> from dateutil.relativedelta import relativedelta >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -89,14 +89,10 @@ Split line by amount:: >>> reschedule.execute('preview') >>> term1, term2, term3, term4 = reschedule.form.terms - >>> term1.date == period.end_date - True - >>> term2.date == period.end_date + relativedelta(months=2) - True - >>> term3.date == period.end_date + relativedelta(months=4) - True - >>> term4.date == period.end_date + relativedelta(months=6) - True + >>> assertEqual(term1.date, period.end_date) + >>> assertEqual(term2.date, period.end_date + relativedelta(months=2)) + >>> assertEqual(term3.date, period.end_date + relativedelta(months=4)) + >>> assertEqual(term4.date, period.end_date + relativedelta(months=6)) >>> term1.amount, term2.amount, term3.amount, term4.amount (Decimal('30.00'), Decimal('30.00'), Decimal('30.00'), Decimal('10.00')) @@ -112,12 +108,9 @@ Split line by number:: >>> reschedule.form.description = "Split 3 months" >>> term1, term2, term3 = reschedule.form.terms - >>> term1.date == period.end_date - True - >>> term2.date == period.end_date + relativedelta(months=1) - True - >>> term3.date == period.end_date + relativedelta(months=2) - True + >>> assertEqual(term1.date, period.end_date) + >>> assertEqual(term2.date, period.end_date + relativedelta(months=1)) + >>> assertEqual(term3.date, period.end_date + relativedelta(months=2)) >>> term1.amount, term2.amount, term3.amount (Decimal('33.33'), Decimal('33.33'), Decimal('33.34')) >>> term1.amount = Decimal('40.00') @@ -143,15 +136,12 @@ Check receivable:: >>> line1.debit, line1.amount (Decimal('36.00'), Decimal('40.00')) - >>> line1.maturity_date == period.end_date - True + >>> assertEqual(line1.maturity_date, period.end_date) >>> line2.debit, line2.amount (Decimal('27.00'), Decimal('30.00')) - >>> line2.maturity_date == period.end_date + relativedelta(months=1) - True + >>> assertEqual(line2.maturity_date, period.end_date + relativedelta(months=1)) >>> line3.debit, line3.amount (Decimal('27.00'), Decimal('30.00')) - >>> line3.maturity_date == period.end_date + relativedelta(months=3) - True + >>> assertEqual(line3.maturity_date, period.end_date + relativedelta(months=3)) diff --git a/modules/account/tests/scenario_move_template.rst b/modules/account/tests/scenario_move_template.rst index b0dfeb5be3..71af8283d7 100644 --- a/modules/account/tests/scenario_move_template.rst +++ b/modules/account/tests/scenario_move_template.rst @@ -7,7 +7,8 @@ Imports:: >>> import datetime >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import ( + ... activate_modules, assertEqual, assertLessEqual, assertGreaterEqual) >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -95,23 +96,19 @@ Create Template:: Create Move:: >>> create_move = Wizard('account.move.template.create') - >>> create_move.form.date == today - True + >>> assertEqual(create_move.form.date, today) >>> period = create_move.form.period - >>> period.start_date <= today <= period.end_date - True + >>> assertLessEqual(period.start_date, today) + >>> assertGreaterEqual(period.end_date, today) >>> index = fiscalyear.periods.index(create_move.form.period) >>> next_period = fiscalyear.periods[index + 1] >>> create_move.form.date = next_period.start_date - >>> create_move.form.period == next_period - True + >>> assertEqual(create_move.form.period, next_period) >>> prev_period = fiscalyear.periods[index - 1] >>> create_move.form.period = prev_period - >>> create_move.form.date == prev_period.end_date - True + >>> assertEqual(create_move.form.date, prev_period.end_date) >>> create_move.form.period = next_period - >>> create_move.form.date == next_period.start_date - True + >>> assertEqual(create_move.form.date, next_period.start_date) >>> create_move.form.template = template >>> create_move.execute('keywords') >>> data = {} diff --git a/modules/account/tests/scenario_renew_fiscalyear.rst b/modules/account/tests/scenario_renew_fiscalyear.rst index c1f0725ddf..de7be3bfda 100644 --- a/modules/account/tests/scenario_renew_fiscalyear.rst +++ b/modules/account/tests/scenario_renew_fiscalyear.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear @@ -69,6 +69,5 @@ Renew fiscalyear and test sequence name is updated:: >>> renew_fiscalyear.form.reset_sequences = True >>> renew_fiscalyear.execute('create_') >>> new_fiscalyear, = renew_fiscalyear.actions[0] - >>> new_fiscalyear.post_move_sequence.name == ( + >>> assertEqual(new_fiscalyear.post_move_sequence.name, ... 'Sequence %s' % new_fiscalyear.name) - True diff --git a/modules/account_asset/tests/scenario_account_asset.rst b/modules/account_asset/tests/scenario_account_asset.rst index a3fb520b03..bbc0bf771d 100644 --- a/modules/account_asset/tests/scenario_account_asset.rst +++ b/modules/account_asset/tests/scenario_account_asset.rst @@ -7,7 +7,7 @@ Imports:: >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -94,8 +94,7 @@ Buy an asset:: >>> invoice_line.product = asset_product >>> invoice_line.quantity = 1 >>> invoice_line.unit_price = Decimal('1000') - >>> invoice_line.account == asset_account - True + >>> assertEqual(invoice_line.account, asset_account) >>> supplier_invoice.invoice_date = fiscalyear.start_date >>> supplier_invoice.click('post') >>> supplier_invoice.state @@ -112,15 +111,12 @@ Depreciate the asset:: >>> asset.supplier_invoice_line = invoice_line >>> asset.value Decimal('1000.00') - >>> asset.start_date == supplier_invoice.invoice_date - True - >>> asset.end_date == (supplier_invoice.invoice_date + - ... relativedelta(years=2, days=-1)) - True + >>> assertEqual(asset.start_date, supplier_invoice.invoice_date) + >>> assertEqual(asset.end_date, (supplier_invoice.invoice_date + + ... relativedelta(years=2, days=-1))) >>> asset.quantity 1.0 - >>> asset.unit == unit - True + >>> assertEqual(asset.unit, unit) >>> asset.residual_value = Decimal('100') >>> asset.click('create_lines') >>> len(asset.lines) @@ -173,12 +169,10 @@ Update the asset:: Decimal('100.00') >>> update.form.date = (supplier_invoice.invoice_date ... + relativedelta(months=2)) - >>> update.form.latest_move_date == (supplier_invoice.invoice_date - ... + relativedelta(months=3, days=-1)) - True - >>> update.form.next_depreciation_date == (supplier_invoice.invoice_date - ... + relativedelta(months=4, days=-1)) - True + >>> assertEqual(update.form.latest_move_date, (supplier_invoice.invoice_date + ... + relativedelta(months=3, days=-1))) + >>> assertEqual(update.form.next_depreciation_date, (supplier_invoice.invoice_date + ... + relativedelta(months=4, days=-1))) >>> update.execute('create_move') Traceback (most recent call last): ... @@ -239,14 +233,12 @@ Sale the asset:: >>> invoice_line.asset = asset >>> invoice_line.quantity = 1 >>> invoice_line.unit_price = Decimal('600') - >>> invoice_line.account == revenue - True + >>> assertEqual(invoice_line.account, revenue) >>> customer_invoice.click('post') >>> customer_invoice.state 'posted' >>> asset.reload() - >>> asset.customer_invoice_line == customer_invoice.lines[0] - True + >>> assertEqual(asset.customer_invoice_line, customer_invoice.lines[0]) >>> revenue.debit Decimal('860.72') >>> revenue.credit diff --git a/modules/account_asset/tests/scenario_purchase_asset.rst b/modules/account_asset/tests/scenario_purchase_asset.rst index d2f0f13498..8d61d96d5a 100644 --- a/modules/account_asset/tests/scenario_purchase_asset.rst +++ b/modules/account_asset/tests/scenario_purchase_asset.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -102,7 +102,5 @@ Purchase an asset mixed with services:: >>> purchase.click('process') >>> invoice, = purchase.invoices >>> asset_line, service_line = invoice.lines - >>> asset_line.account == asset_account - True - >>> service_line.account == expense - True + >>> assertEqual(asset_line.account, asset_account) + >>> assertEqual(service_line.account, expense) diff --git a/modules/account_consolidation/tests/scenario_invoice.rst b/modules/account_consolidation/tests/scenario_invoice.rst index 213fa40547..2748724b49 100644 --- a/modules/account_consolidation/tests/scenario_invoice.rst +++ b/modules/account_consolidation/tests/scenario_invoice.rst @@ -8,7 +8,7 @@ Imports:: >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.account.tests.tools import ( ... create_fiscalyear, create_chart, get_accounts) >>> from trytond.modules.account_invoice.tests.tools import ( @@ -61,7 +61,5 @@ Create invoice:: Check consolidation company:: - >>> invoice.consolidation_company == saber - True - >>> invoice.move.consolidation_company == saber - True + >>> assertEqual(invoice.consolidation_company, saber) + >>> assertEqual(invoice.move.consolidation_company, saber) diff --git a/modules/account_dunning/tests/scenario_account_dunning.rst b/modules/account_dunning/tests/scenario_account_dunning.rst index 2f33941f0f..f08dbc87de 100644 --- a/modules/account_dunning/tests/scenario_account_dunning.rst +++ b/modules/account_dunning/tests/scenario_account_dunning.rst @@ -8,7 +8,8 @@ Imports:: >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import ( + ... activate_modules, set_user, assertEqual, assertTrue) >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -165,14 +166,11 @@ Create dunnings on 5 days:: >>> create_dunning.form.date = period.start_date + relativedelta(days=5) >>> create_dunning.execute('create_') >>> dunning, = Dunning.find([]) - >>> dunning.procedure == procedure - True - >>> dunning.level == procedure.levels[0] - True + >>> assertEqual(dunning.procedure, procedure) + >>> assertEqual(dunning.level, procedure.levels[0]) >>> dunning.state 'draft' - >>> dunning.line == dunning_line - True + >>> assertEqual(dunning.line, dunning_line) Create dunnings on 30 days with draft dunning:: @@ -180,15 +178,12 @@ Create dunnings on 30 days with draft dunning:: >>> create_dunning.form.date = period.start_date + relativedelta(days=30) >>> create_dunning.execute('create_') >>> dunning, = Dunning.find([]) - >>> dunning.procedure == procedure - True - >>> dunning.level == procedure.levels[0] - True + >>> assertEqual(dunning.procedure, procedure) + >>> assertEqual(dunning.level, procedure.levels[0]) >>> dunning.state 'draft' >>> dunning.date - >>> dunning.line == dunning_line - True + >>> assertEqual(dunning.line, dunning_line) Process dunning:: @@ -209,16 +204,12 @@ Create dunnings on 30 days with blocked dunning:: >>> create_dunning.form.date = period.start_date + relativedelta(days=30) >>> create_dunning.execute('create_') >>> dunning, = Dunning.find([]) - >>> dunning.procedure == procedure - True - >>> dunning.level == procedure.levels[0] - True + >>> assertEqual(dunning.procedure, procedure) + >>> assertEqual(dunning.level, procedure.levels[0]) >>> dunning.state 'waiting' - >>> dunning.line == dunning_line - True - >>> bool(dunning.blocked) - True + >>> assertEqual(dunning.line, dunning_line) + >>> assertTrue(dunning.blocked) >>> dunning.blocked = False >>> dunning.save() @@ -228,15 +219,12 @@ Create dunnings on 30 days:: >>> create_dunning.form.date = period.start_date + relativedelta(days=30) >>> create_dunning.execute('create_') >>> dunning, = Dunning.find([]) - >>> dunning.procedure == procedure - True - >>> dunning.level == procedure.levels[1] - True + >>> assertEqual(dunning.procedure, procedure) + >>> assertEqual(dunning.level, procedure.levels[1]) >>> dunning.state 'draft' >>> dunning.date - >>> dunning.line == dunning_line - True + >>> assertEqual(dunning.line, dunning_line) Pay dunning:: diff --git a/modules/account_dunning_email/tests/scenario_account_dunning_email.rst b/modules/account_dunning_email/tests/scenario_account_dunning_email.rst index cb2b13eb75..cf0da115c8 100644 --- a/modules/account_dunning_email/tests/scenario_account_dunning_email.rst +++ b/modules/account_dunning_email/tests/scenario_account_dunning_email.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -125,7 +125,5 @@ Process dunning:: 'Customer ' >>> email.subject 'Dunning Email' - >>> email.resource == dunning - True - >>> email.dunning_level == level - True + >>> assertEqual(email.resource, dunning) + >>> assertEqual(email.dunning_level, level) diff --git a/modules/account_es/tests/scenario_reporting.rst b/modules/account_es/tests/scenario_reporting.rst index 9d4718e234..1a600b416c 100644 --- a/modules/account_es/tests/scenario_reporting.rst +++ b/modules/account_es/tests/scenario_reporting.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.tools import file_open >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -168,8 +168,7 @@ Generate aeat reports:: >>> extension 'txt' >>> with file_open('account_es/tests/111.txt') as f: - ... content == f.read() - True + ... assertEqual(content, f.read()) >>> name 'AEAT Model 111-2018-01' @@ -182,8 +181,7 @@ Generate aeat reports:: >>> extension 'txt' >>> with file_open('account_es/tests/115.txt') as f: - ... content == f.read() - True + ... assertEqual(content, f.read()) >>> name 'AEAT Model 115-2018-01' @@ -195,8 +193,7 @@ Generate aeat reports:: >>> extension 'txt' >>> with file_open('account_es/tests/303.txt') as f: - ... content == f.read() - True + ... assertEqual(content, f.read()) >>> name 'AEAT Model 303-2018-01' @@ -212,8 +209,7 @@ Generate aeat reports:: >>> extension 'txt' >>> with file_open('account_es/tests/347.txt') as f: - ... content == f.read() - True + ... assertEqual(content, f.read()) >>> name 'AEAT Model 347-...' @@ -230,8 +226,7 @@ Generate aeat reports:: >>> extension 'txt' >>> with file_open('account_es/tests/349.txt') as f: - ... content == f.read() - True + ... assertEqual(content, f.read()) >>> name 'AEAT Model 349-...' diff --git a/modules/account_es/tests/scenario_reporting_alternate_currency.rst b/modules/account_es/tests/scenario_reporting_alternate_currency.rst index 8b3f6f3190..0f783b0b61 100644 --- a/modules/account_es/tests/scenario_reporting_alternate_currency.rst +++ b/modules/account_es/tests/scenario_reporting_alternate_currency.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -103,8 +103,7 @@ EC Operation and VATList report uses company currency:: ... } >>> with config.set_context(context): ... record, = VatList.find([]) - >>> record.party == party - True + >>> assertEqual(record.party, party) >>> record.amount Decimal('121.00') >>> ECOperationList = Model.get('account.reporting.es_ec_operation_list') @@ -115,8 +114,7 @@ EC Operation and VATList report uses company currency:: ... } >>> with config.set_context(context): ... record, = ECOperationList.find([]) - >>> record.party == supplier - True + >>> assertEqual(record.party, supplier) >>> record.amount Decimal('50.00') >>> VatBook = Model.get('account.reporting.vat_book_es') @@ -127,8 +125,7 @@ EC Operation and VATList report uses company currency:: ... } >>> with config.set_context(context): ... record, = VatBook.find([]) - >>> record.party == party - True + >>> assertEqual(record.party, party) >>> record.base_amount Decimal('100.00') >>> record.tax_amount diff --git a/modules/account_es/tests/scenario_reporting_compensate.rst b/modules/account_es/tests/scenario_reporting_compensate.rst index 7c56e59db3..1ddcc92c4b 100644 --- a/modules/account_es/tests/scenario_reporting_compensate.rst +++ b/modules/account_es/tests/scenario_reporting_compensate.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.tools import file_open >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -131,7 +131,6 @@ Generate aeat 303 report:: >>> extension 'txt' >>> with file_open('account_es/tests/303_compensate.txt') as f: - ... content == f.read() - True + ... assertEqual(content, f.read()) >>> name 'AEAT Model 303-2018-02' diff --git a/modules/account_es/tests/scenario_reporting_surcharge_tax.rst b/modules/account_es/tests/scenario_reporting_surcharge_tax.rst index d9a89a78df..571cd01c4a 100644 --- a/modules/account_es/tests/scenario_reporting_surcharge_tax.rst +++ b/modules/account_es/tests/scenario_reporting_surcharge_tax.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.tools import file_open >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -119,15 +119,13 @@ Generate VAT Book:: >>> len(records) 3 >>> tax_record = [r for r in records if not r.surcharge_tax][0] - >>> tax_record.party == party - True + >>> assertEqual(tax_record.party, party) >>> tax_record.base_amount Decimal('100.00') >>> tax_record.tax_amount Decimal('21.00') >>> surcharge_tax_record = [r for r in records if r.surcharge_tax][0] - >>> surcharge_tax_record.party == surcharge_party - True + >>> assertEqual(surcharge_tax_record.party, surcharge_party) >>> surcharge_tax_record.base_amount Decimal('50.00') >>> surcharge_tax_record.tax_amount @@ -135,8 +133,7 @@ Generate VAT Book:: >>> surcharge_tax_record.surcharge_tax_amount Decimal('2.60') >>> with file_open('account_es/tests/vat_book.csv', 'rb') as f: - ... content == f.read() - True + ... assertEqual(content, f.read()) >>> name 'VAT Book-...' >>> extension diff --git a/modules/account_fr/tests/scenario_fec.rst b/modules/account_fr/tests/scenario_fec.rst index 5214b8b265..8f1f144698 100644 --- a/modules/account_fr/tests/scenario_fec.rst +++ b/modules/account_fr/tests/scenario_fec.rst @@ -9,7 +9,7 @@ Imports:: >>> import io >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear @@ -200,8 +200,7 @@ Generate FEC:: >>> template = template.format( ... current_date=current_date, ... ) - >>> FEC.form.file.decode('utf-8') == template - True + >>> assertEqual(FEC.form.file.decode('utf-8'), template) Generate FEC for previous fiscal year:: @@ -210,5 +209,4 @@ Generate FEC for previous fiscal year:: >>> FEC.execute('generate') >>> file = os.path.join(os.path.dirname(__file__), 'FEC-previous.csv') >>> with io.open(file, mode='rb') as fp: - ... FEC.form.file.decode('utf-8') == fp.read().decode('utf-8') - True + ... assertEqual(FEC.form.file.decode('utf-8'), fp.read().decode('utf-8')) diff --git a/modules/account_invoice/tests/scenario_invoice.rst b/modules/account_invoice/tests/scenario_invoice.rst index bc9af7c9a8..c1156dad3e 100644 --- a/modules/account_invoice/tests/scenario_invoice.rst +++ b/modules/account_invoice/tests/scenario_invoice.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -176,23 +176,20 @@ Create invoice:: Test change tax:: >>> tax_line, = invoice.taxes - >>> tax_line.tax == tax - True + >>> assertEqual(tax_line.tax, tax) >>> tax_line.tax = None >>> tax_line.tax = tax Validate invoice:: >>> invoice.click('validate_invoice') - >>> invoice.validated_by == employee - True + >>> assertEqual(invoice.validated_by, employee) Post invoice:: >>> invoice.invoice_date = today >>> invoice.click('post') - >>> invoice.posted_by == employee - True + >>> assertEqual(invoice.posted_by, employee) >>> invoice.state 'posted' >>> invoice.tax_identifier.code @@ -252,8 +249,8 @@ Credit invoice with refund:: ... ('type', '=', 'out'), ('id', '!=', invoice.id)]) >>> credit_note.state 'paid' - >>> all(line.taxes_date == today for line in credit_note.lines) - True + >>> for line in credit_note.lines: + ... assertEqual(line.taxes_date, today) >>> receivable.reload() >>> receivable.debit Decimal('240.00') @@ -370,16 +367,13 @@ Create some complex invoice and test its taxes base rounding:: >>> invoice.save() >>> invoice.untaxed_amount Decimal('0.00') - >>> invoice.taxes[0].base == invoice.untaxed_amount - True + >>> assertEqual(invoice.taxes[0].base, invoice.untaxed_amount) >>> empty_invoice, found_invoice = Invoice.find( ... [('untaxed_amount', '=', Decimal(0))], order=[('id', 'ASC')]) - >>> found_invoice.id == invoice.id - True + >>> assertEqual(found_invoice, invoice) >>> empty_invoice, found_invoice = Invoice.find( ... [('total_amount', '=', Decimal(0))], order=[('id', 'ASC')]) - >>> found_invoice.id == invoice.id - True + >>> assertEqual(found_invoice, invoice) Clear company tax_identifier:: diff --git a/modules/account_invoice/tests/scenario_invoice_alternate_currency_lower_rate.rst b/modules/account_invoice/tests/scenario_invoice_alternate_currency_lower_rate.rst index a04c6e4a1b..062e07c894 100644 --- a/modules/account_invoice/tests/scenario_invoice_alternate_currency_lower_rate.rst +++ b/modules/account_invoice/tests/scenario_invoice_alternate_currency_lower_rate.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -88,8 +88,7 @@ Pay the invoice:: >>> pay = invoice.click('pay') >>> pay.form.amount Decimal('400.00') - >>> pay.form.currency == eur - True + >>> assertEqual(pay.form.currency, eur) >>> pay.form.payment_method = payment_method >>> pay.form.date = today >>> pay.execute('choice') diff --git a/modules/account_invoice/tests/scenario_invoice_alternate_currency_rate_change.rst b/modules/account_invoice/tests/scenario_invoice_alternate_currency_rate_change.rst index f90b5c2734..73d18c5543 100644 --- a/modules/account_invoice/tests/scenario_invoice_alternate_currency_rate_change.rst +++ b/modules/account_invoice/tests/scenario_invoice_alternate_currency_rate_change.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import create_company >>> from trytond.modules.account.tests.tools import ( @@ -101,8 +101,7 @@ Pay the invoice:: >>> pay = Wizard('account.invoice.pay', [invoice]) >>> pay.form.amount Decimal('400.00') - >>> pay.form.currency == eur - True + >>> assertEqual(pay.form.currency, eur) >>> pay.form.payment_method = payment_method >>> pay.form.date = tomorrow >>> pay.execute('choice') diff --git a/modules/account_invoice/tests/scenario_invoice_alternative_payee.rst b/modules/account_invoice/tests/scenario_invoice_alternative_payee.rst index 03ee0968a2..82937c6dff 100644 --- a/modules/account_invoice/tests/scenario_invoice_alternative_payee.rst +++ b/modules/account_invoice/tests/scenario_invoice_alternative_payee.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -91,8 +91,7 @@ Post customer invoice:: Copying invoice with single alternative payee is kept:: >>> duplicate_inv, = invoice.duplicate() - >>> duplicate_inv.alternative_payees == invoice.alternative_payees - True + >>> assertEqual(duplicate_inv.alternative_payees, invoice.alternative_payees) Set another payee:: diff --git a/modules/account_invoice/tests/scenario_renew_fiscalyear.rst b/modules/account_invoice/tests/scenario_renew_fiscalyear.rst index deee4ee912..0826564dd2 100644 --- a/modules/account_invoice/tests/scenario_renew_fiscalyear.rst +++ b/modules/account_invoice/tests/scenario_renew_fiscalyear.rst @@ -8,7 +8,7 @@ Imports:: >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear @@ -99,7 +99,7 @@ Renew fiscalyear and test sequence name is updated:: >>> renew_fiscalyear.form.reset_sequences = True >>> renew_fiscalyear.execute('create_') >>> new_fiscalyear, = renew_fiscalyear.actions[0] - >>> all(seq.out_invoice_sequence.name == - ... 'Sequence %s' % new_fiscalyear.name - ... for seq in new_fiscalyear.invoice_sequences) - True + >>> for sequence in new_fiscalyear.invoice_sequences: + ... assertEqual( + ... sequence.out_invoice_sequence.name, + ... 'Sequence %s' % new_fiscalyear.name) diff --git a/modules/account_invoice_defer/tests/scenario_account_invoice_defer.rst b/modules/account_invoice_defer/tests/scenario_account_invoice_defer.rst index ddfce279e1..8c112731c1 100644 --- a/modules/account_invoice_defer/tests/scenario_account_invoice_defer.rst +++ b/modules/account_invoice_defer/tests/scenario_account_invoice_defer.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -90,14 +90,11 @@ Create invoice:: Check invoice deferred and run it:: >>> deferral, = InvoiceDeferred.find([]) - >>> deferral.invoice_line == invoice_line - True + >>> assertEqual(deferral.invoice_line, invoice_line) >>> deferral.amount Decimal('1000.00') - >>> deferral.start_date == invoice_line.defer_from - True - >>> deferral.end_date == invoice_line.defer_to - True + >>> assertEqual(deferral.start_date, invoice_line.defer_from) + >>> assertEqual(deferral.end_date, invoice_line.defer_to) >>> deferral.click('run') Check moves on invoice deferred:: diff --git a/modules/account_payment/tests/scenario_account_payment.rst b/modules/account_payment/tests/scenario_account_payment.rst index fa23cc8d0a..592231bf39 100644 --- a/modules/account_payment/tests/scenario_account_payment.rst +++ b/modules/account_payment/tests/scenario_account_payment.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -86,29 +86,23 @@ Partially pay line:: >>> pay_line = Wizard('account.move.line.pay', [line]) >>> pay_line.form.date = tomorrow >>> pay_line.execute('next_') - >>> pay_line.form.journal == payment_journal - True + >>> assertEqual(pay_line.form.journal, payment_journal) >>> pay_line.execute('next_') >>> payment, = Payment.find() - >>> payment.date == tomorrow - True - >>> payment.party == supplier - True + >>> assertEqual(payment.date, tomorrow) + >>> assertEqual(payment.party, supplier) >>> payment.amount Decimal('50.00') >>> payment.amount = Decimal('20.00') >>> payment.click('submit') - >>> payment.submitted_by == employee - True + >>> assertEqual(payment.submitted_by, employee) >>> payment.click('approve') - >>> payment.approved_by == employee - True + >>> assertEqual(payment.approved_by, employee) >>> payment.state 'approved' >>> process_payment = payment.click('process_wizard') >>> group, = process_payment.actions[0] - >>> group.payments == [payment] - True + >>> assertEqual(group.payments, [payment]) >>> payment.state 'processing' >>> line.reload() @@ -130,8 +124,7 @@ Success the payment and recheck the payment group:: >>> group.click('succeed') >>> payment.reload() - >>> payment.succeeded_by == employee - True + >>> assertEqual(payment.succeeded_by, employee) >>> payment.state 'succeeded' >>> group.reload() @@ -146,8 +139,7 @@ Search for the completed payment:: >>> group, = PaymentGroup.find([('payment_complete', '=', 'True')]) >>> group.payment_complete True - >>> group.id == payment.group.id - True + >>> assertEqual(group, payment.group) Partially fail to pay the remaining:: @@ -165,8 +157,7 @@ Partially fail to pay the remaining:: Decimal('0.00') >>> payment.reload() >>> payment.click('fail') - >>> payment.failed_by == employee - True + >>> assertEqual(payment.failed_by, employee) >>> payment.state 'failed' >>> payment.group.payment_complete diff --git a/modules/account_payment/tests/scenario_account_payment_direct_debit.rst b/modules/account_payment/tests/scenario_account_payment_direct_debit.rst index 521e1f43f1..d30259feee 100644 --- a/modules/account_payment/tests/scenario_account_payment_direct_debit.rst +++ b/modules/account_payment/tests/scenario_account_payment_direct_debit.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -90,12 +90,9 @@ Create direct debit:: >>> payment, = Payment.find([]) >>> payment.amount Decimal('100.00') - >>> payment.party == customer1 - True - >>> payment.date == tomorrow - True - >>> payment.journal == payment_journal - True + >>> assertEqual(payment.party, customer1) + >>> assertEqual(payment.date, tomorrow) + >>> assertEqual(payment.journal, payment_journal) Re-run create direct debit does nothing:: @@ -103,5 +100,4 @@ Re-run create direct debit does nothing:: >>> create_direct_debit.form.date = after_tomorrow >>> create_direct_debit.execute('create_') - >>> Payment.find([]) == [payment] - True + >>> assertEqual(Payment.find([]), [payment]) diff --git a/modules/account_payment/tests/scenario_account_payment_dunning.rst b/modules/account_payment/tests/scenario_account_payment_dunning.rst index e5f803c9c7..160f508f2d 100644 --- a/modules/account_payment/tests/scenario_account_payment_dunning.rst +++ b/modules/account_payment/tests/scenario_account_payment_dunning.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -101,8 +101,7 @@ Fail the payment:: >>> payment.click('submit') >>> process_payment = payment.click('process_wizard') >>> group, = process_payment.actions[0] - >>> group.payments == [payment] - True + >>> assertEqual(group.payments, [payment]) >>> payment.click('fail') >>> payment.state 'failed' @@ -115,8 +114,7 @@ Create dunning:: >>> create_dunning = Wizard('account.dunning.create') >>> create_dunning.execute('create_') >>> dunning, = Dunning.find([]) - >>> dunning.line == line - True + >>> assertEqual(dunning.line, line) Recreate a payment:: diff --git a/modules/account_payment/tests/scenario_account_payment_planning.rst b/modules/account_payment/tests/scenario_account_payment_planning.rst index bb199c89c9..cd60f8aba4 100644 --- a/modules/account_payment/tests/scenario_account_payment_planning.rst +++ b/modules/account_payment/tests/scenario_account_payment_planning.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -72,8 +72,7 @@ Paying the line without date uses the maturity date:: >>> pay_line.execute('next_') >>> pay_line.execute('next_') >>> payment, = Payment.find() - >>> payment.date == next_week - True + >>> assertEqual(payment.date, next_week) The date on the payment wizard is used for payment date:: @@ -83,5 +82,4 @@ The date on the payment wizard is used for payment date:: >>> pay_line.execute('next_') >>> pay_line.execute('next_') >>> payment, = Payment.find() - >>> payment.date == tomorrow - True + >>> assertEqual(payment.date, tomorrow) diff --git a/modules/account_payment_braintree/tests/scenario_account_payment_braintree.rst b/modules/account_payment_braintree/tests/scenario_account_payment_braintree.rst index 36441af9a2..d73b216318 100644 --- a/modules/account_payment_braintree/tests/scenario_account_payment_braintree.rst +++ b/modules/account_payment_braintree/tests/scenario_account_payment_braintree.rst @@ -10,7 +10,8 @@ Imports:: >>> import braintree >>> from braintree.test.nonces import Nonces >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import ( + ... activate_modules, assertEqual, assertTrue) >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -109,10 +110,8 @@ Process the payment:: >>> process_payment = payment.click('process_wizard') >>> payment.state 'processing' - >>> bool(payment.braintree_payment_settled) - True - >>> payment.amount == amount - True + >>> assertTrue(payment.braintree_payment_settled) + >>> assertEqual(payment.amount, amount) >>> _ = gateway.testing.settle_transaction(payment.braintree_transaction_id) @@ -127,8 +126,7 @@ Pull update:: >>> payment.reload() >>> payment.state 'succeeded' - >>> payment.amount == amount - True + >>> assertEqual(payment.amount, amount) Create a customer:: @@ -260,8 +258,7 @@ Refund some amount:: >>> refund.state 'processing' >>> payment.reload() - >>> payment.amount == amount - True + >>> assertEqual(payment.amount, amount) >>> _ = gateway.testing.settle_transaction(refund.braintree_transaction_id) >>> cron_refund_pull, = Cron.find([ diff --git a/modules/account_payment_clearing/tests/scenario_account_payment_clearing.rst b/modules/account_payment_clearing/tests/scenario_account_payment_clearing.rst index d77502b6e3..e65b831411 100644 --- a/modules/account_payment_clearing/tests/scenario_account_payment_clearing.rst +++ b/modules/account_payment_clearing/tests/scenario_account_payment_clearing.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -112,8 +112,7 @@ Succeed payment:: >>> succeed.execute('succeed') >>> payment.state 'succeeded' - >>> payment.clearing_move.date == first - True + >>> assertEqual(payment.clearing_move.date, first) >>> payment.clearing_move.state 'draft' >>> bool(payment.clearing_reconciled) @@ -252,10 +251,8 @@ Create a line for the payment:: >>> line = statement.lines.new(date=today) >>> line.amount = Decimal('-50.00') >>> line.related_to = payment - >>> line.party == supplier - True - >>> line.account == bank_clearing - True + >>> assertEqual(line.party, supplier) + >>> assertEqual(line.account, bank_clearing) Remove the party must remove payment:: @@ -309,8 +306,7 @@ Create a statement that reimburse the payment group:: ... ) >>> line = statement.lines.new(date=today) >>> line.related_to = payment.group - >>> line.account == bank_clearing - True + >>> assertEqual(line.account, bank_clearing) >>> line.amount = Decimal('50.00') >>> statement.click('validate_statement') @@ -453,10 +449,8 @@ Create statement for the payment:: >>> line = statement.lines.new(date=yesterday) >>> line.amount = Decimal('-50.00') >>> line.related_to = payment - >>> line.party == supplier - True - >>> line.account == bank_clearing - True + >>> assertEqual(line.party, supplier) + >>> assertEqual(line.account, bank_clearing) >>> statement.save() Validate statement and check the payment is confirmed:: @@ -477,5 +471,4 @@ Validate statement and check the payment is confirmed:: >>> debit_line, = [l for l in payment.clearing_move.lines if l.debit > 0] >>> debit_line.debit Decimal('50.00') - >>> debit_line.date == yesterday - True + >>> assertEqual(debit_line.date, yesterday) diff --git a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_identical.rst b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_identical.rst index 06e5e64636..f1567dc0ab 100644 --- a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_identical.rst +++ b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_identical.rst @@ -12,7 +12,7 @@ Imports:: >>> import stripe >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -104,8 +104,6 @@ Run cron:: >>> cron_customer_create.click('run_once') >>> stripe_customer2.reload() - >>> stripe_customer2.identical_customers == [stripe_customer1] - True + >>> assertEqual(stripe_customer2.identical_customers, [stripe_customer1]) >>> stripe_customer1.reload() - >>> stripe_customer1.identical_customers == [stripe_customer2] - True + >>> assertEqual(stripe_customer1.identical_customers, [stripe_customer2]) diff --git a/modules/account_rule/tests/scenario_account_rule.rst b/modules/account_rule/tests/scenario_account_rule.rst index c5b0474916..04cbe5869d 100644 --- a/modules/account_rule/tests/scenario_account_rule.rst +++ b/modules/account_rule/tests/scenario_account_rule.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -104,9 +104,6 @@ Test rules with a sale:: 'processing' >>> invoice, = sale.invoices - >>> invoice.lines[0].account == account_revenue1 - True - >>> invoice.lines[1].account == account_revenue2 - True - >>> invoice.lines[2].account == account_revenue3 - True + >>> assertEqual(invoice.lines[0].account, account_revenue1) + >>> assertEqual(invoice.lines[1].account, account_revenue2) + >>> assertEqual(invoice.lines[2].account, account_revenue3) diff --git a/modules/account_statement/tests/scenario_account_statement.rst b/modules/account_statement/tests/scenario_account_statement.rst index 2996516dd2..f631257537 100644 --- a/modules/account_statement/tests/scenario_account_statement.rst +++ b/modules/account_statement/tests/scenario_account_statement.rst @@ -8,7 +8,7 @@ Imports:: >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -142,8 +142,7 @@ Received 180 from customer:: >>> statement_line.date = today >>> statement_line.amount = Decimal('180') >>> statement_line.party = customer - >>> statement_line.account == receivable - True + >>> assertEqual(statement_line.account, receivable) >>> statement_line.related_to = customer_invoice1 >>> statement_line.amount Decimal('100.00') @@ -154,10 +153,8 @@ Received 180 from customer:: '0001' >>> statement_line.description 'description' - >>> statement_line.party == customer - True - >>> statement_line.account == receivable - True + >>> assertEqual(statement_line.party, customer) + >>> assertEqual(statement_line.account, receivable) >>> statement_line.description = 'other description' >>> statement_line.related_to = customer_invoice2 >>> statement_line.amount @@ -182,8 +179,7 @@ Paid 50 to supplier:: >>> statement_line.date = today >>> statement_line.amount = Decimal('-60') >>> statement_line.party = supplier - >>> statement_line.account == payable - True + >>> assertEqual(statement_line.account, payable) >>> statement_line.related_to = supplier_invoice >>> statement_line.amount Decimal('-50.00') @@ -309,8 +305,7 @@ Let's test the negative amount version of the supplier/customer invoices:: >>> statement_line.account = receivable >>> statement_line.amount = Decimal(-120) >>> statement_line.related_to = customer_invoice3 - >>> statement_line.related_to.id == customer_invoice3.id - True + >>> assertEqual(statement_line.related_to, customer_invoice3) >>> statement_line = StatementLine() >>> statement.lines.append(statement_line) diff --git a/modules/account_statement/tests/scenario_statement_origin.rst b/modules/account_statement/tests/scenario_statement_origin.rst index 890210cb0e..98246dd937 100644 --- a/modules/account_statement/tests/scenario_statement_origin.rst +++ b/modules/account_statement/tests/scenario_statement_origin.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -77,14 +77,11 @@ Statement can not be posted until all origins are finished:: >>> statement.click('draft') >>> origin, = statement.origins >>> line = origin.lines.new() - >>> line.date == today - True + >>> assertEqual(line.date, today) >>> line.amount Decimal('50.00') - >>> line.party == customer - True - >>> line.account == receivable - True + >>> assertEqual(line.party, customer) + >>> assertEqual(line.account, receivable) >>> line.amount = Decimal('52.00') >>> line = origin.lines.new() >>> line.amount diff --git a/modules/account_statement/tests/scenario_statement_origin_invoices.rst b/modules/account_statement/tests/scenario_statement_origin_invoices.rst index 452de72f0b..ffd9120523 100644 --- a/modules/account_statement/tests/scenario_statement_origin_invoices.rst +++ b/modules/account_statement/tests/scenario_statement_origin_invoices.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -99,17 +99,13 @@ Pending amount is used to fill all invoices:: >>> line.related_to = customer_invoice1 >>> line.amount Decimal('100.00') - >>> line.party == customer - True - >>> line.account == receivable - True + >>> assertEqual(line.party, customer) + >>> assertEqual(line.account, receivable) >>> origin.pending_amount Decimal('80.00') >>> line = origin.lines.new() >>> line.related_to = customer_invoice2 >>> line.amount Decimal('80.00') - >>> line.party == customer - True - >>> line.account == receivable - True + >>> assertEqual(line.party, customer) + >>> assertEqual(line.account, receivable) diff --git a/modules/account_statement_aeb43/tests/scenario_account_statement_aeb43.rst b/modules/account_statement_aeb43/tests/scenario_account_statement_aeb43.rst index 92b48f0fc7..c97cbfd496 100644 --- a/modules/account_statement_aeb43/tests/scenario_account_statement_aeb43.rst +++ b/modules/account_statement_aeb43/tests/scenario_account_statement_aeb43.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime >>> from decimal import Decimal >>> from proteus import config, Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.tools import file_open >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -80,8 +80,7 @@ Check Statement:: >>> Statement = Model.get('account.statement') >>> statement, = Statement.find([]) - >>> statement.journal == journal - True + >>> assertEqual(statement.journal, journal) >>> statement.number_of_lines 1 >>> statement.total_amount diff --git a/modules/account_statement_mt940/tests/scenario_account_statement_mt940.rst b/modules/account_statement_mt940/tests/scenario_account_statement_mt940.rst index 6db1781ed9..1f1241b947 100644 --- a/modules/account_statement_mt940/tests/scenario_account_statement_mt940.rst +++ b/modules/account_statement_mt940/tests/scenario_account_statement_mt940.rst @@ -5,7 +5,7 @@ Account Statement MT940 Scenario Imports:: >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.tools import file_open >>> from trytond.modules.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import ( @@ -110,8 +110,7 @@ Check Statement:: datetime.date(2019, 7, 31) >>> origin.amount Decimal('100.00') - >>> origin.party == customer - True + >>> assertEqual(origin.party, customer) >>> origin.description '98.76.54.321 John Doe' >>> origin.information['mt940_reference'] diff --git a/modules/account_statement_ofx/tests/scenario_account_statement_ofx.rst b/modules/account_statement_ofx/tests/scenario_account_statement_ofx.rst index 570c66f496..76e912d44d 100644 --- a/modules/account_statement_ofx/tests/scenario_account_statement_ofx.rst +++ b/modules/account_statement_ofx/tests/scenario_account_statement_ofx.rst @@ -5,7 +5,7 @@ Account Statement OFX Scenario Imports:: >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.tools import file_open >>> from trytond.modules.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import create_company, \ @@ -101,8 +101,7 @@ Check Statement:: datetime.date(2018, 2, 21) >>> origin.amount Decimal('100.00') - >>> origin.party == michael_scott_paper - True + >>> assertEqual(origin.party, michael_scott_paper) >>> origin.description 'COMMUNICATION' >>> origin.information['ofx_type'] diff --git a/modules/account_statement_rule/tests/scenario_account_statement_rule.rst b/modules/account_statement_rule/tests/scenario_account_statement_rule.rst index ac2b3905b1..fabbd5dfe7 100644 --- a/modules/account_statement_rule/tests/scenario_account_statement_rule.rst +++ b/modules/account_statement_rule/tests/scenario_account_statement_rule.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import ( @@ -84,7 +84,5 @@ Apply rules on statement:: 2 >>> sorted([l.amount for l in statement.lines]) [Decimal('5.00'), Decimal('45.00')] - >>> {l.account for l in statement.lines} == {tax, receivable} - True - >>> {l.party for l in statement.lines} == {None, customer} - True + >>> assertEqual({l.account for l in statement.lines}, {tax, receivable}) + >>> assertEqual({l.party for l in statement.lines}, {None, customer}) diff --git a/modules/account_statement_rule/tests/scenario_account_statement_rule_keyword_bank_account.rst b/modules/account_statement_rule/tests/scenario_account_statement_rule_keyword_bank_account.rst index 7996ba3e7a..81373b0cce 100644 --- a/modules/account_statement_rule/tests/scenario_account_statement_rule_keyword_bank_account.rst +++ b/modules/account_statement_rule/tests/scenario_account_statement_rule_keyword_bank_account.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -106,8 +106,7 @@ Apply rules on statement match:: >>> statement.click('apply_rules') >>> line, = statement.lines - >>> line.party == customer - True + >>> assertEqual(line.party, customer) >>> statement.click('validate_statement') >>> statement.click('post') @@ -135,7 +134,5 @@ Now a party is found:: >>> line, = statement.lines >>> line.amount Decimal('50.00') - >>> line.party == customer - True - >>> line.account == accounts['receivable'] - True + >>> assertEqual(line.party, customer) + >>> assertEqual(line.account, accounts['receivable']) diff --git a/modules/account_statement_rule/tests/scenario_account_statement_rule_keywords.rst b/modules/account_statement_rule/tests/scenario_account_statement_rule_keywords.rst index 588230772d..43bb6e02ad 100644 --- a/modules/account_statement_rule/tests/scenario_account_statement_rule_keywords.rst +++ b/modules/account_statement_rule/tests/scenario_account_statement_rule_keywords.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -116,7 +116,5 @@ Now a party is found:: >>> line, = statement.lines >>> line.amount Decimal('50.00') - >>> line.party == customer - True - >>> line.account == receivable - True + >>> assertEqual(line.party, customer) + >>> assertEqual(line.account, receivable) diff --git a/modules/account_statement_sepa/tests/scenario_account_statement_sepa.rst b/modules/account_statement_sepa/tests/scenario_account_statement_sepa.rst index 4b4355ed33..2881e03f5e 100644 --- a/modules/account_statement_sepa/tests/scenario_account_statement_sepa.rst +++ b/modules/account_statement_sepa/tests/scenario_account_statement_sepa.rst @@ -5,7 +5,7 @@ Account Statement Sepa Scenario Imports:: >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.tools import file_open >>> from trytond.modules.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import ( @@ -104,8 +104,7 @@ Check Statement:: datetime.date(2009, 4, 29) >>> origin.amount Decimal('-100.00') - >>> origin.party == supplier - True + >>> assertEqual(origin.party, supplier) >>> origin.description >>> origin.information['camt_creditor_name'] 'Supplier' diff --git a/modules/account_stock_eu/tests/scenario_account_stock_eu_arrival.rst b/modules/account_stock_eu/tests/scenario_account_stock_eu_arrival.rst index b291929405..7b8728d667 100644 --- a/modules/account_stock_eu/tests/scenario_account_stock_eu_arrival.rst +++ b/modules/account_stock_eu/tests/scenario_account_stock_eu_arrival.rst @@ -10,7 +10,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -179,8 +179,7 @@ Receive products from France:: 20.0 >>> move.intrastat_country_of_origin >>> move.intrastat_vat - >>> move.intrastat_declaration.month == today.replace(day=1) - True + >>> assertEqual(move.intrastat_declaration.month, today.replace(day=1)) >>> move, = shipment.inventory_moves >>> move.intrastat_type @@ -242,8 +241,7 @@ Receive returned products from France:: 5.0 >>> move.intrastat_country_of_origin >>> move.intrastat_vat - >>> move.intrastat_declaration.month == today.replace(day=1) - True + >>> assertEqual(move.intrastat_declaration.month, today.replace(day=1)) >>> move, = shipment.inventory_moves >>> move.intrastat_type @@ -253,8 +251,7 @@ Check declaration:: >>> declaration, = IntrastatDeclaration.find([]) >>> declaration.country.code 'BE' - >>> declaration.month == today.replace(day=1) - True + >>> assertEqual(declaration.month, today.replace(day=1)) >>> declaration.state 'opened' >>> bool(declaration.extended) diff --git a/modules/account_stock_eu/tests/scenario_account_stock_eu_dispatch.rst b/modules/account_stock_eu/tests/scenario_account_stock_eu_dispatch.rst index fb180452ac..b23c3aa927 100644 --- a/modules/account_stock_eu/tests/scenario_account_stock_eu_dispatch.rst +++ b/modules/account_stock_eu/tests/scenario_account_stock_eu_dispatch.rst @@ -10,7 +10,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.currency.tests.tools import get_currency >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -188,8 +188,7 @@ Send products to particular to France:: >>> move.intrastat_country_of_origin.code 'CN' >>> move.intrastat_vat - >>> move.intrastat_declaration.month == today.replace(day=1) - True + >>> assertEqual(move.intrastat_declaration.month, today.replace(day=1)) Send products to US:: @@ -255,16 +254,14 @@ Send returned products to France:: 'CN' >>> move.intrastat_vat.code 'FR40303265045' - >>> move.intrastat_declaration.month == today.replace(day=1) - True + >>> assertEqual(move.intrastat_declaration.month, today.replace(day=1)) Check declaration:: >>> declaration, = IntrastatDeclaration.find([]) >>> declaration.country.code 'BE' - >>> declaration.month == today.replace(day=1) - True + >>> assertEqual(declaration.month, today.replace(day=1)) >>> declaration.state 'opened' diff --git a/modules/analytic_account/tests/scenario_analytic_account.rst b/modules/analytic_account/tests/scenario_analytic_account.rst index 136ed01651..10dcb821b7 100644 --- a/modules/analytic_account/tests/scenario_analytic_account.rst +++ b/modules/analytic_account/tests/scenario_analytic_account.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -106,8 +106,7 @@ Cancel reversal move:: True >>> cancel_move, = [l.move for l in line.reconciliation.lines ... if l.move != move] - >>> cancel_move.origin == move - True + >>> assertEqual(cancel_move.origin, move) >>> analytic_account.reload() >>> analytic_account.credit Decimal('42.00') @@ -138,8 +137,7 @@ Cancel move:: True >>> cancel_move, = [l.move for l in line.reconciliation.lines ... if l.move != move] - >>> cancel_move.origin == move - True + >>> assertEqual(cancel_move.origin, move) >>> analytic_account.reload() >>> analytic_account.credit Decimal('0.00') @@ -165,12 +163,10 @@ Check analytic lines are created on posting:: >>> move.click('post') >>> line, = [l for l in move.lines if l.analytic_lines] >>> analytic_line, = line.analytic_lines - >>> analytic_line.account == analytic_account2 - True + >>> assertEqual(analytic_line.account, analytic_account2) >>> analytic_line.credit Decimal('73') - >>> analytic_line.date == analytic_line.move_line.date - True + >>> assertEqual(analytic_line.date, analytic_line.move_line.date) Prepare to balance non-deferral accounts:: diff --git a/modules/analytic_budget/tests/scenario_analytic_budget.rst b/modules/analytic_budget/tests/scenario_analytic_budget.rst index d88029050e..b8e6bbd7b4 100644 --- a/modules/analytic_budget/tests/scenario_analytic_budget.rst +++ b/modules/analytic_budget/tests/scenario_analytic_budget.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -129,10 +129,8 @@ Copy the budget without amounts:: >>> copy_budget.form.factor = Decimal('1.2') >>> copy_budget.execute('copy') >>> new_budget, = copy_budget.actions[0] - >>> new_budget.start_date == next_period.start_date - True - >>> new_budget.end_date == next_period.end_date - True + >>> assertEqual(new_budget.start_date, next_period.start_date) + >>> assertEqual(new_budget.end_date, next_period.end_date) >>> analytic_budget, other_analytic_budget = new_budget.lines >>> analytic_budget.total_amount Decimal('-84.00') diff --git a/modules/analytic_invoice/tests/scenario_analytic_invoice.rst b/modules/analytic_invoice/tests/scenario_analytic_invoice.rst index 3b5d075ec8..1df68dfca5 100644 --- a/modules/analytic_invoice/tests/scenario_analytic_invoice.rst +++ b/modules/analytic_invoice/tests/scenario_analytic_invoice.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -88,8 +88,7 @@ Create invoice with analytic accounts:: >>> invoice.payment_term = payment_term >>> line = invoice.lines.new() >>> entry, = line.analytic_accounts - >>> entry.root == root - True + >>> assertEqual(entry.root, root) >>> entry.account = analytic_account >>> line.product = product >>> line.quantity = 5 diff --git a/modules/analytic_invoice/tests/scenario_analytic_invoice_defer.rst b/modules/analytic_invoice/tests/scenario_analytic_invoice_defer.rst index 0467a1f013..be63331692 100644 --- a/modules/analytic_invoice/tests/scenario_analytic_invoice_defer.rst +++ b/modules/analytic_invoice/tests/scenario_analytic_invoice_defer.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -107,14 +107,11 @@ Create invoice:: Check invoice deferred and run it:: >>> deferral, = InvoiceDeferred.find([]) - >>> deferral.invoice_line == invoice_line - True + >>> assertEqual(deferral.invoice_line, invoice_line) >>> deferral.amount Decimal('1000.00') - >>> deferral.start_date == invoice_line.defer_from - True - >>> deferral.end_date == invoice_line.defer_to - True + >>> assertEqual(deferral.start_date, invoice_line.defer_from) + >>> assertEqual(deferral.end_date, invoice_line.defer_to) >>> deferral.click('run') >>> deferral.state 'running' diff --git a/modules/analytic_purchase/tests/scenario_analytic_purchase.rst b/modules/analytic_purchase/tests/scenario_analytic_purchase.rst index 30ab54bdc4..dd9955e50e 100644 --- a/modules/analytic_purchase/tests/scenario_analytic_purchase.rst +++ b/modules/analytic_purchase/tests/scenario_analytic_purchase.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -102,8 +102,7 @@ Purchase with analytic accounts:: >>> purchase.invoice_method = 'order' >>> purchase_line = purchase.lines.new() >>> entry, = purchase_line.analytic_accounts - >>> entry.root == root - True + >>> assertEqual(entry.root, root) >>> entry.account = analytic_account >>> purchase_line.product = product >>> purchase_line.quantity = 5 @@ -119,8 +118,7 @@ Check invoice analytic accounts:: >>> invoice = Invoice(purchase.invoices[0].id) >>> invoice_line, = invoice.lines >>> entry, = invoice_line.analytic_accounts - >>> entry.account == analytic_account - True + >>> assertEqual(entry.account, analytic_account) Purchase with an empty analytic account:: diff --git a/modules/analytic_sale/tests/scenario_analytic_sale.rst b/modules/analytic_sale/tests/scenario_analytic_sale.rst index 5d6a7146fb..64042e3728 100644 --- a/modules/analytic_sale/tests/scenario_analytic_sale.rst +++ b/modules/analytic_sale/tests/scenario_analytic_sale.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -103,8 +103,7 @@ Sale with analytic accounts:: >>> sale.invoice_method = 'order' >>> sale_line = sale.lines.new() >>> entry, = sale_line.analytic_accounts - >>> entry.root == root - True + >>> assertEqual(entry.root, root) >>> entry.account = analytic_account >>> sale_line.product = product >>> sale_line.quantity = 5 @@ -119,8 +118,7 @@ Check analytic accounts on invoice:: >>> invoice = Invoice(sale.invoices[0].id) >>> invoice_line, = invoice.lines >>> entry, = invoice_line.analytic_accounts - >>> entry.account == analytic_account - True + >>> assertEqual(entry.account, analytic_account) Sale with an empty analytic account:: diff --git a/modules/attendance/tests/scenario_attendance.rst b/modules/attendance/tests/scenario_attendance.rst index e89e0090f6..1cabdbad93 100644 --- a/modules/attendance/tests/scenario_attendance.rst +++ b/modules/attendance/tests/scenario_attendance.rst @@ -7,7 +7,8 @@ Imports:: >>> import datetime as dt >>> from dateutil.relativedelta import relativedelta >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import ( + ... activate_modules, assertEqual, assertTrue) >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> now = dt.datetime.now() @@ -44,10 +45,8 @@ Create an attendance record for the employee:: >>> attendance.at = now >>> attendance.save() - >>> attendance.date == now.date() - True - >>> bool(attendance.rec_name) - True + >>> assertEqual(attendance.date, now.date()) + >>> assertTrue(attendance.rec_name) When creating a new attendance the type is automatically set:: @@ -91,5 +90,4 @@ Update attendance date time, update its date:: >>> attendance.at = next_week >>> attendance.save() - >>> attendance.date == next_week.date() - True + >>> assertEqual(attendance.date, next_week.date()) diff --git a/modules/attendance/tests/scenario_attendance_timesheet.rst b/modules/attendance/tests/scenario_attendance_timesheet.rst index 2d0b1bc617..c0b9974900 100644 --- a/modules/attendance/tests/scenario_attendance_timesheet.rst +++ b/modules/attendance/tests/scenario_attendance_timesheet.rst @@ -8,7 +8,7 @@ Imports:: >>> from dateutil.relativedelta import relativedelta >>> from proteus import Model >>> from trytond import backend - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -75,7 +75,4 @@ Check attendance time sheet:: >>> if backend.name != 'sqlite': ... sheet, = Sheet.find([('date', '=', dt.date(2020, 4, 2))]) ... sheet.duration - ... sheet.timesheet_duration == dt.timedelta(hours=2) - ... else: - ... True - True + ... assertEqual(sheet.timesheet_duration, dt.timedelta(hours=2)) diff --git a/modules/carrier_carriage/tests/scenario_carrier_carriage.rst b/modules/carrier_carriage/tests/scenario_carrier_carriage.rst index 586be68d70..25eddaed3b 100644 --- a/modules/carrier_carriage/tests/scenario_carrier_carriage.rst +++ b/modules/carrier_carriage/tests/scenario_carrier_carriage.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.account.tests.tools import ( ... create_chart, get_accounts) >>> from trytond.modules.company.tests.tools import ( @@ -127,16 +127,14 @@ Sale products with cost on shipment:: Check shipment:: >>> shipment, = sale.shipments - >>> shipment.carrier == carrier1 - True + >>> assertEqual(shipment.carrier, carrier1) >>> shipment.cost_used Decimal('2.0000') >>> shipment.cost_sale_used Decimal('3.0000') >>> carriage, = shipment.before_carriages - >>> carriage.carrier == carrier2 - True + >>> assertEqual(carriage.carrier, carrier2) >>> carriage.cost_used Decimal('1.0000') >>> carriage.cost_sale_used diff --git a/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst b/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst index 1c45cd3f3e..a1bf0bcfe7 100644 --- a/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst +++ b/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -120,8 +120,7 @@ Receive a single product line:: >>> shipment.carrier = carrier >>> shipment.cost_used Decimal('60.0000') - >>> shipment.cost_currency_used == company.currency - True + >>> assertEqual(shipment.cost_currency_used, company.currency) >>> shipment.click('receive') >>> shipment.state 'received' @@ -148,8 +147,7 @@ Sale products with cost on shipment:: >>> sale_line.quantity = 5.0 >>> sale.click('quote') >>> cost_line = sale.lines[-1] - >>> cost_line.product == carrier_product - True + >>> assertEqual(cost_line.product, carrier_product) >>> cost_line.quantity 1.0 >>> cost_line.amount @@ -165,22 +163,19 @@ Send products:: >>> ShipmentOut = Model.get('stock.shipment.out') >>> shipment, = sale.shipments - >>> shipment.carrier == carrier - True + >>> assertEqual(shipment.carrier, carrier) >>> shipment.cost_used Decimal('15.0000') >>> shipment.cost_sale_used Decimal('15.0000') - >>> shipment.cost_sale_currency_used == company.currency - True + >>> assertEqual(shipment.cost_sale_currency_used, company.currency) >>> move, = shipment.inventory_moves >>> move.quantity = 4 >>> shipment.cost_used Decimal('12.0000') >>> shipment.cost_sale_used Decimal('12.0000') - >>> shipment.cost_sale_currency_used == company.currency - True + >>> assertEqual(shipment.cost_sale_currency_used, company.currency) >>> shipment.state 'waiting' >>> shipment.click('assign_force') @@ -216,8 +211,7 @@ Sale products with cost on order:: >>> sale_line.quantity = 3.0 >>> sale.click('quote') >>> cost_line = sale.lines[-1] - >>> cost_line.product == carrier_product - True + >>> assertEqual(cost_line.product, carrier_product) >>> cost_line.quantity 1.0 >>> cost_line.amount @@ -232,8 +226,7 @@ Sale products with cost on order:: Check customer shipment:: >>> shipment, = sale.shipments - >>> shipment.carrier == carrier - True + >>> assertEqual(shipment.carrier, carrier) Check customer invoice:: diff --git a/modules/carrier_subdivision/tests/scenario_carrier_subdivision.rst b/modules/carrier_subdivision/tests/scenario_carrier_subdivision.rst index 7181c81f97..7d87fe6b28 100644 --- a/modules/carrier_subdivision/tests/scenario_carrier_subdivision.rst +++ b/modules/carrier_subdivision/tests/scenario_carrier_subdivision.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -119,9 +119,7 @@ Test right carrier is used on sale:: >>> Sale = Model.get('sale.sale') >>> sale = Sale() >>> sale.party = customer - >>> sale.carrier == carrier - True + >>> assertEqual(sale.carrier, carrier) >>> sale.carrier = None >>> sale.party = other_customer - >>> sale.carrier == catalan_carrier - True + >>> assertEqual(sale.carrier, catalan_carrier) diff --git a/modules/carrier_subdivision/tests/scenario_carrier_subdivision_postal_code.rst b/modules/carrier_subdivision/tests/scenario_carrier_subdivision_postal_code.rst index 6aa4b8c9bd..0c3f4356e6 100644 --- a/modules/carrier_subdivision/tests/scenario_carrier_subdivision_postal_code.rst +++ b/modules/carrier_subdivision/tests/scenario_carrier_subdivision_postal_code.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -89,9 +89,7 @@ Test right carrier is used on sale:: >>> Sale = Model.get('sale.sale') >>> sale = Sale() >>> sale.party = customer - >>> sale.carrier == carrier - True + >>> assertEqual(sale.carrier, carrier) >>> sale.carrier = None >>> sale.party = other_customer - >>> sale.carrier == local_carrier - True + >>> assertEqual(sale.carrier, local_carrier) diff --git a/modules/carrier_weight/tests/scenario_carrier_weight.rst b/modules/carrier_weight/tests/scenario_carrier_weight.rst index 8f54268eb2..64134df2f1 100644 --- a/modules/carrier_weight/tests/scenario_carrier_weight.rst +++ b/modules/carrier_weight/tests/scenario_carrier_weight.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -131,8 +131,7 @@ Receive a single product line:: >>> shipment.carrier = carrier >>> shipment.cost_used Decimal('25.0000') - >>> shipment.cost_currency_used == company.currency - True + >>> assertEqual(shipment.cost_currency_used, company.currency) >>> shipment.click('receive') >>> shipment.state 'received' @@ -165,8 +164,7 @@ Sale products with cost on shipment:: >>> sale_line.description = 'Comment' >>> sale.click('quote') >>> cost_line = sale.lines[-1] - >>> cost_line.product == carrier_product - True + >>> assertEqual(cost_line.product, carrier_product) >>> cost_line.quantity 1.0 >>> cost_line.amount @@ -182,22 +180,19 @@ Send products:: >>> ShipmentOut = Model.get('stock.shipment.out') >>> shipment, = sale.shipments - >>> shipment.carrier == carrier - True + >>> assertEqual(shipment.carrier, carrier) >>> shipment.cost_used Decimal('40.0000') >>> shipment.cost_sale_used Decimal('40.0000') - >>> shipment.cost_sale_currency_used == company.currency - True + >>> assertEqual(shipment.cost_sale_currency_used, company.currency) >>> move = shipment.inventory_moves[0] >>> move.quantity -= 1 >>> shipment.cost_used Decimal('25.0000') >>> shipment.cost_sale_used Decimal('25.0000') - >>> shipment.cost_sale_currency_used == company.currency - True + >>> assertEqual(shipment.cost_sale_currency_used, company.currency) >>> shipment.state 'waiting' >>> shipment.click('assign_force') @@ -233,8 +228,7 @@ Sale products with cost on order:: >>> sale_line.quantity = 3.0 >>> sale.click('quote') >>> cost_line = sale.lines[-1] - >>> cost_line.product == carrier_product - True + >>> assertEqual(cost_line.product, carrier_product) >>> cost_line.quantity 1.0 >>> cost_line.amount @@ -249,8 +243,7 @@ Sale products with cost on order:: Check customer shipment:: >>> shipment, = sale.shipments - >>> shipment.carrier == carrier - True + >>> assertEqual(shipment.carrier, carrier) Check customer invoice:: diff --git a/modules/commission/tests/scenario_agent_selection.rst b/modules/commission/tests/scenario_agent_selection.rst index 8f09da2b05..def2092c68 100644 --- a/modules/commission/tests/scenario_agent_selection.rst +++ b/modules/commission/tests/scenario_agent_selection.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import ( @@ -76,8 +76,7 @@ The agent is assigned on quotation:: >>> sale.click('quote') >>> sale.state 'quotation' - >>> sale.agent == agent - True + >>> assertEqual(sale.agent, agent) Agent is not set for yesterday sales:: @@ -107,7 +106,5 @@ Creating a sale and test agent is assigned:: >>> sale.click('quote') >>> sale.state 'quotation' - >>> sale.quoted_by == employee - True - >>> sale.agent == agent - True + >>> assertEqual(sale.quoted_by, employee) + >>> assertEqual(sale.agent, agent) diff --git a/modules/commission/tests/scenario_commission.rst b/modules/commission/tests/scenario_commission.rst index 6e60e0b7a0..7b887de7ca 100644 --- a/modules/commission/tests/scenario_commission.rst +++ b/modules/commission/tests/scenario_commission.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -184,8 +184,8 @@ Pay invoice:: >>> pay.state 'end' >>> Commission = Model.get('commission') - >>> [c.date == tomorrow for c in Commission.find([])] - [True, True] + >>> for commission in Commission.find([]): + ... assertEqual(commission.date, tomorrow) Create commission invoices:: @@ -199,11 +199,9 @@ Create commission invoices:: ... ]) >>> invoice.total_amount Decimal('10.00') - >>> invoice.party == agent_party - True + >>> assertEqual(invoice.party, agent_party) >>> invoice_line, = invoice.lines - >>> invoice_line.product == commission_product - True + >>> assertEqual(invoice_line.product, commission_product) >>> invoice, = Invoice.find([ ... ('type', '=', 'out'), @@ -225,8 +223,7 @@ Credit invoice:: >>> credit = Wizard('account.invoice.credit', [invoice]) >>> credit.execute('credit') >>> credit_note, = credit.actions[0] - >>> credit_note.agent == agent - True + >>> assertEqual(credit_note.agent, agent) Check commission reporting per agent:: @@ -241,8 +238,7 @@ Check commission reporting per agent:: >>> reporting_agent.number 1 - >>> reporting_agent_timeseries.date == tomorrow - True + >>> assertEqual(reporting_agent_timeseries.date, tomorrow) >>> reporting_agent_timeseries.base_amount Decimal('100.00') >>> reporting_agent_timeseries.amount diff --git a/modules/document_incoming/tests/scenario_document_incoming.rst b/modules/document_incoming/tests/scenario_document_incoming.rst index 050381e7f2..3bd9bf7466 100644 --- a/modules/document_incoming/tests/scenario_document_incoming.rst +++ b/modules/document_incoming/tests/scenario_document_incoming.rst @@ -5,7 +5,7 @@ Document Incoming Scenario Imports:: >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.tools import file_open Activate modules:: @@ -31,6 +31,5 @@ Process document:: >>> document.state 'done' >>> new_document = document.result - >>> new_document.data == document.data - True + >>> assertEqual(new_document.data, document.data) >>> new_document.type diff --git a/modules/document_incoming_invoice/tests/scenario_document_incoming_invoice.rst b/modules/document_incoming_invoice/tests/scenario_document_incoming_invoice.rst index 32955cdf8f..885e50b48e 100644 --- a/modules/document_incoming_invoice/tests/scenario_document_incoming_invoice.rst +++ b/modules/document_incoming_invoice/tests/scenario_document_incoming_invoice.rst @@ -5,7 +5,7 @@ Document Incoming Invoice Scenario Imports:: >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.account.tests.tools import ( ... create_chart, create_fiscalyear) >>> from trytond.modules.account_invoice.tests.tools import ( @@ -57,5 +57,4 @@ Process document:: >>> document.click('process') >>> invoice = document.result - >>> invoice.party == suppplier - True + >>> assertEqual(invoice.party, suppplier) diff --git a/modules/document_incoming_ocr_typless/tests/scenario_document_incoming_ocr_typless.rst b/modules/document_incoming_ocr_typless/tests/scenario_document_incoming_ocr_typless.rst index 827d3bcdf3..2087bd616a 100644 --- a/modules/document_incoming_ocr_typless/tests/scenario_document_incoming_ocr_typless.rst +++ b/modules/document_incoming_ocr_typless/tests/scenario_document_incoming_ocr_typless.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.tools import file_open >>> from trytond.modules.account.tests.tools import ( ... create_chart, create_fiscalyear, get_accounts, create_tax) @@ -97,8 +97,7 @@ Process document:: >>> document.click('process') >>> invoice = document.result - >>> invoice.party == suppplier - True + >>> assertEqual(invoice.party, suppplier) >>> invoice.reference 'INV-0007' >>> invoice.invoice_date @@ -108,8 +107,7 @@ Process document:: >>> len(invoice.lines) 2 >>> line_service, = [l for l in invoice.lines if l.product] - >>> line_service.product == service - True + >>> assertEqual(line_service.product, service) >>> line_service.quantity 23.0 >>> line_service.unit_price @@ -125,8 +123,7 @@ Process document:: [Decimal('5.75'), Decimal('40.00')] >>> sorted([t.base for t in invoice.taxes]) [Decimal('57.50'), Decimal('200.00')] - >>> {t.tax for t in invoice.taxes} == {tax_10, tax_20} - True + >>> assertEqual({t.tax for t in invoice.taxes}, {tax_10, tax_20}) >>> invoice.untaxed_amount Decimal('257.50') >>> invoice.tax_amount diff --git a/modules/incoterm/tests/scenario_incoterm.rst b/modules/incoterm/tests/scenario_incoterm.rst index 4d07d33683..22f4b8a1f7 100644 --- a/modules/incoterm/tests/scenario_incoterm.rst +++ b/modules/incoterm/tests/scenario_incoterm.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -152,8 +152,7 @@ Test incoterms are deducted from sale:: >>> sale.shipment_cost_method = None >>> sale.incoterm.rec_name 'FCA (2020)' - >>> sale.incoterm_location == warehouse_address - True + >>> assertEqual(sale.incoterm_location, warehouse_address) Try sale without incoterm:: @@ -193,8 +192,7 @@ Test incoterm on shipment:: >>> shipment, = sale.shipments >>> shipment.incoterm.rec_name 'CIF (2020)' - >>> shipment.incoterm_location == port.addresses[0] - True + >>> assertEqual(shipment.incoterm_location, port.addresses[0]) Test incoterm is set on purchase:: diff --git a/modules/marketing_automation/tests/scenario_marketing_automation.rst b/modules/marketing_automation/tests/scenario_marketing_automation.rst index 2bc5ebe0de..d2a72cfe9f 100644 --- a/modules/marketing_automation/tests/scenario_marketing_automation.rst +++ b/modules/marketing_automation/tests/scenario_marketing_automation.rst @@ -8,7 +8,8 @@ Imports:: >>> from proteus import Model, Wizard >>> from proteus.config import get_config >>> from trytond.pyson import Eval, PYSONEncoder - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import ( + ... activate_modules, assertEqual, assertIn, assertTrue) >>> from trytond.tools import file_open Patch sendmail_transactional:: @@ -105,8 +106,7 @@ Trigger scenario:: >>> Record = Model.get('marketing.automation.record') >>> record, = Record.find([]) - >>> record.record == party - True + >>> assertEqual(record.record, party) >>> scenario.record_count 1 >>> scenario.record_count_blocked @@ -138,24 +138,19 @@ Check email sent:: >>> from_, to, msg = smtp_calls.call_args[0] >>> smtp_calls.reset_mock() >>> msg = msg.get_payload(0).get_payload(decode=True).decode('utf-8') - >>> to == [contact.value] - True - >>> re.search(r'Hello, (.*)!', msg).group(1) == party.name - True + >>> assertEqual(to, [contact.value]) + >>> assertEqual(re.search(r'Hello, (.*)!', msg).group(1), party.name) >>> open_url.shortened_url in msg True - >>> open_url.record == record_activity - True + >>> assertEqual(open_url.record, record_activity) >>> open_url.method 'marketing.automation.record.activity|on_email_opened' >>> click_url.shortened_url in msg True - >>> click_url.record == record_activity - True + >>> assertEqual(click_url.record, record_activity) >>> click_url.method 'marketing.automation.record.activity|on_email_clicked' - >>> record.uuid in msg - True + >>> assertIn(record.uuid, msg) >>> email, = Email.find([]) >>> email.recipients @@ -164,10 +159,8 @@ Check email sent:: 'Hello' >>> email.resource == party True - >>> email.marketing_automation_activity == root_activity - True - >>> bool(email.marketing_automation_record) - True + >>> assertEqual(email.marketing_automation_activity, root_activity) + >>> assertTrue(email.marketing_automation_record) Trigger open email and reminder after delay:: diff --git a/modules/marketing_automation/tests/scenario_marketing_automation_unsubscribable.rst b/modules/marketing_automation/tests/scenario_marketing_automation_unsubscribable.rst index 94c66d1346..ad53a96500 100644 --- a/modules/marketing_automation/tests/scenario_marketing_automation_unsubscribable.rst +++ b/modules/marketing_automation/tests/scenario_marketing_automation_unsubscribable.rst @@ -10,7 +10,7 @@ Imports:: >>> from proteus.config import get_config >>> from trytond.modules.company.tests.tools import create_company >>> from trytond.pyson import Eval, PYSONEncoder - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.tools import file_open Patch sendmail_transactional:: @@ -84,8 +84,7 @@ Trigger scenario:: >>> cron_process.click('run_once') >>> record, = Record.find([]) - >>> record.record == sale - True + >>> assertEqual(record.record, sale) Block and unsubscribe:: @@ -93,8 +92,7 @@ Block and unsubscribe:: >>> bool(record.blocked) True >>> party.reload() - >>> party.marketing_scenario_unsubscribed == [scenario] - True + >>> assertEqual(party.marketing_scenario_unsubscribed, [scenario]) Create a new sale:: diff --git a/modules/marketing_campaign/tests/scenario_marketing_campaign_sale.rst b/modules/marketing_campaign/tests/scenario_marketing_campaign_sale.rst index 9abd6fe060..23d5435001 100644 --- a/modules/marketing_campaign/tests/scenario_marketing_campaign_sale.rst +++ b/modules/marketing_campaign/tests/scenario_marketing_campaign_sale.rst @@ -14,7 +14,7 @@ Imports:: ... set_fiscalyear_invoice_sequences) >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual Activate modules:: @@ -107,8 +107,7 @@ Create an opportunity and convert to sale:: >>> sale, = opportunity.click('convert') >>> opportunity.state 'converted' - >>> opportunity.sales == [sale] - True + >>> assertEqual(opportunity.sales, [sale]) Check and confirm sale:: diff --git a/modules/party/tests/scenario_party_erase.rst b/modules/party/tests/scenario_party_erase.rst index 51f6007913..84af127ccf 100644 --- a/modules/party/tests/scenario_party_erase.rst +++ b/modules/party/tests/scenario_party_erase.rst @@ -5,7 +5,7 @@ Party Erase Scenario Imports:: >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual Activate modules:: @@ -33,8 +33,7 @@ Create a party:: Try erase active party:: >>> erase = Wizard('party.erase', models=[party]) - >>> erase.form.party == party - True + >>> assertEqual(erase.form.party, party) >>> erase.execute('erase') Traceback (most recent call last): ... @@ -46,8 +45,7 @@ Erase inactive party:: >>> party.save() >>> erase = Wizard('party.erase', models=[party]) - >>> erase.form.party == party - True + >>> assertEqual(erase.form.party, party) >>> erase.execute('erase') Check fields have been erased:: diff --git a/modules/party/tests/scenario_party_replace.rst b/modules/party/tests/scenario_party_replace.rst index 18ef150201..7f51079187 100644 --- a/modules/party/tests/scenario_party_replace.rst +++ b/modules/party/tests/scenario_party_replace.rst @@ -5,7 +5,8 @@ Party Replace Scenario Imports:: >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import ( + ... activate_modules, assertEqual, assertFalse) Activate modules:: @@ -35,8 +36,7 @@ Create a second party similar party:: Replace the second by the first party:: >>> replace = Wizard('party.replace', models=[party2]) - >>> replace.form.source == party2 - True + >>> assertEqual(replace.form.source, party2) >>> replace.form.destination = party1 >>> replace.execute('replace') @@ -45,13 +45,9 @@ Replace the second by the first party:: False >>> identifier2.reload() - >>> identifier2.party == party1 - True - >>> bool(identifier2.active) - False + >>> assertEqual(identifier2.party, party1) + >>> assertFalse(identifier2.active) >>> address2.reload() - >>> address2.party == party1 - True - >>> bool(address2.active) - False + >>> assertEqual(address2.party, party1) + >>> assertFalse(address2.active) diff --git a/modules/product_cost_history/tests/scenario_product_cost_history.rst b/modules/product_cost_history/tests/scenario_product_cost_history.rst index a98a3c4d9e..9e6b8f622c 100644 --- a/modules/product_cost_history/tests/scenario_product_cost_history.rst +++ b/modules/product_cost_history/tests/scenario_product_cost_history.rst @@ -8,7 +8,7 @@ Imports:: >>> import time >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -111,11 +111,10 @@ Check cost history:: >>> order = [('date', 'ASC')] >>> [c.cost_price for c in ProductCostHistory.find([], order=order)] [Decimal('100.0000'), Decimal('120.0000'), Decimal('110.0000')] - >>> [c.date for c in ProductCostHistory.find([], order=order)] == [ + >>> assertEqual([c.date for c in ProductCostHistory.find([], order=order)], [ ... today - dt.timedelta(days=2), ... today - dt.timedelta(days=1), - ... today] - True + ... today]) Check cost price history on product:: diff --git a/modules/product_kit/tests/scenario_product_kit_purchase.rst b/modules/product_kit/tests/scenario_product_kit_purchase.rst index 0bde778427..1619cb99b1 100644 --- a/modules/product_kit/tests/scenario_product_kit_purchase.rst +++ b/modules/product_kit/tests/scenario_product_kit_purchase.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -192,8 +192,7 @@ Check invoice:: >>> invoice, = purchase.invoices >>> line, = invoice.lines - >>> line.product == service - True + >>> assertEqual(line.product, service) Check stock moves:: diff --git a/modules/product_kit/tests/scenario_product_kit_sale.rst b/modules/product_kit/tests/scenario_product_kit_sale.rst index bc4bcc7973..74a522456e 100644 --- a/modules/product_kit/tests/scenario_product_kit_sale.rst +++ b/modules/product_kit/tests/scenario_product_kit_sale.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -179,8 +179,7 @@ Check invoice:: >>> invoice, = sale.invoices >>> line, = invoice.lines - >>> line.product == service - True + >>> assertEqual(line.product, service) Check shipment:: diff --git a/modules/production/tests/scenario_production.rst b/modules/production/tests/scenario_production.rst index f596a9687d..993b647eb6 100644 --- a/modules/production/tests/scenario_production.rst +++ b/modules/production/tests/scenario_production.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -129,8 +129,7 @@ Make a production:: >>> production.product = product >>> production.bom = bom >>> production.quantity = 2 - >>> production.planned_start_date == yesterday - True + >>> assertEqual(production.planned_start_date, yesterday) >>> sorted([i.quantity for i in production.inputs]) [10.0, 300.0] >>> output, = production.outputs @@ -168,14 +167,13 @@ Do the production:: >>> production.click('run') >>> {i.state for i in production.inputs} {'done'} - >>> {i.effective_date == today for i in production.inputs} - {True} + >>> for input_ in production.inputs: + ... assertEqual(input_.effective_date, today) >>> production.click('done') >>> output, = production.outputs >>> output.state 'done' - >>> output.effective_date == production.effective_date - True + >>> assertEqual(output.effective_date, production.effective_date) >>> output.unit_price Decimal('12.5000') >>> with config.set_context(locations=[storage.id]): @@ -195,14 +193,12 @@ Make a production with effective date yesterday and running the day before:: >>> production.click('assign_try') >>> production.click('run') >>> production.reload() - >>> {i.effective_date == before_yesterday for i in production.inputs} - {True} + >>> for input_ in production.inputs: + ... assertEqual(input_.effective_date, before_yesterday) >>> production.click('done') >>> production.reload() >>> output, = production.outputs - >>> output.effective_date == yesterday - True - + >>> assertEqual(output.effective_date, yesterday) Make a production with a bom of zero quantity:: @@ -232,5 +228,4 @@ Reschedule productions:: >>> cron.interval_type = 'months' >>> cron.click('run_once') >>> production.reload() - >>> production.planned_start_date == today - True + >>> assertEqual(production.planned_start_date, today) diff --git a/modules/production_outsourcing/tests/scenario_production_outsourcing.rst b/modules/production_outsourcing/tests/scenario_production_outsourcing.rst index fd41148887..8b0174d9f1 100644 --- a/modules/production_outsourcing/tests/scenario_production_outsourcing.rst +++ b/modules/production_outsourcing/tests/scenario_production_outsourcing.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_chart, \ @@ -107,8 +107,7 @@ Create Routing:: >>> routing = Routing(name="Supplier") >>> routing.supplier = supplier >>> routing.supplier_service = service - >>> routing.supplier_service_supplier == service_supplier - True + >>> assertEqual(routing.supplier_service_supplier, service_supplier) >>> routing.supplier_quantity = 2 >>> routing.boms.append(bom) >>> routing.save() @@ -131,10 +130,8 @@ Make a production:: >>> production.state 'waiting' >>> purchase_line, = production.purchase_lines - >>> purchase_line.product == service - True - >>> purchase_line.product_supplier == service_supplier - True + >>> assertEqual(purchase_line.product, service) + >>> assertEqual(purchase_line.product_supplier, service_supplier) >>> purchase_line.quantity 20.0 >>> production.cost diff --git a/modules/production_routing/tests/scenario_stock_supply_production.rst b/modules/production_routing/tests/scenario_stock_supply_production.rst index d4d30fadb4..48b5f08e81 100644 --- a/modules/production_routing/tests/scenario_stock_supply_production.rst +++ b/modules/production_routing/tests/scenario_stock_supply_production.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -75,5 +75,4 @@ There is now a production request with the routing:: >>> Production = Model.get('production') >>> production, = Production.find([]) - >>> production.routing == routing - True + >>> assertEqual(production.routing, routing) diff --git a/modules/production_work/tests/scenario_production_work.rst b/modules/production_work/tests/scenario_production_work.rst index f5f184fca1..d3ff3d05f0 100644 --- a/modules/production_work/tests/scenario_production_work.rst +++ b/modules/production_work/tests/scenario_production_work.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -186,16 +186,12 @@ Make a production:: Test works:: >>> work1, work2 = production.works - >>> work1.operation == operation1 - True - >>> work1.work_center == center1 - True + >>> assertEqual(work1.operation, operation1) + >>> assertEqual(work1.work_center, center1) >>> work1.state 'request' - >>> work2.operation == operation2 - True - >>> work2.work_center == center2 - True + >>> assertEqual(work2.operation, operation2) + >>> assertEqual(work2.work_center, center2) >>> work2.state 'request' @@ -220,23 +216,20 @@ Run works:: >>> cycle1.click('run') >>> cycle1.state 'running' - >>> cycle1.run_by == employee - True + >>> assertEqual(cycle1.run_by, employee) >>> work1.reload() >>> work1.state 'running' >>> cycle1.click('do') >>> cycle1.state 'done' - >>> cycle1.done_by == employee - True + >>> assertEqual(cycle1.done_by, employee) >>> work1.reload() >>> work1.state 'finished' >>> cycle2 = work2.cycles.new() >>> cycle2.click('cancel') - >>> cycle2.cancelled_by == employee - True + >>> assertEqual(cycle2.cancelled_by, employee) >>> cycle2.state 'cancelled' >>> work2.reload() diff --git a/modules/project/tests/scenario_project_status.rst b/modules/project/tests/scenario_project_status.rst index 705fa363c7..894659ac8c 100644 --- a/modules/project/tests/scenario_project_status.rst +++ b/modules/project/tests/scenario_project_status.rst @@ -5,7 +5,7 @@ Project Status Scenario Imports:: >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company Activate project:: @@ -30,11 +30,9 @@ Create a project with a task:: >>> Work = Model.get('project.work') >>> project = Work(type='project', name="Project") - >>> project.status == open - True + >>> assertEqual(project.status, open) >>> task = project.children.new(name="Task") - >>> task.status == open - True + >>> assertEqual(task.status, open) >>> project.save() >>> task, = project.children @@ -89,6 +87,5 @@ Re-open task:: Copy the project:: >>> project_copy, = project.duplicate() - >>> project_copy.status == open - True + >>> assertEqual(project_copy.status, open) >>> project_copy.progress diff --git a/modules/purchase/tests/scenario_purchase.rst b/modules/purchase/tests/scenario_purchase.rst index 4a8d7e32be..1a6dea5871 100644 --- a/modules/purchase/tests/scenario_purchase.rst +++ b/modules/purchase/tests/scenario_purchase.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -168,13 +168,11 @@ Purchase 5 products:: >>> purchase.click('quote') >>> purchase.untaxed_amount, purchase.tax_amount, purchase.total_amount (Decimal('25.00'), Decimal('2.50'), Decimal('27.50')) - >>> purchase.quoted_by == employee - True + >>> assertEqual(purchase.quoted_by, employee) >>> purchase.click('confirm') >>> purchase.untaxed_amount, purchase.tax_amount, purchase.total_amount (Decimal('25.00'), Decimal('2.50'), Decimal('27.50')) - >>> purchase.confirmed_by == employee - True + >>> assertEqual(purchase.confirmed_by, employee) >>> purchase.state 'processing' >>> purchase.shipment_state @@ -184,8 +182,7 @@ Purchase 5 products:: >>> len(purchase.moves), len(purchase.shipment_returns), len(purchase.invoices) (2, 0, 1) >>> invoice, = purchase.invoices - >>> invoice.origins == purchase.rec_name - True + >>> assertEqual(invoice.origins, purchase.rec_name) >>> invoice.untaxed_amount, invoice.tax_amount, invoice.total_amount (Decimal('25.00'), Decimal('2.50'), Decimal('27.50')) @@ -195,19 +192,15 @@ Invoice line must be linked to stock move:: ... invoice.lines, key=lambda l: l.quantity or 0) >>> stock_move1, stock_move2 = sorted(purchase.moves, ... key=lambda m: m.quantity) - >>> invoice_line1.stock_moves == [stock_move1] - True - >>> stock_move1.invoice_lines == [invoice_line1] - True - >>> invoice_line2.stock_moves == [stock_move2] - True - >>> stock_move2.invoice_lines == [invoice_line2] - True + >>> assertEqual(invoice_line1.stock_moves, [stock_move1]) + >>> assertEqual(stock_move1.invoice_lines, [invoice_line1]) + >>> assertEqual(invoice_line2.stock_moves, [stock_move2]) + >>> assertEqual(stock_move2.invoice_lines, [invoice_line2]) Check actual quantity:: - >>> all(l.quantity == l.actual_quantity for l in purchase.lines) - True + >>> for line in purchase.lines: + ... assertEqual(line.quantity, line.actual_quantity) Post invoice and check no new invoices:: @@ -269,8 +262,7 @@ Validate Shipments:: ... incoming_move = Move(id=move.id) ... shipment.incoming_moves.append(incoming_move) >>> shipment.save() - >>> shipment.origins == purchase.rec_name - True + >>> assertEqual(shipment.origins, purchase.rec_name) >>> shipment.click('receive') >>> shipment.click('done') >>> purchase.reload() @@ -296,10 +288,8 @@ Open supplier invoice:: Invoice lines must be linked to each stock moves:: - >>> invoice_line1.stock_moves == [stock_move1] - True - >>> invoice_line2.stock_moves == [stock_move2] - True + >>> assertEqual(invoice_line1.stock_moves, [stock_move1]) + >>> assertEqual(invoice_line2.stock_moves, [stock_move2]) Check second invoices:: diff --git a/modules/purchase/tests/scenario_purchase_copy_product_suppliers.rst b/modules/purchase/tests/scenario_purchase_copy_product_suppliers.rst index 67c8ec78fa..8ae04d3885 100644 --- a/modules/purchase/tests/scenario_purchase_copy_product_suppliers.rst +++ b/modules/purchase/tests/scenario_purchase_copy_product_suppliers.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -44,8 +44,7 @@ Create a product with suppliers:: >>> product, = template.products >>> product_supplier = product.product_suppliers.new() >>> product_supplier.party = supplier - >>> product_supplier.template == template - True + >>> assertEqual(product_supplier.template, template) >>> product.save() Supplier is copied when copying the template:: diff --git a/modules/purchase/tests/scenario_purchase_default_taxes.rst b/modules/purchase/tests/scenario_purchase_default_taxes.rst index 5c3e3797a3..88e82c13ad 100644 --- a/modules/purchase/tests/scenario_purchase_default_taxes.rst +++ b/modules/purchase/tests/scenario_purchase_default_taxes.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company >>> from trytond.modules.account.tests.tools import ( ... create_chart, get_accounts, create_tax) @@ -45,8 +45,7 @@ Create a purchase without product:: >>> purchase = Purchase(party=supplier) >>> line = purchase.lines.new() - >>> line.taxes == [tax] - True + >>> assertEqual(line.taxes, [tax]) >>> line.quantity = 1 >>> line.unit_price = Decimal('100.0000') >>> purchase.click('quote') @@ -62,5 +61,4 @@ Check invoice:: >>> invoice.total_amount Decimal('110.00') >>> line, = invoice.lines - >>> line.account == accounts['expense'] - True + >>> assertEqual(line.account, accounts['expense']) diff --git a/modules/purchase/tests/scenario_purchase_modify_header.rst b/modules/purchase/tests/scenario_purchase_modify_header.rst index 4bc3950132..4b1347604f 100644 --- a/modules/purchase/tests/scenario_purchase_modify_header.rst +++ b/modules/purchase/tests/scenario_purchase_modify_header.rst @@ -6,7 +6,7 @@ Imports:: >>> from proteus import Model, Wizard >>> from decimal import Decimal - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -88,8 +88,7 @@ Create a sale with a line:: Change the party:: >>> modify_header = purchase.click('modify_header') - >>> modify_header.form.party == supplier - True + >>> assertEqual(modify_header.form.party, supplier) >>> modify_header.form.party = another >>> modify_header.execute('modify') diff --git a/modules/purchase/tests/scenario_purchase_reporting.rst b/modules/purchase/tests/scenario_purchase_reporting.rst index 672c0531b0..f62edab7f6 100644 --- a/modules/purchase/tests/scenario_purchase_reporting.rst +++ b/modules/purchase/tests/scenario_purchase_reporting.rst @@ -7,7 +7,7 @@ Imports:: >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -107,20 +107,18 @@ Check purchase reporting per supplier:: >>> len(reports) 2 >>> with config.set_context(context=context): - ... sorted((r.supplier.id, r.number, r.expense) for r in reports) == \ - ... sorted([(supplier1.id, 1, Decimal('30')), - ... (supplier2.id, 1, Decimal('10'))]) - True + ... assertEqual({(r.supplier.id, r.number, r.expense) for r in reports}, + ... {(supplier1.id, 1, Decimal('30')), + ... (supplier2.id, 1, Decimal('10'))}) >>> len(time_series) 2 >>> purchase1_ts_date = purchase1.purchase_date.replace(day=1) >>> purchase2_ts_date = purchase2.purchase_date.replace(day=1) >>> with config.set_context(context=context): - ... sorted((r.supplier.id, r.date, r.number, r.expense) - ... for r in time_series) == sorted( - ... [(supplier1.id, purchase1_ts_date, 1, Decimal('30')), - ... (supplier2.id, purchase2_ts_date, 1, Decimal('10'))]) - True + ... assertEqual({(r.supplier.id, r.date, r.number, r.expense) + ... for r in time_series}, + ... {(supplier1.id, purchase1_ts_date, 1, Decimal('30')), + ... (supplier2.id, purchase2_ts_date, 1, Decimal('10'))}) Check purchase reporting per product without supplier:: @@ -139,15 +137,13 @@ Check purchase reporting per product with supplier:: >>> len(reports) 2 >>> with config.set_context(context=context): - ... sorted((r.product.id, r.number, r.expense) for r in reports) == \ - ... sorted([(product1.id, 1, Decimal('20')), - ... (product2.id, 1, Decimal('10'))]) - True + ... assertEqual({(r.product.id, r.number, r.expense) for r in reports}, + ... {(product1.id, 1, Decimal('20')), + ... (product2.id, 1, Decimal('10'))}) >>> len(time_series) 2 >>> with config.set_context(context=context): - ... sorted((r.product.id, r.date, r.number, r.expense) - ... for r in time_series) == sorted( - ... [(product1.id, purchase1_ts_date, 1, Decimal('20')), - ... (product2.id, purchase1_ts_date, 1, Decimal('10'))]) - True + ... assertEqual({(r.product.id, r.date, r.number, r.expense) + ... for r in time_series}, + ... {(product1.id, purchase1_ts_date, 1, Decimal('20')), + ... (product2.id, purchase1_ts_date, 1, Decimal('10'))}) diff --git a/modules/purchase/tests/scenario_purchase_return_wizard.rst b/modules/purchase/tests/scenario_purchase_return_wizard.rst index b0f9225311..af3b3cd72b 100644 --- a/modules/purchase/tests/scenario_purchase_return_wizard.rst +++ b/modules/purchase/tests/scenario_purchase_return_wizard.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -88,7 +88,6 @@ Return purchase using the wizard:: >>> returned_purchase, = Purchase.find([ ... ('state', '=', 'draft'), ... ]) - >>> returned_purchase.origin == purchase_to_return - True + >>> assertEqual(returned_purchase.origin, purchase_to_return) >>> sorted([x.quantity or 0 for x in returned_purchase.lines]) [-1.0, 0] diff --git a/modules/purchase_amendment/tests/scenario_purchase_amendment.rst b/modules/purchase_amendment/tests/scenario_purchase_amendment.rst index c3c67b24b8..7795c34606 100644 --- a/modules/purchase_amendment/tests/scenario_purchase_amendment.rst +++ b/modules/purchase_amendment/tests/scenario_purchase_amendment.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -101,8 +101,7 @@ Add an amendment:: >>> line.action = 'payment_term' >>> line = amendment.lines.new() >>> line.action = 'party' - >>> line.party == supplier1 - True + >>> assertEqual(line.party, supplier1) >>> line.party = supplier2 >>> line = amendment.lines.new() >>> line.action = 'warehouse' @@ -111,8 +110,7 @@ Add an amendment:: >>> line = amendment.lines.new() >>> line.action = 'line' >>> line.line = purchase.lines[0] - >>> line.product == product1 - True + >>> assertEqual(line.product, product1) >>> line.product = product2 >>> line.quantity 5.0 @@ -133,11 +131,9 @@ Validate amendment:: >>> purchase.reload() >>> purchase.revision 1 - >>> purchase.party == supplier2 - True + >>> assertEqual(purchase.party, supplier2) >>> line = purchase.lines[0] - >>> line.product == product2 - True + >>> assertEqual(line.product, product2) >>> line.quantity 4.0 >>> line.unit_price @@ -149,15 +145,13 @@ Validate amendment:: Decimal('46.00') >>> move, = purchase.moves - >>> move.product == product2 - True + >>> assertEqual(move.product, product2) >>> move.quantity 4.0 >>> invoice, = purchase.invoices >>> line = invoice.lines[0] - >>> line.product == product2 - True + >>> assertEqual(line.product, product2) >>> line.quantity 4.0 >>> line.unit_price diff --git a/modules/purchase_blanket_agreement/tests/scenario_purchase_blanket_agreement.rst b/modules/purchase_blanket_agreement/tests/scenario_purchase_blanket_agreement.rst index 28f159acaf..e3b72215bc 100644 --- a/modules/purchase_blanket_agreement/tests/scenario_purchase_blanket_agreement.rst +++ b/modules/purchase_blanket_agreement/tests/scenario_purchase_blanket_agreement.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -109,8 +109,7 @@ Create purchase from blanket agreement:: >>> purchase, = create_purchase.actions[0] >>> line, = purchase.lines - >>> line.product == product1 - True + >>> assertEqual(line.product, product1) >>> line.quantity 20.0 >>> line.unit_price diff --git a/modules/purchase_product_quantity/tests/scenario_purchase_product_quantity.rst b/modules/purchase_product_quantity/tests/scenario_purchase_product_quantity.rst index 0a58eebad1..f6533ae5fc 100644 --- a/modules/purchase_product_quantity/tests/scenario_purchase_product_quantity.rst +++ b/modules/purchase_product_quantity/tests/scenario_purchase_product_quantity.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.account.tests.tools import ( ... create_chart, get_accounts) >>> from trytond.modules.company.tests.tools import ( @@ -96,8 +96,7 @@ Create purchase:: >>> purchase_request.state 'purchased' - >>> purchase_request.purchase_line.unit == gr - True + >>> assertEqual(purchase_request.purchase_line.unit, gr) >>> purchase_request.purchase_line.quantity 100.0 @@ -123,7 +122,6 @@ Create purchase:: >>> purchase_request.state 'purchased' - >>> purchase_request.purchase_line.unit == gr - True + >>> assertEqual(purchase_request.purchase_line.unit, gr) >>> purchase_request.purchase_line.quantity 1050.0 diff --git a/modules/purchase_request/tests/scenario_purchase_request.rst b/modules/purchase_request/tests/scenario_purchase_request.rst index bb26b438f3..fd2b2cd2d3 100644 --- a/modules/purchase_request/tests/scenario_purchase_request.rst +++ b/modules/purchase_request/tests/scenario_purchase_request.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import (create_chart, @@ -157,8 +157,7 @@ There is now a draft purchase request:: >>> set_user(purchase_user) >>> pr, = PurchaseRequest.find([('state', '=', 'draft')]) - >>> pr.product == product - True + >>> assertEqual(pr.product, product) >>> pr.quantity 1.0 @@ -241,12 +240,10 @@ Create the purchase with a unique line:: >>> len(purchase.lines) 1 >>> line, = purchase.lines - >>> line.product == product - True + >>> assertEqual(line.product, product) >>> line.quantity 2.0 - >>> line.unit == unit - True + >>> assertEqual(line.unit, unit) Create a purchase request without product:: diff --git a/modules/purchase_request_quotation/tests/scenario_purchase_request_quotation.rst b/modules/purchase_request_quotation/tests/scenario_purchase_request_quotation.rst index aa80fb79ce..fbea157197 100644 --- a/modules/purchase_request_quotation/tests/scenario_purchase_request_quotation.rst +++ b/modules/purchase_request_quotation/tests/scenario_purchase_request_quotation.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -125,8 +125,7 @@ add another supplier:: 'draft' >>> create_quotation = Wizard( ... 'purchase.request.quotation.create', [purchase_request]) - >>> [supplier] == create_quotation.form.suppliers - True + >>> assertEqual(create_quotation.form.suppliers, [supplier]) >>> create_quotation.form.suppliers.append(Party(supplier2.id)) >>> create_quotation.execute('create_quotations') >>> create_quotation.execute('end') @@ -205,8 +204,7 @@ best price from quotations was selected (supplier2 price):: >>> purchase, = Purchase.find([ ... ('state', '=', 'draft'), ... ]) - >>> purchase.party == supplier2 - True + >>> assertEqual(purchase.party, supplier2) >>> purchase.lines[0].unit_price Decimal('8.000') diff --git a/modules/purchase_requisition/tests/scenario_purchase_requisition.rst b/modules/purchase_requisition/tests/scenario_purchase_requisition.rst index f539eb0db8..ec87c05f53 100644 --- a/modules/purchase_requisition/tests/scenario_purchase_requisition.rst +++ b/modules/purchase_requisition/tests/scenario_purchase_requisition.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import (create_company, ... get_company) >>> from trytond.modules.account.tests.tools import (create_chart, @@ -201,18 +201,14 @@ Create Purchase order from Request:: >>> pr, = PurchaseRequest.find([('state', '=', 'draft')]) >>> pr.state 'draft' - >>> pr.product == product - True - >>> pr.party == supplier - True + >>> assertEqual(pr.product, product) + >>> assertEqual(pr.party, supplier) >>> pr.quantity 2.0 >>> pr.computed_quantity 2.0 - >>> pr.supply_date == today - True - >>> pr.warehouse == warehouse_loc - True + >>> assertEqual(pr.supply_date, today) + >>> assertEqual(pr.warehouse, warehouse_loc) >>> create_purchase = Wizard('purchase.request.create_purchase', [pr]) >>> pr.state 'purchased' @@ -308,10 +304,8 @@ Create purchase requisition with two different suppliers:: >>> pr = PurchaseRequest.find([('state', '=', 'draft')]) >>> len(pr) 2 - >>> pr[0].party == supplier2 - True - >>> pr[1].party == supplier - True + >>> assertEqual(pr[0].party, supplier2) + >>> assertEqual(pr[1].party, supplier) >>> create_purchase = Wizard('purchase.request.create_purchase', pr) >>> purchase, = Purchase.find([ ... ('state', '=', 'draft'), diff --git a/modules/purchase_secondary_unit/tests/scenario_purchase_blanket_agreement_secondary_unit.rst b/modules/purchase_secondary_unit/tests/scenario_purchase_blanket_agreement_secondary_unit.rst index a6b4b9b9d4..016c9f6c2a 100644 --- a/modules/purchase_secondary_unit/tests/scenario_purchase_blanket_agreement_secondary_unit.rst +++ b/modules/purchase_secondary_unit/tests/scenario_purchase_blanket_agreement_secondary_unit.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -89,24 +89,20 @@ Create purchase from blanket agreement:: >>> create_purchase = Wizard( ... 'purchase.blanket_agreement.create_purchase', [blanket_agreement]) - >>> create_purchase.form.lines[0].unit == gr - True + >>> assertEqual(create_purchase.form.lines[0].unit, gr) >>> create_purchase.execute('create_purchase') >>> purchase, = create_purchase.actions[0] >>> line, = purchase.lines - >>> line.product == product - True + >>> assertEqual(line.product, product) - >>> line.secondary_unit == gr - True + >>> assertEqual(line.secondary_unit, gr) >>> line.secondary_quantity 800.0 >>> line.secondary_unit_price Decimal('7.0000') - >>> line.unit == unit - True + >>> assertEqual(line.unit, unit) >>> line.quantity 8.0 >>> line.unit_price diff --git a/modules/purchase_secondary_unit/tests/scenario_purchase_requisition_secondary_unit.rst b/modules/purchase_secondary_unit/tests/scenario_purchase_requisition_secondary_unit.rst index 2aa44b1595..0dce9917d0 100644 --- a/modules/purchase_secondary_unit/tests/scenario_purchase_requisition_secondary_unit.rst +++ b/modules/purchase_secondary_unit/tests/scenario_purchase_requisition_secondary_unit.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -100,8 +100,7 @@ Create Purchase order from Request:: >>> create_purchase.execute('start') >>> request.state 'purchased' - >>> request.purchase_line.unit == unit - True + >>> assertEqual(request.purchase_line.unit, unit) >>> request.purchase_line.quantity 3.0 >>> request.purchase_line.unit_price diff --git a/modules/purchase_secondary_unit/tests/scenario_purchase_secondary_unit.rst b/modules/purchase_secondary_unit/tests/scenario_purchase_secondary_unit.rst index 0cc6a2344e..bd5dcfb53c 100644 --- a/modules/purchase_secondary_unit/tests/scenario_purchase_secondary_unit.rst +++ b/modules/purchase_secondary_unit/tests/scenario_purchase_secondary_unit.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_chart, \ @@ -123,8 +123,7 @@ Check secondary unit on invoice:: >>> invoice, = purchase.invoices >>> line, = invoice.lines - >>> line.secondary_unit == kg - True + >>> assertEqual(line.secondary_unit, kg) >>> line.secondary_quantity 2.0 >>> line.secondary_unit_price @@ -133,8 +132,7 @@ Check secondary unit on invoice:: Check secondary unit on move:: >>> move, = purchase.moves - >>> move.secondary_unit == kg - True + >>> assertEqual(move.secondary_unit, kg) >>> move.secondary_quantity 2.0 >>> move.secondary_unit_price diff --git a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost.rst b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost.rst index b0aa50ce8a..e2897c6376 100644 --- a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost.rst +++ b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -82,8 +82,7 @@ Receive a single product line:: >>> shipment.carrier = carrier >>> shipment.cost_used Decimal('3.0000') - >>> shipment.cost_currency_used == company.currency - True + >>> assertEqual(shipment.cost_currency_used, company.currency) >>> shipment.click('receive') >>> shipment.state 'received' diff --git a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock.rst b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock.rst index e1588bb9c6..36863ece2a 100644 --- a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock.rst +++ b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -139,8 +139,7 @@ Receive a single product line:: >>> shipment.carrier = carrier >>> shipment.cost_used Decimal('3.0000') - >>> shipment.cost_currency_used == company.currency - True + >>> assertEqual(shipment.cost_currency_used, company.currency) >>> shipment.click('receive') >>> shipment.state 'received' diff --git a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst index 9c622658a3..39fdee0624 100644 --- a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst +++ b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -150,8 +150,7 @@ Receive 4 products:: >>> shipment.carrier = carrier >>> shipment.cost_used Decimal('3.0000') - >>> shipment.cost_currency_used == company.currency - True + >>> assertEqual(shipment.cost_currency_used, company.currency) >>> shipment.click('receive') >>> shipment.state 'received' diff --git a/modules/sale/tests/scenario_sale.rst b/modules/sale/tests/scenario_sale.rst index 0b34a688cd..1227b626a9 100644 --- a/modules/sale/tests/scenario_sale.rst +++ b/modules/sale/tests/scenario_sale.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -160,13 +160,11 @@ Sale 5 products:: >>> sale.click('quote') >>> sale.untaxed_amount, sale.tax_amount, sale.total_amount (Decimal('50.00'), Decimal('5.00'), Decimal('55.00')) - >>> sale.quoted_by == employee - True + >>> assertEqual(sale.quoted_by, employee) >>> sale.click('confirm') >>> sale.untaxed_amount, sale.tax_amount, sale.total_amount (Decimal('50.00'), Decimal('5.00'), Decimal('55.00')) - >>> sale.confirmed_by == employee - True + >>> assertEqual(sale.confirmed_by, employee) >>> sale.state 'processing' >>> sale.shipment_state @@ -176,11 +174,9 @@ Sale 5 products:: >>> len(sale.shipments), len(sale.shipment_returns), len(sale.invoices) (1, 0, 1) >>> invoice, = sale.invoices - >>> invoice.origins == sale.rec_name - True + >>> assertEqual(invoice.origins, sale.rec_name) >>> shipment, = sale.shipments - >>> shipment.origins == sale.rec_name - True + >>> assertEqual(shipment.origins, sale.rec_name) Invoice line must be linked to stock move:: @@ -188,19 +184,15 @@ Invoice line must be linked to stock move:: ... invoice.lines, key=lambda l: l.quantity or 0) >>> stock_move1, stock_move2 = sorted(shipment.outgoing_moves, ... key=lambda m: m.quantity or 0) - >>> invoice_line1.stock_moves == [stock_move1] - True - >>> stock_move1.invoice_lines == [invoice_line1] - True - >>> invoice_line2.stock_moves == [stock_move2] - True - >>> stock_move2.invoice_lines == [invoice_line2] - True + >>> assertEqual(invoice_line1.stock_moves, [stock_move1]) + >>> assertEqual(stock_move1.invoice_lines, [invoice_line1]) + >>> assertEqual(invoice_line2.stock_moves, [stock_move2]) + >>> assertEqual(stock_move2.invoice_lines, [invoice_line2]) Check actual quantity:: - >>> all(l.quantity == l.actual_quantity for l in sale.lines) - True + >>> for line in sale.lines: + ... assertEqual(line.quantity, line.actual_quantity) Post invoice and check no new invoices:: @@ -288,10 +280,8 @@ Open customer invoice:: Invoice lines must be linked to each stock moves:: - >>> invoice_line1.stock_moves == [stock_move1] - True - >>> invoice_line2.stock_moves == [stock_move2] - True + >>> assertEqual(invoice_line1.stock_moves, [stock_move1]) + >>> assertEqual(invoice_line2.stock_moves, [stock_move2]) Check second invoices:: @@ -356,8 +346,7 @@ Stock moves must be linked to invoice line:: >>> stock_move, = shipment.outgoing_moves >>> stock_move.quantity 4.0 - >>> stock_move.invoice_lines == [invoice_line] - True + >>> assertEqual(stock_move.invoice_lines, [invoice_line]) Ship 3 products:: @@ -634,8 +623,7 @@ Return sales using the wizard:: >>> returned_sale, = Sale.find([ ... ('state', '=', 'draft'), ... ]) - >>> returned_sale.origin == sale_to_return - True + >>> assertEqual(returned_sale.origin, sale_to_return) >>> sorted([x.quantity or 0 for x in returned_sale.lines]) [-1.0, 0] @@ -683,8 +671,7 @@ invoices:: >>> sale.click('confirm') >>> invoice, = sale.invoices >>> invoice_line, = invoice.lines - >>> invoice_line.stock_moves == [] - True + >>> assertEqual(invoice_line.stock_moves, []) >>> invoice_line.quantity = 5.0 >>> invoice.click('post') >>> pay = invoice.click('pay') diff --git a/modules/sale/tests/scenario_sale_default_taxes.rst b/modules/sale/tests/scenario_sale_default_taxes.rst index 9fadf2efa6..fbcbbfcc01 100644 --- a/modules/sale/tests/scenario_sale_default_taxes.rst +++ b/modules/sale/tests/scenario_sale_default_taxes.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company >>> from trytond.modules.account.tests.tools import ( ... create_chart, get_accounts, create_tax) @@ -45,8 +45,7 @@ Create a sale without product:: >>> sale = Sale(party=customer) >>> line = sale.lines.new() - >>> line.taxes == [tax] - True + >>> assertEqual(line.taxes, [tax]) >>> line.quantity = 1 >>> line.unit_price = Decimal('100.0000') >>> sale.click('quote') @@ -62,5 +61,4 @@ Check invoice:: >>> invoice.total_amount Decimal('110.00') >>> line, = invoice.lines - >>> line.account == accounts['revenue'] - True + >>> assertEqual(line.account, accounts['revenue']) diff --git a/modules/sale/tests/scenario_sale_modify_header.rst b/modules/sale/tests/scenario_sale_modify_header.rst index 54a62c1e2f..6a273e7a40 100644 --- a/modules/sale/tests/scenario_sale_modify_header.rst +++ b/modules/sale/tests/scenario_sale_modify_header.rst @@ -6,7 +6,7 @@ Imports:: >>> from proteus import Model, Wizard >>> from decimal import Decimal - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -90,8 +90,7 @@ Create a sale with a line:: Change the party:: >>> modify_header = sale.click('modify_header') - >>> modify_header.form.party == customer - True + >>> assertEqual(modify_header.form.party, customer) >>> modify_header.form.party = another >>> modify_header.execute('modify') diff --git a/modules/sale/tests/scenario_sale_reporting.rst b/modules/sale/tests/scenario_sale_reporting.rst index aa088b2e15..584e4a2548 100644 --- a/modules/sale/tests/scenario_sale_reporting.rst +++ b/modules/sale/tests/scenario_sale_reporting.rst @@ -7,7 +7,7 @@ Imports:: >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -164,18 +164,16 @@ Check sale reporting per customer:: >>> len(reports) 2 >>> with config.set_context(context=context): - ... sorted((r.customer.id, r.number, r.revenue) for r in reports) == \ - ... sorted([(customer1.id, 1, Decimal('30')), - ... (customer2.id, 1, Decimal('10'))]) - True + ... assertEqual({(r.customer.id, r.number, r.revenue) for r in reports}, + ... {(customer1.id, 1, Decimal('30')), + ... (customer2.id, 1, Decimal('10'))}) >>> len(time_series) 2 >>> with config.set_context(context=context): - ... sorted((r.customer.id, r.date, r.number, r.revenue) - ... for r in time_series) == sorted( - ... [(customer1.id, sale1.sale_date.replace(day=1), 1, Decimal('30')), - ... (customer2.id, sale2.sale_date.replace(day=1), 1, Decimal('10'))]) - True + ... assertEqual({(r.customer.id, r.date, r.number, r.revenue) + ... for r in time_series}, + ... {(customer1.id, sale1.sale_date.replace(day=1), 1, Decimal('30')), + ... (customer2.id, sale2.sale_date.replace(day=1), 1, Decimal('10'))}) Check sale reporting per customer categories:: @@ -190,29 +188,26 @@ Check sale reporting per customer categories:: >>> len(reports) 3 >>> with config.set_context(context=context): - ... sorted((r.category.id, r.number, r.revenue) for r in reports) == \ - ... sorted([(party_category_child1.id, 1, Decimal('30')), + ... assertEqual({(r.category.id, r.number, r.revenue) for r in reports}, + ... {(party_category_child1.id, 1, Decimal('30')), ... (party_category_root2.id, 1, Decimal('30')), - ... (party_category_child2.id, 1, Decimal('10'))]) - True + ... (party_category_child2.id, 1, Decimal('10'))}) >>> len(time_series) 3 >>> with config.set_context(context=context): - ... sorted((r.category.id, r.date, r.number, r.revenue) - ... for r in time_series) == sorted( - ... [(party_category_child1.id, sale1.sale_date.replace(day=1), 1, Decimal('30')), + ... assertEqual({(r.category.id, r.date, r.number, r.revenue) + ... for r in time_series}, + ... {(party_category_child1.id, sale1.sale_date.replace(day=1), 1, Decimal('30')), ... (party_category_root2.id, sale1.sale_date.replace(day=1), 1, Decimal('30')), - ... (party_category_child2.id, sale2.sale_date.replace(day=1), 1, Decimal('10'))]) - True + ... (party_category_child2.id, sale2.sale_date.replace(day=1), 1, Decimal('10'))}) >>> len(tree) 4 >>> with config.set_context(context=context): - ... sorted((r.name, r.revenue) for r in tree) == sorted([ - ... ('Root1', Decimal('40')), + ... assertEqual({(r.name, r.revenue) for r in tree}, + ... {('Root1', Decimal('40')), ... ('Child1', Decimal('30')), ... ('Child2', Decimal('10')), - ... ('Root2', Decimal('30'))]) - True + ... ('Root2', Decimal('30'))}) >>> child1, = CustomerCategoryTree.find([('rec_name', '=', 'Child1')]) >>> child1.rec_name 'Child1' @@ -227,19 +222,17 @@ Check sale reporting per product:: >>> len(reports) 2 >>> with config.set_context(context=context): - ... sorted((r.product.id, r.number, r.revenue) for r in reports) == \ - ... sorted([(product1.id, 2, Decimal('30')), - ... (product2.id, 1, Decimal('10'))]) - True + ... assertEqual({(r.product.id, r.number, r.revenue) for r in reports}, + ... {(product1.id, 2, Decimal('30')), + ... (product2.id, 1, Decimal('10'))}) >>> len(time_series) 3 >>> with config.set_context(context=context): - ... sorted((r.product.id, r.date, r.number, r.revenue) - ... for r in time_series) == sorted( - ... [(product1.id, sale1.sale_date.replace(day=1), 1, Decimal('20')), + ... assertEqual({(r.product.id, r.date, r.number, r.revenue) + ... for r in time_series}, + ... {(product1.id, sale1.sale_date.replace(day=1), 1, Decimal('20')), ... (product2.id, sale1.sale_date.replace(day=1), 1, Decimal('10')), - ... (product1.id, sale2.sale_date.replace(day=1), 1, Decimal('10'))]) - True + ... (product1.id, sale2.sale_date.replace(day=1), 1, Decimal('10'))}) Check sale reporting per product categories:: @@ -254,35 +247,32 @@ Check sale reporting per product categories:: >>> len(reports) 4 >>> with config.set_context(context=context): - ... sorted((r.category.id, r.number, r.revenue) for r in reports) == \ - ... sorted([(category_child1.id, 2, Decimal('30')), + ... assertEqual({(r.category.id, r.number, r.revenue) for r in reports}, + ... {(category_child1.id, 2, Decimal('30')), ... (category_root2.id, 2, Decimal('30')), ... (category_child2.id, 1, Decimal('10')), - ... (account_category.id, 2, Decimal('40'))]) - True + ... (account_category.id, 2, Decimal('40'))}) >>> len(time_series) 7 >>> with config.set_context(context=context): - ... sorted((r.category.id, r.date, r.number, r.revenue) - ... for r in time_series) == sorted( - ... [(category_child1.id, sale1.sale_date.replace(day=1), 1, Decimal('20')), + ... assertEqual({(r.category.id, r.date, r.number, r.revenue) + ... for r in time_series}, + ... {(category_child1.id, sale1.sale_date.replace(day=1), 1, Decimal('20')), ... (category_root2.id, sale1.sale_date.replace(day=1), 1, Decimal('20')), ... (category_child2.id, sale1.sale_date.replace(day=1), 1, Decimal('10')), ... (category_child1.id, sale2.sale_date.replace(day=1), 1, Decimal('10')), ... (category_root2.id, sale2.sale_date.replace(day=1), 1, Decimal('10')), ... (account_category.id, sale1.sale_date.replace(day=1), 1, Decimal('30')), - ... (account_category.id, sale2.sale_date.replace(day=1), 1, Decimal('10'))]) - True + ... (account_category.id, sale2.sale_date.replace(day=1), 1, Decimal('10'))}) >>> len(tree) 5 >>> with config.set_context(context=context): - ... sorted((r.name, r.revenue) for r in tree) == sorted([ - ... ('Root1', Decimal('40')), + ... assertEqual({(r.name, r.revenue) for r in tree}, + ... {('Root1', Decimal('40')), ... ('Child1', Decimal('30')), ... ('Child2', Decimal('10')), ... ('Root2', Decimal('30')), - ... ('Account Category', Decimal('40'))]) - True + ... ('Account Category', Decimal('40'))}) >>> child1, = ProductCategoryTree.find([('rec_name', '=', 'Child1')]) >>> child1.rec_name 'Child1' @@ -311,16 +301,14 @@ Check sale reporting per countries:: >>> len(country_time_series) 2 >>> with config.set_context(context=context): - ... sorted((r.country.id, r.date, r.number, r.revenue) - ... for r in country_time_series) == sorted( - ... [(country_us.id, sale1.sale_date.replace(day=1), 1, Decimal('30')), - ... (country_us.id, sale2.sale_date.replace(day=1), 1, Decimal('10'))]) - True + ... assertEqual({(r.country.id, r.date, r.number, r.revenue) + ... for r in country_time_series}, + ... {(country_us.id, sale1.sale_date.replace(day=1), 1, Decimal('30')), + ... (country_us.id, sale2.sale_date.replace(day=1), 1, Decimal('10'))}) >>> len(subdivision_time_series) 2 >>> with config.set_context(context=context): - ... sorted((r.subdivision.id, r.date, r.number, r.revenue) - ... for r in subdivision_time_series) == sorted( - ... [(california.id, sale1.sale_date.replace(day=1), 1, Decimal('30')), - ... (new_york.id, sale2.sale_date.replace(day=1), 1, Decimal('10'))]) - True + ... assertEqual({(r.subdivision.id, r.date, r.number, r.revenue) + ... for r in subdivision_time_series}, + ... {(california.id, sale1.sale_date.replace(day=1), 1, Decimal('30')), + ... (new_york.id, sale2.sale_date.replace(day=1), 1, Decimal('10'))}) diff --git a/modules/sale_advance_payment/tests/scenario_advance_payment.rst b/modules/sale_advance_payment/tests/scenario_advance_payment.rst index 99f5554177..628cef414a 100644 --- a/modules/sale_advance_payment/tests/scenario_advance_payment.rst +++ b/modules/sale_advance_payment/tests/scenario_advance_payment.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -135,8 +135,7 @@ As usual an invoice and a shipment has been created:: >>> invoice, = sale.invoices >>> invoice_line, = invoice.lines - >>> invoice_line.account == revenue - True + >>> assertEqual(invoice_line.account, revenue) >>> invoice.total_amount Decimal('20.00') >>> len(sale.shipments) @@ -164,12 +163,10 @@ The advance payment invoice has been created:: >>> invoice, = sale.advance_payment_invoices >>> invoice_line, = invoice.lines - >>> invoice_line.account == advance_payment_account - True + >>> assertEqual(invoice_line.account, advance_payment_account) >>> invoice.total_amount Decimal('10.00') - >>> invoice.invoice_date == next_week - True + >>> assertEqual(invoice.invoice_date, next_week) >>> invoice.invoice_date = None >>> invoice.click('post') >>> sale.reload() @@ -199,16 +196,13 @@ Let's pay the advance payment invoice:: 2 >>> il1, il2 = sorted([il for il in invoice.lines], ... key=lambda il: 1 if il.product else 0) - >>> il1.account == advance_payment_account - True + >>> assertEqual(il1.account, advance_payment_account) >>> il1.unit_price Decimal('10.00') - >>> il1.taxes_date == today - True + >>> assertEqual(il1.taxes_date, today) >>> il1.quantity -1.0 - >>> il2.product == product - True + >>> assertEqual(il2.product, product) >>> il2.unit_price Decimal('20.0000') >>> il2.quantity @@ -256,8 +250,7 @@ Let's try to pack it:: Let's pay the advance payment invoice:: >>> invoice, = sale.advance_payment_invoices - >>> invoice.invoice_date == next_week - True + >>> assertEqual(invoice.invoice_date, next_week) >>> invoice.invoice_date = None >>> invoice.click('post') >>> pay = invoice.click('pay') @@ -316,8 +309,7 @@ There is no purchase request created yet:: The advance payment invoice has been created, now pay it:: >>> invoice, = sale.advance_payment_invoices - >>> invoice.invoice_date == next_week - True + >>> assertEqual(invoice.invoice_date, next_week) >>> invoice.invoice_date = None >>> invoice.click('post') >>> pay = invoice.click('pay') @@ -404,8 +396,7 @@ it:: >>> _, inv_recreated = sale.advance_payment_invoices >>> inv_recreated.total_amount Decimal('10.00') - >>> inv_recreated.invoice_date == next_week - True + >>> assertEqual(inv_recreated.invoice_date, next_week) >>> inv_recreated.invoice_date = None >>> inv_recreated.click('post') >>> pay = inv_recreated.click('pay') diff --git a/modules/sale_amendment/tests/scenario_sale_amendment.rst b/modules/sale_amendment/tests/scenario_sale_amendment.rst index f91358962a..9fb67b7729 100644 --- a/modules/sale_amendment/tests/scenario_sale_amendment.rst +++ b/modules/sale_amendment/tests/scenario_sale_amendment.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -101,8 +101,7 @@ Add an amendment:: >>> line.action = 'payment_term' >>> line = amendment.lines.new() >>> line.action = 'party' - >>> line.party == customer1 - True + >>> assertEqual(line.party, customer1) >>> line.party = customer2 >>> line = amendment.lines.new() >>> line.action = 'warehouse' @@ -111,8 +110,7 @@ Add an amendment:: >>> line = amendment.lines.new() >>> line.action = 'line' >>> line.line = sale.lines[0] - >>> line.product == product1 - True + >>> assertEqual(line.product, product1) >>> line.product = product2 >>> line.quantity 5.0 @@ -133,11 +131,9 @@ Validate amendment:: >>> sale.reload() >>> sale.revision 1 - >>> sale.party == customer2 - True + >>> assertEqual(sale.party, customer2) >>> line = sale.lines[0] - >>> line.product == product2 - True + >>> assertEqual(line.product, product2) >>> line.quantity 4.0 >>> line.unit_price @@ -150,15 +146,13 @@ Validate amendment:: >>> shipment, = sale.shipments >>> move, = shipment.outgoing_moves - >>> move.product == product2 - True + >>> assertEqual(move.product, product2) >>> move.quantity 4.0 >>> invoice, = sale.invoices >>> line = invoice.lines[0] - >>> line.product == product2 - True + >>> assertEqual(line.product, product2) >>> line.quantity 4.0 >>> line.unit_price diff --git a/modules/sale_blanket_agreement/tests/scenario_sale_blanket_agreement.rst b/modules/sale_blanket_agreement/tests/scenario_sale_blanket_agreement.rst index 78ae69db20..78a3dd3855 100644 --- a/modules/sale_blanket_agreement/tests/scenario_sale_blanket_agreement.rst +++ b/modules/sale_blanket_agreement/tests/scenario_sale_blanket_agreement.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -105,8 +105,7 @@ Create sale from blanket agreement:: >>> sale, = create_sale.actions[0] >>> line, = sale.lines - >>> line.product == product1 - True + >>> assertEqual(line.product, product1) >>> line.quantity 20.0 >>> line.unit_price diff --git a/modules/sale_gift_card/tests/scenario_sale_gift_card.rst b/modules/sale_gift_card/tests/scenario_sale_gift_card.rst index 96d687eca6..205049a653 100644 --- a/modules/sale_gift_card/tests/scenario_sale_gift_card.rst +++ b/modules/sale_gift_card/tests/scenario_sale_gift_card.rst @@ -7,7 +7,7 @@ Imports:: >>> import re >>> from decimal import Decimal >>> from proteus import Model, Report - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -129,8 +129,7 @@ Check gift cards:: >>> len(cards) 2 >>> card = cards[-1] - >>> card.product == gift_card - True + >>> assertEqual(card.product, gift_card) >>> card.value Decimal('50.00') >>> bool(card.origin) @@ -156,8 +155,7 @@ Check invoice:: >>> invoice, = sale.invoices >>> line, = invoice.lines - >>> line.account == gift_card_revenue - True + >>> assertEqual(line.account, gift_card_revenue) Redeem a gift card to buy a product:: @@ -182,8 +180,7 @@ Redeem a gift card to buy a product:: Check gift card:: >>> card.reload() - >>> card.spent_on == sale - True + >>> assertEqual(card.spent_on, sale) Check the invoice:: @@ -195,5 +192,4 @@ Check the invoice:: >>> gift_card_line, = [l for l in invoice.lines if l.product == gift_card] >>> gift_card_line.quantity -1.0 - >>> gift_card_line.account == gift_card_revenue - True + >>> assertEqual(gift_card_line.account, gift_card_revenue) diff --git a/modules/sale_gift_card/tests/scenario_sale_gift_card_goods.rst b/modules/sale_gift_card/tests/scenario_sale_gift_card_goods.rst index b7dad3b834..6a1a03443b 100644 --- a/modules/sale_gift_card/tests/scenario_sale_gift_card_goods.rst +++ b/modules/sale_gift_card/tests/scenario_sale_gift_card_goods.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -109,8 +109,7 @@ Check invoice:: >>> invoice, = sale.invoices >>> line, = invoice.lines - >>> line.account == gift_card_revenue - True + >>> assertEqual(line.account, gift_card_revenue) Ship the gift card:: diff --git a/modules/sale_gift_card/tests/scenario_sale_point_gift_card.rst b/modules/sale_gift_card/tests/scenario_sale_point_gift_card.rst index 9f199c5191..8ba0f979ab 100644 --- a/modules/sale_gift_card/tests/scenario_sale_point_gift_card.rst +++ b/modules/sale_gift_card/tests/scenario_sale_point_gift_card.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -173,8 +173,7 @@ Check gift card:: >>> gift_card, = GiftCard.find([]) >>> gift_card.value Decimal('100.00') - >>> gift_card.currency == sale.currency - True + >>> assertEqual(gift_card.currency, sale.currency) Print gift card:: @@ -213,8 +212,7 @@ Pay:: Check gift card:: >>> gift_card.reload() - >>> gift_card.spent_on == sale - True + >>> assertEqual(gift_card.spent_on, sale) Post sale:: diff --git a/modules/sale_invoice_date/tests/scenario_sale_invoice_date.rst b/modules/sale_invoice_date/tests/scenario_sale_invoice_date.rst index a3ca6fbcaf..6cb6ab6ea7 100644 --- a/modules/sale_invoice_date/tests/scenario_sale_invoice_date.rst +++ b/modules/sale_invoice_date/tests/scenario_sale_invoice_date.rst @@ -10,7 +10,7 @@ Imports:: >>> from dateutil.relativedelta import relativedelta >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -86,8 +86,7 @@ Create product:: Make a sale:: >>> sale = Sale(party=customer) - >>> sale.invoice_term == invoice_term - True + >>> assertEqual(sale.invoice_term, invoice_term) >>> line = sale.lines.new() >>> line.product = product >>> line.quantity = 1 @@ -99,5 +98,4 @@ Make a sale:: Check invoice date:: >>> invoice, = sale.invoices - >>> invoice.invoice_date == end_month - True + >>> assertEqual(invoice.invoice_date, end_month) diff --git a/modules/sale_opportunity/tests/scenario_sale_opportunity.rst b/modules/sale_opportunity/tests/scenario_sale_opportunity.rst index f4e4737bd3..4990d3f50b 100644 --- a/modules/sale_opportunity/tests/scenario_sale_opportunity.rst +++ b/modules/sale_opportunity/tests/scenario_sale_opportunity.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_chart, \ @@ -131,14 +131,12 @@ Convert to sale:: >>> sale, = opportunity.click('convert') >>> opportunity.state 'converted' - >>> sale.origin == opportunity - True + >>> assertEqual(sale.origin, opportunity) Find the sale:: >>> line, = sale.lines - >>> line.product == product - True + >>> assertEqual(line.product, product) >>> line.quantity 10.0 diff --git a/modules/sale_point/tests/scenario_sale_point.rst b/modules/sale_point/tests/scenario_sale_point.rst index b1c0663909..c50873cdfb 100644 --- a/modules/sale_point/tests/scenario_sale_point.rst +++ b/modules/sale_point/tests/scenario_sale_point.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -162,8 +162,7 @@ Overpay by terminal:: >>> payment.form.amount = Decimal('6100.00') >>> payment.execute('pay') - >>> payment.form.method == cash_method - True + >>> assertEqual(payment.form.method, cash_method) >>> payment.form.amount Decimal('-64.00') >>> payment.execute('pay') @@ -182,14 +181,11 @@ Check stock move:: >>> move, = StockMove.find([ ... ('origin.sale', '=', sale.id, 'sale.point.sale.line') ... ]) - >>> move.product == goods - True + >>> assertEqual(move.product, goods) >>> move.quantity 500.0 - >>> move.from_location == storage_loc - True - >>> move.to_location == customer_loc - True + >>> assertEqual(move.from_location, storage_loc) + >>> assertEqual(move.to_location, customer_loc) >>> move.state 'done' diff --git a/modules/sale_point/tests/scenario_sale_point_return.rst b/modules/sale_point/tests/scenario_sale_point_return.rst index dac0b6d20c..9780b28466 100644 --- a/modules/sale_point/tests/scenario_sale_point_return.rst +++ b/modules/sale_point/tests/scenario_sale_point_return.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -143,12 +143,9 @@ Check stock move:: >>> line, = sale.lines >>> move, = line.moves - >>> move.product == goods - True - >>> move.from_location == customer_loc - True - >>> move.to_location == input_loc - True + >>> assertEqual(move.product, goods) + >>> assertEqual(move.from_location, customer_loc) + >>> assertEqual(move.to_location, input_loc) >>> move.state 'done' diff --git a/modules/sale_price_list/tests/scenario_sale_price_list.rst b/modules/sale_price_list/tests/scenario_sale_price_list.rst index d5c1256f1b..0936985032 100644 --- a/modules/sale_price_list/tests/scenario_sale_price_list.rst +++ b/modules/sale_price_list/tests/scenario_sale_price_list.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -129,8 +129,7 @@ Use the price list on sale:: >>> Sale = Model.get('sale.sale') >>> sale = Sale() >>> sale.party = customer - >>> sale.price_list == price_list - True + >>> assertEqual(sale.price_list, price_list) >>> sale.payment_term = payment_term >>> sale_line = sale.lines.new() >>> sale_line.product = product @@ -163,5 +162,4 @@ Use the sale price list on sale:: >>> set_user(sale_user) >>> sale.party = customer_without_price_list - >>> sale.price_list == sale_price_list - True + >>> assertEqual(sale.price_list, sale_price_list) diff --git a/modules/sale_product_customer/tests/scenario_sale_copy_product_customer.rst b/modules/sale_product_customer/tests/scenario_sale_copy_product_customer.rst index 12244cb711..3b84515621 100644 --- a/modules/sale_product_customer/tests/scenario_sale_copy_product_customer.rst +++ b/modules/sale_product_customer/tests/scenario_sale_copy_product_customer.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -44,8 +44,7 @@ Create a product with customers:: >>> product, = template.products >>> product_customer = product.product_customers.new() >>> product_customer.party = customer - >>> product_customer.template == template - True + >>> assertEqual(product_customer.template, template) >>> product.save() Customer is copied when copying the template:: diff --git a/modules/sale_secondary_unit/tests/scenario_sale_blanket_agreement_secondary_unit.rst b/modules/sale_secondary_unit/tests/scenario_sale_blanket_agreement_secondary_unit.rst index c44faeafcf..4f7799c977 100644 --- a/modules/sale_secondary_unit/tests/scenario_sale_blanket_agreement_secondary_unit.rst +++ b/modules/sale_secondary_unit/tests/scenario_sale_blanket_agreement_secondary_unit.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -87,24 +87,20 @@ Create sale blanket agreement:: Create sale from blanket agreement:: >>> create_sale = blanket_agreement.click('create_sale') - >>> create_sale.form.lines[0].unit == gr - True + >>> assertEqual(create_sale.form.lines[0].unit, gr) >>> create_sale.execute('create_sale') >>> sale, = create_sale.actions[0] >>> line, = sale.lines - >>> line.product == product - True + >>> assertEqual(line.product, product) - >>> line.secondary_unit == gr - True + >>> assertEqual(line.secondary_unit, gr) >>> line.secondary_quantity 800.0 >>> line.secondary_unit_price Decimal('9.0000') - >>> line.unit == unit - True + >>> assertEqual(line.unit, unit) >>> line.quantity 8.0 >>> line.unit_price diff --git a/modules/sale_secondary_unit/tests/scenario_sale_secondary_unit.rst b/modules/sale_secondary_unit/tests/scenario_sale_secondary_unit.rst index 515aee82dd..c22e30d201 100644 --- a/modules/sale_secondary_unit/tests/scenario_sale_secondary_unit.rst +++ b/modules/sale_secondary_unit/tests/scenario_sale_secondary_unit.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_chart, \ @@ -110,8 +110,7 @@ Check secondary unit on invoice:: >>> invoice, = sale.invoices >>> line, = invoice.lines - >>> line.secondary_unit == kg - True + >>> assertEqual(line.secondary_unit, kg) >>> line.secondary_quantity 2.0 >>> line.secondary_unit_price @@ -120,8 +119,7 @@ Check secondary unit on invoice:: Check secondary unit on move:: >>> move, = sale.moves - >>> move.secondary_unit == kg - True + >>> assertEqual(move.secondary_unit, kg) >>> move.secondary_quantity 2.0 >>> move.secondary_unit_price @@ -129,7 +127,6 @@ Check secondary unit on move:: >>> shipment, = sale.shipments >>> move, = shipment.inventory_moves - >>> move.secondary_unit == kg - True + >>> assertEqual(move.secondary_unit, kg) >>> move.secondary_quantity 2.0 diff --git a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst index b3971f3a40..951a926d5d 100644 --- a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst +++ b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -122,8 +122,7 @@ Sale products with cost on shipment:: >>> sale_line.quantity = 5.0 >>> sale.click('quote') >>> cost_line = sale.lines[-1] - >>> cost_line.product == carrier_product - True + >>> assertEqual(cost_line.product, carrier_product) >>> cost_line.quantity 1.0 >>> cost_line.amount @@ -141,20 +140,17 @@ Send products:: >>> shipment, = sale.shipments >>> shipment.cost_method 'shipment' - >>> shipment.carrier == carrier - True + >>> assertEqual(shipment.carrier, carrier) >>> shipment.cost_used Decimal('2.0000') >>> shipment.cost_sale_used Decimal('3.0000') - >>> shipment.cost_sale_currency_used == company.currency - True + >>> assertEqual(shipment.cost_sale_currency_used, company.currency) >>> move, = shipment.inventory_moves >>> move.quantity = 4 >>> shipment.cost_sale_used Decimal('3.0000') - >>> shipment.cost_sale_currency_used == company.currency - True + >>> assertEqual(shipment.cost_sale_currency_used, company.currency) >>> shipment.state 'waiting' >>> shipment.click('assign_force') @@ -177,9 +173,8 @@ Check customer invoice:: >>> sale.reload() >>> invoice, = sale.invoices - >>> sorted([l.product.id for l in invoice.lines]) == \ - ... sorted([product.id, carrier_product.id]) - True + >>> assertEqual({l.product for l in invoice.lines}, + ... {product, carrier_product}) >>> invoice.untaxed_amount Decimal('83.00') @@ -211,8 +206,7 @@ Sale products with cost on order:: >>> sale_line.quantity = 3.0 >>> sale.click('quote') >>> cost_line = sale.lines[-1] - >>> cost_line.product == carrier_product - True + >>> assertEqual(cost_line.product, carrier_product) >>> cost_line.quantity 1.0 >>> cost_line.amount @@ -227,8 +221,7 @@ Sale products with cost on order:: Check customer shipment:: >>> shipment, = sale.shipments - >>> shipment.carrier == carrier - True + >>> assertEqual(shipment.carrier, carrier) Check customer invoice:: diff --git a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_modify_price.rst b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_modify_price.rst index 5df93eeaf2..a715715a00 100644 --- a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_modify_price.rst +++ b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_modify_price.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -79,8 +79,7 @@ Make a quote:: >>> sale_line.quantity = 5.0 >>> sale.click('quote') >>> cost_line = sale.lines[-1] - >>> cost_line.product == carrier_product - True + >>> assertEqual(cost_line.product, carrier_product) >>> cost_line.quantity 1.0 >>> cost_line.amount @@ -93,8 +92,7 @@ Change the shipment cost price:: >>> cost_line.unit_price = Decimal('2.00') >>> sale.click('quote') >>> cost_line = sale.lines[-1] - >>> cost_line.product == carrier_product - True + >>> assertEqual(cost_line.product, carrier_product) >>> cost_line.quantity 1.0 >>> cost_line.amount @@ -108,8 +106,7 @@ Change the carrier price reset the cost line:: >>> sale.click('draft') >>> sale.click('quote') >>> cost_line = sale.lines[-1] - >>> cost_line.product == carrier_product - True + >>> assertEqual(cost_line.product, carrier_product) >>> cost_line.quantity 1.0 >>> cost_line.amount diff --git a/modules/sale_subscription/tests/scenario_sale_subscription.rst b/modules/sale_subscription/tests/scenario_sale_subscription.rst index 9f0d7ad221..2c31d4075f 100644 --- a/modules/sale_subscription/tests/scenario_sale_subscription.rst +++ b/modules/sale_subscription/tests/scenario_sale_subscription.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from dateutil.relativedelta import relativedelta >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_chart, \ @@ -115,8 +115,7 @@ Subscribe:: >>> line = subscription.lines.new() >>> line.service = service >>> line.quantity = 10 - >>> line.start_date == subscription.start_date - True + >>> assertEqual(line.start_date, subscription.start_date) >>> subscription.click('quote') >>> subscription.state diff --git a/modules/sale_subscription_asset/tests/scenario_sale_subscription_asset.rst b/modules/sale_subscription_asset/tests/scenario_sale_subscription_asset.rst index 1ecc8a8f7e..dbb3c3b4f0 100644 --- a/modules/sale_subscription_asset/tests/scenario_sale_subscription_asset.rst +++ b/modules/sale_subscription_asset/tests/scenario_sale_subscription_asset.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_chart, \ @@ -117,8 +117,7 @@ Subscribe:: ... service.reload() ... lots_available = sorted( ... l.number for l in service.asset_lots_available) - >>> subscribed_line == line - True + >>> assertEqual(subscribed_line, line) >>> lots_available ['002'] diff --git a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst index e2af27296b..2c0059a61c 100644 --- a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst +++ b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst @@ -8,7 +8,7 @@ Imports:: >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -171,10 +171,8 @@ Create Purchase from Request:: >>> create_purchase = Wizard('purchase.request.create_purchase', ... [purchase_request]) >>> purchase, = Purchase.find() - >>> purchase.customer == customer - True - >>> purchase.delivery_address == sale.shipment_address - True + >>> assertEqual(purchase.customer, customer) + >>> assertEqual(purchase.delivery_address, sale.shipment_address) >>> purchase.payment_term = payment_term >>> purchase_line, = purchase.lines >>> purchase_line.unit_price = Decimal('3.0000') diff --git a/modules/sale_supply_production/tests/scenario_sale_supply_production.rst b/modules/sale_supply_production/tests/scenario_sale_supply_production.rst index 4001950190..babca50482 100644 --- a/modules/sale_supply_production/tests/scenario_sale_supply_production.rst +++ b/modules/sale_supply_production/tests/scenario_sale_supply_production.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -115,12 +115,9 @@ Check the production:: >>> production, = Production.find([]) >>> production.state 'request' - >>> production.origin == sale.lines[0] - True - >>> production.product == product - True - >>> production.bom == bom - True + >>> assertEqual(production.origin, sale.lines[0]) + >>> assertEqual(production.product, product) + >>> assertEqual(production.bom, bom) >>> production.quantity 10.0 diff --git a/modules/stock/tests/scenario_stock_inventory.rst b/modules/stock/tests/scenario_stock_inventory.rst index 4e44d3a3f4..ed7aa61e9e 100644 --- a/modules/stock/tests/scenario_stock_inventory.rst +++ b/modules/stock/tests/scenario_stock_inventory.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -171,10 +171,8 @@ Confirm the inventory:: >>> move, = line_p1.moves >>> move.quantity 1.0 - >>> move.from_location == lost_found_loc - True - >>> move.to_location == inventory.location - True + >>> assertEqual(move.from_location, lost_found_loc) + >>> assertEqual(move.to_location, inventory.location) >>> line_p2.reload() >>> len(line_p2.moves) 0 @@ -231,10 +229,8 @@ Add quantity of consumable product:: >>> move, = line.moves >>> move.quantity 5.0 - >>> move.from_location == lost_found_loc - True - >>> move.to_location == inventory.location - True + >>> assertEqual(move.from_location, lost_found_loc) + >>> assertEqual(move.to_location, inventory.location) Create an inventory that should be empty after completion:: diff --git a/modules/stock/tests/scenario_stock_inventory_empty_quantity.rst b/modules/stock/tests/scenario_stock_inventory_empty_quantity.rst index bedc658325..3227bff4b1 100644 --- a/modules/stock/tests/scenario_stock_inventory_empty_quantity.rst +++ b/modules/stock/tests/scenario_stock_inventory_empty_quantity.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -82,7 +82,5 @@ Creating an inventory with empty quantities creates and empty move:: >>> move, = line.moves >>> move.quantity 1.0 - >>> move.from_location == inventory.location - True - >>> move.to_location == lost_found_loc - True + >>> assertEqual(move.from_location, inventory.location) + >>> assertEqual(move.to_location, lost_found_loc) diff --git a/modules/stock/tests/scenario_stock_product_quantities_by_warehouse.rst b/modules/stock/tests/scenario_stock_product_quantities_by_warehouse.rst index c653f5bea1..40c45c343b 100644 --- a/modules/stock/tests/scenario_stock_product_quantities_by_warehouse.rst +++ b/modules/stock/tests/scenario_stock_product_quantities_by_warehouse.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard, Report >>> from trytond import backend - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -104,9 +104,8 @@ Check Product Quantities by Warehouse:: ... records = ProductQuantitiesByWarehouse.find([]) >>> len(records) 3 - >>> [(r.date, r.quantity) for r in records] == [ - ... (yesterday, 10), (today, 10), (tomorrow, 6)] - True + >>> assertEqual([(r.date, r.quantity) for r in records], + ... [(yesterday, 10), (today, 10), (tomorrow, 6)]) Check Product Quantities by Warehouse Moves:: @@ -117,10 +116,10 @@ Check Product Quantities by Warehouse Moves:: ... records = ProductQuantitiesByWarehouseMove.find([]) >>> len(records) 4 - >>> [(r.date, r.cumulative_quantity_start, r.quantity, r.cumulative_quantity_end) - ... for r in records] == [ - ... (yesterday, 0, 10, 10), + >>> assertEqual([ + ... (r.date, r.cumulative_quantity_start, r.quantity, r.cumulative_quantity_end) + ... for r in records], + ... [(yesterday, 0, 10, 10), ... (tomorrow, 10, -6, 4), ... (tomorrow, 4, 5, 9), - ... (tomorrow, 9, -3, 6)] - True + ... (tomorrow, 9, -3, 6)]) diff --git a/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst b/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst index 652cfc9801..b67f084230 100644 --- a/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst +++ b/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst @@ -7,7 +7,8 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import ( + ... activate_modules, assertEqual, assertFalse) >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -135,12 +136,10 @@ Update unit price of a move:: True >>> recompute = Wizard('product.recompute_cost_price', [product]) - >>> recompute.form.from_ == move.effective_date - True + >>> assertEqual(recompute.form.from_, move.effective_date) >>> recompute.execute('recompute') >>> move.reload() - >>> bool(move.unit_price_updated) - False + >>> assertFalse(move.unit_price_updated) >>> [m.cost_price for m in StockMove.find([])] [Decimal('107.5000'), Decimal('130.0000'), Decimal('130.0000'), Decimal('100.0000')] diff --git a/modules/stock/tests/scenario_stock_reporting_margin.rst b/modules/stock/tests/scenario_stock_reporting_margin.rst index d2f750c8ae..c337e0a8d3 100644 --- a/modules/stock/tests/scenario_stock_reporting_margin.rst +++ b/modules/stock/tests/scenario_stock_reporting_margin.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -144,17 +144,16 @@ Check reporting margin per product:: >>> len(time_series) 3 >>> with config.set_context(context=context): - ... sorted(( + ... assertEqual({( ... r.product.id, str(r.date), r.quantity, r.cost, r.revenue, ... r.profit, r.margin) - ... for r in time_series) == sorted([ - ... (product.id, str(yesterday), 2, Decimal('40.00'), Decimal('80.00'), + ... for r in time_series}, + ... {(product.id, str(yesterday), 2, Decimal('40.00'), Decimal('80.00'), ... Decimal('40.00'), Decimal('0.5000')), ... (product.id, str(today), 3, Decimal('60.00'), Decimal('90.00'), ... Decimal('30.00'), Decimal('0.3333')), ... (product2.id, str(today), 2, Decimal('40.00'), Decimal('100.00'), - ... Decimal('60.00'), Decimal('0.6000'))]) - True + ... Decimal('60.00'), Decimal('0.6000'))}) Check reporting margin per categories:: @@ -170,37 +169,34 @@ Check reporting margin per categories:: >>> len(reports) 2 >>> with config.set_context(context=context): - ... sorted((r.category.id, r.cost, r.revenue, r.profit, r.margin) - ... for r in reports) == sorted([ - ... (category1.id, Decimal('100.00'), Decimal('170.00'), + ... assertEqual({(r.category.id, r.cost, r.revenue, r.profit, r.margin) + ... for r in reports}, + ... {(category1.id, Decimal('100.00'), Decimal('170.00'), ... Decimal('70.00'), Decimal('0.4118')), ... (category2.id, Decimal('40.00'), Decimal('100.00'), - ... Decimal('60.00'), Decimal('0.6000'))]) - True + ... Decimal('60.00'), Decimal('0.6000'))}) >>> len(time_series) 3 >>> with config.set_context(context=context): - ... sorted((r.category.id, str(r.date), r.cost, r.revenue, r.profit, r.margin) - ... for r in time_series) == sorted([ - ... (category1.id, str(yesterday), Decimal('40.00'), Decimal('80.00'), + ... assertEqual({(r.category.id, str(r.date), r.cost, r.revenue, r.profit, r.margin) + ... for r in time_series}, + ... {(category1.id, str(yesterday), Decimal('40.00'), Decimal('80.00'), ... Decimal('40.00'), Decimal('0.5000')), ... (category1.id, str(today), Decimal('60.00'), Decimal('90.00'), ... Decimal('30.00'), Decimal('0.3333')), ... (category2.id, str(today), Decimal('40.00'), Decimal('100.00'), - ... Decimal('60.00'), Decimal('0.6000'))]) - True + ... Decimal('60.00'), Decimal('0.6000'))}) >>> len(tree) 3 >>> with config.set_context(context=context): - ... sorted((r.name, r.cost, r.revenue, r.profit, r.margin) - ... for r in tree) == sorted([ - ... ("Root", Decimal('140.00'), Decimal('270.00'), + ... assertEqual({(r.name, r.cost, r.revenue, r.profit, r.margin) + ... for r in tree}, + ... {("Root", Decimal('140.00'), Decimal('270.00'), ... Decimal('130.00'), Decimal('0.4815')), ... ("Child1", Decimal('100.00'), Decimal('170.00'), ... Decimal('70.00'), Decimal('0.4118')), ... ('Child2', Decimal('40.00'), Decimal('100.00'), - ... Decimal('60.00'), Decimal('0.6000'))]) - True + ... Decimal('60.00'), Decimal('0.6000'))}) >>> child1, = MarginCategoryTree.find([('rec_name', '=', 'Child1')]) >>> child1.rec_name 'Child1' diff --git a/modules/stock/tests/scenario_stock_shipment_in_return.rst b/modules/stock/tests/scenario_stock_shipment_in_return.rst index bd3a3621fe..2014f9424f 100644 --- a/modules/stock/tests/scenario_stock_shipment_in_return.rst +++ b/modules/stock/tests/scenario_stock_shipment_in_return.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -77,5 +77,4 @@ Reschedule shipment:: >>> cron.interval_type = 'months' >>> cron.click('run_once') >>> shipment_return.reload() - >>> shipment_return.planned_date == today - True + >>> assertEqual(shipment_return.planned_date, today) diff --git a/modules/stock/tests/scenario_stock_shipment_internal.rst b/modules/stock/tests/scenario_stock_shipment_internal.rst index b947e1d06a..6a8450031d 100644 --- a/modules/stock/tests/scenario_stock_shipment_internal.rst +++ b/modules/stock/tests/scenario_stock_shipment_internal.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Report - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -123,15 +123,13 @@ Create Internal Shipment from lost_found location:: Check that now we can finish the older shipment:: >>> shipment.click('assign_try') - >>> shipment.assigned_by == employee - True + >>> assertEqual(shipment.assigned_by, employee) >>> shipment.done_by >>> shipment.click('done') >>> shipment.state 'done' - >>> shipment.done_by == employee - True + >>> assertEqual(shipment.done_by, employee) Duplicate Internal Shipment:: @@ -150,5 +148,4 @@ Reschedule shipment:: >>> cron.interval_type = 'months' >>> cron.click('run_once') >>> shipment_copy.reload() - >>> shipment_copy.planned_date == today - True + >>> assertEqual(shipment_copy.planned_date, today) diff --git a/modules/stock/tests/scenario_stock_shipment_internal_transit.rst b/modules/stock/tests/scenario_stock_shipment_internal_transit.rst index 37cd08118f..d6f118ceb3 100644 --- a/modules/stock/tests/scenario_stock_shipment_internal_transit.rst +++ b/modules/stock/tests/scenario_stock_shipment_internal_transit.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -63,8 +63,7 @@ Create Internal Shipment with lead time:: >>> shipment.to_location = warehouse2.storage_location >>> bool(shipment.transit_location) True - >>> shipment.planned_start_date == today - True + >>> assertEqual(shipment.planned_start_date, today) >>> move = shipment.moves.new() >>> move.product = product >>> move.quantity = 2 @@ -76,21 +75,15 @@ Create Internal Shipment with lead time:: >>> outgoing_move, = shipment.outgoing_moves >>> outgoing_move.quantity 2.0 - >>> outgoing_move.from_location == shipment.from_location - True - >>> outgoing_move.to_location == shipment.transit_location - True - >>> outgoing_move.planned_date == today - True + >>> assertEqual(outgoing_move.from_location, shipment.from_location) + >>> assertEqual(outgoing_move.to_location, shipment.transit_location) + >>> assertEqual(outgoing_move.planned_date, today) >>> incoming_move, = shipment.incoming_moves >>> incoming_move.quantity 2.0 - >>> incoming_move.from_location == shipment.transit_location - True - >>> incoming_move.to_location == shipment.to_location - True - >>> incoming_move.planned_date == tomorrow - True + >>> assertEqual(incoming_move.from_location, shipment.transit_location) + >>> assertEqual(incoming_move.to_location, shipment.to_location) + >>> assertEqual(incoming_move.planned_date, tomorrow) >>> outgoing_move.quantity = 1 >>> outgoing_move.save() @@ -103,10 +96,8 @@ Create Internal Shipment with lead time:: 1.0 >>> shipment.outgoing_moves[0].state 'done' - >>> shipment.outgoing_moves[0].effective_date == yesterday - True + >>> assertEqual(shipment.outgoing_moves[0].effective_date, yesterday) >>> shipment.click('done') >>> shipment.incoming_moves[0].state 'done' - >>> shipment.incoming_moves[0].effective_date == today - True + >>> assertEqual(shipment.incoming_moves[0].effective_date, today) diff --git a/modules/stock/tests/scenario_stock_shipment_out.rst b/modules/stock/tests/scenario_stock_shipment_out.rst index 61424739f5..72315bbaf4 100644 --- a/modules/stock/tests/scenario_stock_shipment_out.rst +++ b/modules/stock/tests/scenario_stock_shipment_out.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Report - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -107,12 +107,9 @@ Set the shipment state to waiting:: 2 >>> len(shipment_out.inventory_moves) 2 - >>> sorted( - ... [m.origin for m in shipment_out.inventory_moves], - ... key=lambda m: m.id) == \ - ... sorted( - ... [m for m in shipment_out.outgoing_moves], key=lambda m: m.id) - True + >>> assertEqual( + ... {m.origin for m in shipment_out.inventory_moves}, + ... {m for m in shipment_out.outgoing_moves}) Make 1 unit of the product available:: @@ -167,14 +164,12 @@ Ignore non assigned moves and pack shipment:: >>> _ = picking_list.execute([shipment_out]) >>> shipment_out.click('pick') - >>> shipment_out.picked_by == employee - True + >>> assertEqual(shipment_out.picked_by, employee) >>> shipment_out.packed_by >>> shipment_out.done_by >>> shipment_out.click('pack') - >>> shipment_out.packed_by == employee - True + >>> assertEqual(shipment_out.packed_by, employee) >>> shipment_out.done_by >>> [m.state for m in shipment_out.outgoing_moves] ['assigned'] @@ -182,9 +177,8 @@ Ignore non assigned moves and pack shipment:: 1 >>> shipment_out.inventory_moves[0].state 'done' - >>> sum([m.quantity for m in shipment_out.inventory_moves]) == \ - ... sum([m.quantity for m in shipment_out.outgoing_moves]) - True + >>> assertEqual(sum([m.quantity for m in shipment_out.inventory_moves]), + ... sum([m.quantity for m in shipment_out.outgoing_moves])) >>> delivery_note = Report('stock.shipment.out.delivery_note') >>> _ = delivery_note.execute([shipment_out]) @@ -192,14 +186,12 @@ Ignore non assigned moves and pack shipment:: Set the state as Done:: >>> shipment_out.click('done') - >>> shipment_out.done_by == employee - True + >>> assertEqual(shipment_out.done_by, employee) >>> [m.state for m in shipment_out.outgoing_moves] ['done'] >>> planned_dates = [m.planned_date for m in ... shipment_out.outgoing_moves] - >>> planned_dates == [today] - True + >>> assertEqual(planned_dates, [today]) >>> effective_dates = [m.effective_date for m in ... shipment_out.outgoing_moves] >>> len(set(effective_dates)) @@ -210,9 +202,8 @@ Set the state as Done:: 1 >>> shipment_out.inventory_moves[0].state 'done' - >>> sum([m.quantity for m in shipment_out.inventory_moves]) == \ - ... sum([m.quantity for m in shipment_out.outgoing_moves]) - True + >>> assertEqual(sum([m.quantity for m in shipment_out.inventory_moves]), + ... sum([m.quantity for m in shipment_out.outgoing_moves])) Create Shipment Out with effective date:: @@ -271,11 +262,9 @@ Finish the shipment:: >>> shipment_out.state 'done' >>> outgoing_move, = shipment_out.outgoing_moves - >>> outgoing_move.effective_date == yesterday - True + >>> assertEqual(outgoing_move.effective_date, yesterday) >>> inventory_move, = shipment_out.inventory_moves - >>> inventory_move.effective_date == yesterday - True + >>> assertEqual(inventory_move.effective_date, yesterday) Reschedule shipment:: @@ -289,5 +278,4 @@ Reschedule shipment:: >>> cron.interval_type = 'months' >>> cron.click('run_once') >>> shipment_copy.reload() - >>> shipment_copy.planned_date == today - True + >>> assertEqual(shipment_copy.planned_date, today) diff --git a/modules/stock_assign_manual/tests/scenario_stock_assign_manual.rst b/modules/stock_assign_manual/tests/scenario_stock_assign_manual.rst index 9b39ddae4b..a39f98e33b 100644 --- a/modules/stock_assign_manual/tests/scenario_stock_assign_manual.rst +++ b/modules/stock_assign_manual/tests/scenario_stock_assign_manual.rst @@ -7,7 +7,7 @@ Imports:: >>> import json >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -99,8 +99,7 @@ Make a customer shipment:: Assign manually the first move:: >>> assign_manual = shipment.click('assign_manual_wizard') - >>> assign_manual.form.move == shipment.inventory_moves[0] - True + >>> assertEqual(assign_manual.form.move, shipment.inventory_moves[0]) >>> assign_manual.form.move_quantity 2.0 >>> assign_manual.form.place = json.dumps([storage_loc.id, product.id]) @@ -123,9 +122,8 @@ Shipment is not yet assigned:: ['assigned', 'assigned', 'draft'] >>> [m.quantity for m in shipment.inventory_moves if m.state == 'assigned'] [1.0, 1.0] - >>> {m.from_location for m in shipment.inventory_moves - ... if m.state == 'assigned'} == {storage_loc, storage_loc2} - True + >>> assertEqual({m.from_location for m in shipment.inventory_moves + ... if m.state == 'assigned'}, {storage_loc, storage_loc2}) Assign manually remaining move:: diff --git a/modules/stock_consignment/tests/scenario_stock_consignment.rst b/modules/stock_consignment/tests/scenario_stock_consignment.rst index a55a7f4380..cb79c3687b 100644 --- a/modules/stock_consignment/tests/scenario_stock_consignment.rst +++ b/modules/stock_consignment/tests/scenario_stock_consignment.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_chart, \ @@ -154,19 +154,15 @@ Check supplier invoice line:: >>> InvoiceLine = Model.get('account.invoice.line') >>> invoice_line, = InvoiceLine.find([('invoice_type', '=', 'in')]) - >>> invoice_line.product == product - True + >>> assertEqual(invoice_line.product, product) >>> invoice_line.quantity 4.0 - >>> invoice_line.unit == unit - True + >>> assertEqual(invoice_line.unit, unit) >>> invoice_line.unit_price Decimal('4.0000') - >>> invoice_line.taxes == [supplier_tax] - True + >>> assertEqual(invoice_line.taxes, [supplier_tax]) >>> move, = shipment.moves - >>> move.origin == invoice_line - True + >>> assertEqual(move.origin, invoice_line) Use supplier consignment stock for shipment out:: @@ -234,19 +230,15 @@ Use customer consignment stock:: Check customer invoice line:: >>> invoice_line, = InvoiceLine.find([('invoice_type', '=', 'out')]) - >>> invoice_line.product == product - True + >>> assertEqual(invoice_line.product, product) >>> invoice_line.quantity 1.0 - >>> invoice_line.unit == unit - True + >>> assertEqual(invoice_line.unit, unit) >>> invoice_line.unit_price Decimal('10.0000') - >>> invoice_line.taxes == [customer_tax] - True + >>> assertEqual(invoice_line.taxes, [customer_tax]) >>> move, = shipment.moves - >>> move.origin == invoice_line - True + >>> assertEqual(move.origin, invoice_line) Duplicate shipment clear origin:: diff --git a/modules/stock_consignment/tests/scenario_stock_consignment_supplier_customer.rst b/modules/stock_consignment/tests/scenario_stock_consignment_supplier_customer.rst index e2d504e568..c20608a881 100644 --- a/modules/stock_consignment/tests/scenario_stock_consignment_supplier_customer.rst +++ b/modules/stock_consignment/tests/scenario_stock_consignment_supplier_customer.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_chart, \ @@ -147,27 +147,21 @@ Check supplier invoice line:: >>> InvoiceLine = Model.get('account.invoice.line') >>> invoice_line, = InvoiceLine.find([('invoice_type', '=', 'in')]) - >>> invoice_line.product == product - True + >>> assertEqual(invoice_line.product, product) >>> invoice_line.quantity 4.0 - >>> invoice_line.unit == unit - True + >>> assertEqual(invoice_line.unit, unit) >>> invoice_line.unit_price Decimal('4.0000') - >>> invoice_line.origin == move - True + >>> assertEqual(invoice_line.origin, move) Check customer invoice line:: >>> invoice_line, = InvoiceLine.find([('invoice_type', '=', 'out')]) - >>> invoice_line.product == product - True + >>> assertEqual(invoice_line.product, product) >>> invoice_line.quantity 4.0 - >>> invoice_line.unit == unit - True + >>> assertEqual(invoice_line.unit, unit) >>> invoice_line.unit_price Decimal('10.0000') - >>> invoice_line.origin == move - True + >>> assertEqual(invoice_line.origin, move) diff --git a/modules/stock_inventory_location/tests/scenario_stock_inventories.rst b/modules/stock_inventory_location/tests/scenario_stock_inventories.rst index a8a133d171..f4eb06cddb 100644 --- a/modules/stock_inventory_location/tests/scenario_stock_inventories.rst +++ b/modules/stock_inventory_location/tests/scenario_stock_inventories.rst @@ -5,7 +5,7 @@ Stock Inventories Scenario Imports:: >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company Activate modules:: @@ -33,7 +33,6 @@ Create inventories:: >>> inventories, = create.actions >>> len(inventories) 2 - >>> {i.location for i in inventories} == {storage_loc, storage_loc2} - True + >>> assertEqual({i.location for i in inventories}, {storage_loc, storage_loc2}) >>> inventories[0].empty_quantity 'keep' diff --git a/modules/stock_location_move/tests/scenario_stock_location_move.rst b/modules/stock_location_move/tests/scenario_stock_location_move.rst index 7930d39d7f..a7a90c7746 100644 --- a/modules/stock_location_move/tests/scenario_stock_location_move.rst +++ b/modules/stock_location_move/tests/scenario_stock_location_move.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> today = dt.date.today() @@ -46,18 +46,15 @@ Move pallet from storage1 to storage2:: >>> shipment.state 'assigned' >>> pallet.reload() - >>> pallet.assigned_by == shipment - True - >>> pallet.parent == storage1 - True + >>> assertEqual(pallet.assigned_by, shipment) + >>> assertEqual(pallet.parent, storage1) >>> shipment.click('done') >>> shipment.state 'done' >>> pallet.reload() >>> pallet.assigned_by - >>> pallet.parent == storage2 - True + >>> assertEqual(pallet.parent, storage2) Assign pallet from wrong location:: @@ -120,10 +117,8 @@ Move pallet from storage1 to storage2 with lead_time:: >>> shipment.click('ship') >>> pallet.reload() - >>> pallet.parent == shipment.transit_location - True + >>> assertEqual(pallet.parent, shipment.transit_location) >>> shipment.click('done') >>> pallet.reload() - >>> pallet.parent == warehouse2.storage_location - True + >>> assertEqual(pallet.parent, warehouse2.storage_location) diff --git a/modules/stock_lot/tests/scenario_stock_lot_move_add.rst b/modules/stock_lot/tests/scenario_stock_lot_move_add.rst index beaebb838c..debaa760e1 100644 --- a/modules/stock_lot/tests/scenario_stock_lot_move_add.rst +++ b/modules/stock_lot/tests/scenario_stock_lot_move_add.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -60,12 +60,10 @@ Create a lot:: Add few lots:: >>> add_lots = move.click('add_lots_wizard') - >>> add_lots.form.product== product - True + >>> assertEqual(add_lots.form.product, product) >>> add_lots.form.quantity 10.0 - >>> add_lots.form.unit == unit - True + >>> assertEqual(add_lots.form.unit, unit) >>> add_lots.form.quantity_remaining 10.0 @@ -90,8 +88,7 @@ Check moves:: >>> move, = Move.find([('lot.number', '=', '02')]) >>> move.quantity 1.0 - >>> move.lot == lot2 - True + >>> assertEqual(move.lot, lot2) >>> move, = Move.find([('lot', '=', None)]) >>> move.quantity 7.0 diff --git a/modules/stock_lot/tests/scenario_stock_lot_number.rst b/modules/stock_lot/tests/scenario_stock_lot_number.rst index bdf8a3023f..4919fea50f 100644 --- a/modules/stock_lot/tests/scenario_stock_lot_number.rst +++ b/modules/stock_lot/tests/scenario_stock_lot_number.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual Activate modules:: @@ -35,8 +35,7 @@ Create product:: >>> unit, = ProductUom.find([('name', '=', 'Unit')]) >>> template = ProductTemplate() - >>> template.lot_sequence == sequence - True + >>> assertEqual(template.lot_sequence, sequence) >>> template.name = 'Product' >>> template.default_uom = unit >>> template.type = 'goods' diff --git a/modules/stock_lot/tests/scenario_stock_lot_shipment_in.rst b/modules/stock_lot/tests/scenario_stock_lot_shipment_in.rst index e2397a5141..51c5daa199 100644 --- a/modules/stock_lot/tests/scenario_stock_lot_shipment_in.rst +++ b/modules/stock_lot/tests/scenario_stock_lot_shipment_in.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -79,8 +79,7 @@ Receive the shipment with one lot:: Change lot and try to finish:: >>> incoming_move, = shipment.inventory_moves - >>> incoming_move.lot == lot1 - True + >>> assertEqual(incoming_move.lot, lot1) >>> incoming_move.lot = lot2 >>> shipment.click('done') Traceback (most recent call last): diff --git a/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst b/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst index 0a3154925f..3642c40112 100644 --- a/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst +++ b/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import config, Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -99,8 +99,8 @@ Assign the shipment:: Check the inventory moves origin:: >>> outgoing_move, = shipment_out.outgoing_moves - >>> all(m.origin == outgoing_move for m in shipment_out.inventory_moves) - True + >>> for move in shipment_out.inventory_moves: + ... assertEqual(move.origin, outgoing_move) Try to pick without lot:: @@ -137,8 +137,8 @@ Pick the shipment:: Check the inventory moves have an outgoing move origin with the same lot:: - >>> all(m.lot == m.origin.lot for m in shipment_out.inventory_moves) - True + >>> for move in shipment_out.inventory_moves: + ... assertEqual(move.lot, move.origin.lot) Pack the shipment and return to pick:: @@ -155,5 +155,5 @@ Pack the shipment and return to pick:: Check the inventory moves still have an outgoing move origin with the same lot:: - >>> all(m.lot == m.origin.lot for m in shipment_out.inventory_moves) - True + >>> for move in shipment_out.inventory_moves: + ... assertEqual(move.lot, move.origin.lot) diff --git a/modules/stock_lot/tests/scenario_stock_lot_shipment_out_internal.rst b/modules/stock_lot/tests/scenario_stock_lot_shipment_out_internal.rst index a1d2546470..8e1e3d4f97 100644 --- a/modules/stock_lot/tests/scenario_stock_lot_shipment_out_internal.rst +++ b/modules/stock_lot/tests/scenario_stock_lot_shipment_out_internal.rst @@ -8,7 +8,8 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import ( + ... activate_modules, assertEqual, assertTrue) >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -62,10 +63,8 @@ Create Internal Shipment with lead time:: >>> shipment.planned_date = tomorrow >>> shipment.from_location = warehouse1.storage_location >>> shipment.to_location = warehouse2.storage_location - >>> bool(shipment.transit_location) - True - >>> shipment.planned_start_date == today - True + >>> assertTrue(shipment.transit_location) + >>> assertEqual(shipment.planned_start_date, today) >>> move = shipment.moves.new() >>> move.product = product >>> move.quantity = 3 @@ -105,8 +104,8 @@ Assign the shipment:: Check the inventory moves origin:: >>> incoming_move, = shipment.incoming_moves - >>> all(m.origin == incoming_move for m in shipment.outgoing_moves) - True + >>> for move in shipment.outgoing_moves: + ... assertEqual(move.origin, incoming_move) Set 2 lots:: @@ -136,5 +135,5 @@ Ship the shipment:: Check the outgoing moves have an incoming move origin with the same lot:: - >>> all(m.lot == m.origin.lot for m in shipment.outgoing_moves) - True + >>> for move in shipment.outgoing_moves: + ... assertEqual(move.lot, move.origin.lot) diff --git a/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst b/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst index 0a83e3c418..9c59d8cf9d 100644 --- a/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst +++ b/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import config, Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -82,8 +82,7 @@ Let's ship a product with a lot:: >>> Lot = Model.get('stock.lot') >>> lot = Lot(number='00001', product=product) - >>> lot.unit == unit - True + >>> assertEqual(lot.unit, unit) >>> lot.unit_quantity 1.0 >>> lot.save() diff --git a/modules/stock_lot_unit/tests/scenario_stock_lot_unit_move_add.rst b/modules/stock_lot_unit/tests/scenario_stock_lot_unit_move_add.rst index 4818dffaa7..9912726c1c 100644 --- a/modules/stock_lot_unit/tests/scenario_stock_lot_unit_move_add.rst +++ b/modules/stock_lot_unit/tests/scenario_stock_lot_unit_move_add.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -67,8 +67,7 @@ Add a lot:: 5.0 >>> lot.product = product # proteus does not set reverse domain >>> lot.number = '01' - >>> lot.unit == unit - True + >>> assertEqual(lot.unit, unit) >>> lot.unit_quantity 1.0 >>> lot.quantity diff --git a/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst b/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst index 820f9cf852..88c34ee975 100644 --- a/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst +++ b/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst @@ -8,7 +8,7 @@ Imports:: >>> from decimal import Decimal >>> from operator import attrgetter >>> from proteus import Model, Wizard, Report - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -235,5 +235,4 @@ Create the packs and ship the shipment:: Because there is only one box, the pack shipping number is also the shipment identification number:: - >>> pack.shipping_reference == shipment.shipping_reference - True + >>> assertEqual(pack.shipping_reference, shipment.shipping_reference) diff --git a/modules/stock_product_location/tests/scenario_product_copy_locations.rst b/modules/stock_product_location/tests/scenario_product_copy_locations.rst index 66a4e833a1..96de18f1de 100644 --- a/modules/stock_product_location/tests/scenario_product_copy_locations.rst +++ b/modules/stock_product_location/tests/scenario_product_copy_locations.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -53,8 +53,7 @@ Create a product with suppliers:: >>> product_location = product.locations.new() >>> product_location.warehouse = warehouse_loc >>> product_location.location = child_loc - >>> product_location.template == template - True + >>> assertEqual(product_location.template, template) >>> product.save() Location is copied when copying the template:: diff --git a/modules/stock_product_location/tests/scenario_stock_product_location.rst b/modules/stock_product_location/tests/scenario_stock_product_location.rst index fb27b404a2..f00c39ee54 100644 --- a/modules/stock_product_location/tests/scenario_stock_product_location.rst +++ b/modules/stock_product_location/tests/scenario_stock_product_location.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -96,8 +96,7 @@ Test that to_location is child location on reception:: >>> shipment_in.click('receive') >>> move, = shipment_in.inventory_moves - >>> move.to_location == child_loc - True + >>> assertEqual(move.to_location, child_loc) Create return shipment out:: @@ -123,5 +122,4 @@ Test that to_location is child location on reception:: >>> shipment_out_return.click('receive') >>> move, = shipment_out_return.inventory_moves - >>> move.to_location == child_loc - True + >>> assertEqual(move.to_location, child_loc) diff --git a/modules/stock_product_location/tests/scenario_stock_product_location_consumable.rst b/modules/stock_product_location/tests/scenario_stock_product_location_consumable.rst index 204582f1bc..b35311eda2 100644 --- a/modules/stock_product_location/tests/scenario_stock_product_location_consumable.rst +++ b/modules/stock_product_location/tests/scenario_stock_product_location_consumable.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company @@ -75,5 +75,4 @@ Assign the shipment:: Check assigned from consumable location:: >>> move, = shipment.inventory_moves - >>> move.from_location == consumable_loc - True + >>> assertEqual(move.from_location, consumable_loc) diff --git a/modules/stock_product_location/tests/scenario_stock_product_location_production.rst b/modules/stock_product_location/tests/scenario_stock_product_location_production.rst index 6159e27961..efe5ed197c 100644 --- a/modules/stock_product_location/tests/scenario_stock_product_location_production.rst +++ b/modules/stock_product_location/tests/scenario_stock_product_location_production.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company >>> today = dt.date.today() @@ -129,22 +129,16 @@ Make a production:: Test storage location of the warehouse:: - >> warehouse_loc.storage_location == storage_loc - True + >> assertEqual(warehouse_loc.storage_location, storage_loc) Test locations of the production inputs:: - >>> all([input_.from_location == storage_loc for \ - ... input_ in production.inputs]) - True - >>> all([input_.to_location == production_loc for \ - ... input_ in production.inputs]) - True + >>> for input_ in production.inputs: + ... assertEqual(input_.from_location, storage_loc) + ... assertEqual(input_.to_location, production_loc) Test location of the production output:: >>> output, = production.outputs - >>> output.from_location == production_loc - True - >>> output.to_location == child_loc - True + >>> assertEqual(output.from_location, production_loc) + >>> assertEqual(output.to_location, child_loc) diff --git a/modules/stock_product_location/tests/scenario_stock_product_location_template.rst b/modules/stock_product_location/tests/scenario_stock_product_location_template.rst index 7c88fde330..ee92965232 100644 --- a/modules/stock_product_location/tests/scenario_stock_product_location_template.rst +++ b/modules/stock_product_location/tests/scenario_stock_product_location_template.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -95,8 +95,7 @@ Test that to_location is child location on reception:: >>> shipment_in.click('receive') >>> move, = shipment_in.inventory_moves - >>> move.to_location == child_loc - True + >>> assertEqual(move.to_location, child_loc) Create return shipment out:: @@ -122,5 +121,4 @@ Test that to_location is child location on reception:: >>> shipment_out_return.click('receive') >>> move, = shipment_out_return.inventory_moves - >>> move.to_location == child_loc - True + >>> assertEqual(move.to_location, child_loc) diff --git a/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning.rst b/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning.rst index 16e73d03d1..8ec0f44ea9 100644 --- a/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning.rst +++ b/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning.rst @@ -9,7 +9,7 @@ Imports:: >>> import datetime as dt >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -139,27 +139,21 @@ Check early planning:: >>> plan1, = QuantityEarlyPlan.find( ... [('origin', '=', str(shipment_out1))]) - >>> plan1.earlier_date == week2 - True - >>> plan1.earliest_date == today - True + >>> assertEqual(plan1.earlier_date, week2) + >>> assertEqual(plan1.earliest_date, today) >>> plan1.earliest_percentage 0.4 >>> plan2, = QuantityEarlyPlan.find( ... [('origin', '=', str(shipment_out2))]) - >>> plan2.earlier_date == week2 - True - >>> plan2.earliest_date == week2 - True + >>> assertEqual(plan2.earlier_date, week2) + >>> assertEqual(plan2.earliest_date, week2) >>> plan2.earliest_percentage 1.0 >>> plan3, = QuantityEarlyPlan.find( ... [('origin', '=', str(shipment_out3))]) - >>> plan3.earlier_date == week4 - True - >>> plan3.earliest_date == today - True + >>> assertEqual(plan3.earlier_date, week4) + >>> assertEqual(plan3.earliest_date, today) >>> plan3.earliest_percentage 0.75 diff --git a/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning_incoming.rst b/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning_incoming.rst index fcfed40730..3eb57ff1e3 100644 --- a/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning_incoming.rst +++ b/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning_incoming.rst @@ -9,7 +9,7 @@ Imports:: >>> import datetime as dt >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -134,15 +134,12 @@ Check early planning:: >>> plan, = QuantityEarlyPlan.find( ... [('origin', '=', str(shipment_int1))]) - >>> plan.earlier_date == week1 - True + >>> assertEqual(plan.earlier_date, week1) >>> plan, = QuantityEarlyPlan.find( ... [('origin', '=', str(shipment_int2))]) - >>> plan.earlier_date == today - True + >>> assertEqual(plan.earlier_date, today) >>> plan, = QuantityEarlyPlan.find( ... [('origin', '=', str(shipment_out))]) - >>> plan.earlier_date == week1 - True + >>> assertEqual(plan.earlier_date, week1) diff --git a/modules/stock_quantity_issue/tests/scenario_stock_quantity_issue.rst b/modules/stock_quantity_issue/tests/scenario_stock_quantity_issue.rst index e819f6a333..0cc03da1a1 100644 --- a/modules/stock_quantity_issue/tests/scenario_stock_quantity_issue.rst +++ b/modules/stock_quantity_issue/tests/scenario_stock_quantity_issue.rst @@ -9,7 +9,7 @@ Imports:: >>> import datetime as dt >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) @@ -123,8 +123,7 @@ Check quantity issues:: >>> product.quantity, product.forecast_quantity (0.0, -6.0) - >>> issue1.best_planned_date == week2 - True + >>> assertEqual(issue1.best_planned_date, week2) Apply best planned date to first shipment:: diff --git a/modules/stock_split/tests/scenario_stock_split_shipment.rst b/modules/stock_split/tests/scenario_stock_split_shipment.rst index 250f0d8f56..6f89fad5d4 100644 --- a/modules/stock_split/tests/scenario_stock_split_shipment.rst +++ b/modules/stock_split/tests/scenario_stock_split_shipment.rst @@ -7,7 +7,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -86,11 +86,9 @@ Split shipment:: >>> shipment2, = Shipment.find([('id', '!=', shipment1.id)]) >>> move, = shipment1.outgoing_moves - >>> move.id == move1.id - True + >>> assertEqual(move, move1) >>> len(shipment1.inventory_moves) 0 >>> move, = shipment2.outgoing_moves - >>> move.id == move2.id - True + >>> assertEqual(move, move2) diff --git a/modules/stock_supply/tests/scenario_stock_internal_supply_lead_time.rst b/modules/stock_supply/tests/scenario_stock_internal_supply_lead_time.rst index e5f06ddb11..24b72f4007 100644 --- a/modules/stock_supply/tests/scenario_stock_internal_supply_lead_time.rst +++ b/modules/stock_supply/tests/scenario_stock_internal_supply_lead_time.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -115,30 +115,24 @@ Execute internal supply:: 2 >>> first, second = shipments - >>> first.planned_date == today - True + >>> assertEqual(first.planned_date, today) >>> first.state 'request' >>> len(first.moves) 1 >>> move, = first.moves - >>> move.from_location == warehouse_loc.storage_location - True - >>> move.to_location == sec_warehouse_loc.storage_location - True + >>> assertEqual(move.from_location, warehouse_loc.storage_location) + >>> assertEqual(move.to_location, sec_warehouse_loc.storage_location) >>> move.quantity 15.0 - >>> second.planned_date == tomorrow - True + >>> assertEqual(second.planned_date, tomorrow) >>> second.state 'request' >>> len(second.moves) 1 >>> move, = second.moves - >>> move.from_location == warehouse_loc.storage_location - True - >>> move.to_location == sec_warehouse_loc.storage_location - True + >>> assertEqual(move.from_location, warehouse_loc.storage_location) + >>> assertEqual(move.to_location, sec_warehouse_loc.storage_location) >>> move.quantity 10.0 diff --git a/modules/stock_supply/tests/scenario_stock_internal_supply_overflow.rst b/modules/stock_supply/tests/scenario_stock_internal_supply_overflow.rst index 8f63628408..a8055f0bf7 100644 --- a/modules/stock_supply/tests/scenario_stock_internal_supply_overflow.rst +++ b/modules/stock_supply/tests/scenario_stock_internal_supply_overflow.rst @@ -6,7 +6,7 @@ Imports:: >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company @@ -94,14 +94,11 @@ Execute internal supply:: >>> shipment.state 'request' >>> move, = shipment.moves - >>> move.product.id == product.id - True + >>> assertEqual(move.product, product) >>> move.quantity 40.0 - >>> move.from_location.id == overflowed_storage_loc.id - True - >>> move.to_location.id == overflow_loc.id - True + >>> assertEqual(move.from_location, overflowed_storage_loc) + >>> assertEqual(move.to_location, overflow_loc) Using an overflow location -------------------------- @@ -132,11 +129,8 @@ Execute internal supply:: >>> shipment.state 'request' >>> move, = shipment.moves - >>> move.product.id == product.id - True + >>> assertEqual(move.product, product) >>> move.quantity 10.0 - >>> move.from_location.id == sec_overflowed_storage_loc.id - True - >>> move.to_location.id == overflow_loc.id - True + >>> assertEqual(move.from_location, sec_overflowed_storage_loc) + >>> assertEqual(move.to_location, overflow_loc) diff --git a/modules/stock_supply/tests/scenario_stock_supply_purchase_request.rst b/modules/stock_supply/tests/scenario_stock_supply_purchase_request.rst index 759643a5f8..0a0ace9836 100644 --- a/modules/stock_supply/tests/scenario_stock_supply_purchase_request.rst +++ b/modules/stock_supply/tests/scenario_stock_supply_purchase_request.rst @@ -8,7 +8,7 @@ Imports:: >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules, set_user + >>> from trytond.tests.tools import activate_modules, set_user, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import (create_chart, @@ -176,8 +176,7 @@ There is now a draft purchase request:: >>> set_user(purchase_user) >>> pr, = PurchaseRequest.find([('state', '=', 'draft')]) - >>> pr.product == product - True + >>> assertEqual(pr.product, product) >>> pr.quantity 2.0 @@ -216,8 +215,7 @@ There is now a draft purchase request:: >>> set_user(purchase_user) >>> pr, = PurchaseRequest.find([('state', '=', 'draft')]) - >>> pr.product == product - True + >>> assertEqual(pr.product, product) >>> pr.quantity 12.0 @@ -233,8 +231,7 @@ There is now a draft purchase request:: >>> set_user(purchase_user) >>> pr, = PurchaseRequest.find([('state', '=', 'draft')]) - >>> pr.product == product - True + >>> assertEqual(pr.product, product) >>> pr.quantity 12.0 diff --git a/modules/stock_supply_forecast/tests/scenario_stock_supply_forecast.rst b/modules/stock_supply_forecast/tests/scenario_stock_supply_forecast.rst index 456443cb0c..c73229482a 100644 --- a/modules/stock_supply_forecast/tests/scenario_stock_supply_forecast.rst +++ b/modules/stock_supply_forecast/tests/scenario_stock_supply_forecast.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import (create_chart, @@ -94,7 +94,6 @@ There is a draft purchase request after confirming the forecast:: >>> create_pr = Wizard('stock.supply') >>> create_pr.execute('create_') >>> pr, = PurchaseRequest.find([('state', '=', 'draft')]) - >>> pr.product == product - True + >>> assertEqual(pr.product, product) >>> pr.quantity 10.0 diff --git a/modules/stock_supply_production/tests/scenario_stock_supply_production.rst b/modules/stock_supply_production/tests/scenario_stock_supply_production.rst index 41f0fd8a65..4477068f7d 100644 --- a/modules/stock_supply_production/tests/scenario_stock_supply_production.rst +++ b/modules/stock_supply_production/tests/scenario_stock_supply_production.rst @@ -7,7 +7,7 @@ Imports:: >>> import datetime as dt >>> from decimal import Decimal >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.stock.exceptions import MoveFutureWarning @@ -93,13 +93,12 @@ There is now a production request:: 2 >>> {p.state for p in productions} {'request'} - >>> all(p.product == product for p in productions) - True + >>> for production in productions: + ... assertEqual(production.product, product) >>> sum(p.quantity for p in productions) 2.0 - >>> sorted(p.planned_date for p in productions) == [ - ... today, today + dt.timedelta(days=9)] - True + >>> assertEqual(sorted(p.planned_date for p in productions), + ... [today, today + dt.timedelta(days=9)]) Create an order point negative minimal quantity:: @@ -138,8 +137,7 @@ There is now a production request:: >>> production, = Production.find([]) >>> production.state 'request' - >>> production.product == product - True + >>> assertEqual(production.product, product) >>> production.quantity 11.0 @@ -152,7 +150,6 @@ Using zero as minimal quantity also creates a production request:: >>> production, = Production.find([]) >>> production.state 'request' - >>> production.product == product - True + >>> assertEqual(production.product, product) >>> production.quantity 11.0 diff --git a/modules/user_role/tests/scenario_user_role.rst b/modules/user_role/tests/scenario_user_role.rst index dc5ea6b801..cde21e60aa 100644 --- a/modules/user_role/tests/scenario_user_role.rst +++ b/modules/user_role/tests/scenario_user_role.rst @@ -6,7 +6,7 @@ Imports:: >>> import datetime as dt >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual Activate modules:: @@ -45,8 +45,7 @@ Set the role to the user:: >>> len(user.groups) 2 - >>> user.groups == [groups[0], groups[1]] - True + >>> assertEqual(user.groups, [groups[0], groups[1]]) Start the role in the future:: diff --git a/modules/web_shop_shopify/tests/scenario_web_shop_shopify.rst b/modules/web_shop_shopify/tests/scenario_web_shop_shopify.rst index c3216a3092..d0070292a4 100644 --- a/modules/web_shop_shopify/tests/scenario_web_shop_shopify.rst +++ b/modules/web_shop_shopify/tests/scenario_web_shop_shopify.rst @@ -16,7 +16,7 @@ Imports:: >>> from shopify.api_version import ApiVersion >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -511,8 +511,7 @@ Run fetch order:: 'processing' >>> payment.amount Decimal('258.98') - >>> sale.carrier == carrier - True + >>> assertEqual(sale.carrier, carrier) >>> sale.state 'quotation' @@ -609,8 +608,7 @@ Correct taxes as partial invoice can get rounding gap:: >>> tax_line, = invoice.taxes >>> tax_line.amount += payment.amount - invoice.total_amount >>> invoice.save() - >>> invoice.total_amount == payment.amount - True + >>> assertEqual(invoice.total_amount, payment.amount) Post invoice:: diff --git a/modules/web_shop_shopify/tests/scenario_web_shop_shopify_secondary_unit.rst b/modules/web_shop_shopify/tests/scenario_web_shop_shopify_secondary_unit.rst index c59677ec12..97af23d34c 100644 --- a/modules/web_shop_shopify/tests/scenario_web_shop_shopify_secondary_unit.rst +++ b/modules/web_shop_shopify/tests/scenario_web_shop_shopify_secondary_unit.rst @@ -16,7 +16,7 @@ Imports:: >>> from shopify.api_version import ApiVersion >>> from proteus import Model, Wizard - >>> from trytond.tests.tools import activate_modules + >>> from trytond.tests.tools import activate_modules, assertEqual >>> from trytond.modules.company.tests.tools import ( ... create_company, get_company) >>> from trytond.modules.account.tests.tools import ( @@ -206,14 +206,12 @@ Run fetch order:: >>> line, = [l for l in sale.lines if l.product] >>> line.quantity 2.0 - >>> line.unit == unit - True + >>> assertEqual(line.unit, unit) >>> line.unit_price Decimal('100.0000') >>> line.secondary_quantity 50.0 - >>> line.secondary_unit == cm - True + >>> assertEqual(line.secondary_unit, cm) >>> line.secondary_unit_price Decimal('4.0000') diff --git a/trytond/CHANGELOG b/trytond/CHANGELOG index ed9d6587f1..667f9ffe48 100644 --- a/trytond/CHANGELOG +++ b/trytond/CHANGELOG @@ -1,3 +1,4 @@ +* Add assert methods to test tools * Set ELLIPSIS option flag on doctest * Set IGNORE_EXCEPTION_DETAIL option flag on doctest * Add timeout parameter on RPC definitions diff --git a/trytond/doc/ref/tests.rst b/trytond/doc/ref/tests.rst index 469a603806..1a9a94ad60 100644 --- a/trytond/doc/ref/tests.rst +++ b/trytond/doc/ref/tests.rst @@ -163,3 +163,6 @@ Tools .. function:: set_user(user, config) Set the user of the ``config`` proteus connection to ``user``. + +The module exposes also all the assert methods of :py:class:`unittest.TestCase` +that can be run doctest scenario. diff --git a/trytond/trytond/tests/tools.py b/trytond/trytond/tests/tools.py index a2ecc4c8b9..f01cc96d6f 100644 --- a/trytond/trytond/tests/tools.py +++ b/trytond/trytond/tests/tools.py @@ -1,5 +1,8 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. + +import unittest + from proteus import Model, Wizard from proteus import config as pconfig @@ -41,3 +44,10 @@ def set_user(user, config=None): User = Model.get('res.user', config=config) config.user = int(user) config._context = User.get_preferences(True, {}) + + +_dummy_test_case = unittest.TestCase() + + +def __getattr__(name): + return getattr(_dummy_test_case, name)