From a9d1b61cf101fd2f05dea3cf699639a7aada92bb Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Sat, 18 Oct 2014 23:10:44 +0300 Subject: [PATCH] Adjusted tests. --- tests/test_fee_charge_rules.cpp | 10 +++++++--- tests/test_reconnect_on_tariff_change.cpp | 7 +++++-- tests/testusers.h | 2 ++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/test_fee_charge_rules.cpp b/tests/test_fee_charge_rules.cpp index 825c2b36..2df09be4 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,7 +41,8 @@ namespace tut TEST_TARIFFS tariffs; TEST_ADMIN admin; TEST_STORE store; - USER_IMPL user(&settings, &store, &tariffs, &admin, NULL); + TEST_SERVICES services; + USER_IMPL user(&settings, &store, &tariffs, &admin, NULL, services); USER_PROPERTY & cash(user.GetProperty().cash); USER_PROPERTY & tariffName(user.GetProperty().tariffName); @@ -72,7 +74,8 @@ namespace tut TEST_TARIFFS tariffs; TEST_ADMIN admin; TEST_STORE store; - USER_IMPL user(&settings, &store, &tariffs, &admin, NULL); + TEST_SERVICES services; + USER_IMPL user(&settings, &store, &tariffs, &admin, NULL, services); USER_PROPERTY & cash(user.GetProperty().cash); USER_PROPERTY & credit(user.GetProperty().credit); @@ -118,7 +121,8 @@ namespace tut TEST_TARIFFS tariffs; TEST_ADMIN admin; TEST_STORE store; - USER_IMPL user(&settings, &store, &tariffs, &admin, NULL); + TEST_SERVICES services; + USER_IMPL user(&settings, &store, &tariffs, &admin, NULL, services); USER_PROPERTY & cash(user.GetProperty().cash); USER_PROPERTY & credit(user.GetProperty().credit); diff --git a/tests/test_reconnect_on_tariff_change.cpp b/tests/test_reconnect_on_tariff_change.cpp index 8e2bb2f9..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, private NONCOPYABLE { @@ -62,7 +63,8 @@ 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; @@ -119,7 +121,8 @@ 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; diff --git a/tests/testusers.h b/tests/testusers.h index 3d3b7931..131fb9b6 100644 --- a/tests/testusers.h +++ b/tests/testusers.h @@ -1,6 +1,8 @@ #ifndef __TEST_USERS_H__ #define __TEST_USERS_H__ +#include "stg/users.h" + class TEST_USERS : public USERS { public: TEST_USERS() {} -- 2.43.2