Minor ChangeLog fix

[stg.git] / tests / test_fee_charge_rules.cpp

diff --git a/tests/test_fee_charge_rules.cpp b/tests/test_fee_charge_rules.cpp
index 657a609ae036c9264e64201ea0d61957b4d198d1..825c2b3687ef16260d1462dd656a021dcf20b505 100644 (file)
--- a/tests/test_fee_charge_rules.cpp
+++ b/tests/test_fee_charge_rules.cpp
@@ -8,8 +8,6 @@
 #include "testadmin.h"
 #include "teststore.h"
 
 #include "testadmin.h"
 #include "teststore.h"
 

-const volatile time_t stgTime = 0;
-

 namespace tut
 {
     struct fee_charge_rules_data {
 namespace tut
 {
     struct fee_charge_rules_data {


@@ -47,19 +45,21 @@ namespace tut
         USER_PROPERTY<double> & cash(user.GetProperty().cash);
         USER_PROPERTY<std::string> & tariffName(user.GetProperty().tariffName);
 
         USER_PROPERTY<double> & cash(user.GetProperty().cash);
         USER_PROPERTY<std::string> & tariffName(user.GetProperty().tariffName);
 

-        ensure_equals("user.cash == 0", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == 0 (initial value)", user.GetProperty().cash, 0);

         cash = 100;
         cash = 100;

-        ensure_equals("user.cash == 100", user.GetProperty().cash, 100);
+        ensure_equals("user.cash == 100 (explicitly set)", user.GetProperty().cash, 100);

 
         tariffs.SetFee(50);
         tariffName = "test";
 
         tariffs.SetFee(50);
         tariffName = "test";

-        ensure_equals("user.tariffName == 'test'", user.GetProperty().tariffName.ConstData(), "test");
+        ensure_equals("user.tariffName == 'test' (explicitly set)", user.GetProperty().tariffName.ConstData(), "test");
+        user.ProcessDayFee();
+        ensure_equals("user.cash == 50 (first fee charge)", user.GetProperty().cash, 50);

         user.ProcessDayFee();
         user.ProcessDayFee();

-        ensure_equals("user.cash == 50", user.GetProperty().cash, 50);
+        ensure_equals("user.cash == 0 (second fee charge)", user.GetProperty().cash, 0);

         user.ProcessDayFee();
         user.ProcessDayFee();

-        ensure_equals("user.cash == 0", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == -50 (third fee charge)", user.GetProperty().cash, -50);

         user.ProcessDayFee();
         user.ProcessDayFee();

-        ensure_equals("user.cash == -50", user.GetProperty().cash, -50);
+        ensure_equals("user.cash == -100 (fourth fee charge)", user.GetProperty().cash, -100);

     }
 
     template<>
     }
 
     template<>


@@ -75,25 +75,37 @@ namespace tut
         USER_IMPL user(&settings, &store, &tariffs, &admin, NULL);
 
         USER_PROPERTY<double> & cash(user.GetProperty().cash);
         USER_IMPL user(&settings, &store, &tariffs, &admin, NULL);
 
         USER_PROPERTY<double> & cash(user.GetProperty().cash);

+        USER_PROPERTY<double> & credit(user.GetProperty().credit);

         USER_PROPERTY<std::string> & tariffName(user.GetProperty().tariffName);
 
         USER_PROPERTY<std::string> & tariffName(user.GetProperty().tariffName);
 

-        ensure_equals("user.cash == 0", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == 0 (initial value)", user.GetProperty().cash, 0);
+        ensure_equals("user.credit == 0 (initial value)", user.GetProperty().credit, 0);

         cash = 100;
         cash = 100;

-        ensure_equals("user.cash == 100", user.GetProperty().cash, 100);
+        ensure_equals("user.cash == 100 (explicitly set)", user.GetProperty().cash, 100);

 
         tariffs.SetFee(50);
         tariffName = "test";
 
         tariffs.SetFee(50);
         tariffName = "test";

-        ensure_equals("user.tariffName == 'test'", user.GetProperty().tariffName.ConstData(), "test");
+        ensure_equals("user.tariffName == 'test' (explicitly set)", user.GetProperty().tariffName.ConstData(), "test");

         user.ProcessDayFee();
         user.ProcessDayFee();

-        ensure_equals("user.cash == 50", user.GetProperty().cash, 50);
+        ensure_equals("user.cash == 50 (first fee charge)", user.GetProperty().cash, 50);

         user.ProcessDayFee();
         user.ProcessDayFee();

-        ensure_equals("user.cash == 0", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == 0 (second fee charge)", user.GetProperty().cash, 0);

         user.ProcessDayFee();
         user.ProcessDayFee();

-        ensure_equals("user.cash == 0", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == -50 (third fee charge)", user.GetProperty().cash, -50);
+        user.ProcessDayFee();
+        ensure_equals("user.cash == -50 (not charging `cause value is negative)", user.GetProperty().cash, -50);

         cash = 49;
         cash = 49;

-        ensure_equals("user.cash == 49", user.GetProperty().cash, 49);
+        ensure_equals("user.cash == 49 (explicitly set)", user.GetProperty().cash, 49);
+        user.ProcessDayFee();
+        ensure_equals("user.cash == -1 (charge to negative value)", user.GetProperty().cash, -1);

         user.ProcessDayFee();
         user.ProcessDayFee();

-        ensure_equals("user.cash == -1", user.GetProperty().cash, -1);
+        ensure_equals("user.cash == -1 (not charging `cause value is negative)", user.GetProperty().cash, -1);
+        credit = 50;
+        ensure_equals("user.credit == 50 (explicitly set)", user.GetProperty().credit, 50);
+        user.ProcessDayFee();
+        ensure_equals("user.cash == -51 (charging `cause value + credit gives us a positive value)", user.GetProperty().cash, -51);
+        user.ProcessDayFee();
+        ensure_equals("user.cash == -51 (not charging `cause credit now is not enoght)", user.GetProperty().cash, -51);

     }
 
     template<>
     }
 
     template<>


@@ -109,25 +121,34 @@ namespace tut
         USER_IMPL user(&settings, &store, &tariffs, &admin, NULL);
 
         USER_PROPERTY<double> & cash(user.GetProperty().cash);
         USER_IMPL user(&settings, &store, &tariffs, &admin, NULL);
 
         USER_PROPERTY<double> & cash(user.GetProperty().cash);

+        USER_PROPERTY<double> & credit(user.GetProperty().credit);

         USER_PROPERTY<std::string> & tariffName(user.GetProperty().tariffName);
 
         USER_PROPERTY<std::string> & tariffName(user.GetProperty().tariffName);
 

-        ensure_equals("user.cash == 0", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == 0 (initial value)", user.GetProperty().cash, 0);

         cash = 100;
         cash = 100;

-        ensure_equals("user.cash == 100", user.GetProperty().cash, 100);
+        ensure_equals("user.cash == 100 (explicitly set)", user.GetProperty().cash, 100);

 
         tariffs.SetFee(50);
         tariffName = "test";
 
         tariffs.SetFee(50);
         tariffName = "test";

-        ensure_equals("user.tariffName == 'test'", user.GetProperty().tariffName.ConstData(), "test");
+        ensure_equals("user.tariffName == 'test' (explicitly set)", user.GetProperty().tariffName.ConstData(), "test");

         user.ProcessDayFee();
         user.ProcessDayFee();

-        ensure_equals("user.cash == 50", user.GetProperty().cash, 50);
+        ensure_equals("user.cash == 50 (first fee charge)", user.GetProperty().cash, 50);

         user.ProcessDayFee();
         user.ProcessDayFee();

-        ensure_equals("user.cash == 50", user.GetProperty().cash, 50);
-        tariffs.SetFee(49);
+        ensure_equals("user.cash == 0 (second fee charge)", user.GetProperty().cash, 0);

         user.ProcessDayFee();
         user.ProcessDayFee();

-        ensure_equals("user.cash == 1", user.GetProperty().cash, 1);
+        ensure_equals("user.cash == 0 (not charging `cause value is lower than fee)", user.GetProperty().cash, 0);
+        cash = 50;
+        ensure_equals("user.cash == 50 (explicitly set)", user.GetProperty().cash, 50);
+        tariffs.SetFee(51);
+        user.ProcessDayFee();
+        ensure_equals("user.cash == 50 (not charging `cause value is lower than fee)", user.GetProperty().cash, 50);

         cash = 0;
         cash = 0;

-        ensure_equals("user.cash == 0", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == 0 (explicitly set)", user.GetProperty().cash, 0);
+        credit = 51;
+        ensure_equals("user.credit == 51 (explicitly set)", user.GetProperty().credit, 51);
+        user.ProcessDayFee();
+        ensure_equals("user.cash == -51 (charging `cause value + credit gives us a value greater than fee)", user.GetProperty().cash, -51);

         user.ProcessDayFee();
         user.ProcessDayFee();

-        ensure_equals("user.cash == 0", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == -51 (not charging `cause credit now is not enought)", user.GetProperty().cash, -51);

     }
 }
     }
 }