From e9571391fbe36f25d9df171764f6d47d8f024acc Mon Sep 17 00:00:00 2001 From: Elena Mamontova Date: Fri, 9 Sep 2016 09:33:40 +0300 Subject: [PATCH 1/1] Ticket 37. The 'equals' object changed to 'equal' in the testobject::test<7>() - testobject::test<10>() functions. --- tests/test_tariff.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/test_tariff.cpp b/tests/test_tariff.cpp index 0969a490..7b1250c5 100644 --- a/tests/test_tariff.cpp +++ b/tests/test_tariff.cpp @@ -362,9 +362,9 @@ namespace tut ensure_equals("Allow cheaper", tariff.TariffChangeIsAllowed(cheaper).empty(), true); td.tariffConf.fee = 100; - TARIFF_IMPL equals(td); + TARIFF_IMPL equal(td); - ensure_equals("Allow equal", tariff.TariffChangeIsAllowed(equals).empty(), true); + ensure_equals("Allow equal", tariff.TariffChangeIsAllowed(equal).empty(), true); td.tariffConf.fee = 150; TARIFF_IMPL expensive(td); @@ -389,9 +389,9 @@ namespace tut ensure_equals("Allow cheaper", tariff.TariffChangeIsAllowed(cheaper).empty(), true); td.tariffConf.fee = 100; - TARIFF_IMPL equals(td); + TARIFF_IMPL equal(td); - ensure_equals("Allow equal", !tariff.TariffChangeIsAllowed(equals).empty(), true); + ensure_equals("Allow equal", !tariff.TariffChangeIsAllowed(equal).empty(), true); td.tariffConf.fee = 150; TARIFF_IMPL expensive(td); @@ -416,9 +416,9 @@ namespace tut ensure_equals("Allow cheaper", !tariff.TariffChangeIsAllowed(cheaper).empty(), true); td.tariffConf.fee = 100; - TARIFF_IMPL equals(td); + TARIFF_IMPL equal(td); - ensure_equals("Allow equal", !tariff.TariffChangeIsAllowed(equals).empty(), true); + ensure_equals("Allow equal", !tariff.TariffChangeIsAllowed(equal).empty(), true); td.tariffConf.fee = 150; TARIFF_IMPL expensive(td); @@ -443,9 +443,9 @@ namespace tut ensure_equals("Allow cheaper", !tariff.TariffChangeIsAllowed(cheaper).empty(), true); td.tariffConf.fee = 100; - TARIFF_IMPL equals(td); + TARIFF_IMPL equal(td); - ensure_equals("Allow equal", !tariff.TariffChangeIsAllowed(equals).empty(), true); + ensure_equals("Allow equal", !tariff.TariffChangeIsAllowed(equal).empty(), true); td.tariffConf.fee = 150; TARIFF_IMPL expensive(td); -- 2.44.2