Ticket 37. Int2TS() and TS2Int() methods declare removed.

[stg.git] / tests / test_tariff.cpp

diff --git a/tests/test_tariff.cpp b/tests/test_tariff.cpp
index b671e0b5b33b7bb38f3d22593dbd30875fe36d37..188aee8a1802cdad240568d766ab392ca783e7a5 100644 (file)
--- a/tests/test_tariff.cpp
+++ b/tests/test_tariff.cpp
@@ -352,7 +352,7 @@ namespace tut
         set_test_name("Check changePolicy - ALLOW");
 
         TARIFF_DATA td("test");
         set_test_name("Check changePolicy - ALLOW");
 
         TARIFF_DATA td("test");

-        td.tariffConf.changePolicy = TARIFF::CHANGE_POLICY ALLOW;
+        td.tariffConf.changePolicy = TARIFF::ALLOW;

         td.tariffConf.fee = 100;
         TARIFF_IMPL tariff(td);
 
         td.tariffConf.fee = 100;
         TARIFF_IMPL tariff(td);
 


@@ -362,9 +362,9 @@ namespace tut
         ensure_equals("Allow cheaper", tariff.TariffChangeIsAllowed(cheaper).empty(), true);
 
         td.tariffConf.fee = 100;
         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);
 
         td.tariffConf.fee = 150;
         TARIFF_IMPL expensive(td);


@@ -379,7 +379,7 @@ namespace tut
         set_test_name("Check changePolicy - TO_CHEAP");
 
         TARIFF_DATA td("test");
         set_test_name("Check changePolicy - TO_CHEAP");
 
         TARIFF_DATA td("test");

-        td.tariffConf.changePolicy = TARIFF::CHANGE_POLICY TO_CHEAP;
+        td.tariffConf.changePolicy = TARIFF::TO_CHEAP;

         td.tariffConf.fee = 100;
         TARIFF_IMPL tariff(td);
 
         td.tariffConf.fee = 100;
         TARIFF_IMPL tariff(td);
 


@@ -389,13 +389,67 @@ namespace tut
         ensure_equals("Allow cheaper", tariff.TariffChangeIsAllowed(cheaper).empty(), true);
 
         td.tariffConf.fee = 100;
         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("Prohibit equal", tariff.TariffChangeIsAllowed(equal).empty(), false);

 
         td.tariffConf.fee = 150;
         TARIFF_IMPL expensive(td);
 
 
         td.tariffConf.fee = 150;
         TARIFF_IMPL expensive(td);
 

-        ensure_equals("Allow expensive", !tariff.TariffChangeIsAllowed(expensive).empty(), true);
+        ensure_equals("Prohibit expensive", tariff.TariffChangeIsAllowed(expensive).empty(), false);
+    }
+
+    template<>
+    template<>
+    void testobject::test<9>()
+    {
+        set_test_name("Check changePolicy - TO_EXPENSIVE");
+
+        TARIFF_DATA td("test");
+        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).empty(), false);
+
+        td.tariffConf.fee = 100;
+        TARIFF_IMPL equal(td);
+
+        ensure_equals("Allow equal", tariff.TariffChangeIsAllowed(equal).empty(), true);
+
+        td.tariffConf.fee = 150;
+        TARIFF_IMPL expensive(td);
+
+        ensure_equals("Allow expensive", tariff.TariffChangeIsAllowed(expensive).empty(), true);
+    }
+
+    template<>
+    template<>
+    void testobject::test<10>()
+    {
+        set_test_name("Check changePolicy - DENY");
+
+        TARIFF_DATA td("test");
+        td.tariffConf.changePolicy = TARIFF::DENY;
+        td.tariffConf.fee = 100;
+        TARIFF_IMPL tariff(td);
+
+        td.tariffConf.fee = 50;
+        TARIFF_IMPL cheaper(td);
+
+        ensure_equals("Prohibit cheaper", tariff.TariffChangeIsAllowed(cheaper).empty(), false);
+
+        td.tariffConf.fee = 100;
+        TARIFF_IMPL equal(td);
+
+        ensure_equals("Prohibit equal", tariff.TariffChangeIsAllowed(equal).empty(), false);
+
+        td.tariffConf.fee = 150;
+        TARIFF_IMPL expensive(td);
+
+        ensure_equals("Prohibit expensive", tariff.TariffChangeIsAllowed(expensive).empty(), false);

     }
 }
     }
 }