mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-06 14:59:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix split_filename() failing tests using the new get_file_title_with_path() function

Browse Source
This commit is contained in:
David Capello 2018-08-12 20:13:27 -03:00
parent 1288b670c9
commit 542e43140d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laf

@ -1 +1 @@
Subproject commit 037ae6550b8b46672ebd43c1e530063491afea0b Subproject commit 835ddb7497ab2b5321fe413dd3bc9cf102334011

4
src/app/file/split_filename.cpp
View File

@ -22,9 +22,7 @@ namespace app {
// can't split anything // can't split anything
int split_filename(const std::string& filename, std::string& left, std::string& right, int& width) int split_filename(const std::string& filename, std::string& left, std::string& right, int& width)
{ {
left = base::join_path( left = base::get_file_title_with_path(filename);
base::get_file_path(filename),
base::get_file_title(filename));
right = base::get_file_extension(filename); right = base::get_file_extension(filename);
if (!right.empty()) if (!right.empty())
right.insert(right.begin(), '.'); right.insert(right.begin(), '.');

12
src/app/file/split_filename_tests.cpp
View File

@ -18,7 +18,12 @@ TEST(SplitFilename, Common)
int width; int width;
EXPECT_EQ(1, split_filename("C:\\test\\a1.png", left, right, 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(".png", right);
EXPECT_EQ(1, width); EXPECT_EQ(1, width);
@ -38,11 +43,8 @@ TEST(SplitFilename, InvalidEraseInLeftPart_Issue784)
std::string left, right; std::string left, right;
int width; 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(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(".png", right);
EXPECT_EQ(4, width); EXPECT_EQ(4, width);
} }