More subscriptions, less notifiers.

[stg.git] / tests / testsettings.h

diff --git a/tests/testsettings.h b/tests/testsettings.h
index 20e262714e92866f986342ab3967312648998a81..1eadb8ec80d146e61fc1cd5aefadad731886e9f8 100644 (file)
--- a/tests/testsettings.h
+++ b/tests/testsettings.h
@@ -1,39 +1,37 @@
-#ifndef __TEST_SETTINGS_H__
-#define __TEST_SETTINGS_H__
+#pragma once

 
 #include "stg/settings.h"
 
 
 #include "stg/settings.h"
 

-class TEST_SETTINGS : public SETTINGS {
+class TestSettings : public STG::Settings
+{

     public:
     public:

-        TEST_SETTINGS() { filterParamsLog.push_back("*"); }
+        TestSettings() { m_filterParamsLog.push_back("*"); }

 
 

-        const std::string & GetDirName(size_t) const { return dirName; }
-        const std::string & GetScriptsDir() const { return scriptsDir; }
-        unsigned            GetDetailStatWritePeriod() const { return 10; }
-        unsigned            GetStatWritePeriod() const { return 10; }
-        unsigned            GetDayFee() const { return 0; }
-        bool                GetFullFee() const { return false; }
-        unsigned            GetDayResetTraff() const { return 0; }
-        bool                GetSpreadFee() const { return false; }
-        bool                GetFreeMbAllowInet() const { return false; }
-        bool                GetDayFeeIsLastDay() const { return false; }
-        bool                GetWriteFreeMbTraffCost() const { return false; }
-        bool                GetShowFeeInCash() const { return false; }
-        unsigned            GetMessageTimeout() const { return 0; }
-        unsigned            GetFeeChargeType() const { return 0; }
-        bool                GetReconnectOnTariffChange() const { return false; }
-        const std::string & GetMonitorDir() const { return monitorDir; }
-        bool                GetMonitoring() const { return false; }
-        const std::vector<std::string> & GetScriptParams() const { return scriptParams; }
-        bool                GetDisableSessionLog() const { return false; }
-        const std::vector<std::string>& GetFilterParamsLog() const { return filterParamsLog; }
+        const std::string&  GetDirName(size_t) const override { return m_dirName; }
+        const std::string&  GetScriptsDir() const override { return m_scriptsDir; }
+        unsigned            GetDetailStatWritePeriod() const override { return 10; }
+        unsigned            GetStatWritePeriod() const override { return 10; }
+        unsigned            GetDayFee() const override { return 0; }
+        bool                GetFullFee() const override { return false; }
+        unsigned            GetDayResetTraff() const override { return 0; }
+        bool                GetSpreadFee() const override { return false; }
+        bool                GetFreeMbAllowInet() const override { return false; }
+        bool                GetDayFeeIsLastDay() const override { return false; }
+        bool                GetWriteFreeMbTraffCost() const override { return false; }
+        bool                GetShowFeeInCash() const override { return false; }
+        unsigned            GetMessageTimeout() const override { return 0; }
+        unsigned            GetFeeChargeType() const override { return 0; }
+        bool                GetReconnectOnTariffChange() const override { return false; }
+        const std::string&  GetMonitorDir() const override { return m_monitorDir; }
+        bool                GetMonitoring() const override { return false; }
+        const std::vector<std::string>& GetScriptParams() const override { return m_scriptParams; }
+        bool                GetDisableSessionLog() const override { return false; }
+        const std::vector<std::string>& GetFilterParamsLog() const override { return m_filterParamsLog; }

 
     private:
 
     private:

-        std::string dirName;
-        std::string scriptsDir;
-        std::string monitorDir;
-        std::vector<std::string> scriptParams;
-        std::vector<std::string> filterParamsLog;
+        std::string m_dirName;
+        std::string m_scriptsDir;
+        std::string m_monitorDir;
+        std::vector<std::string> m_scriptParams;
+        std::vector<std::string> m_filterParamsLog;

 };
 };

-
-#endif