diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-28 15:47:52 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-28 15:47:52 +0200 |
| commit | 811edc5952caf265a4c56b52933165830838dab1 (patch) | |
| tree | 787ef28916e4799083aa1b7e0d5076a35d130eca /tests/auto/tools | |
| parent | 40787b4d077eea1211f43d9f247c560957bd6887 (diff) | |
| parent | 0f647796788494947632c0874931e4d84bccad46 (diff) | |
Merge 1.9 into master
Change-Id: I5320b7c62d6a80089df75c2caca79c15602c01e5
Diffstat (limited to 'tests/auto/tools')
| -rw-r--r-- | tests/auto/tools/tst_tools.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp index 9cfbb08e3..dca88f438 100644 --- a/tests/auto/tools/tst_tools.cpp +++ b/tests/auto/tools/tst_tools.cpp @@ -88,12 +88,21 @@ void TestTools::testFileInfo() QCOMPARE(FileInfo::path("C:/fileInDriveRoot"), QString("C:/")); QVERIFY(!FileInfo::isAbsolute("bla/lol")); QVERIFY(FileInfo::isAbsolute("/bla/lol")); - if (HostOsInfo::isWindowsHost()) + if (HostOsInfo::isWindowsHost()) { QVERIFY(FileInfo::isAbsolute("C:\\bla\\lol")); + QVERIFY(FileInfo::isAbsolute("C:\\")); + QVERIFY(FileInfo::isAbsolute("C:/")); + QVERIFY(!FileInfo::isAbsolute("C:")); + } QCOMPARE(FileInfo::resolvePath("/abc/lol", "waffl"), QString("/abc/lol/waffl")); QCOMPARE(FileInfo::resolvePath("/abc/def/ghi/jkl/", "../foo/bar"), QString("/abc/def/ghi/foo/bar")); QCOMPARE(FileInfo::resolvePath("/abc/def/ghi/jkl/", "../../foo/bar"), QString("/abc/def/foo/bar")); QCOMPARE(FileInfo::resolvePath("/abc", "../../../foo/bar"), QString("/foo/bar")); + if (HostOsInfo::isWindowsHost()) { + QCOMPARE(FileInfo::resolvePath("C:/share", ".."), QString("C:/")); + QCOMPARE(FileInfo::resolvePath("C:/share", "D:/"), QString("D:/")); + QCOMPARE(FileInfo::resolvePath("C:/share", "D:"), QString()); // should soft-assert + } QCOMPARE(FileInfo("/does/not/exist").lastModified(), FileTime()); } |