Merge pull request #274 from offa/update_cpr

Update cpr v1.11.0

Author: offa

conanfile.py

@@ -17,7 +17,7 @@ class InfluxdbCxxConan(ConanFile):
     }
 
     def requirements(self):
-        self.requires("cpr/1.10.5")
+        self.requires("cpr/1.11.0")
         if not self.options.system and self.options.boost:
             self.requires("boost/1.85.0")
         if self.options.tests:

script/ci_testdeploy.sh

@@ -22,7 +22,7 @@ conan install \
     --build=missing \
     -s build_type=${BUILD_TYPE} \
     -s compiler.cppstd=20 \
-    --requires=cpr/1.10.0
+    --requires=cpr/1.11.0
 
 cmake -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" "$@" ..
 cmake --build . -j

test/HttpTest.cxx

@@ -93,7 +93,7 @@ namespace influxdb::test
     {
         auto http = createHttp();
 
-        REQUIRE_CALL(sessionMock, Post()).RETURN(createResponse(cpr::ErrorCode::INTERNAL_ERROR, cpr::status::HTTP_OK));
+        REQUIRE_CALL(sessionMock, Post()).RETURN(createResponse(cpr::ErrorCode::SEND_ERROR, cpr::status::HTTP_OK));
         ALLOW_CALL(sessionMock, SetUrl(_));
         ALLOW_CALL(sessionMock, UpdateHeader(_));
         ALLOW_CALL(sessionMock, SetBody(_));
@@ -144,7 +144,7 @@ namespace influxdb::test
     {
         auto http = createHttp();
 
-        REQUIRE_CALL(sessionMock, Get()).RETURN(createResponse(cpr::ErrorCode::CONNECTION_FAILURE, cpr::status::HTTP_OK));
+        REQUIRE_CALL(sessionMock, Get()).RETURN(createResponse(cpr::ErrorCode::COULDNT_CONNECT, cpr::status::HTTP_OK));
         ALLOW_CALL(sessionMock, SetUrl(_));
         ALLOW_CALL(sessionMock, SetParameters(_));
 
@@ -188,7 +188,7 @@ namespace influxdb::test
     {
         auto http = createHttp();
 
-        REQUIRE_CALL(sessionMock, Post()).RETURN(createResponse(cpr::ErrorCode::INTERNAL_ERROR, cpr::status::HTTP_OK));
+        REQUIRE_CALL(sessionMock, Post()).RETURN(createResponse(cpr::ErrorCode::UNKNOWN_ERROR, cpr::status::HTTP_OK));
         ALLOW_CALL(sessionMock, SetUrl(_));
         ALLOW_CALL(sessionMock, SetParameters(_));
 
@@ -243,10 +243,11 @@ namespace influxdb::test
 
     TEST_CASE("Set proxy with authentication", "[HttpTest]")
     {
+        using namespace std::string_literals;
         auto http = createHttp();
 
         REQUIRE_CALL(sessionMock, SetProxies(_)).WITH(_1["http"] == std::string{"https://auth-proxy-server:1234"} && _1["https"] == std::string{"https://auth-proxy-server:1234"});
-        REQUIRE_CALL(sessionMock, SetProxyAuth(_)).WITH(_1["http"] == std::string{"abc:def"} && _1["https"] == std::string{"abc:def"});
+        REQUIRE_CALL(sessionMock, SetProxyAuth(_)).WITH(_1.GetUsername("http") == "abc"s && _1.GetPassword("http") == "def"s && _1.GetUsername("https") == "abc"s && _1.GetPassword("https") == "def"s);
 
         http.setProxy(Proxy{"https://auth-proxy-server:1234", Proxy::Auth{"abc", "def"}});
     }
@@ -288,7 +289,7 @@ namespace influxdb::test
     {
         auto http = createHttp();
 
-        REQUIRE_CALL(sessionMock, Get()).RETURN(createResponse(cpr::ErrorCode::CONNECTION_FAILURE, cpr::status::HTTP_OK));
+        REQUIRE_CALL(sessionMock, Get()).RETURN(createResponse(cpr::ErrorCode::COULDNT_CONNECT, cpr::status::HTTP_OK));
         ALLOW_CALL(sessionMock, SetUrl(_));
         ALLOW_CALL(sessionMock, SetParameters(_));
 

test/mock/CprMock.cxx

@@ -115,37 +115,16 @@ namespace cpr
         influxdb::test::sessionMock.UpdateHeader(header);
     }
 
-    Parameters::Parameters(const std::initializer_list<Parameter>& parameters)
-        : CurlContainer<Parameter>(parameters)
-    {
-    }
-
     Proxies::Proxies(const std::initializer_list<std::pair<const std::string, std::string>>& hosts)
         : hosts_{hosts}
     {
     }
 
-    Authentication::~Authentication() noexcept = default;
-
-
     bool CaseInsensitiveCompare::operator()([[maybe_unused]] const std::string& a, [[maybe_unused]] const std::string& b) const noexcept
     {
         return false;
     }
 
-    std::string util::urlEncode(const std::string& s)
-    {
-        return s;
-    }
-
-    CurlHolder::CurlHolder() = default;
-    CurlHolder::~CurlHolder() = default;
-
-    const char* Authentication::GetAuthString() const noexcept
-    {
-        return auth_string_.c_str();
-    }
-
     const std::string& Proxies::operator[](const std::string& protocol)
     {
         if (hosts_.count(protocol) == 0)
@@ -155,20 +134,4 @@ namespace cpr
         return hosts_[protocol];
     }
 
-    const char* ProxyAuthentication::operator[](const std::string& protocol)
-    {
-        if (proxyAuth_.count(protocol) == 0)
-        {
-            FAIL("ProxyAuthentication: No entry '" << protocol << "' available");
-        }
-        return proxyAuth_[protocol].GetAuthString();
-    }
-
-    EncodedAuthentication::~EncodedAuthentication() noexcept = default;
-
-    const char* EncodedAuthentication::GetAuthString() const noexcept
-    {
-        return auth_string_.c_str();
-    }
-
 }