diff --git a/include/cpp_restapi/cpp-httplib_connection.hpp b/include/cpp_restapi/cpp-httplib_connection.hpp deleted file mode 100644 index b5d2386..0000000 --- a/include/cpp_restapi/cpp-httplib_connection.hpp +++ /dev/null @@ -1,24 +0,0 @@ - -#ifndef CPP_HTTPLIB_CONNECTION_HPP_INCLUDED -#define CPP_HTTPLIB_CONNECTION_HPP_INCLUDED - -#include "threaded_connection.hpp" -#include "cpp_restapi_export.h" - - -namespace cpp_restapi::CppHttplibBackend -{ - class [[deprecated("Use createCppHttplibConnection() from ")]] CPP_RESTAPI_EXPORT Connection: public ThreadedConnection - { - public: - Connection(const std::string& address, const std::map& headerEntries); - Connection(const Connection &) = delete; - - Connection& operator=(const Connection &) = delete; - - Response fetchPage(const std::string& request) override; - std::unique_ptr subscribe(const std::string& request, EventCallback callback) override; - }; -} - -#endif diff --git a/include/cpp_restapi/create_cpp-httplib_connection.hpp b/include/cpp_restapi/create_cpp-httplib_connection.hpp index 52ae3e7..2d3df9a 100644 --- a/include/cpp_restapi/create_cpp-httplib_connection.hpp +++ b/include/cpp_restapi/create_cpp-httplib_connection.hpp @@ -8,10 +8,10 @@ #include "cpp_restapi_export.h" +#include "iconnection.hpp" + namespace cpp_restapi { - struct IConnection; - /** * @brief Create a connection using the cpp-httplib backend * @param address base URL of the API (e.g. "https://api.github.com") diff --git a/include/cpp_restapi/curl_connection.hpp b/include/cpp_restapi/curl_connection.hpp deleted file mode 100644 index dff17ff..0000000 --- a/include/cpp_restapi/curl_connection.hpp +++ /dev/null @@ -1,26 +0,0 @@ - -#ifndef CONNECTION_QT_HPP -#define CONNECTION_QT_HPP - -#include "threaded_connection.hpp" -#include "cpp_restapi_export.h" - - -namespace cpp_restapi::CurlBackend -{ - class [[deprecated("Use createCurlConnection() from ")]] CPP_RESTAPI_EXPORT Connection: public ThreadedConnection - { - public: - Connection(const std::string& address, const std::map& headerEntries); - Connection(const Connection &) = delete; - - ~Connection(); - - Connection& operator=(const Connection &) = delete; - - Response fetchPage(const std::string& request) override; - std::unique_ptr subscribe(const std::string& request, EventCallback callback) override; - }; -} - -#endif diff --git a/include/cpp_restapi/github/connection_builder.hpp b/include/cpp_restapi/github/connection_builder.hpp index 6e8e062..4298e50 100644 --- a/include/cpp_restapi/github/connection_builder.hpp +++ b/include/cpp_restapi/github/connection_builder.hpp @@ -5,6 +5,7 @@ #include #include #include +#include #include @@ -68,19 +69,6 @@ namespace cpp_restapi::GitHub std::forward(args)..., m_address, m_headerEntries); } - /** - * @brief build @ref cpp_restapi::IConnection object - * @tparam CT connection type (Qt or Curl backend). @ref cpp_restapi::CurlBackend::Connection or @ref cpp_restapi::QtBackend::Connection - * @param args backend specific arguments to be passed to connection. - * @deprecated Use build(factory, args...) with a factory function instead (e.g. build(createCurlConnection)) - */ - template - [[deprecated("Use build(factory, args...) with a factory function instead")]] - std::shared_ptr build(Args&&... args) - { - return std::make_shared(std::forward(args)..., m_address, m_headerEntries); - } - private: std::map m_headerEntries; std::string m_address; diff --git a/include/cpp_restapi/github/request.hpp b/include/cpp_restapi/github/request.hpp index 85b26a5..0f5b910 100644 --- a/include/cpp_restapi/github/request.hpp +++ b/include/cpp_restapi/github/request.hpp @@ -35,7 +35,7 @@ namespace cpp_restapi::GitHub class CPP_RESTAPI_GITHUB_EXPORT Request { public: - Request(std::shared_ptr); + explicit Request(std::unique_ptr); Request(const Request &) = delete; ~Request(); @@ -97,12 +97,6 @@ namespace cpp_restapi::GitHub */ std::string getAuthenticatedUser(); - /** - * @deprecated Use getAuthenticatedUser() instead (fixes typo in method name). - */ - [[deprecated("Use getAuthenticatedUser() instead")]] - std::string getAuntenticatedUser(); - /** * @brief Lists all users, in the order that they * signed up on GitHub. This list includes personal @@ -520,7 +514,7 @@ namespace cpp_restapi::GitHub std::string repoContributors(const std::string& owner, const std::string& repo); private: - std::shared_ptr m_connection; + std::unique_ptr m_connection; std::string doRequest(const std::string &); }; diff --git a/include/cpp_restapi/isse_connection.hpp b/include/cpp_restapi/isse_connection.hpp index 30e6065..aacb19d 100644 --- a/include/cpp_restapi/isse_connection.hpp +++ b/include/cpp_restapi/isse_connection.hpp @@ -12,7 +12,7 @@ namespace cpp_restapi * @brief Interface for SSE (Server-Sent Events) connections * * Provides streaming subscription to an SSE endpoint. - * Unlike IConnection::get() which returns a complete response, + * Unlike IConnection::fetch() which returns a complete response, * SSE delivers events continuously via a callback. */ struct ISseConnection diff --git a/include/cpp_restapi/qt_connection.hpp b/include/cpp_restapi/qt_connection.hpp deleted file mode 100644 index 09c4528..0000000 --- a/include/cpp_restapi/qt_connection.hpp +++ /dev/null @@ -1,42 +0,0 @@ - -#ifndef CONNECTION_QT__HPP -#define CONNECTION_QT__HPP - -#include -#include -#include - -#include "base_connection.hpp" -#include "cpp_restapi_export.h" - - -class QNetworkAccessManager; - -namespace cpp_restapi::QtBackend -{ - class [[deprecated("Use createQtConnection() from ")]] CPP_RESTAPI_EXPORT Connection: public QObject, public BaseConnection - { - public: - Connection(QNetworkAccessManager &, const std::string& address, const std::map& headerEntries); - Connection(const Connection &) = delete; - - ~Connection(); - - Connection& operator=(const Connection &) = delete; - - using BaseConnection::fetch; - - Response fetchPage(const std::string& request) override; - std::unique_ptr subscribe(const std::string& request, EventCallback callback) override; - - protected: - void fetchAsync(const std::string& fullUrl, CancellationToken cancel, FetchCallback onSuccess, ErrorCallback onError) override; - - private: - QNetworkAccessManager& m_networkManager; - - QNetworkRequest prepareRequest(); - }; -} - -#endif diff --git a/src/base_connection.cpp b/src/base_connection.cpp index 6da469e..9556f39 100644 --- a/src/base_connection.cpp +++ b/src/base_connection.cpp @@ -1,7 +1,8 @@ -#include #include +#include "base_connection.hpp" + namespace cpp_restapi { diff --git a/include/cpp_restapi/base_connection.hpp b/src/base_connection.hpp similarity index 94% rename from include/cpp_restapi/base_connection.hpp rename to src/base_connection.hpp index af3fddd..6b6bf9e 100644 --- a/include/cpp_restapi/base_connection.hpp +++ b/src/base_connection.hpp @@ -6,7 +6,6 @@ #include #include -#include "cpp_restapi_export.h" namespace cpp_restapi @@ -14,7 +13,7 @@ namespace cpp_restapi /** * @brief base class with common parts for backend specific implementations */ - class CPP_RESTAPI_EXPORT BaseConnection: public cpp_restapi::IConnection + class BaseConnection: public cpp_restapi::IConnection { public: explicit BaseConnection(const std::string& address, const std::map& headerEntries); diff --git a/src/cpp-httplib_backend/CMakeLists.txt b/src/cpp-httplib_backend/CMakeLists.txt index ebb2ab7..7cc438a 100644 --- a/src/cpp-httplib_backend/CMakeLists.txt +++ b/src/cpp-httplib_backend/CMakeLists.txt @@ -12,7 +12,6 @@ endif() target_sources(cpp_restapi_core PRIVATE connection.cpp - create_connection.cpp sse_connection.cpp ) diff --git a/src/cpp-httplib_backend/connection.cpp b/src/cpp-httplib_backend/connection.cpp index 22e58ec..f7e0711 100644 --- a/src/cpp-httplib_backend/connection.cpp +++ b/src/cpp-httplib_backend/connection.cpp @@ -1,23 +1,36 @@ +#include + #include -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include -#pragma GCC diagnostic pop +#include #include "cpp-httplib_sse_connection.hpp" +#include "threaded_connection.hpp" -namespace cpp_restapi::CppHttplibBackend +namespace { - Connection::Connection(const std::string& address, const std::map& headerEntries) - : ThreadedConnection(address, headerEntries) + class CppHttplibConnection final: public cpp_restapi::ThreadedConnection + { + public: + CppHttplibConnection(const std::string& address, const std::map& headerEntries); + CppHttplibConnection(const CppHttplibConnection &) = delete; + + CppHttplibConnection& operator=(const CppHttplibConnection &) = delete; + + cpp_restapi::Response fetchPage(const std::string& request) override; + std::unique_ptr subscribe(const std::string& request, cpp_restapi::IConnection::EventCallback callback) override; + }; + + + CppHttplibConnection::CppHttplibConnection(const std::string& address, const std::map& headerEntries) + : cpp_restapi::ThreadedConnection(address, headerEntries) { } - Response Connection::fetchPage(const std::string& page) + cpp_restapi::Response CppHttplibConnection::fetchPage(const std::string& page) { auto pos = page.find("//"); if (pos == std::string::npos) @@ -48,10 +61,21 @@ namespace cpp_restapi::CppHttplibBackend } - std::unique_ptr Connection::subscribe(const std::string& request, EventCallback callback) + std::unique_ptr CppHttplibConnection::subscribe(const std::string& request, cpp_restapi::IConnection::EventCallback callback) { - auto sse = std::make_unique(address(), getHeaderEntries()); + auto sse = std::make_unique(address(), getHeaderEntries()); sse->subscribe(request, std::move(callback)); return sse; } } + + +namespace cpp_restapi +{ + std::unique_ptr createCppHttplibConnection( + const std::string& address, + const std::map& headerEntries) + { + return std::make_unique(address, headerEntries); + } +} diff --git a/src/cpp-httplib_backend/create_connection.cpp b/src/cpp-httplib_backend/create_connection.cpp deleted file mode 100644 index 7b37e80..0000000 --- a/src/cpp-httplib_backend/create_connection.cpp +++ /dev/null @@ -1,20 +0,0 @@ - -#include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include -#pragma GCC diagnostic pop - -namespace cpp_restapi -{ - std::unique_ptr createCppHttplibConnection( - const std::string& address, - const std::map& headerEntries) - { -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return std::make_unique(address, headerEntries); -#pragma GCC diagnostic pop - } -} diff --git a/src/curl_backend/CMakeLists.txt b/src/curl_backend/CMakeLists.txt index 63896df..5606fb6 100644 --- a/src/curl_backend/CMakeLists.txt +++ b/src/curl_backend/CMakeLists.txt @@ -4,7 +4,6 @@ find_package(CURL REQUIRED) target_sources(cpp_restapi_core PRIVATE connection.cpp - create_connection.cpp sse_connection.cpp ) diff --git a/src/curl_backend/connection.cpp b/src/curl_backend/connection.cpp index 52c7e1f..e7f46c1 100644 --- a/src/curl_backend/connection.cpp +++ b/src/curl_backend/connection.cpp @@ -9,31 +9,45 @@ #include #include #include +#include #include -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include -#pragma GCC diagnostic pop +#include #include "curl_sse_connection.hpp" +#include "threaded_connection.hpp" -namespace cpp_restapi::CurlBackend +namespace { - Connection::Connection(const std::string& address, const std::map& headerEntries) - : ThreadedConnection(address, headerEntries) + class CurlConnection final: public cpp_restapi::ThreadedConnection + { + public: + CurlConnection(const std::string& address, const std::map& headerEntries); + CurlConnection(const CurlConnection &) = delete; + + ~CurlConnection() override; + + CurlConnection& operator=(const CurlConnection &) = delete; + + cpp_restapi::Response fetchPage(const std::string& request) override; + std::unique_ptr subscribe(const std::string& request, cpp_restapi::IConnection::EventCallback callback) override; + }; + + + CurlConnection::CurlConnection(const std::string& address, const std::map& headerEntries) + : cpp_restapi::ThreadedConnection(address, headerEntries) { } - Connection::~Connection() + CurlConnection::~CurlConnection() { } - Response Connection::fetchPage(const std::string& page) + cpp_restapi::Response CurlConnection::fetchPage(const std::string& page) { std::string body; std::string headers; @@ -102,10 +116,21 @@ namespace cpp_restapi::CurlBackend } - std::unique_ptr Connection::subscribe(const std::string& request, EventCallback callback) + std::unique_ptr CurlConnection::subscribe(const std::string& request, cpp_restapi::IConnection::EventCallback callback) { - auto sse = std::make_unique(address(), getHeaderEntries()); + auto sse = std::make_unique(address(), getHeaderEntries()); sse->subscribe(request, std::move(callback)); return sse; } } + + +namespace cpp_restapi +{ + std::unique_ptr createCurlConnection( + const std::string& address, + const std::map& headerEntries) + { + return std::make_unique(address, headerEntries); + } +} diff --git a/src/curl_backend/create_connection.cpp b/src/curl_backend/create_connection.cpp deleted file mode 100644 index e75da94..0000000 --- a/src/curl_backend/create_connection.cpp +++ /dev/null @@ -1,20 +0,0 @@ - -#include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include -#pragma GCC diagnostic pop - -namespace cpp_restapi -{ - std::unique_ptr createCurlConnection( - const std::string& address, - const std::map& headerEntries) - { -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return std::make_unique(address, headerEntries); -#pragma GCC diagnostic pop - } -} diff --git a/src/qt_backend/CMakeLists.txt b/src/qt_backend/CMakeLists.txt index cda2b34..e5fd849 100644 --- a/src/qt_backend/CMakeLists.txt +++ b/src/qt_backend/CMakeLists.txt @@ -11,7 +11,6 @@ endif() target_sources(cpp_restapi_core PRIVATE connection.cpp - create_connection.cpp sse_connection.cpp ) diff --git a/src/qt_backend/connection.cpp b/src/qt_backend/connection.cpp index d36660e..1fed946 100644 --- a/src/qt_backend/connection.cpp +++ b/src/qt_backend/connection.cpp @@ -1,38 +1,64 @@ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include -#pragma GCC diagnostic pop -#include "qt_sse_connection.hpp" +#include #include #include +#include #include #include #include #include +#include "base_connection.hpp" +#include "qt_sse_connection.hpp" + -namespace cpp_restapi::QtBackend +namespace { - Connection::Connection(QNetworkAccessManager& manager, const std::string& address, const std::map& headerEntries) - : BaseConnection(address, headerEntries) + class QtConnection final: public QObject, public cpp_restapi::BaseConnection + { + public: + QtConnection(QNetworkAccessManager &, const std::string& address, const std::map& headerEntries); + QtConnection(const QtConnection &) = delete; + + ~QtConnection() override; + + QtConnection& operator=(const QtConnection &) = delete; + + cpp_restapi::Response fetchPage(const std::string& request) override; + std::unique_ptr subscribe(const std::string& request, cpp_restapi::IConnection::EventCallback callback) override; + + protected: + void fetchAsync(const std::string& fullUrl, + cpp_restapi::CancellationToken cancel, + cpp_restapi::IConnection::FetchCallback onSuccess, + cpp_restapi::IConnection::ErrorCallback onError) override; + + private: + QNetworkAccessManager& m_networkManager; + + QNetworkRequest prepareRequest(); + }; + + + QtConnection::QtConnection(QNetworkAccessManager& manager, const std::string& address, const std::map& headerEntries) + : cpp_restapi::BaseConnection(address, headerEntries) , m_networkManager(manager) { } - Connection::~Connection() + QtConnection::~QtConnection() { } - Response Connection::fetchPage(const std::string& page) + cpp_restapi::Response QtConnection::fetchPage(const std::string& page) { - Response result; + cpp_restapi::Response result; QNetworkRequest request = prepareRequest(); const QUrl url(QString::fromStdString(page)); @@ -85,7 +111,7 @@ namespace cpp_restapi::QtBackend } - QNetworkRequest Connection::prepareRequest() + QNetworkRequest QtConnection::prepareRequest() { QNetworkRequest request; @@ -100,15 +126,18 @@ namespace cpp_restapi::QtBackend } - std::unique_ptr Connection::subscribe(const std::string& request, EventCallback callback) + std::unique_ptr QtConnection::subscribe(const std::string& request, cpp_restapi::IConnection::EventCallback callback) { - auto sse = std::make_unique(m_networkManager, address(), getHeaderEntries()); + auto sse = std::make_unique(m_networkManager, address(), getHeaderEntries()); sse->subscribe(request, std::move(callback)); return sse; } - void Connection::fetchAsync(const std::string& url, CancellationToken cancel, FetchCallback onSuccess, ErrorCallback onError) + void QtConnection::fetchAsync(const std::string& url, + cpp_restapi::CancellationToken cancel, + cpp_restapi::IConnection::FetchCallback onSuccess, + cpp_restapi::IConnection::ErrorCallback onError) { QNetworkRequest request = prepareRequest(); request.setUrl(QUrl(QString::fromStdString(url))); @@ -124,7 +153,7 @@ namespace cpp_restapi::QtBackend if (reply->error() == QNetworkReply::NoError) { - Response resp; + cpp_restapi::Response resp; resp.statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); resp.body = reply->readAll().toStdString(); @@ -142,9 +171,21 @@ namespace cpp_restapi::QtBackend if (onError) { const int code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); - onError(HttpError{code, reply->readAll().toStdString(), reply->errorString().toStdString()}); + onError(cpp_restapi::HttpError{code, reply->readAll().toStdString(), reply->errorString().toStdString()}); } } }); } } + + +namespace cpp_restapi +{ + std::unique_ptr createQtConnection( + QNetworkAccessManager& manager, + const std::string& address, + const std::map& headerEntries) + { + return std::make_unique(manager, address, headerEntries); + } +} diff --git a/src/qt_backend/create_connection.cpp b/src/qt_backend/create_connection.cpp deleted file mode 100644 index 883bbd1..0000000 --- a/src/qt_backend/create_connection.cpp +++ /dev/null @@ -1,21 +0,0 @@ - -#include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include -#pragma GCC diagnostic pop - -namespace cpp_restapi -{ - std::unique_ptr createQtConnection( - QNetworkAccessManager& manager, - const std::string& address, - const std::map& headerEntries) - { -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return std::make_unique(manager, address, headerEntries); -#pragma GCC diagnostic pop - } -} diff --git a/src/services/github/request.cpp b/src/services/github/request.cpp index e878fa9..2c2161b 100644 --- a/src/services/github/request.cpp +++ b/src/services/github/request.cpp @@ -1,5 +1,6 @@ #include +#include #include #include @@ -13,7 +14,7 @@ namespace cpp_restapi::GitHub { - Request::Request(std::shared_ptr connection) + Request::Request(std::unique_ptr connection) : m_connection(std::move(connection)) { } @@ -62,11 +63,6 @@ namespace cpp_restapi::GitHub return doRequest("user"); } - std::string Request::getAuntenticatedUser() - { - return getAuthenticatedUser(); - } - std::string Request::listUsers() { const std::string request = std::string("users"); diff --git a/src/threaded_connection.cpp b/src/threaded_connection.cpp index 90b8c59..a7b853d 100644 --- a/src/threaded_connection.cpp +++ b/src/threaded_connection.cpp @@ -1,7 +1,8 @@ -#include #include +#include "threaded_connection.hpp" + namespace cpp_restapi { diff --git a/include/cpp_restapi/threaded_connection.hpp b/src/threaded_connection.hpp similarity index 100% rename from include/cpp_restapi/threaded_connection.hpp rename to src/threaded_connection.hpp diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 131296f..893934c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -23,6 +23,10 @@ add_executable(api_tests main.cpp ) +target_include_directories(api_tests + PRIVATE + ${PROJECT_SOURCE_DIR}/src +) target_link_libraries(api_tests PRIVATE diff --git a/tests/connection_tests.cpp b/tests/connection_tests.cpp index 6fd630a..f58a300 100644 --- a/tests/connection_tests.cpp +++ b/tests/connection_tests.cpp @@ -1,17 +1,11 @@ #include -#include +#include +#include #include #include #include -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "cpp_restapi/cpp-httplib_connection.hpp" -#include "cpp_restapi/curl_connection.hpp" -#include "cpp_restapi/qt_connection.hpp" -#pragma GCC diagnostic pop - #include "cpp_restapi/create_cpp-httplib_connection.hpp" #include "cpp_restapi/create_curl_connection.hpp" #include "cpp_restapi/create_qt_connection.hpp" @@ -31,35 +25,36 @@ namespace { constexpr int port = 9010; - template - std::unique_ptr buildConnection(); + struct CurlBackendTag + { + static constexpr bool usesQtEventLoop = false; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + static std::unique_ptr build() + { + return createCurlConnection(std::string("http://127.0.0.1:") + std::to_string(port), {}); + } + }; - template<> - std::unique_ptr buildConnection() + struct QtBackendTag { - return createCurlConnection(std::string("http://127.0.0.1:") + std::to_string(port), {}); - } + static constexpr bool usesQtEventLoop = true; - template<> - std::unique_ptr buildConnection() - { - static QNetworkAccessManager networkmanager; - return createQtConnection(networkmanager, std::string("http://127.0.0.1:") + std::to_string(port), {}); - } + static std::unique_ptr build() + { + static QNetworkAccessManager networkmanager; + return createQtConnection(networkmanager, std::string("http://127.0.0.1:") + std::to_string(port), {}); + } + }; - template<> - std::unique_ptr buildConnection() + struct CppHttplibBackendTag { - return createCppHttplibConnection(std::string("http://127.0.0.1:") + std::to_string(port), {}); - } - - template - constexpr bool isQtBackend = std::is_same_v; + static constexpr bool usesQtEventLoop = false; -#pragma GCC diagnostic pop + static std::unique_ptr build() + { + return createCppHttplibConnection(std::string("http://127.0.0.1:") + std::to_string(port), {}); + } + }; } @@ -77,16 +72,13 @@ class ConnectionTest: public testing::Test }; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -using Backends = testing::Types; -#pragma GCC diagnostic pop +using Backends = testing::Types; TYPED_TEST_SUITE(ConnectionTest, Backends); TYPED_TEST(ConnectionTest, pagination) { - auto connection = buildConnection(); + auto connection = TypeParam::build(); const std::string secondPage = connection->url() + "/url/to/second/page&page=2"; const std::string thirdPage = connection->url() + "/url/to/last/page&page=3"; @@ -104,7 +96,7 @@ TYPED_TEST(ConnectionTest, pagination) TYPED_TEST(ConnectionTest, arraysPagination) { - auto connection = buildConnection(); + auto connection = TypeParam::build(); const std::string secondPage = connection->url() + "/url/to/second/page&page=2"; const std::string thirdPage = connection->url() + "/url/to/last/page&page=3"; @@ -123,7 +115,7 @@ TYPED_TEST(ConnectionTest, arraysPagination) TYPED_TEST(ConnectionTest, fetchSuccessReturnsBody) { - auto connection = buildConnection(); + auto connection = TypeParam::build(); EXPECT_CALL(this->server, request("/api/data", _)) .WillOnce(Return(GithubServerMock::Response{R"({"key":"value"})", {}, 200})); @@ -138,7 +130,7 @@ TYPED_TEST(ConnectionTest, fetchSuccessReturnsBody) TYPED_TEST(ConnectionTest, fetchReturns404Error) { - auto connection = buildConnection(); + auto connection = TypeParam::build(); EXPECT_CALL(this->server, request("/missing", _)) .WillOnce(Return(GithubServerMock::Response{"Not Found", {}, 404})); @@ -153,7 +145,7 @@ TYPED_TEST(ConnectionTest, fetchReturns404Error) TYPED_TEST(ConnectionTest, fetchReturns500Error) { - auto connection = buildConnection(); + auto connection = TypeParam::build(); EXPECT_CALL(this->server, request("/broken", _)) .WillOnce(Return(GithubServerMock::Response{"Internal Server Error", {}, 500})); @@ -169,10 +161,10 @@ TYPED_TEST(ConnectionTest, fetchReturns500Error) TYPED_TEST(ConnectionTest, asyncFetchCallsOnSuccess) { - if constexpr (isQtBackend) + if constexpr (TypeParam::usesQtEventLoop) GTEST_SKIP() << "Qt backend requires event loop for async operations"; - auto connection = buildConnection(); + auto connection = TypeParam::build(); EXPECT_CALL(this->server, request("/async/ok", _)) .WillOnce(Return(GithubServerMock::Response{R"({"async":"ok"})", {}, 200})); @@ -195,10 +187,10 @@ TYPED_TEST(ConnectionTest, asyncFetchCallsOnSuccess) TYPED_TEST(ConnectionTest, asyncFetchCallsOnError) { - if constexpr (isQtBackend) + if constexpr (TypeParam::usesQtEventLoop) GTEST_SKIP() << "Qt backend requires event loop for async operations"; - auto connection = buildConnection(); + auto connection = TypeParam::build(); EXPECT_CALL(this->server, request("/async/fail", _)) .WillOnce(Return(GithubServerMock::Response{"Server Error", {}, 500})); @@ -220,7 +212,7 @@ TYPED_TEST(ConnectionTest, asyncFetchCallsOnError) TYPED_TEST(ConnectionTest, sseSubscribeReceivesEvents) { - if constexpr (isQtBackend) + if constexpr (TypeParam::usesQtEventLoop) GTEST_SKIP() << "Qt backend requires event loop for SSE"; this->server.setSseEvents({ @@ -230,7 +222,7 @@ TYPED_TEST(ConnectionTest, sseSubscribeReceivesEvents) }); this->server.listen(); - auto connection = buildConnection(); + auto connection = TypeParam::build(); std::promise> promise; auto future = promise.get_future(); diff --git a/tests/github_request_tests.cpp b/tests/github_request_tests.cpp index d8d008b..4c451d5 100644 --- a/tests/github_request_tests.cpp +++ b/tests/github_request_tests.cpp @@ -1,14 +1,15 @@ +#include +#include +#include +#include +#include +#include + #include #include #include -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "cpp_restapi/cpp-httplib_connection.hpp" -#include "cpp_restapi/curl_connection.hpp" -#include "cpp_restapi/qt_connection.hpp" -#pragma GCC diagnostic pop #include "cpp_restapi/create_cpp-httplib_connection.hpp" #include "cpp_restapi/create_curl_connection.hpp" #include "cpp_restapi/create_qt_connection.hpp" @@ -28,35 +29,33 @@ namespace { constexpr int port = 9010; - template - std::shared_ptr buildConnection(GitHub::ConnectionBuilder &); - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - - template<> - std::shared_ptr buildConnection(GitHub::ConnectionBuilder& builder) + struct CurlBackendTag { - return builder.build(createCurlConnection); - } + static std::unique_ptr build(GitHub::ConnectionBuilder& builder) + { + return builder.build(createCurlConnection); + } + }; - template<> - std::shared_ptr buildConnection(GitHub::ConnectionBuilder& builder) + struct QtBackendTag { - static QNetworkAccessManager networkmanager; - return builder.build(createQtConnection, networkmanager); - } + static std::unique_ptr build(GitHub::ConnectionBuilder& builder) + { + static QNetworkAccessManager networkmanager; + return builder.build(createQtConnection, networkmanager); + } + }; - template<> - std::shared_ptr buildConnection(GitHub::ConnectionBuilder& builder) + struct CppHttplibBackendTag { - return builder.build(createCppHttplibConnection); - } - -#pragma GCC diagnostic pop + static std::unique_ptr build(GitHub::ConnectionBuilder& builder) + { + return builder.build(createCppHttplibConnection); + } + }; template - std::shared_ptr buildNewApi(std::function c = {}) + std::unique_ptr buildNewApi(std::function c = {}) { auto builder = GitHub::ConnectionBuilder(); builder.setAddress(std::string("http://127.0.0.1:") + std::to_string(port)); @@ -64,7 +63,7 @@ namespace if (c) c(builder); - return buildConnection(builder); + return T::build(builder); } } @@ -97,10 +96,7 @@ class ApiTest: public testing::Test }; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -using Backends = testing::Types; -#pragma GCC diagnostic pop +using Backends = testing::Types; TYPED_TEST_SUITE(ApiTest, Backends); @@ -111,7 +107,7 @@ TYPED_TEST(ApiTest, fetchRegularUser) auto connection = buildNewApi(); - GitHub::Request request(connection); + GitHub::Request request(std::move(connection)); const auto info = request.getUserInfo("userName1234"); EXPECT_EQ(info, "{\"id\":1234,\"login\":\"userName1234\"}\n"); @@ -130,7 +126,7 @@ TYPED_TEST(ApiTest, authorization) builder.setToken("github_token"); }); - GitHub::Request request(connection); + GitHub::Request request(std::move(connection)); const auto info = request.getUserInfo("userName1234"); EXPECT_EQ(info, "{\"id\":1234,\"login\":\"userName1234\"}\n"); @@ -146,7 +142,7 @@ TYPED_TEST(ApiTest, requestReturns404ErrorGivesEmptyString) auto connection = buildNewApi([](GitHub::ConnectionBuilder&) {}); - GitHub::Request request(connection); + GitHub::Request request(std::move(connection)); const auto result = request.getUserInfo("nonexistent"); EXPECT_TRUE(result.empty()); @@ -162,7 +158,7 @@ TYPED_TEST(ApiTest, requestReturns500ErrorGivesEmptyString) auto connection = buildNewApi([](GitHub::ConnectionBuilder&) {}); - GitHub::Request request(connection); + GitHub::Request request(std::move(connection)); const auto result = request.getUserInfo("anyuser"); EXPECT_TRUE(result.empty()); diff --git a/tests/test_stubs.hpp b/tests/test_stubs.hpp index 2dd2151..8753ee3 100644 --- a/tests/test_stubs.hpp +++ b/tests/test_stubs.hpp @@ -7,7 +7,9 @@ #include #include -#include + +#include "threaded_connection.hpp" + namespace test_stubs {