Adjusted tests.

diff --git a/tests/test_fee_charge_rules.cpp b/tests/test_fee_charge_rules.cpp
index 825c2b3687ef16260d1462dd656a021dcf20b505..2df09be425dd6c530430a06ed9ec458e328129ac 100644 (file)
--- 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 "testtariffs.h"
 #include "testadmin.h"
 #include "teststore.h"

+#include "testservices.h"

 
 namespace tut
 {
 
 namespace tut
 {


@@ -40,7 +41,8 @@ namespace tut
         TEST_TARIFFS tariffs;
         TEST_ADMIN admin;
         TEST_STORE store;
         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<double> & cash(user.GetProperty().cash);
         USER_PROPERTY<std::string> & tariffName(user.GetProperty().tariffName);
 
         USER_PROPERTY<double> & cash(user.GetProperty().cash);
         USER_PROPERTY<std::string> & tariffName(user.GetProperty().tariffName);


@@ -72,7 +74,8 @@ namespace tut
         TEST_TARIFFS tariffs;
         TEST_ADMIN admin;
         TEST_STORE store;
         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<double> & cash(user.GetProperty().cash);
         USER_PROPERTY<double> & credit(user.GetProperty().credit);
 
         USER_PROPERTY<double> & cash(user.GetProperty().cash);
         USER_PROPERTY<double> & credit(user.GetProperty().credit);


@@ -118,7 +121,8 @@ namespace tut
         TEST_TARIFFS tariffs;
         TEST_ADMIN admin;
         TEST_STORE store;
         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<double> & cash(user.GetProperty().cash);
         USER_PROPERTY<double> & credit(user.GetProperty().credit);
 
         USER_PROPERTY<double> & cash(user.GetProperty().cash);
         USER_PROPERTY<double> & credit(user.GetProperty().credit);

diff --git a/tests/test_reconnect_on_tariff_change.cpp b/tests/test_reconnect_on_tariff_change.cpp
index 8e2bb2f986cc4c978fd8b0e5158eb1cf465d9ff5..2bb0438cb6b5cd8fa9ab75f94b56983e2466a379 100644 (file)
--- 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 "teststore.h"
 #include "testauth.h"
 #include "testusers.h"

+#include "testservices.h"

 
 class AFTER_CONNECTED_NOTIFIER : public PROPERTY_NOTIFIER_BASE<bool>,
                                  private NONCOPYABLE {
 
 class AFTER_CONNECTED_NOTIFIER : public PROPERTY_NOTIFIER_BASE<bool>,
                                  private NONCOPYABLE {


@@ -62,7 +63,8 @@ namespace tut
         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;
+        USER_IMPL user(&settings, &store, &tariffs, &admin, &users, services);

 
         AFTER_CONNECTED_NOTIFIER connectionNotifier;
 
 
         AFTER_CONNECTED_NOTIFIER connectionNotifier;
 


@@ -119,7 +121,8 @@ namespace tut
         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;
+        USER_IMPL user(&settings, &store, &tariffs, &admin, &users, services);

 
         AFTER_CONNECTED_NOTIFIER connectionNotifier;
 
 
         AFTER_CONNECTED_NOTIFIER connectionNotifier;
 

diff --git a/tests/testusers.h b/tests/testusers.h
index 3d3b7931c48f0de70e83382f5ea6a8864e690b62..131fb9b6d06abf65c71efb8c8d41c26ea8447535 100644 (file)
--- a/tests/testusers.h
+++ b/tests/testusers.h
@@ -1,6 +1,8 @@
 #ifndef __TEST_USERS_H__
 #define __TEST_USERS_H__
 
 #ifndef __TEST_USERS_H__
 #define __TEST_USERS_H__
 

+#include "stg/users.h"
+

 class TEST_USERS : public USERS {
     public:
         TEST_USERS() {}
 class TEST_USERS : public USERS {
     public:
         TEST_USERS() {}