deleted second assert, added test case

Signed-off-by: IsiGebauer <isigebauer0@gmail.com> Signed-off-by: IsiGebauer <emanuel.gebauer0@gmail.com>
small fix to allow the foldername to be empty. JoinPath function then adds all the strings in args to one file-path
2024-12-28 22:35:45 +01:00 · 2024-12-23 18:59:19 +01:00
2 changed files with 8 additions and 3 deletions
--- a/base/base_tests/file_name_utils_tests.cpp
+++ b/base/base_tests/file_name_utils_tests.cpp
@ -81,6 +81,8 @@ UNIT_TEST(FilePath_Join)
  TEST_EQUAL("omim/strings.txt", base::JoinPath("omim/", "strings.txt"), ());
  TEST_EQUAL("../../omim/strings.txt", base::JoinPath("..", "..", "omim", "strings.txt"), ());
  TEST_EQUAL("../../omim/strings.txt", base::JoinPath("../", "..", "omim/", "strings.txt"), ());
+  TEST_EQUAL("omim/strings.txt", base::JoinPath("", "omim/", "strings.txt"), ());
+  TEST_EQUAL("omim/strings.txt", base::JoinPath("", "","omim/", "strings.txt"), ());  
 }

 #endif // OMIM_OS_WINDOWS
--- a/base/file_name_utils.hpp
+++ b/base/file_name_utils.hpp
@ -40,7 +40,12 @@ template <typename... Args>
 std::string JoinPath(std::string const & folder, Args &&... args)
 {
  if (folder.empty())
-    return {};
+  {
+    if (sizeof...(args) == 0)
+      return {};
+    else
+      return impl::JoinPath(std::forward<Args>(args)...);
+  }

  return AddSlashIfNeeded(folder) + impl::JoinPath(std::forward<Args>(args)...);
 }
@ -50,8 +55,6 @@ std::string JoinPath(std::string const & folder, Args &&... args)
 template <typename... Args>
 std::string JoinPath(std::string const & dir, std::string const & fileOrDir, Args &&... args)
 {
-  ASSERT(!dir.empty(), ("JoinPath dir is empty"));
-  ASSERT(!fileOrDir.empty(), ("JoinPath fileOrDir is empty"));
  return impl::JoinPath(dir, fileOrDir, std::forward<Args>(args)...);
 }
 }  // namespace base
Author	SHA1	Message	Date
IsiGebauer	2089627bdc	deleted second assert, added test case Signed-off-by: IsiGebauer <isigebauer0@gmail.com> Signed-off-by: IsiGebauer <emanuel.gebauer0@gmail.com>	2024-12-28 22:35:45 +01:00
IsiGebauer	9fbe9540db	small fix to allow the foldername to be empty. JoinPath function then adds all the strings in args to one file-path	2024-12-23 18:59:19 +01:00