More subscriptions, less notifiers.

[stg.git] / tests / testtariffs.h

diff --git a/tests/testtariffs.h b/tests/testtariffs.h
index 8d02d881846ee51220aad28304181ab878f62ee5..ca8ab0cea301230ad6d3ca6ff406a278cffc3204 100644 (file)
--- a/tests/testtariffs.h
+++ b/tests/testtariffs.h
@@ -1,46 +1,35 @@
-#ifndef __TEST_TARIFFS_H__
-#define __TEST_TARIFFS_H__
+#pragma once
 
 #include "stg/tariffs.h"
 
 #include "tariff_impl.h"
 
-class TEST_TARIFFS : public STG::Tariffs {
+class TestTariffs : public STG::Tariffs
+{
     public:
-        TEST_TARIFFS() : testTariff("") {}
+        TestTariffs() : m_tariff("") {}
 
         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(STG::NotifierBase<STG::TariffData> *) override {}
-        void DelNotifierAdd(STG::NotifierBase<STG::TariffData> *) override {}
-
-        void AddNotifierDel(STG::NotifierBase<STG::TariffData> *) override {}
-        void DelNotifierDel(STG::NotifierBase<STG::TariffData> *) override {}
+        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           GetTariffsData(std::vector<STG::TariffData> * /*tdl*/) const override {}
+        void           GetTariffsData(std::vector<STG::TariffData>* /*tdl*/) const override {}
 
         size_t         Count() const override { return 0; }
 
-        const std::string & GetStrError() const override { 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;
-        STG::TariffImpl testTariff;
+        std::string m_errorStr;
+        STG::TariffImpl m_tariff;
 };
-
-inline
-void TEST_TARIFFS::SetFee(double fee)
-{
-    STG::TariffData td(testTariff.GetTariffData());
-    td.tariffConf.fee = fee;
-    testTariff = td;
-}
-
-#endif