boost_mirror/filesystem
1
0
Fork 0
mirror of https://github.com/boostorg/filesystem.git synced 2025-05-12 13:41:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Windows tests for the changed path::remove_filename behavior in v4.

Browse Source
This commit is contained in:
Andrey Semashev 2023-02-07 02:22:48 +03:00
parent 32a3878d6a
commit f6c99195d5
1 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
test/path_test.cpp
View File

@ -1481,11 +1481,12 @@ void query_and_decomposition_tests()
p = q = path("\\\\?\\"); p = q = path("\\\\?\\");
PATH_TEST_EQ(p.relative_path().string(), ""); PATH_TEST_EQ(p.relative_path().string(), "");
PATH_TEST_EQ(p.parent_path().string(), ""); PATH_TEST_EQ(p.parent_path().string(), "");
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#if BOOST_FILESYSTEM_VERSION == 3 #if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
PATH_TEST_EQ(p.filename(), "\\\\?\\"); PATH_TEST_EQ(p.filename(), "\\\\?\\");
PATH_TEST_EQ(p.stem(), "\\\\?\\"); PATH_TEST_EQ(p.stem(), "\\\\?\\");
#else #else
PATH_TEST_EQ(q.remove_filename().string(), p.string());
PATH_TEST_EQ(p.filename(), ""); PATH_TEST_EQ(p.filename(), "");
PATH_TEST_EQ(p.stem(), ""); PATH_TEST_EQ(p.stem(), "");
#endif #endif
@ -1511,12 +1512,13 @@ void query_and_decomposition_tests()
p = q = path("\\\\.\\"); p = q = path("\\\\.\\");
PATH_TEST_EQ(p.relative_path().string(), ""); PATH_TEST_EQ(p.relative_path().string(), "");
PATH_TEST_EQ(p.parent_path().string(), ""); PATH_TEST_EQ(p.parent_path().string(), "");
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#if BOOST_FILESYSTEM_VERSION == 3 #if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
PATH_TEST_EQ(p.filename(), "\\\\.\\"); PATH_TEST_EQ(p.filename(), "\\\\.\\");
PATH_TEST_EQ(p.stem(), "\\\\"); PATH_TEST_EQ(p.stem(), "\\\\");
PATH_TEST_EQ(p.extension(), ".\\"); PATH_TEST_EQ(p.extension(), ".\\");
#else #else
PATH_TEST_EQ(q.remove_filename().string(), p.string());
PATH_TEST_EQ(p.filename(), ""); PATH_TEST_EQ(p.filename(), "");
PATH_TEST_EQ(p.stem(), ""); PATH_TEST_EQ(p.stem(), "");
PATH_TEST_EQ(p.extension(), ""); PATH_TEST_EQ(p.extension(), "");
@ -1543,11 +1545,12 @@ void query_and_decomposition_tests()
p = q = path("\\??\\"); p = q = path("\\??\\");
PATH_TEST_EQ(p.relative_path().string(), ""); PATH_TEST_EQ(p.relative_path().string(), "");
PATH_TEST_EQ(p.parent_path().string(), ""); PATH_TEST_EQ(p.parent_path().string(), "");
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#if BOOST_FILESYSTEM_VERSION == 3 #if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
PATH_TEST_EQ(p.filename(), "\\??\\"); PATH_TEST_EQ(p.filename(), "\\??\\");
PATH_TEST_EQ(p.stem(), "\\??\\"); PATH_TEST_EQ(p.stem(), "\\??\\");
#else #else
PATH_TEST_EQ(q.remove_filename().string(), p.string());
PATH_TEST_EQ(p.filename(), ""); PATH_TEST_EQ(p.filename(), "");
PATH_TEST_EQ(p.stem(), ""); PATH_TEST_EQ(p.stem(), "");
#endif #endif
@ -1573,10 +1576,11 @@ void query_and_decomposition_tests()
p = q = path("c:"); p = q = path("c:");
PATH_TEST_EQ(p.relative_path().string(), ""); PATH_TEST_EQ(p.relative_path().string(), "");
PATH_TEST_EQ(p.parent_path().string(), ""); PATH_TEST_EQ(p.parent_path().string(), "");
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#if BOOST_FILESYSTEM_VERSION == 3 #if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
PATH_TEST_EQ(p.filename(), "c:"); PATH_TEST_EQ(p.filename(), "c:");
#else #else
PATH_TEST_EQ(q.remove_filename().string(), p.string());
PATH_TEST_EQ(p.filename(), ""); PATH_TEST_EQ(p.filename(), "");
#endif #endif
PATH_TEST_EQ(p.root_name(), "c:"); PATH_TEST_EQ(p.root_name(), "c:");
@ -1597,10 +1601,11 @@ void query_and_decomposition_tests()
p = q = path("\\\\?\\c:"); p = q = path("\\\\?\\c:");
PATH_TEST_EQ(p.relative_path().string(), ""); PATH_TEST_EQ(p.relative_path().string(), "");
PATH_TEST_EQ(p.parent_path().string(), ""); PATH_TEST_EQ(p.parent_path().string(), "");
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#if BOOST_FILESYSTEM_VERSION == 3 #if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
PATH_TEST_EQ(p.filename(), "\\\\?\\c:"); PATH_TEST_EQ(p.filename(), "\\\\?\\c:");
#else #else
PATH_TEST_EQ(q.remove_filename().string(), p.string());
PATH_TEST_EQ(p.filename(), ""); PATH_TEST_EQ(p.filename(), "");
#endif #endif
PATH_TEST_EQ(p.root_name(), "\\\\?\\c:"); PATH_TEST_EQ(p.root_name(), "\\\\?\\c:");
@ -1621,10 +1626,11 @@ void query_and_decomposition_tests()
p = q = path("\\\\.\\c:"); p = q = path("\\\\.\\c:");
PATH_TEST_EQ(p.relative_path().string(), ""); PATH_TEST_EQ(p.relative_path().string(), "");
PATH_TEST_EQ(p.parent_path().string(), ""); PATH_TEST_EQ(p.parent_path().string(), "");
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#if BOOST_FILESYSTEM_VERSION == 3 #if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
PATH_TEST_EQ(p.filename(), "\\\\.\\c:"); PATH_TEST_EQ(p.filename(), "\\\\.\\c:");
#else #else
PATH_TEST_EQ(q.remove_filename().string(), p.string());
PATH_TEST_EQ(p.filename(), ""); PATH_TEST_EQ(p.filename(), "");
#endif #endif
PATH_TEST_EQ(p.root_name(), "\\\\.\\c:"); PATH_TEST_EQ(p.root_name(), "\\\\.\\c:");
@ -1645,10 +1651,11 @@ void query_and_decomposition_tests()
p = q = path("\\??\\c:"); p = q = path("\\??\\c:");
PATH_TEST_EQ(p.relative_path().string(), ""); PATH_TEST_EQ(p.relative_path().string(), "");
PATH_TEST_EQ(p.parent_path().string(), ""); PATH_TEST_EQ(p.parent_path().string(), "");
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#if BOOST_FILESYSTEM_VERSION == 3 #if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
PATH_TEST_EQ(p.filename(), "\\??\\c:"); PATH_TEST_EQ(p.filename(), "\\??\\c:");
#else #else
PATH_TEST_EQ(q.remove_filename().string(), p.string());
PATH_TEST_EQ(p.filename(), ""); PATH_TEST_EQ(p.filename(), "");
#endif #endif
PATH_TEST_EQ(p.root_name(), "\\??\\c:"); PATH_TEST_EQ(p.root_name(), "\\??\\c:");
@ -1733,10 +1740,11 @@ void query_and_decomposition_tests()
p = q = path("c:/"); p = q = path("c:/");
PATH_TEST_EQ(p.relative_path().string(), ""); PATH_TEST_EQ(p.relative_path().string(), "");
PATH_TEST_EQ(p.parent_path().string(), "c:"); PATH_TEST_EQ(p.parent_path().string(), "c:");
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#if BOOST_FILESYSTEM_VERSION == 3 #if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
PATH_TEST_EQ(p.filename(), "/"); PATH_TEST_EQ(p.filename(), "/");
#else #else
PATH_TEST_EQ(q.remove_filename().string(), p.string());
PATH_TEST_EQ(p.filename(), ""); PATH_TEST_EQ(p.filename(), "");
#endif #endif
PATH_TEST_EQ(p.root_name(), "c:"); PATH_TEST_EQ(p.root_name(), "c:");
@ -1757,10 +1765,11 @@ void query_and_decomposition_tests()
p = q = path("\\\\?\\c:\\"); p = q = path("\\\\?\\c:\\");
PATH_TEST_EQ(p.relative_path().string(), ""); PATH_TEST_EQ(p.relative_path().string(), "");
PATH_TEST_EQ(p.parent_path().string(), "\\\\?\\c:"); PATH_TEST_EQ(p.parent_path().string(), "\\\\?\\c:");
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#if BOOST_FILESYSTEM_VERSION == 3 #if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
PATH_TEST_EQ(p.filename(), "\\"); PATH_TEST_EQ(p.filename(), "\\");
#else #else
PATH_TEST_EQ(q.remove_filename().string(), p.string());
PATH_TEST_EQ(p.filename(), ""); PATH_TEST_EQ(p.filename(), "");
#endif #endif
PATH_TEST_EQ(p.root_name(), "\\\\?\\c:"); PATH_TEST_EQ(p.root_name(), "\\\\?\\c:");
@ -1781,10 +1790,11 @@ void query_and_decomposition_tests()
p = q = path("\\\\.\\c:\\"); p = q = path("\\\\.\\c:\\");
PATH_TEST_EQ(p.relative_path().string(), ""); PATH_TEST_EQ(p.relative_path().string(), "");
PATH_TEST_EQ(p.parent_path().string(), "\\\\.\\c:"); PATH_TEST_EQ(p.parent_path().string(), "\\\\.\\c:");
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#if BOOST_FILESYSTEM_VERSION == 3 #if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
PATH_TEST_EQ(p.filename(), "\\"); PATH_TEST_EQ(p.filename(), "\\");
#else #else
PATH_TEST_EQ(q.remove_filename().string(), p.string());
PATH_TEST_EQ(p.filename(), ""); PATH_TEST_EQ(p.filename(), "");
#endif #endif
PATH_TEST_EQ(p.root_name(), "\\\\.\\c:"); PATH_TEST_EQ(p.root_name(), "\\\\.\\c:");
@ -1805,10 +1815,11 @@ void query_and_decomposition_tests()
p = q = path("\\??\\c:\\"); p = q = path("\\??\\c:\\");
PATH_TEST_EQ(p.relative_path().string(), ""); PATH_TEST_EQ(p.relative_path().string(), "");
PATH_TEST_EQ(p.parent_path().string(), "\\??\\c:"); PATH_TEST_EQ(p.parent_path().string(), "\\??\\c:");
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#if BOOST_FILESYSTEM_VERSION == 3 #if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
PATH_TEST_EQ(p.filename(), "\\"); PATH_TEST_EQ(p.filename(), "\\");
#else #else
PATH_TEST_EQ(q.remove_filename().string(), p.string());
PATH_TEST_EQ(p.filename(), ""); PATH_TEST_EQ(p.filename(), "");
#endif #endif
PATH_TEST_EQ(p.root_name(), "\\??\\c:"); PATH_TEST_EQ(p.root_name(), "\\??\\c:");
@ -1861,7 +1872,11 @@ void query_and_decomposition_tests()
p = q = path("c://foo"); p = q = path("c://foo");
PATH_TEST_EQ(p.relative_path().string(), "foo"); PATH_TEST_EQ(p.relative_path().string(), "foo");
PATH_TEST_EQ(p.parent_path().string(), "c:/"); PATH_TEST_EQ(p.parent_path().string(), "c:/");
#if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string()); PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#else
PATH_TEST_EQ(q.remove_filename().string(), "c://");
#endif
PATH_TEST_EQ(p.filename(), "foo"); PATH_TEST_EQ(p.filename(), "foo");
PATH_TEST_EQ(p.root_name(), "c:"); PATH_TEST_EQ(p.root_name(), "c:");
PATH_TEST_EQ(p.root_directory(), "/"); PATH_TEST_EQ(p.root_directory(), "/");
@ -1877,7 +1892,11 @@ void query_and_decomposition_tests()
p = q = path("c:\\foo\\bar"); p = q = path("c:\\foo\\bar");
PATH_TEST_EQ(p.relative_path().string(), "foo\\bar"); PATH_TEST_EQ(p.relative_path().string(), "foo\\bar");
PATH_TEST_EQ(p.parent_path().string(), "c:\\foo"); PATH_TEST_EQ(p.parent_path().string(), "c:\\foo");
#if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string()); PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#else
PATH_TEST_EQ(q.remove_filename().string(), "c:\\foo\\");
#endif
PATH_TEST_EQ(p.filename(), "bar"); PATH_TEST_EQ(p.filename(), "bar");
PATH_TEST_EQ(p.root_name(), "c:"); PATH_TEST_EQ(p.root_name(), "c:");
PATH_TEST_EQ(p.root_directory(), "\\"); PATH_TEST_EQ(p.root_directory(), "\\");
@ -1893,7 +1912,11 @@ void query_and_decomposition_tests()
p = q = path("\\\\?\\c:\\foo\\bar"); p = q = path("\\\\?\\c:\\foo\\bar");
PATH_TEST_EQ(p.relative_path().string(), "foo\\bar"); PATH_TEST_EQ(p.relative_path().string(), "foo\\bar");
PATH_TEST_EQ(p.parent_path().string(), "\\\\?\\c:\\foo"); PATH_TEST_EQ(p.parent_path().string(), "\\\\?\\c:\\foo");
#if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string()); PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#else
PATH_TEST_EQ(q.remove_filename().string(), "\\\\?\\c:\\foo\\");
#endif
PATH_TEST_EQ(p.filename(), "bar"); PATH_TEST_EQ(p.filename(), "bar");
PATH_TEST_EQ(p.root_name(), "\\\\?\\c:"); PATH_TEST_EQ(p.root_name(), "\\\\?\\c:");
PATH_TEST_EQ(p.root_directory(), "\\"); PATH_TEST_EQ(p.root_directory(), "\\");
@ -1909,7 +1932,11 @@ void query_and_decomposition_tests()
p = q = path("\\\\.\\c:\\foo\\bar"); p = q = path("\\\\.\\c:\\foo\\bar");
PATH_TEST_EQ(p.relative_path().string(), "foo\\bar"); PATH_TEST_EQ(p.relative_path().string(), "foo\\bar");
PATH_TEST_EQ(p.parent_path().string(), "\\\\.\\c:\\foo"); PATH_TEST_EQ(p.parent_path().string(), "\\\\.\\c:\\foo");
#if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string()); PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#else
PATH_TEST_EQ(q.remove_filename().string(), "\\\\.\\c:\\foo\\");
#endif
PATH_TEST_EQ(p.filename(), "bar"); PATH_TEST_EQ(p.filename(), "bar");
PATH_TEST_EQ(p.root_name(), "\\\\.\\c:"); PATH_TEST_EQ(p.root_name(), "\\\\.\\c:");
PATH_TEST_EQ(p.root_directory(), "\\"); PATH_TEST_EQ(p.root_directory(), "\\");
@ -1925,7 +1952,11 @@ void query_and_decomposition_tests()
p = q = path("\\??\\c:\\foo\\bar"); p = q = path("\\??\\c:\\foo\\bar");
PATH_TEST_EQ(p.relative_path().string(), "foo\\bar"); PATH_TEST_EQ(p.relative_path().string(), "foo\\bar");
PATH_TEST_EQ(p.parent_path().string(), "\\??\\c:\\foo"); PATH_TEST_EQ(p.parent_path().string(), "\\??\\c:\\foo");
#if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string()); PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#else
PATH_TEST_EQ(q.remove_filename().string(), "\\??\\c:\\foo\\");
#endif
PATH_TEST_EQ(p.filename(), "bar"); PATH_TEST_EQ(p.filename(), "bar");
PATH_TEST_EQ(p.root_name(), "\\??\\c:"); PATH_TEST_EQ(p.root_name(), "\\??\\c:");
PATH_TEST_EQ(p.root_directory(), "\\"); PATH_TEST_EQ(p.root_directory(), "\\");
@ -1941,10 +1972,11 @@ void query_and_decomposition_tests()
p = q = path("prn:"); p = q = path("prn:");
PATH_TEST_EQ(p.relative_path().string(), ""); PATH_TEST_EQ(p.relative_path().string(), "");
PATH_TEST_EQ(p.parent_path().string(), ""); PATH_TEST_EQ(p.parent_path().string(), "");
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#if BOOST_FILESYSTEM_VERSION == 3 #if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
PATH_TEST_EQ(p.filename(), "prn:"); PATH_TEST_EQ(p.filename(), "prn:");
#else #else
PATH_TEST_EQ(q.remove_filename().string(), p.string());
PATH_TEST_EQ(p.filename(), ""); PATH_TEST_EQ(p.filename(), "");
#endif #endif
PATH_TEST_EQ(p.root_name(), "prn:"); PATH_TEST_EQ(p.root_name(), "prn:");
@ -1965,7 +1997,11 @@ void query_and_decomposition_tests()
p = q = path("\\\\net\\\\\\foo"); p = q = path("\\\\net\\\\\\foo");
PATH_TEST_EQ(p.relative_path().string(), "foo"); PATH_TEST_EQ(p.relative_path().string(), "foo");
PATH_TEST_EQ(p.parent_path().string(), "\\\\net\\"); PATH_TEST_EQ(p.parent_path().string(), "\\\\net\\");
#if BOOST_FILESYSTEM_VERSION == 3
PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string()); PATH_TEST_EQ(q.remove_filename().string(), p.parent_path().string());
#else
PATH_TEST_EQ(q.remove_filename().string(), "\\\\net\\\\\\");
#endif
PATH_TEST_EQ(p.filename(), "foo"); PATH_TEST_EQ(p.filename(), "foo");
PATH_TEST_EQ(p.root_name(), "\\\\net"); PATH_TEST_EQ(p.root_name(), "\\\\net");
PATH_TEST_EQ(p.root_directory(), "\\"); PATH_TEST_EQ(p.root_directory(), "\\");