1 files changed, 94 insertions, 1 deletions

diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
index 09ef0ea44f..a1f9ca0b87 100644
--- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
@@ -116,7 +116,7 @@ static DWORD createSymbolicLink(const QString &symLinkName, const QString &targe
                            reinterpret_cast<const wchar_t*>(nativeTarget.utf16()), flags) == FALSE) {
         result = GetLastError();
         QTextStream(errorMessage) << "CreateSymbolicLink(" <<  nativeSymLinkName << ", "
-            << nativeTarget << ", 0x" << hex << flags << dec << ") failed with error " << result
+            << nativeTarget << ", 0x" << Qt::hex << flags << Qt::dec << ") failed with error " << result
             << ": " << qt_error_string(int(result));
     }
     return result;
@@ -287,6 +287,8 @@ private slots:
     void invalidState();
     void nonExistingFile();
 
+    void stdfilesystem();
+
 private:
     const QString m_currentDir;
     QString m_sourceFile;
@@ -2269,6 +2271,97 @@ void tst_QFileInfo::nonExistingFile()
     stateCheck(info, dirname, filename);
 }
 
+void tst_QFileInfo::stdfilesystem()
+{
+#if QT_CONFIG(cxx17_filesystem)
+
+    namespace fs = std::filesystem;
+
+    // Verify constructing with fs::path leads to valid objects
+    {
+        // We compare using absoluteFilePath since QFileInfo::operator== ends up using
+        // canonicalFilePath which evaluates to empty-string for non-existent paths causing
+        // these tests to always succeed.
+#define COMPARE_CONSTRUCTION(filepath)                                                 \
+        QCOMPARE(QFileInfo(fs::path(filepath)).absoluteFilePath(),                     \
+                 QFileInfo(QString::fromLocal8Bit(filepath)).absoluteFilePath());      \
+        QCOMPARE(QFileInfo(base, fs::path(filepath)).absoluteFilePath(),               \
+                 QFileInfo(base, QString::fromLocal8Bit(filepath)).absoluteFilePath())
+
+        QDir base{ "../" }; // Used for the QFileInfo(QDir, <path>) ctor
+
+        COMPARE_CONSTRUCTION("./file");
+
+#ifdef Q_OS_WIN32
+        COMPARE_CONSTRUCTION("C:\\path\\to\\file.txt");
+        COMPARE_CONSTRUCTION("x:\\path/to\\file.txt");
+        COMPARE_CONSTRUCTION("D:/path/TO/file.txt");
+        COMPARE_CONSTRUCTION("//sharename/folder/file.txt");
+#endif
+        COMPARE_CONSTRUCTION("/path/TO/file.txt");
+        COMPARE_CONSTRUCTION("./path/TO/file.txt");
+        COMPARE_CONSTRUCTION("../file.txt");
+        COMPARE_CONSTRUCTION("./filæ.txt");
+
+#undef COMPARE_CONSTRUCTION
+        {
+            // One proper comparison with operator== for each ctor
+            QFile file(QStringLiteral("./filesystem_test_file.txt"));
+            if (!file.open(QFile::NewOnly))
+                QVERIFY(file.exists());
+            file.close();
+
+            QFileInfo pinfo{ fs::path{ "./filesystem_test_file.txt" } };
+            QFileInfo info{ QStringLiteral("./filesystem_test_file.txt") };
+            QCOMPARE(pinfo, info);
+        }
+
+        {
+            // And once more for QFileInfo(QDir, <path>)
+            const QString &subdir = QStringLiteral("./filesystem_test_dir/");
+            base = QDir(QStringLiteral("."));
+            if (!base.exists(subdir))
+                QVERIFY(base.mkdir(subdir));
+            base.cd(subdir);
+            QFile file{ base.filePath(QStringLiteral("./filesystem_test_file.txt")) };
+            if (!file.open(QFile::NewOnly))
+                QVERIFY(file.exists());
+            file.close();
+            QFileInfo pinfo{ base, fs::path{ "filesystem_test_file.txt" } };
+            QFileInfo info{ base, QStringLiteral("filesystem_test_file.txt") };
+            QCOMPARE(pinfo, info);
+        }
+    }
+
+    // Verify that functions returning path all point to the same place
+    {
+#define COMPARE_PATHS(actual, expected)                               \
+    QCOMPARE(QString::fromStdU16String(actual.u16string()), expected)
+
+        QFile file(QStringLiteral("./orig"));
+        if (!file.open(QFile::NewOnly))
+            QVERIFY(file.exists());
+        file.close();
+
+        QFileInfo info{ QStringLiteral("./orig") };
+        COMPARE_PATHS(info.filesystemPath(), info.path());
+        COMPARE_PATHS(info.filesystemAbsolutePath(), info.absolutePath());
+        COMPARE_PATHS(info.filesystemCanonicalPath(), info.canonicalPath());
+        COMPARE_PATHS(info.filesystemFilePath(), info.filePath());
+        COMPARE_PATHS(info.filesystemAbsoluteFilePath(), info.absoluteFilePath());
+        COMPARE_PATHS(info.filesystemCanonicalFilePath(), info.canonicalFilePath());
+
+        QVERIFY(file.link(QStringLiteral("./filesystem_test_symlink.lnk")));
+        info = QFileInfo{ "./filesystem_test_symlink.lnk" };
+
+        COMPARE_PATHS(info.filesystemSymLinkTarget(), info.symLinkTarget());
+#undef COMPARE_PATHS
+    }
+
+#else
+    QSKIP("Not supported");
+#endif
+}
 
 QTEST_MAIN(tst_QFileInfo)
 #include "tst_qfileinfo.moc"