luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a FileUtils unit test on Windows.

This commit is contained in:
Matthias Koefferlein 2018-07-15 15:36:30 +02:00
parent a1d8913de9
commit cb33753e1c
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tl/unit_tests/tlFileUtils.cc
View File

@ -516,30 +516,35 @@ TEST(13)
} }
#if defined(HAVE_QT) #if defined(HAVE_QT)
// absolute_path vs. Qt
// absolute_path, relative_path and absolute_file_path
TEST(14) TEST(14)
{ {
std::string xpath_qt = tl::to_string (QDir::current ().absoluteFilePath ("doesnotexist")); std::string xpath_qt = tl::to_string (QDir::current ().absoluteFilePath ("doesnotexist"));
std::string xpath = tl::absolute_file_path ("doesnotexist"); std::string xpath = tl::absolute_file_path ("doesnotexist");
EXPECT_EQ (xpath_qt, xpath); EXPECT_EQ (tl::replaced (xpath_qt, "\\", "/"), tl::replaced (xpath, "\\", "/"));
std::string xpath2_qt = tl::to_string (QDir::current ().absolutePath ()); std::string xpath2_qt = tl::to_string (QDir::current ().absolutePath ());
std::string xpath2 = tl::absolute_path ("./doesnotexist"); std::string xpath2 = tl::absolute_path ("./doesnotexist");
EXPECT_EQ (xpath2_qt, xpath2); EXPECT_EQ (tl::replaced (xpath2_qt, "\\", "/"), tl::replaced (xpath2, "\\", "/"));
xpath2 = tl::absolute_file_path (xpath2); xpath2 = tl::absolute_file_path (xpath2);
EXPECT_EQ (xpath2_qt, xpath2); EXPECT_EQ (tl::replaced (xpath2_qt, "\\", "/"), tl::replaced (xpath2, "\\", "/"));
}
#endif
// relative_path and absolute_file_path
TEST(15)
{
std::string xpath = tl::absolute_file_path ("doesnotexist");
std::string xpath2 = tl::absolute_path ("./doesnotexist");
EXPECT_EQ (tl::relative_path (xpath2, xpath2), ""); EXPECT_EQ (tl::relative_path (xpath2, xpath2), "");
EXPECT_EQ (tl::relative_path (xpath2, xpath), "doesnotexist"); EXPECT_EQ (tl::relative_path (xpath2, xpath), "doesnotexist");
EXPECT_EQ (tl::relative_path (xpath2, tl::combine_path (xpath, "a")), "doesnotexist/a"); EXPECT_EQ (tl::relative_path (xpath2, tl::combine_path (xpath, "a")), "doesnotexist/a");
} }
#endif
// dir_entries // dir_entries
TEST(15) TEST(16)
{ {
std::string tp = tl::absolute_file_path (tmp_file ()); std::string tp = tl::absolute_file_path (tmp_file ());
std::string tt = tl::combine_path (tp, "detest"); std::string tt = tl::combine_path (tp, "detest");