Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / tests / test_tariff.cpp

diff --git a/tests/test_tariff.cpp b/tests/test_tariff.cpp
index 0969a490125ad556d9a99e11c65f7ad3d26d2334..188aee8a1802cdad240568d766ab392ca783e7a5 100644 (file)
--- 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;
         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);


@@ -389,14 +389,14 @@ 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<>


@@ -413,12 +413,12 @@ namespace tut
         td.tariffConf.fee = 50;
         TARIFF_IMPL cheaper(td);
 
         td.tariffConf.fee = 50;
         TARIFF_IMPL cheaper(td);
 

-        ensure_equals("Allow cheaper", !tariff.TariffChangeIsAllowed(cheaper).empty(), true);
+        ensure_equals("Prohibit cheaper", tariff.TariffChangeIsAllowed(cheaper).empty(), false);

 
         td.tariffConf.fee = 100;
 
         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);


@@ -440,16 +440,16 @@ namespace tut
         td.tariffConf.fee = 50;
         TARIFF_IMPL cheaper(td);
 
         td.tariffConf.fee = 50;
         TARIFF_IMPL cheaper(td);
 

-        ensure_equals("Allow cheaper", !tariff.TariffChangeIsAllowed(cheaper).empty(), true);
+        ensure_equals("Prohibit cheaper", tariff.TariffChangeIsAllowed(cheaper).empty(), false);

 
         td.tariffConf.fee = 100;
 
         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);

     }
 }
     }
 }