Fix test tariffs and users interface

diff --git a/tests/testtariffs.h b/tests/testtariffs.h
index e2651814cf0e94562917f37ade55983aeae85a67..2e4dd5f01a6ce104ef0b96b43e27e265d77e16d6 100644 (file)
--- a/tests/testtariffs.h
+++ b/tests/testtariffs.h
@@ -12,13 +12,14 @@ class TEST_TARIFFS : public TARIFFS {
         int            ReadTariffs () { return 0; }
         const TARIFF * FindByName(const std::string & /*name*/) const { return &testTariff; }
         const TARIFF * GetNoTariff() const { return NULL; }
         int            ReadTariffs () { return 0; }
         const TARIFF * FindByName(const std::string & /*name*/) const { return &testTariff; }
         const TARIFF * GetNoTariff() const { return NULL; }

-        int            GetTariffsNum() const { return 0; }

         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; }
 
         void           GetTariffsData(std::list<TARIFF_DATA> * /*tdl*/) {}
 
         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; }
 
         void           GetTariffsData(std::list<TARIFF_DATA> * /*tdl*/) {}
 

+        size_t         Count() const { return 0; }
+

         const std::string & GetStrError() const { return strError; }
 
         void           SetFee(double fee);
         const std::string & GetStrError() const { return strError; }
 
         void           SetFee(double fee);

diff --git a/tests/testusers.h b/tests/testusers.h
index bbf4806383394906c1c0451dd141caa73349ef2b..780d0dd9483e771cef90761e7ea317ac62f7b04d 100644 (file)
--- a/tests/testusers.h
+++ b/tests/testusers.h
@@ -22,7 +22,7 @@ class TEST_USERS : public USERS {
         void Del(const std::string & /*login*/, const ADMIN * /*admin*/) {}
 
         int  ReadUsers() { return 0; }
         void Del(const std::string & /*login*/, const ADMIN * /*admin*/) {}
 
         int  ReadUsers() { return 0; }

-        int  GetUserNum() const { return 0; }
+        virtual size_t Count() const { return 0; };

 
         int  FindByIPIdx(uint32_t /*ip*/, USER_PTR * /*user*/) const
         { return -1; }
 
         int  FindByIPIdx(uint32_t /*ip*/, USER_PTR * /*user*/) const
         { return -1; }