X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/21c054c70c5ad524a0e42ce0e644d9058ee2d020..6a7381b164a6998bd2822355c58ab514c9dc79a7:/tests/test_fee_charge_rules.cpp

diff --git a/tests/test_fee_charge_rules.cpp b/tests/test_fee_charge_rules.cpp
index 825c2b36..b2a2790e 100644
--- a/tests/test_fee_charge_rules.cpp
+++ b/tests/test_fee_charge_rules.cpp
@@ -7,6 +7,7 @@
 #include "testtariffs.h"
 #include "testadmin.h"
 #include "teststore.h"
+#include "testservices.h"
 
 namespace tut
 {
@@ -40,26 +41,27 @@ namespace tut
         TEST_TARIFFS tariffs;
         TEST_ADMIN admin;
         TEST_STORE store;
-        USER_IMPL user(&settings, &store, &tariffs, &admin, NULL);
+        TEST_SERVICES services;
+        STG::UserImpl user(&settings, &store, &tariffs, &admin, NULL, services);
 
-        USER_PROPERTY<double> & cash(user.GetProperty().cash);
-        USER_PROPERTY<std::string> & tariffName(user.GetProperty().tariffName);
+        STG::UserProperty<double> & cash(user.GetProperties().cash);
+        STG::UserProperty<std::string> & tariffName(user.GetProperties().tariffName);
 
-        ensure_equals("user.cash == 0 (initial value)", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == 0 (initial value)", user.GetProperties().cash, 0);
         cash = 100;
-        ensure_equals("user.cash == 100 (explicitly set)", user.GetProperty().cash, 100);
+        ensure_equals("user.cash == 100 (explicitly set)", user.GetProperties().cash, 100);
 
         tariffs.SetFee(50);
         tariffName = "test";
-        ensure_equals("user.tariffName == 'test' (explicitly set)", user.GetProperty().tariffName.ConstData(), "test");
+        ensure_equals("user.tariffName == 'test' (explicitly set)", user.GetProperties().tariffName.ConstData(), "test");
         user.ProcessDayFee();
-        ensure_equals("user.cash == 50 (first fee charge)", user.GetProperty().cash, 50);
+        ensure_equals("user.cash == 50 (first fee charge)", user.GetProperties().cash, 50);
         user.ProcessDayFee();
-        ensure_equals("user.cash == 0 (second fee charge)", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == 0 (second fee charge)", user.GetProperties().cash, 0);
         user.ProcessDayFee();
-        ensure_equals("user.cash == -50 (third fee charge)", user.GetProperty().cash, -50);
+        ensure_equals("user.cash == -50 (third fee charge)", user.GetProperties().cash, -50);
         user.ProcessDayFee();
-        ensure_equals("user.cash == -100 (fourth fee charge)", user.GetProperty().cash, -100);
+        ensure_equals("user.cash == -100 (fourth fee charge)", user.GetProperties().cash, -100);
     }
 
     template<>
@@ -72,40 +74,41 @@ namespace tut
         TEST_TARIFFS tariffs;
         TEST_ADMIN admin;
         TEST_STORE store;
-        USER_IMPL user(&settings, &store, &tariffs, &admin, NULL);
+        TEST_SERVICES services;
+        STG::UserImpl user(&settings, &store, &tariffs, &admin, NULL, services);
 
-        USER_PROPERTY<double> & cash(user.GetProperty().cash);
-        USER_PROPERTY<double> & credit(user.GetProperty().credit);
-        USER_PROPERTY<std::string> & tariffName(user.GetProperty().tariffName);
+        STG::UserProperty<double> & cash(user.GetProperties().cash);
+        STG::UserProperty<double> & credit(user.GetProperties().credit);
+        STG::UserProperty<std::string> & tariffName(user.GetProperties().tariffName);
 
-        ensure_equals("user.cash == 0 (initial value)", user.GetProperty().cash, 0);
-        ensure_equals("user.credit == 0 (initial value)", user.GetProperty().credit, 0);
+        ensure_equals("user.cash == 0 (initial value)", user.GetProperties().cash, 0);
+        ensure_equals("user.credit == 0 (initial value)", user.GetProperties().credit, 0);
         cash = 100;
-        ensure_equals("user.cash == 100 (explicitly set)", user.GetProperty().cash, 100);
+        ensure_equals("user.cash == 100 (explicitly set)", user.GetProperties().cash, 100);
 
         tariffs.SetFee(50);
         tariffName = "test";
-        ensure_equals("user.tariffName == 'test' (explicitly set)", user.GetProperty().tariffName.ConstData(), "test");
+        ensure_equals("user.tariffName == 'test' (explicitly set)", user.GetProperties().tariffName.ConstData(), "test");
         user.ProcessDayFee();
-        ensure_equals("user.cash == 50 (first fee charge)", user.GetProperty().cash, 50);
+        ensure_equals("user.cash == 50 (first fee charge)", user.GetProperties().cash, 50);
         user.ProcessDayFee();
-        ensure_equals("user.cash == 0 (second fee charge)", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == 0 (second fee charge)", user.GetProperties().cash, 0);
         user.ProcessDayFee();
-        ensure_equals("user.cash == -50 (third fee charge)", user.GetProperty().cash, -50);
+        ensure_equals("user.cash == -50 (third fee charge)", user.GetProperties().cash, -50);
         user.ProcessDayFee();
-        ensure_equals("user.cash == -50 (not charging `cause value is negative)", user.GetProperty().cash, -50);
+        ensure_equals("user.cash == -50 (not charging `cause value is negative)", user.GetProperties().cash, -50);
         cash = 49;
-        ensure_equals("user.cash == 49 (explicitly set)", user.GetProperty().cash, 49);
+        ensure_equals("user.cash == 49 (explicitly set)", user.GetProperties().cash, 49);
         user.ProcessDayFee();
-        ensure_equals("user.cash == -1 (charge to negative value)", user.GetProperty().cash, -1);
+        ensure_equals("user.cash == -1 (charge to negative value)", user.GetProperties().cash, -1);
         user.ProcessDayFee();
-        ensure_equals("user.cash == -1 (not charging `cause value is negative)", user.GetProperty().cash, -1);
+        ensure_equals("user.cash == -1 (not charging `cause value is negative)", user.GetProperties().cash, -1);
         credit = 50;
-        ensure_equals("user.credit == 50 (explicitly set)", user.GetProperty().credit, 50);
+        ensure_equals("user.credit == 50 (explicitly set)", user.GetProperties().credit, 50);
         user.ProcessDayFee();
-        ensure_equals("user.cash == -51 (charging `cause value + credit gives us a positive value)", user.GetProperty().cash, -51);
+        ensure_equals("user.cash == -51 (charging `cause value + credit gives us a positive value)", user.GetProperties().cash, -51);
         user.ProcessDayFee();
-        ensure_equals("user.cash == -51 (not charging `cause credit now is not enoght)", user.GetProperty().cash, -51);
+        ensure_equals("user.cash == -51 (not charging `cause credit now is not enoght)", user.GetProperties().cash, -51);
     }
 
     template<>
@@ -118,37 +121,38 @@ namespace tut
         TEST_TARIFFS tariffs;
         TEST_ADMIN admin;
         TEST_STORE store;
-        USER_IMPL user(&settings, &store, &tariffs, &admin, NULL);
+        TEST_SERVICES services;
+        STG::UserImpl user(&settings, &store, &tariffs, &admin, NULL, services);
 
-        USER_PROPERTY<double> & cash(user.GetProperty().cash);
-        USER_PROPERTY<double> & credit(user.GetProperty().credit);
-        USER_PROPERTY<std::string> & tariffName(user.GetProperty().tariffName);
+        STG::UserProperty<double> & cash(user.GetProperties().cash);
+        STG::UserProperty<double> & credit(user.GetProperties().credit);
+        STG::UserProperty<std::string> & tariffName(user.GetProperties().tariffName);
 
-        ensure_equals("user.cash == 0 (initial value)", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == 0 (initial value)", user.GetProperties().cash, 0);
         cash = 100;
-        ensure_equals("user.cash == 100 (explicitly set)", user.GetProperty().cash, 100);
+        ensure_equals("user.cash == 100 (explicitly set)", user.GetProperties().cash, 100);
 
         tariffs.SetFee(50);
         tariffName = "test";
-        ensure_equals("user.tariffName == 'test' (explicitly set)", user.GetProperty().tariffName.ConstData(), "test");
+        ensure_equals("user.tariffName == 'test' (explicitly set)", user.GetProperties().tariffName.ConstData(), "test");
         user.ProcessDayFee();
-        ensure_equals("user.cash == 50 (first fee charge)", user.GetProperty().cash, 50);
+        ensure_equals("user.cash == 50 (first fee charge)", user.GetProperties().cash, 50);
         user.ProcessDayFee();
-        ensure_equals("user.cash == 0 (second fee charge)", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == 0 (second fee charge)", user.GetProperties().cash, 0);
         user.ProcessDayFee();
-        ensure_equals("user.cash == 0 (not charging `cause value is lower than fee)", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == 0 (not charging `cause value is lower than fee)", user.GetProperties().cash, 0);
         cash = 50;
-        ensure_equals("user.cash == 50 (explicitly set)", user.GetProperty().cash, 50);
+        ensure_equals("user.cash == 50 (explicitly set)", user.GetProperties().cash, 50);
         tariffs.SetFee(51);
         user.ProcessDayFee();
-        ensure_equals("user.cash == 50 (not charging `cause value is lower than fee)", user.GetProperty().cash, 50);
+        ensure_equals("user.cash == 50 (not charging `cause value is lower than fee)", user.GetProperties().cash, 50);
         cash = 0;
-        ensure_equals("user.cash == 0 (explicitly set)", user.GetProperty().cash, 0);
+        ensure_equals("user.cash == 0 (explicitly set)", user.GetProperties().cash, 0);
         credit = 51;
-        ensure_equals("user.credit == 51 (explicitly set)", user.GetProperty().credit, 51);
+        ensure_equals("user.credit == 51 (explicitly set)", user.GetProperties().credit, 51);
         user.ProcessDayFee();
-        ensure_equals("user.cash == -51 (charging `cause value + credit gives us a value greater than fee)", user.GetProperty().cash, -51);
+        ensure_equals("user.cash == -51 (charging `cause value + credit gives us a value greater than fee)", user.GetProperties().cash, -51);
         user.ProcessDayFee();
-        ensure_equals("user.cash == -51 (not charging `cause credit now is not enought)", user.GetProperty().cash, -51);
+        ensure_equals("user.cash == -51 (not charging `cause credit now is not enought)", user.GetProperties().cash, -51);
     }
 }