X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9f01f72d7b1da24b97bcfed87a41f37fd88e7d10..5557e008104be6b01ece7c968a25ad2830717d55:/tests/test_reconnect_on_tariff_change.cpp

diff --git a/tests/test_reconnect_on_tariff_change.cpp b/tests/test_reconnect_on_tariff_change.cpp
index 603f60df..2bb0438c 100644
--- a/tests/test_reconnect_on_tariff_change.cpp
+++ b/tests/test_reconnect_on_tariff_change.cpp
@@ -9,6 +9,7 @@
 #include "teststore.h"
 #include "testauth.h"
 #include "testusers.h"
+#include "testservices.h"
 
 class AFTER_CONNECTED_NOTIFIER : public PROPERTY_NOTIFIER_BASE<bool>,
                                  private NONCOPYABLE {
@@ -62,21 +63,21 @@ namespace tut
         TEST_STORE store;
         TEST_AUTH auth;
         TEST_USERS users;
-        USER_IMPL user(&settings, &store, &tariffs, &admin, &users);
+        TEST_SERVICES services;
+        USER_IMPL user(&settings, &store, &tariffs, &admin, &users, services);
 
         AFTER_CONNECTED_NOTIFIER connectionNotifier;
 
         user.AddConnectedAfterNotifier(&connectionNotifier);
 
-        USER_PROPERTY<double> & cash(user.GetProperty().cash);
         USER_PROPERTY<std::string> & tariffName(user.GetProperty().tariffName);
         USER_PROPERTY<USER_IPS> & ips(user.GetProperty().ips);
 
         ips = StrToIPS("*");
 
         ensure_equals("user.connected = false", user.GetConnected(), false);
-        ensure_equals("connects = 0", connectionNotifier.GetConnects(), 0);
-        ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), 0);
+        ensure_equals("connects = 0", connectionNotifier.GetConnects(), static_cast<size_t>(0));
+        ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), static_cast<size_t>(0));
 
         ensure_equals("user.tariffName == NO_TARIFF_NAME", user.GetProperty().tariffName.ConstData(), NO_TARIFF_NAME);
 
@@ -86,8 +87,8 @@ namespace tut
         ensure_equals("user.authorised_by = true", user.IsAuthorizedBy(&auth), true);
 
         ensure_equals("user.connected = true", user.GetConnected(), true);
-        ensure_equals("connects = 1", connectionNotifier.GetConnects(), 1);
-        ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), 0);
+        ensure_equals("connects = 1", connectionNotifier.GetConnects(), static_cast<size_t>(1));
+        ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), static_cast<size_t>(0));
 
         tariffName = "test";
         ensure_equals("user.tariffName == 'test'", user.GetProperty().tariffName.ConstData(), "test");
@@ -95,8 +96,8 @@ namespace tut
         ensure_equals("user.authorised_by = true", user.IsAuthorizedBy(&auth), true);
 
         ensure_equals("user.connected = true", user.GetConnected(), true);
-        ensure_equals("connects = 1", connectionNotifier.GetConnects(), 1);
-        ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), 0);
+        ensure_equals("connects = 1", connectionNotifier.GetConnects(), static_cast<size_t>(1));
+        ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), static_cast<size_t>(0));
     }
 
 
@@ -120,21 +121,21 @@ namespace tut
         TEST_STORE store;
         TEST_AUTH auth;
         TEST_USERS users;
-        USER_IMPL user(&settings, &store, &tariffs, &admin, &users);
+        TEST_SERVICES services;
+        USER_IMPL user(&settings, &store, &tariffs, &admin, &users, services);
 
         AFTER_CONNECTED_NOTIFIER connectionNotifier;
 
         user.AddConnectedAfterNotifier(&connectionNotifier);
 
-        USER_PROPERTY<double> & cash(user.GetProperty().cash);
         USER_PROPERTY<std::string> & tariffName(user.GetProperty().tariffName);
         USER_PROPERTY<USER_IPS> & ips(user.GetProperty().ips);
 
         ips = StrToIPS("*");
 
         ensure_equals("user.connected = false", user.GetConnected(), false);
-        ensure_equals("connects = 0", connectionNotifier.GetConnects(), 0);
-        ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), 0);
+        ensure_equals("connects = 0", connectionNotifier.GetConnects(), static_cast<size_t>(0));
+        ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), static_cast<size_t>(0));
 
         ensure_equals("user.tariffName == NO_TARIFF_NAME", user.GetProperty().tariffName.ConstData(), NO_TARIFF_NAME);
 
@@ -144,8 +145,8 @@ namespace tut
         ensure_equals("user.authorised_by = true", user.IsAuthorizedBy(&auth), true);
 
         ensure_equals("user.connected = true", user.GetConnected(), true);
-        ensure_equals("connects = 1", connectionNotifier.GetConnects(), 1);
-        ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), 0);
+        ensure_equals("connects = 1", connectionNotifier.GetConnects(), static_cast<size_t>(1));
+        ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), static_cast<size_t>(0));
 
         tariffName = "test";
         ensure_equals("user.tariffName == 'test'", user.GetProperty().tariffName.ConstData(), "test");
@@ -153,8 +154,8 @@ namespace tut
         ensure_equals("user.authorised_by = true", user.IsAuthorizedBy(&auth), true);
 
         ensure_equals("user.connected = true", user.GetConnected(), true);
-        ensure_equals("connects = 2", connectionNotifier.GetConnects(), 2);
-        ensure_equals("disconnects = 1", connectionNotifier.GetDisconnects(), 1);
+        ensure_equals("connects = 2", connectionNotifier.GetConnects(), static_cast<size_t>(2));
+        ensure_equals("disconnects = 1", connectionNotifier.GetDisconnects(), static_cast<size_t>(1));
     }
 }