X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/46b0747592074017ff0ea4b33d4a7194235886e5..90b793eb07dc190eeb1144a1da079de760d17c36:/tests/testtariffs.h?ds=inline

diff --git a/tests/testtariffs.h b/tests/testtariffs.h
index f43bc22b..8d02d881 100644
--- a/tests/testtariffs.h
+++ b/tests/testtariffs.h
@@ -5,40 +5,40 @@
 
 #include "tariff_impl.h"
 
-class TEST_TARIFFS : public TARIFFS {
+class TEST_TARIFFS : public STG::Tariffs {
     public:
         TEST_TARIFFS() : testTariff("") {}
 
-        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 &testTariff; }
+        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::list<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 strError; }
 
         void           SetFee(double fee);
 
     private:
         std::string strError;
-        TARIFF_IMPL testTariff;
+        STG::TariffImpl testTariff;
 };
 
 inline
 void TEST_TARIFFS::SetFee(double fee)
 {
-    TARIFF_DATA td(testTariff.GetTariffData());
+    STG::TariffData td(testTariff.GetTariffData());
     td.tariffConf.fee = fee;
     testTariff = td;
 }