Turn Firebird back on.

[stg.git] / 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 603f60dfe01adbb0b1739ef12957b7b8a1f928cc..60e36ffa64df3d0c15836d8dc7b7fb125741a786 100644 (file)
--- a/tests/test_reconnect_on_tariff_change.cpp
+++ b/tests/test_reconnect_on_tariff_change.cpp
@@ -1,17 +1,20 @@
 #include "tut/tut.hpp"
 
 #include "tut/tut.hpp"
 

+#include "stg/admin.h"

 #include "stg/user_property.h"
 #include "user_impl.h"
 
 #include "testsettings.h"
 #include "testtariffs.h"
 #include "stg/user_property.h"
 #include "user_impl.h"
 
 #include "testsettings.h"
 #include "testtariffs.h"

-#include "testadmin.h"

 #include "teststore.h"
 #include "testauth.h"
 #include "testusers.h"
 #include "teststore.h"
 #include "testauth.h"
 #include "testusers.h"

+#include "testservices.h"

 
 

-class AFTER_CONNECTED_NOTIFIER : public PROPERTY_NOTIFIER_BASE<bool>,
-                                 private NONCOPYABLE {
+namespace
+{
+
+class AFTER_CONNECTED_NOTIFIER : public STG::PropertyNotifierBase<bool> {

 public:
     AFTER_CONNECTED_NOTIFIER()
         : connects(0),
 public:
     AFTER_CONNECTED_NOTIFIER()
         : connects(0),


@@ -40,6 +43,8 @@ class TEST_SETTINGS_LOCAL : public TEST_SETTINGS {
         bool reconnectOnTariffChange;
 };
 
         bool reconnectOnTariffChange;
 };
 

+}
+

 namespace tut
 {
     struct reconnect_on_tariff_change_data {
 namespace tut
 {
     struct reconnect_on_tariff_change_data {


@@ -58,27 +63,28 @@ namespace tut
 
         TEST_SETTINGS_LOCAL settings(false);
         TEST_TARIFFS tariffs;
 
         TEST_SETTINGS_LOCAL settings(false);
         TEST_TARIFFS tariffs;

-        TEST_ADMIN admin;
+        tariffs.ReadTariffs();
+        STG::Admin admin(STG::Priv(0xFFFF), {}, {});

         TEST_STORE store;
         TEST_AUTH auth;
         TEST_USERS users;
         TEST_STORE store;
         TEST_AUTH auth;
         TEST_USERS users;

-        USER_IMPL user(&settings, &store, &tariffs, &admin, &users);
+        TEST_SERVICES services;
+        STG::UserImpl user(&settings, &store, &tariffs, &admin, &users, services);

 
         AFTER_CONNECTED_NOTIFIER connectionNotifier;
 
         user.AddConnectedAfterNotifier(&connectionNotifier);
 
 
         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);
+        STG::UserProperty<std::string> & tariffName = user.GetProperties().tariffName;
+        STG::UserProperty<STG::UserIPs> & ips = user.GetProperties().ips;

 
 

-        ips = StrToIPS("*");
+        ips = STG::UserIPs::parse("*");

 
         ensure_equals("user.connected = false", user.GetConnected(), false);
 
         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);
+        ensure_equals("user.tariffName == NO_TARIFF_NAME", user.GetProperties().tariffName.ConstData(), NO_TARIFF_NAME);

 
         user.Authorize(inet_strington("127.0.0.1"), 0, &auth);
         user.Run();
 
         user.Authorize(inet_strington("127.0.0.1"), 0, &auth);
         user.Run();


@@ -86,17 +92,17 @@ namespace tut
         ensure_equals("user.authorised_by = true", user.IsAuthorizedBy(&auth), true);
 
         ensure_equals("user.connected = true", user.GetConnected(), true);
         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";
 
         tariffName = "test";

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

 
         ensure_equals("user.authorised_by = true", user.IsAuthorizedBy(&auth), true);
 
         ensure_equals("user.connected = true", user.GetConnected(), true);
 
         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));

     }
 
 
     }
 
 


@@ -109,34 +115,34 @@ namespace tut
         TEST_SETTINGS_LOCAL settings(true);
 
         TEST_SETTINGS * s1 = &settings;
         TEST_SETTINGS_LOCAL settings(true);
 
         TEST_SETTINGS * s1 = &settings;

-        SETTINGS * s2 = &settings;
+        STG::Settings * s2 = &settings;

 
         ensure("settings.GetReconnectOnTariffChange() == true", settings.GetReconnectOnTariffChange());
         ensure("s1->GetReconnectOnTariffChange() == true", s1->GetReconnectOnTariffChange());
         ensure("s2->GetReconnectOnTariffChange() == true", s2->GetReconnectOnTariffChange());
 
         TEST_TARIFFS tariffs;
 
         ensure("settings.GetReconnectOnTariffChange() == true", settings.GetReconnectOnTariffChange());
         ensure("s1->GetReconnectOnTariffChange() == true", s1->GetReconnectOnTariffChange());
         ensure("s2->GetReconnectOnTariffChange() == true", s2->GetReconnectOnTariffChange());
 
         TEST_TARIFFS tariffs;

-        TEST_ADMIN admin;
+        STG::Admin admin(STG::Priv(0xFFFF), {}, {});

         TEST_STORE store;
         TEST_AUTH auth;
         TEST_USERS users;
         TEST_STORE store;
         TEST_AUTH auth;
         TEST_USERS users;

-        USER_IMPL user(&settings, &store, &tariffs, &admin, &users);
+        TEST_SERVICES services;
+        STG::UserImpl user(&settings, &store, &tariffs, &admin, &users, services);

 
         AFTER_CONNECTED_NOTIFIER connectionNotifier;
 
         user.AddConnectedAfterNotifier(&connectionNotifier);
 
 
         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);
+        STG::UserProperty<std::string> & tariffName = user.GetProperties().tariffName;
+        STG::UserProperty<STG::UserIPs> & ips = user.GetProperties().ips;

 
 

-        ips = StrToIPS("*");
+        ips = STG::UserIPs::parse("*");

 
         ensure_equals("user.connected = false", user.GetConnected(), false);
 
         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);
+        ensure_equals("user.tariffName == NO_TARIFF_NAME", user.GetProperties().tariffName.ConstData(), NO_TARIFF_NAME);

 
         user.Authorize(inet_strington("127.0.0.1"), 0, &auth);
         user.Run();
 
         user.Authorize(inet_strington("127.0.0.1"), 0, &auth);
         user.Run();


@@ -144,17 +150,17 @@ namespace tut
         ensure_equals("user.authorised_by = true", user.IsAuthorizedBy(&auth), true);
 
         ensure_equals("user.connected = true", user.GetConnected(), true);
         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";
 
         tariffName = "test";

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

 
         ensure_equals("user.authorised_by = true", user.IsAuthorizedBy(&auth), true);
 
         ensure_equals("user.connected = true", user.GetConnected(), true);
 
         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));

     }
 }
 
     }
 }