fix/when s_preservePathSeparators enabled

src/aws-cpp-sdk-core/include/aws/core/http/URI.h

@@ -153,7 +153,7 @@ namespace Aws
                 {
                     m_pathSegments.push_back(segment);
                 }
-                m_pathHasTrailingSlash = (m_pathSegments.empty() || !s_preservePathSeparators) && (!segments.empty() && segments.back() == '/');
+                m_pathHasTrailingSlash = !segments.empty() && segments.back() == '/';
             }
 
             /**

src/aws-cpp-sdk-core/source/http/URI.cpp

@@ -206,7 +206,11 @@ Aws::String URI::GetPath() const
         path.append(segment);
     }
 
-    if (m_pathSegments.empty() || m_pathHasTrailingSlash)
+    if (m_pathSegments.empty())
+    {
+        path.push_back('/');
+    }
+    else if (m_pathHasTrailingSlash)
     {
         path.push_back('/');
     }

tests/aws-cpp-sdk-s3-unit-tests/S3UnitTests.cpp

@@ -224,30 +224,53 @@ TEST_F(S3UnitTest, S3UriPathPreservationOn) {
   //Turn on path preservation
   Aws::Http::SetPreservePathSeparators(true);
 
-  auto putObjectRequest = PutObjectRequest()
-      .WithBucket("velvetunderground")
-      .WithKey("////stephanie////says////////////that////////she//wants///////to/know.txt");
+  struct TestCase {
+    const char* bucket;
+    const char* key;
+    const char* expectedUri;
+  };
 
-  std::shared_ptr<IOStream> body = Aws::MakeShared<StringStream>(ALLOCATION_TAG,
-    "What country shall I say is calling From across the world?",
-    std::ios_base::in | std::ios_base::binary);
+  TestCase testCases[] = {
+    {
+      "velvetunderground",
+      "////stephanie////says////////////that////////she//wants///////to/know.txt",
+      "https://velvetunderground.s3.us-east-1.amazonaws.com/////stephanie////says////////////that////////she//wants///////to/know.txt"
+    },
+    {
+      "velvetunderground",
+      "////stephanie////says////////////that////////she//wants///////to/know.txt/",
+      "https://velvetunderground.s3.us-east-1.amazonaws.com/////stephanie////says////////////that////////she//wants///////to/know.txt/"
+    },
+    {
+      "velvetunderground",
+      "////stephanie////says////////////that////////she//wants///////to/know.txt//",
+      "https://velvetunderground.s3.us-east-1.amazonaws.com/////stephanie////says////////////that////////she//wants///////to/know.txt//"
+    }
+  };
 
-  putObjectRequest.SetBody(body);
+  for (const auto& testCase : testCases) {
+    auto putObjectRequest = PutObjectRequest()
+        .WithBucket(testCase.bucket)
+        .WithKey(testCase.key);
 
-  //We have to mock requset because it is used to create the return body, it actually isnt used.
-  auto mockRequest = Aws::MakeShared<Standard::StandardHttpRequest>(ALLOCATION_TAG, "mockuri", HttpMethod::HTTP_GET);
-  mockRequest->SetResponseStreamFactory([]() -> IOStream* {
-    return Aws::New<StringStream>(ALLOCATION_TAG, "response-string", std::ios_base::in | std::ios_base::binary);
-  });
-  auto mockResponse = Aws::MakeShared<Standard::StandardHttpResponse>(ALLOCATION_TAG, mockRequest);
-  mockResponse->SetResponseCode(HttpResponseCode::OK);
-  _mockHttpClient->AddResponseToReturn(mockResponse);
+    std::shared_ptr<IOStream> body = Aws::MakeShared<StringStream>(ALLOCATION_TAG,
+      "test content", std::ios_base::in | std::ios_base::binary);
+    putObjectRequest.SetBody(body);
 
-  const auto response = _s3Client->PutObject(putObjectRequest);
-  AWS_EXPECT_SUCCESS(response);
+    auto mockRequest = Aws::MakeShared<Standard::StandardHttpRequest>(ALLOCATION_TAG, "mockuri", HttpMethod::HTTP_GET);
+    mockRequest->SetResponseStreamFactory([]() -> IOStream* {
+      return Aws::New<StringStream>(ALLOCATION_TAG, "response-string", std::ios_base::in | std::ios_base::binary);
+    });
+    auto mockResponse = Aws::MakeShared<Standard::StandardHttpResponse>(ALLOCATION_TAG, mockRequest);
+    mockResponse->SetResponseCode(HttpResponseCode::OK);
+    _mockHttpClient->AddResponseToReturn(mockResponse);
 
-  const auto seenRequest = _mockHttpClient->GetMostRecentHttpRequest();
-  EXPECT_EQ("https://velvetunderground.s3.us-east-1.amazonaws.com/////stephanie////says////////////that////////she//wants///////to/know.txt", seenRequest.GetUri().GetURIString());
+    const auto response = _s3Client->PutObject(putObjectRequest);
+    AWS_EXPECT_SUCCESS(response);
+
+    const auto seenRequest = _mockHttpClient->GetMostRecentHttpRequest();
+    EXPECT_EQ(testCase.expectedUri, seenRequest.GetUri().GetURIString());
+  }
 }
 
 TEST_F(S3UnitTest, S3EmbeddedErrorTest) {