From 542e43140dd5622411eb01d12fa792468b29ac43 Mon Sep 17 00:00:00 2001 From: David Capello Date: Sun, 12 Aug 2018 20:13:27 -0300 Subject: [PATCH] Fix split_filename() failing tests using the new get_file_title_with_path() function --- laf | 2 +- src/app/file/split_filename.cpp | 4 +--- src/app/file/split_filename_tests.cpp | 12 +++++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/laf b/laf index 037ae6550..835ddb749 160000 --- a/laf +++ b/laf @@ -1 +1 @@ -Subproject commit 037ae6550b8b46672ebd43c1e530063491afea0b +Subproject commit 835ddb7497ab2b5321fe413dd3bc9cf102334011 diff --git a/src/app/file/split_filename.cpp b/src/app/file/split_filename.cpp index f935f983f..7df66301e 100644 --- a/src/app/file/split_filename.cpp +++ b/src/app/file/split_filename.cpp @@ -22,9 +22,7 @@ namespace app { // can't split anything int split_filename(const std::string& filename, std::string& left, std::string& right, int& width) { - left = base::join_path( - base::get_file_path(filename), - base::get_file_title(filename)); + left = base::get_file_title_with_path(filename); right = base::get_file_extension(filename); if (!right.empty()) right.insert(right.begin(), '.'); diff --git a/src/app/file/split_filename_tests.cpp b/src/app/file/split_filename_tests.cpp index 23045e895..97aeb321e 100644 --- a/src/app/file/split_filename_tests.cpp +++ b/src/app/file/split_filename_tests.cpp @@ -18,7 +18,12 @@ TEST(SplitFilename, Common) int width; EXPECT_EQ(1, split_filename("C:\\test\\a1.png", left, right, width)); - EXPECT_EQ(base::fix_path_separators("C:\\test\\a"), base::fix_path_separators(left)); + EXPECT_EQ("C:\\test\\a", left); + EXPECT_EQ(".png", right); + EXPECT_EQ(1, width); + + EXPECT_EQ(1, split_filename("C:/test/a1.png", left, right, width)); + EXPECT_EQ("C:/test/a", left); EXPECT_EQ(".png", right); EXPECT_EQ(1, width); @@ -38,11 +43,8 @@ TEST(SplitFilename, InvalidEraseInLeftPart_Issue784) std::string left, right; int width; - std::string sep; - sep.push_back(base::path_separator); - EXPECT_EQ(1, split_filename("by \xE3\x81\xA1\xE3\x81\x83\xE3\x81\xBE\\0001.png", left, right, width)); - EXPECT_EQ("by \xE3\x81\xA1\xE3\x81\x83\xE3\x81\xBE"+sep, left); + EXPECT_EQ("by \xE3\x81\xA1\xE3\x81\x83\xE3\x81\xBE\\", left); EXPECT_EQ(".png", right); EXPECT_EQ(4, width); }