From 309d88222e62b4bdf2fa704eb2e0a72445020fc9 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Fri, 10 Sep 2021 14:45:31 -0500 Subject: [PATCH] Revert "Address reviewer feedback" This reverts commit ee7cae2ed8f1b0a1b609f5f9ba63e803599f026c. --- src/Helpers_TEST.cc | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/Helpers_TEST.cc b/src/Helpers_TEST.cc index 49b902b8..bfa6c077 100644 --- a/src/Helpers_TEST.cc +++ b/src/Helpers_TEST.cc @@ -53,14 +53,6 @@ TEST(HelpersTEST, UriToPathNoAuthority) ///////////////////////////////////////////////// TEST(HelpersTEST, UriToPathHasAuthority) { -#ifdef WIN32 - const std::string testStr1 = R"(localhost:8000\some\path)"; - const std::string testStr2 = R"(localhost:8000\some\path\)"; -#else - const std::string testStr1 = R"(localhost:8000/some/path)"; - const std::string testStr2 = R"(localhost:8000/some/path/)"; -#endif - { common::URI uri{"http://localhost:8000", true}; EXPECT_EQ("localhost:8000", uriToPath(uri)); @@ -68,12 +60,14 @@ TEST(HelpersTEST, UriToPathHasAuthority) { common::URI uri{"http://localhost:8000/some/path", true}; - EXPECT_EQ(testStr1, uriToPath(uri)); + EXPECT_EQ(common::joinPaths("localhost:8000", "some", "path"), + uriToPath(uri)); } { common::URI uri{"http://localhost:8000/some/path/", true}; - EXPECT_EQ(testStr2, uriToPath(uri)); + EXPECT_EQ(common::separator(common::joinPaths("localhost:8000", "some", + "path")), uriToPath(uri)); } }