From 99421df7033148e6abb4e9f7a4d5d43f5cbd2ab4 Mon Sep 17 00:00:00 2001 From: Aotrix <9aotrix@protonmail.com> Date: Thu, 30 Jul 2026 04:31:49 +0200 Subject: Fixed tests for HearthstoneApi --- battleNetApi/include/apiUrl.hpp | 7 +++++-- battleNetApi/include/hearthstoneApi.hpp | 11 ++++++++--- battleNetApi/include/token.hpp | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) (limited to 'battleNetApi/include') 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 #include +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 #include +namespace bnet { using json = nlohmann::json; class HearthstoneApi { public: static json makeApiRequest(const ApiUrl &iApiUrl, const std::string &iTokenText); - static std::vector makeApiRequest(const std::vector &iApiUrls, const std::string &iTokenText); - static std::vector makeApiRequest(const std::vector &iUrls, const std::string &iTokenText); + static std::vector makeApiRequest(const std::vector &iApiUrls, + const std::string &iTokenText); + static std::vector makeApiRequest(const std::vector &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; // std::chrono::seconds { return std::chrono::duration_cast( - std::chrono::steady_clock::now().time_since_epoch()); + std::chrono::system_clock::now().time_since_epoch()); }; } // namespace } // namespace bnet -- cgit v1.2.3