fix: usable memory loss in HttpClientBasic::Path (philips-software#304)

* fix: usable memory loss in HttpClientBasic::Path * chore: add micro test for HttpClientBasic::Path functionality
gabrielfrasantos · May 26, 2023 · d5d4abf · d5d4abf
1 parent 3267831
commit d5d4abf
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/services/network/HttpClientBasic.cpp b/services/network/HttpClientBasic.cpp
@@ -73,7 +73,7 @@ namespace services
     {
         auto path = services::PathFromUrl(url);
         auto offset = path.empty() ? url.size() : path.begin() - url.begin();
-        return infra::BoundedString(infra::MakeRange(url.begin() + offset, url.begin() + url.max_size() - offset), path.size());
+        return infra::BoundedString(infra::MakeRange(url.begin() + offset, url.begin() + url.max_size()), path.size());
     }
 
     services::HttpHeaders HttpClientBasic::Headers() const

diff --git a/services/network/test/TestHttpClientBasic.cpp b/services/network/test/TestHttpClientBasic.cpp
@@ -1,5 +1,6 @@
 #include "infra/stream/test/StreamMock.hpp"
 #include "infra/timer/test_helper/ClockFixture.hpp"
+#include "infra/util/BoundedString.hpp"
 #include "infra/util/test_helper/BoundedStringMatcher.hpp"
 #include "infra/util/test_helper/MockCallback.hpp"
 #include "infra/util/test_helper/MockHelpers.hpp"
@@ -18,6 +19,11 @@ class HttpClientBasicMock
         ContentError();
     }
 
+    infra::BoundedString GetPath()
+    {
+        return Path();
+    }
+
     MOCK_METHOD0(Established, void());
     MOCK_METHOD0(Done, void());
     MOCK_METHOD1(Error, void(bool intermittentFailure));
@@ -50,6 +56,22 @@ class HttpClientBasicTest
     testing::StrictMock<services::HttpClientMock> httpClient;
 };
 
+TEST_F(HttpClientBasicTest, returned_path_split_correctly)
+{
+    auto path = controller->GetPath();
+    infra::BoundedConstString::WithStorage<5> result = "/path";
+    EXPECT_EQ(path, result);
+}
+
+TEST_F(HttpClientBasicTest, returned_path_memory_trimmed_correctly)
+{
+    std::string_view hostnamePart = "https://hostname";
+    auto path = controller->GetPath();
+    EXPECT_EQ(path.end(), url.end());
+    EXPECT_EQ(path.begin(), url.begin() + hostnamePart.size());
+    EXPECT_EQ(path.max_size(), url.max_size() - hostnamePart.size());
+}
+
 TEST_F(HttpClientBasicTest, intermittent_error_is_reported_on_ConnectionFailed)
 {
     EXPECT_CALL(*controller, Error(true));