From cc6a7b113a21cceb4804f22e3e892322af473e2d Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Sun, 18 Sep 2022 23:30:45 -0700 Subject: [PATCH] fileutils: Fix tests Change-Id: Iafeab41b0e6f7cdb10802e48c3bc7fe5548c064c Reviewed-by: Qt CI Bot Reviewed-by: Eike Ziller Reviewed-by: --- tests/auto/utils/fileutils/tst_fileutils.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/auto/utils/fileutils/tst_fileutils.cpp b/tests/auto/utils/fileutils/tst_fileutils.cpp index 7801a4c42d1..1fa834a7017 100644 --- a/tests/auto/utils/fileutils/tst_fileutils.cpp +++ b/tests/auto/utils/fileutils/tst_fileutils.cpp @@ -126,14 +126,14 @@ void tst_fileutils::parentDir_data() #ifdef Q_OS_WIN QTest::newRow("C:/data") << "C:/data" << "C:/" << ""; QTest::newRow("C:/") << "C:/" << "" << ""; - QTest::newRow("//./com1") << "//./com1" << "//./" << ""; + QTest::newRow("//./com1") << "//./com1" << "//." << ""; QTest::newRow("//?/path") << "//?/path" << "/" << "Qt 4 cannot handle this path."; QTest::newRow("/Global?\?/UNC/host") << "/Global?\?/UNC/host" << "/Global?\?/UNC/host" << "Qt 4 cannot handle this path."; QTest::newRow("//server/directory/file") << "//server/directory/file" << "//server/directory" << ""; - QTest::newRow("//server/directory") << "//server/directory" << "//server/" << ""; - QTest::newRow("//server") << "//server/" << "" << ""; + QTest::newRow("//server/directory") << "//server/directory" << "//server" << ""; + QTest::newRow("//server") << "//server" << "" << ""; #endif } @@ -166,8 +166,8 @@ void tst_fileutils::isChildOf_data() #ifdef Q_OS_WIN QTest::newRow("C:/data") << "C:/" << "C:/data" << true; QTest::newRow("C:/") << "" << "C:/" << false; - QTest::newRow("//./com1") << "/" << "//./com1" << false; - QTest::newRow("//?/path") << "/" << "//?/path" << false; + QTest::newRow("com-port") << "//./" << "//./com1" << true; + QTest::newRow("extended-length-path") << "\\\\?\\C:\\" << "\\\\?\\C:\\path" << false; QTest::newRow("/Global?\?/UNC/host") << "/Global?\?/UNC/host" << "/Global?\?/UNC/host/file" << true; QTest::newRow("//server/directory/file")