Some rscriptd refactoring.

[stg.git] / tests / test_fee_charge_rules.cpp

diff --git a/tests/test_fee_charge_rules.cpp b/tests/test_fee_charge_rules.cpp
index b2a2790e9e19b7e5ccb4a590f267c3aa7b531417..1fe1542fce7a9782c87b98236dc95ebe69b2eb18 100644 (file)
--- a/tests/test_fee_charge_rules.cpp
+++ b/tests/test_fee_charge_rules.cpp
@@ -1,11 +1,11 @@
 #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 "testservices.h"
 
 #include "teststore.h"
 #include "testservices.h"
 


@@ -39,7 +39,7 @@ namespace tut
 
         TEST_SETTINGS_LOCAL settings(0);
         TEST_TARIFFS tariffs;
 
         TEST_SETTINGS_LOCAL settings(0);
         TEST_TARIFFS tariffs;

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

         TEST_STORE store;
         TEST_SERVICES services;
         STG::UserImpl user(&settings, &store, &tariffs, &admin, NULL, services);
         TEST_STORE store;
         TEST_SERVICES services;
         STG::UserImpl user(&settings, &store, &tariffs, &admin, NULL, services);


@@ -72,7 +72,7 @@ namespace tut
 
         TEST_SETTINGS_LOCAL settings(1);
         TEST_TARIFFS tariffs;
 
         TEST_SETTINGS_LOCAL settings(1);
         TEST_TARIFFS tariffs;

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

         TEST_STORE store;
         TEST_SERVICES services;
         STG::UserImpl user(&settings, &store, &tariffs, &admin, NULL, services);
         TEST_STORE store;
         TEST_SERVICES services;
         STG::UserImpl user(&settings, &store, &tariffs, &admin, NULL, services);


@@ -119,7 +119,7 @@ namespace tut
 
         TEST_SETTINGS_LOCAL settings(2);
         TEST_TARIFFS tariffs;
 
         TEST_SETTINGS_LOCAL settings(2);
         TEST_TARIFFS tariffs;

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

         TEST_STORE store;
         TEST_SERVICES services;
         STG::UserImpl user(&settings, &store, &tariffs, &admin, NULL, services);
         TEST_STORE store;
         TEST_SERVICES services;
         STG::UserImpl user(&settings, &store, &tariffs, &admin, NULL, services);