X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9f3223722138dadc2f6cd54dfcbad3d19a3db4d6..8f46a826a07310dbd76e4b3a15f63ae055272542:/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 e60e5989..42f76d0b 100644 --- a/tests/test_reconnect_on_tariff_change.cpp +++ b/tests/test_reconnect_on_tariff_change.cpp @@ -7,6 +7,44 @@ #include "testtariffs.h" #include "testadmin.h" #include "teststore.h" +#include "testauth.h" +#include "testusers.h" +#include "testservices.h" + +namespace +{ + +class AFTER_CONNECTED_NOTIFIER : public PROPERTY_NOTIFIER_BASE, + private NONCOPYABLE { +public: + AFTER_CONNECTED_NOTIFIER() + : connects(0), + disconnects(0) + {} + void Notify(const bool & oldValue, const bool & newValue); + + size_t GetConnects() const { return connects; } + size_t GetDisconnects() const { return disconnects; } + +private: + size_t connects; + size_t disconnects; +}; + +class TEST_SETTINGS_LOCAL : public TEST_SETTINGS { + public: + TEST_SETTINGS_LOCAL(bool _reconnectOnTariffChange) + : TEST_SETTINGS(), + reconnectOnTariffChange(_reconnectOnTariffChange) + {} + + bool GetReconnectOnTariffChange() const { return reconnectOnTariffChange; } + + private: + bool reconnectOnTariffChange; +}; + +} namespace tut { @@ -18,18 +56,6 @@ namespace tut typedef tg::object testobject; - class TEST_SETTINGS_LOCAL : public TEST_SETTINGS { - public: - TEST_SETTINGS_LOCAL(bool _reconnectOnTariffChange) - : reconnectOnTariffChange(_reconnectOnTariffChange) - {} - - bool GetReconnectOnTariffChange() const { return reconnectOnTariffChange; } - - private: - bool reconnectOnTariffChange; - }; - template<> template<> void testobject::test<1>() @@ -40,12 +66,108 @@ namespace tut TEST_TARIFFS tariffs; TEST_ADMIN admin; TEST_STORE store; - USER_IMPL user(&settings, &store, &tariffs, &admin, NULL); + TEST_AUTH auth; + TEST_USERS users; + TEST_SERVICES services; + USER_IMPL user(&settings, &store, &tariffs, &admin, &users, services); + + AFTER_CONNECTED_NOTIFIER connectionNotifier; + + user.AddConnectedAfterNotifier(&connectionNotifier); + + USER_PROPERTY & tariffName(user.GetProperty().tariffName); + USER_PROPERTY & ips(user.GetProperty().ips); + + ips = StrToIPS("*"); + + ensure_equals("user.connected = false", user.GetConnected(), false); + ensure_equals("connects = 0", connectionNotifier.GetConnects(), static_cast(0)); + ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), static_cast(0)); + + ensure_equals("user.tariffName == NO_TARIFF_NAME", user.GetProperty().tariffName.ConstData(), NO_TARIFF_NAME); + + user.Authorize(inet_strington("127.0.0.1"), 0, &auth); + user.Run(); + + ensure_equals("user.authorised_by = true", user.IsAuthorizedBy(&auth), true); + + ensure_equals("user.connected = true", user.GetConnected(), true); + ensure_equals("connects = 1", connectionNotifier.GetConnects(), static_cast(1)); + ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), static_cast(0)); + + tariffName = "test"; + ensure_equals("user.tariffName == 'test'", user.GetProperty().tariffName.ConstData(), "test"); + + ensure_equals("user.authorised_by = true", user.IsAuthorizedBy(&auth), true); + + ensure_equals("user.connected = true", user.GetConnected(), true); + ensure_equals("connects = 1", connectionNotifier.GetConnects(), static_cast(1)); + ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), static_cast(0)); + } + + + template<> + template<> + void testobject::test<2>() + { + set_test_name("Check reconnect on tariff change"); + + TEST_SETTINGS_LOCAL settings(true); + + TEST_SETTINGS * s1 = &settings; + SETTINGS * s2 = &settings; + + ensure("settings.GetReconnectOnTariffChange() == true", settings.GetReconnectOnTariffChange()); + ensure("s1->GetReconnectOnTariffChange() == true", s1->GetReconnectOnTariffChange()); + ensure("s2->GetReconnectOnTariffChange() == true", s2->GetReconnectOnTariffChange()); + + TEST_TARIFFS tariffs; + TEST_ADMIN admin; + TEST_STORE store; + TEST_AUTH auth; + TEST_USERS users; + TEST_SERVICES services; + USER_IMPL user(&settings, &store, &tariffs, &admin, &users, services); + + AFTER_CONNECTED_NOTIFIER connectionNotifier; + + user.AddConnectedAfterNotifier(&connectionNotifier); USER_PROPERTY & tariffName(user.GetProperty().tariffName); + USER_PROPERTY & ips(user.GetProperty().ips); + + ips = StrToIPS("*"); + + ensure_equals("user.connected = false", user.GetConnected(), false); + ensure_equals("connects = 0", connectionNotifier.GetConnects(), static_cast(0)); + ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), static_cast(0)); ensure_equals("user.tariffName == NO_TARIFF_NAME", user.GetProperty().tariffName.ConstData(), NO_TARIFF_NAME); + + user.Authorize(inet_strington("127.0.0.1"), 0, &auth); + user.Run(); + + ensure_equals("user.authorised_by = true", user.IsAuthorizedBy(&auth), true); + + ensure_equals("user.connected = true", user.GetConnected(), true); + ensure_equals("connects = 1", connectionNotifier.GetConnects(), static_cast(1)); + ensure_equals("disconnects = 0", connectionNotifier.GetDisconnects(), static_cast(0)); + tariffName = "test"; ensure_equals("user.tariffName == 'test'", user.GetProperty().tariffName.ConstData(), "test"); + + ensure_equals("user.authorised_by = true", user.IsAuthorizedBy(&auth), true); + + ensure_equals("user.connected = true", user.GetConnected(), true); + ensure_equals("connects = 2", connectionNotifier.GetConnects(), static_cast(2)); + ensure_equals("disconnects = 1", connectionNotifier.GetDisconnects(), static_cast(1)); } } + +void AFTER_CONNECTED_NOTIFIER::Notify(const bool & oldValue, const bool & newValue) +{ + if (!oldValue && newValue) + ++connects; + if (oldValue && !newValue) + ++disconnects; +}