Revert "Address reviewer feedback"

This reverts commit ee7cae2.
gazebosim · Sep 10, 2021 · 309d882 · 309d882
1 parent ee7cae2
commit 309d882
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/Helpers_TEST.cc b/src/Helpers_TEST.cc
@@ -53,27 +53,21 @@ 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));
   }
 
   {
     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));
   }
 }