X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/de9e44e256657beb5160021c7e4fd21d8a9a21d2..1c324d5b2380a68f209e65969079677dbaf1c511:/tests/testtariffs.h

diff --git a/tests/testtariffs.h b/tests/testtariffs.h
index 11c4cfff..30f26a5d 100644
--- a/tests/testtariffs.h
+++ b/tests/testtariffs.h
@@ -1,46 +1,41 @@
-#ifndef __TEST_TARIFFS_H__
-#define __TEST_TARIFFS_H__
+#pragma once
 
 #include "stg/tariffs.h"
 
 #include "tariff_impl.h"
 
-class TEST_TARIFFS : public TARIFFS {
+class TestTariffs : public STG::Tariffs
+{
     public:
-        TEST_TARIFFS() : testTariff("") {}
+        TestTariffs() : m_tariff("") {}
 
-        int            ReadTariffs () { return 0; }
-        const TARIFF * FindByName(const std::string & /*name*/) const { return &testTariff; }
-        const TARIFF * GetNoTariff() const { return NULL; }
-        int            Del(const std::string & /*name*/, const ADMIN * /*admin*/) { return 0; }
-        int            Add(const std::string & /*name*/, const ADMIN * /*admin*/) { return 0; }
-        int            Chg(const TARIFF_DATA & /*td*/, const ADMIN * /*admin*/) { return 0; }
+        int            ReadTariffs() override { return 0; }
+        const STG::Tariff* FindByName(const std::string& /*name*/) const override { return &m_tariff; }
+        const STG::Tariff* GetNoTariff() const override { return NULL; }
+        int            Del(const std::string& /*name*/, const STG::Admin* /*admin*/) override { return 0; }
+        int            Add(const std::string& /*name*/, const STG::Admin* /*admin*/) override { return 0; }
+        int            Chg(const STG::TariffData& /*td*/, const STG::Admin* /*admin*/) override { return 0; }
 
-        void AddNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> *) {}
-        void DelNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> *) {}
+        void AddNotifierAdd(STG::NotifierBase<STG::TariffData>*) override {}
+        void DelNotifierAdd(STG::NotifierBase<STG::TariffData>*) override {}
 
-        void AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> *) {}
-        void DelNotifierDel(NOTIFIER_BASE<TARIFF_DATA> *) {}
+        void AddNotifierDel(STG::NotifierBase<STG::TariffData>*) override {}
+        void DelNotifierDel(STG::NotifierBase<STG::TariffData>*) override {}
 
-        void           GetTariffsData(std::vector<TARIFF_DATA> * /*tdl*/) const {}
+        void           GetTariffsData(std::vector<STG::TariffData>* /*tdl*/) const override {}
 
-        size_t         Count() const { return 0; }
+        size_t         Count() const override { return 0; }
 
-        const std::string & GetStrError() const { return strError; }
+        const std::string& GetStrError() const override { return m_errorStr; }
 
-        void           SetFee(double fee);
+        void           SetFee(double fee)
+        {
+            STG::TariffData td(m_tariff.GetTariffData());
+            td.tariffConf.fee = fee;
+            m_tariff = td;
+        }
 
     private:
-        std::string strError;
-        TARIFF_IMPL testTariff;
+        std::string m_errorStr;
+        STG::TariffImpl m_tariff;
 };
-
-inline
-void TEST_TARIFFS::SetFee(double fee)
-{
-    TARIFF_DATA td(testTariff.GetTariffData());
-    td.tariffConf.fee = fee;
-    testTariff = td;
-}
-
-#endif