From a2dc3e2917673746eb3e513971b100f406216330 Mon Sep 17 00:00:00 2001 From: Elena Mamontova Date: Wed, 30 Nov 2016 16:17:21 +0200 Subject: [PATCH] Ticket 37. test<11>, test<12>, test<13> added. Current time argument added in the TariffChangeIsAllowed() function in test<7>, test<8>, test<9>, test<10>. --- tests/test_tariff.cpp | 78 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 66 insertions(+), 12 deletions(-) diff --git a/tests/test_tariff.cpp b/tests/test_tariff.cpp index 188aee8a..9565be68 100644 --- a/tests/test_tariff.cpp +++ b/tests/test_tariff.cpp @@ -359,17 +359,17 @@ namespace tut td.tariffConf.fee = 50; TARIFF_IMPL cheaper(td); - ensure_equals("Allow cheaper", tariff.TariffChangeIsAllowed(cheaper).empty(), true); + ensure_equals("Allow cheaper", tariff.TariffChangeIsAllowed(cheaper, 1461606400).empty(), true); td.tariffConf.fee = 100; TARIFF_IMPL equal(td); - ensure_equals("Allow equal", tariff.TariffChangeIsAllowed(equal).empty(), true); + ensure_equals("Allow equal", tariff.TariffChangeIsAllowed(equal, 1461606400).empty(), true); td.tariffConf.fee = 150; TARIFF_IMPL expensive(td); - ensure_equals("Allow expensive", tariff.TariffChangeIsAllowed(expensive).empty(), true); + ensure_equals("Allow expensive", tariff.TariffChangeIsAllowed(expensive, 1461606400).empty(), true); } template<> @@ -386,17 +386,17 @@ namespace tut td.tariffConf.fee = 50; TARIFF_IMPL cheaper(td); - ensure_equals("Allow cheaper", tariff.TariffChangeIsAllowed(cheaper).empty(), true); + ensure_equals("Allow cheaper", tariff.TariffChangeIsAllowed(cheaper, 1461606400).empty(), true); td.tariffConf.fee = 100; TARIFF_IMPL equal(td); - ensure_equals("Prohibit equal", tariff.TariffChangeIsAllowed(equal).empty(), false); + ensure_equals("Prohibit equal", tariff.TariffChangeIsAllowed(equal, 1461606400).empty(), false); td.tariffConf.fee = 150; TARIFF_IMPL expensive(td); - ensure_equals("Prohibit expensive", tariff.TariffChangeIsAllowed(expensive).empty(), false); + ensure_equals("Prohibit expensive", tariff.TariffChangeIsAllowed(expensive, 1461606400).empty(), false); } template<> @@ -413,17 +413,17 @@ namespace tut td.tariffConf.fee = 50; TARIFF_IMPL cheaper(td); - ensure_equals("Prohibit cheaper", tariff.TariffChangeIsAllowed(cheaper).empty(), false); + ensure_equals("Prohibit cheaper", tariff.TariffChangeIsAllowed(cheaper, 1461606400).empty(), false); td.tariffConf.fee = 100; TARIFF_IMPL equal(td); - ensure_equals("Allow equal", tariff.TariffChangeIsAllowed(equal).empty(), true); + ensure_equals("Allow equal", tariff.TariffChangeIsAllowed(equal, 1461606400).empty(), true); td.tariffConf.fee = 150; TARIFF_IMPL expensive(td); - ensure_equals("Allow expensive", tariff.TariffChangeIsAllowed(expensive).empty(), true); + ensure_equals("Allow expensive", tariff.TariffChangeIsAllowed(expensive, 1461606400).empty(), true); } template<> @@ -440,16 +440,70 @@ namespace tut td.tariffConf.fee = 50; TARIFF_IMPL cheaper(td); - ensure_equals("Prohibit cheaper", tariff.TariffChangeIsAllowed(cheaper).empty(), false); + ensure_equals("Prohibit cheaper", tariff.TariffChangeIsAllowed(cheaper, 1461606400).empty(), false); td.tariffConf.fee = 100; TARIFF_IMPL equal(td); - ensure_equals("Prohibit equal", tariff.TariffChangeIsAllowed(equal).empty(), false); + ensure_equals("Prohibit equal", tariff.TariffChangeIsAllowed(equal, 1461606400).empty(), false); td.tariffConf.fee = 150; TARIFF_IMPL expensive(td); - ensure_equals("Prohibit expensive", tariff.TariffChangeIsAllowed(expensive).empty(), false); + ensure_equals("Prohibit expensive", tariff.TariffChangeIsAllowed(expensive, 1461606400).empty(), false); + } + + template<> + template<> + void testobject::test<11>() + { + set_test_name("Check changePolicyTimeout < current time"); + + TARIFF_DATA td("test"); + td.tariffConf.changePolicyTimeout = 1451606400; + td.tariffConf.changePolicy = TARIFF::TO_EXPENSIVE; + td.tariffConf.fee = 100; + TARIFF_IMPL tariff(td); + + td.tariffConf.fee = 50; + TARIFF_IMPL cheaper(td); + + ensure_equals("Allow cheaper", tariff.TariffChangeIsAllowed(cheaper, 1461606400).empty(), true); + } + + template<> + template<> + void testobject::test<12>() + { + set_test_name("Check changePolicyTimeout > current time"); + + TARIFF_DATA td("test"); + td.tariffConf.changePolicyTimeout = 1483228800; + td.tariffConf.changePolicy = TARIFF::TO_EXPENSIVE; + td.tariffConf.fee = 100; + TARIFF_IMPL tariff(td); + + td.tariffConf.fee = 50; + TARIFF_IMPL cheaper(td); + + ensure_equals("Prohibit cheaper", tariff.TariffChangeIsAllowed(cheaper, 1461606400).empty(), false); + } + + template<> + template<> + void testobject::test<13>() + { + set_test_name("Check changePolicyTimeout = 0"); + + TARIFF_DATA td("test"); + td.tariffConf.changePolicyTimeout = 0; + td.tariffConf.changePolicy = TARIFF::TO_EXPENSIVE; + td.tariffConf.fee = 100; + TARIFF_IMPL tariff(td); + + td.tariffConf.fee = 50; + TARIFF_IMPL cheaper(td); + + ensure_equals("Prohibit cheaper", tariff.TariffChangeIsAllowed(cheaper, 1461606400).empty(), false); } } -- 2.44.2