Use std::jthread and C++17.

[stg.git] / tests / test_filter_params_log.cpp

diff --git a/tests/test_filter_params_log.cpp b/tests/test_filter_params_log.cpp
index 808a67fd59564fd64418c9fdd881db81e08bcd75..430005fcb7ed6e849d048092be3d9a60a7e8e024 100644 (file)
--- a/tests/test_filter_params_log.cpp
+++ b/tests/test_filter_params_log.cpp
@@ -1,11 +1,11 @@
 #include "tut/tut.hpp"
 
+#include "stg/admin.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"
@@ -65,7 +65,8 @@ namespace tut
         TEST_SETTINGS_LOCAL settings;
         settings.addFilter("*"); // Allow everything by default.
         TEST_TARIFFS tariffs;
-        TEST_ADMIN admin;
+        tariffs.ReadTariffs();
+        STG::Admin admin(STG::Priv(0xFFFF), {}, {});
         TEST_STORE_LOCAL store;
         TEST_AUTH auth;
         TEST_USERS users;
@@ -105,7 +106,7 @@ namespace tut
         TEST_SETTINGS_LOCAL settings;
         settings.addFilter("address"); // Allow everything by default.
         TEST_TARIFFS tariffs;
-        TEST_ADMIN admin;
+        STG::Admin admin(STG::Priv(0xFFFF), {}, {});
         TEST_STORE_LOCAL store;
         TEST_AUTH auth;
         TEST_USERS users;
@@ -145,7 +146,7 @@ namespace tut
         settings.addFilter("address"); // Allow everything by default.
         settings.addFilter("group"); // Allow everything by default.
         TEST_TARIFFS tariffs;
-        TEST_ADMIN admin;
+        STG::Admin admin(STG::Priv(0xFFFF), {}, {});
         TEST_STORE_LOCAL store;
         TEST_AUTH auth;
         TEST_USERS users;
@@ -183,7 +184,7 @@ namespace tut
 
         TEST_SETTINGS_LOCAL settings;
         TEST_TARIFFS tariffs;
-        TEST_ADMIN admin;
+        STG::Admin admin(STG::Priv(0xFFFF), {}, {});
         TEST_STORE_LOCAL store;
         TEST_AUTH auth;
         TEST_USERS users;