Fixed tests for HearthstoneApi

3 files changed, 15 insertions, 7 deletions

diff --git a/battleNetApi/include/apiUrl.hpp b/battleNetApi/include/apiUrl.hpp
index e936b6c..ece4d17 100644
--- a/battleNetApi/include/apiUrl.hpp
+++ b/battleNetApi/include/apiUrl.hpp
@@ -3,16 +3,18 @@
 #include <string>
 #include <unordered_map>
 
+namespace bnet {
+enum class GameMode { constructed, battlegrounds, mercenaries };
+
 class ApiUrl {
   public:
     ApiUrl(const std::string &iContentType, const std::string &iRegion);
 
     void setRegion(const std::string &iRegion);
     void setLocale(const std::string &iLocale);
-    void setGameMode(const std::string &iGameMode);
+    void setGameMode(const GameMode &iGameMode);
     void setPage(const std::string &iPage);
     void setPage(uint64_t iPage);
-    void setPageSize(const std::string &iPageSize);
     void setPageSize(uint64_t iPageSize);
 
     bool hasRegion() const;
@@ -35,3 +37,4 @@ class ApiUrl {
     void setValue(const std::string &iKey, const std::string &iValue);
     bool hasValue(const std::string &iKey) const;
 };
+}; // namespace bnet
diff --git a/battleNetApi/include/hearthstoneApi.hpp b/battleNetApi/include/hearthstoneApi.hpp
index 59cd336..2810204 100644
--- a/battleNetApi/include/hearthstoneApi.hpp
+++ b/battleNetApi/include/hearthstoneApi.hpp
@@ -4,20 +4,25 @@
 #include <nlohmann/json.hpp>
 #include <string>
 
+namespace bnet {
 using json = nlohmann::json;
 
 class HearthstoneApi {
   public:
     static json makeApiRequest(const ApiUrl &iApiUrl, const std::string &iTokenText);
-    static std::vector<json> makeApiRequest(const std::vector<ApiUrl> &iApiUrls, const std::string &iTokenText);
-    static std::vector<json> makeApiRequest(const std::vector<std::string> &iUrls, const std::string &iTokenText);
+    static std::vector<json> makeApiRequest(const std::vector<ApiUrl> &iApiUrls,
+                                            const std::string &iTokenText);
+    static std::vector<json> makeApiRequest(const std::vector<std::string> &iUrls,
+                                            const std::string &iTokenText);
     static json downloadCards(ApiUrl iApiUrl, const Token &iToken);
 
   private:
     static std::string authorizationHeader(const std::string &iTokenText);
-    static size_t curlCallbackStringOutput(void *iContent, size_t iSize, size_t iNmemb, std::string *iS);
+    static size_t curlCallbackStringOutput(void *iContent, size_t iSize, size_t iNmemb,
+                                           std::string *iS);
 
     std::string mAuthorizationHeader; //<! Bearer authorization string for OAuth 2.0 header
 
     friend class HearthstoneApiMock;
 };
+}; // namespace bnet
diff --git a/battleNetApi/include/token.hpp b/battleNetApi/include/token.hpp
index f943b81..479cb29 100644
--- a/battleNetApi/include/token.hpp
+++ b/battleNetApi/include/token.hpp
@@ -22,9 +22,9 @@ class Token {
 };
 
 namespace {
-auto currentTime = [] {
+auto currentTime = [] -> std::chrono::seconds {
     return std::chrono::duration_cast<std::chrono::seconds>(
-        std::chrono::steady_clock::now().time_since_epoch());
+        std::chrono::system_clock::now().time_since_epoch());
 };
 } // namespace
 } // namespace bnet