diff --git a/Base/Util/PathUtil.cpp b/Base/Util/PathUtil.cpp index cf73d360ac453d4b7af6a0acc0a84531c595cfb9..e8b926007f943fdf801efd26b699367e15adea3e 100644 --- a/Base/Util/PathUtil.cpp +++ b/Base/Util/PathUtil.cpp @@ -12,8 +12,8 @@ // // ************************************************************************************************ -#include "Base/Util/Assert.h" #include "Base/Util/PathUtil.h" +#include "Base/Util/Assert.h" #include "Base/Util/StringUtil.h" #include <codecvt> // #include <filesystem> @@ -42,15 +42,6 @@ std::string Base::Path::extensions(const std::string& path) return pos != std::string::npos ? name.substr(pos, name.size() - pos) : ""; } -bool Base::Path::createDirectory(const std::string& dir_name) -{ -#ifdef _WIN32 - return fs::create_directory(convert_utf8_to_utf16(dir_name)); -#else - return fs::create_directory(dir_name); -#endif -} - bool Base::Path::createDirectories(const std::string& dir_name) { #ifdef _WIN32 diff --git a/Base/Util/PathUtil.h b/Base/Util/PathUtil.h index eca326cfb607dc32227e4ebb167b603afd2ca8ba..f6d569f688be4f16e87d27c546f534464926494e 100644 --- a/Base/Util/PathUtil.h +++ b/Base/Util/PathUtil.h @@ -36,10 +36,7 @@ bool hasExtension(const std::string& path, const std::string& ref_extension); //! "/home/user/filename.int" -> ".int", "/home/user/filename.int.gz" -> ".int.gz" std::string extensions(const std::string& path); -//! Creates directory in current directory -bool createDirectory(const std::string& dir_name); - -//! Creates directories in current directory for any element of dir_name which doesn't exist. +//! Creates directory, and its parents, in current directory. bool createDirectories(const std::string& dir_name); //! Returns filenames of files in directory diff --git a/Tests/Unit/Base/FileSystemUtilsTest.cpp b/Tests/Unit/Base/FileSystemUtilsTest.cpp index 9177ed3fe9ca54f10bc19e0f9742989df378ec84..9593251fe4f25efcd7720a6694b3f490d84423a7 100644 --- a/Tests/Unit/Base/FileSystemUtilsTest.cpp +++ b/Tests/Unit/Base/FileSystemUtilsTest.cpp @@ -125,13 +125,13 @@ TEST_F(FileSystemUtilsTest, StemAndExtension) TEST_F(FileSystemUtilsTest, createDirectory) { // with absolute path - EXPECT_TRUE(Base::Path::createDirectory(testCasePath())); - EXPECT_FALSE(Base::Path::createDirectory(testCasePath())); + EXPECT_TRUE(Base::Path::createDirectories(testCasePath())); + EXPECT_FALSE(Base::Path::createDirectories(testCasePath())); // with relative path std::filesystem::current_path(testCasePath()); - EXPECT_TRUE(Base::Path::createDirectory("sub")); - EXPECT_FALSE(Base::Path::createDirectory("sub")); + EXPECT_TRUE(Base::Path::createDirectories("sub")); + EXPECT_FALSE(Base::Path::createDirectories("sub")); EXPECT_TRUE(std::filesystem::exists("sub")); EXPECT_TRUE(std::filesystem::exists(Base::Path::jointPath(testCasePath(), "sub"))); }