Address PR feedback

Signed-off-by: Louise Poubel <louise@openrobotics.org>
gazebosim · Mar 3, 2022 · d453ab6 · d453ab6
1 parent 3e101f8
commit d453ab6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Filesystem.cc b/src/Filesystem.cc
@@ -205,11 +205,11 @@ bool ignition::common::chdir(const std::string &_dir)
 /////////////////////////////////////////////////
 std::string ignition::common::basename(const std::string &_path)
 {
-  fs::path p = fs::path(_path);
+  fs::path p(_path);
   p /= "FOO.TXT";
   p = p.lexically_normal();
   p = p.parent_path();
-  return p.filename().string().empty() ? 
+  return p.filename().string().empty() ?
     std::string{fs::path::preferred_separator} : p.filename().string();
 }
 

diff --git a/src/Filesystem_TEST.cc b/src/Filesystem_TEST.cc
@@ -417,7 +417,11 @@ TEST_F(FilesystemTest, decomposition)
 {
   std::string absolute = joinPaths("", "home", "bob", "foo");
   EXPECT_EQ(basename(absolute), "foo");
+#ifndef _WIN32
   EXPECT_EQ(parentPath(absolute), "/home/bob");
+#else
+  EXPECT_EQ(parentPath(absolute), "\\home\\bob");
+#endif
 
   std::string relative = joinPaths("baz", "foobar");
   EXPECT_EQ(basename(relative), "foobar");
@@ -626,7 +630,7 @@ TEST_F(FilesystemTest, separator)
 #ifndef _WIN32
   EXPECT_EQ("/", ignition::common::separator(""));
 #else
-  EXPECT_EQ("\\", ignition::common::separator("")); 
+  EXPECT_EQ("\\", ignition::common::separator(""));
 #endif
 }