X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/364ec046e6da20abac51adc7c04e96ebb5814f5c..refs/heads/master:/tests/testusers.h

diff --git a/tests/testusers.h b/tests/testusers.h
index 3d3b7931..c2f5da34 100644
--- a/tests/testusers.h
+++ b/tests/testusers.h
@@ -1,50 +1,44 @@
-#ifndef __TEST_USERS_H__
-#define __TEST_USERS_H__
+#pragma once
 
-class TEST_USERS : public USERS {
-    public:
-        TEST_USERS() {}
+#include "stg/users.h"
 
-        int  FindByName(const std::string & /*login*/, USER_PTR * /*user*/)
-        { return -1; }
-        int  FindByName(const std::string & /*login*/, CONST_USER_PTR * /*user*/) const
-        { return -1; }
+struct TestUsers : public STG::Users
+{
+    TestUsers() {}
 
-        bool TariffInUse(const std::string & /*tariffName*/) const
-        { return -1; }
+    using UserPtr = STG::User*;
+    using ConstUserPtr = const STG::User*;
 
-        void AddNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * /*notifier*/) {}
-        void DelNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * /*notifier*/) {}
+    int  FindByName(const std::string& /*login*/, UserPtr* /*user*/) override
+    { return -1; }
+    int  FindByName(const std::string& /*login*/, ConstUserPtr* /*user*/) const override
+    { return -1; }
 
-        void AddNotifierUserDel(NOTIFIER_BASE<USER_PTR> * /*notifier*/) {}
-        void DelNotifierUserDel(NOTIFIER_BASE<USER_PTR> * /*notifier*/) {}
+    bool TariffInUse(const std::string& /*tariffName*/) const override
+    { return -1; }
 
-        int  Add(const std::string & /*login*/, const ADMIN * /*admin*/)
-        { return 0; }
-        void Del(const std::string & /*login*/, const ADMIN * /*admin*/) {}
+    int  Add(const std::string& /*login*/, const STG::Admin* /*admin*/) override
+    { return 0; }
+    void Del(const std::string& /*login*/, const STG::Admin* /*admin*/) override {}
 
-        bool Authorize(const std::string &, uint32_t, uint32_t, const AUTH *)
-        { return false; }
-        bool Unauthorize(const std::string &, const AUTH *, const std::string &)
-        { return false; }
+    bool Authorize(const std::string&, uint32_t, uint32_t, const STG::Auth*) override
+    { return false; }
+    bool Unauthorize(const std::string&, const STG::Auth*, const std::string&) override
+    { return false; }
 
-        int  ReadUsers() { return 0; }
-        virtual size_t Count() const { return 0; };
+    int  ReadUsers() override { return 0; }
+    virtual size_t Count() const override { return 0; };
 
-        int  FindByIPIdx(uint32_t /*ip*/, USER_PTR * /*user*/) const
-        { return -1; }
-        bool IsIPInIndex(uint32_t /*ip*/) const { return false; }
-        bool IsIPInUse(uint32_t, const std::string &, CONST_USER_PTR *) const { return false; }
-        bool Exists(const std::string &) const { return false; }
+    int  FindByIPIdx(uint32_t /*ip*/, UserPtr* /*user*/) const override
+    { return -1; }
+    bool IsIPInIndex(uint32_t /*ip*/) const override { return false; }
+    bool IsIPInUse(uint32_t, const std::string&, ConstUserPtr*) const override { return false; }
+    bool Exists(const std::string&) const override { return false; }
 
-        int  OpenSearch() { return 0; }
-        int  SearchNext(int /*handle*/, USER_PTR * /*u*/) { return -1; }
-        int  CloseSearch(int /*handle*/) { return 0; }
+    unsigned int  OpenSearch() override { return 0; }
+    int  SearchNext(int /*handle*/, UserPtr* /*u*/) override { return -1; }
+    int  CloseSearch(int /*handle*/) override { return 0; }
 
-        int  Start() { return 0; }
-        int  Stop() { return 0; }
-
-    private:
+    int  Start() override { return 0; }
+    int  Stop() override { return 0; }
 };
-
-#endif