From 5b9e2f31bd4bc636cf596ef3375317f33041cad5 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 30 Aug 2023 12:20:13 -0700 Subject: [PATCH] tst_QFileInfo::stdfilesystem: add extra Unicode string tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.6 Change-Id: I2b24e1d3cad44897906efffd17803f70bd4d60f6 Reviewed-by: Ahmad Samir Reviewed-by: Mårten Nordheim --- tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp index e13b16260e..fc5c8d3526 100644 --- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp @@ -2324,6 +2324,18 @@ void tst_QFileInfo::stdfilesystem() COMPARE_CONSTRUCTION("../file.txt"); COMPARE_CONSTRUCTION("./filæ.txt"); + // Test unicode strings + QCOMPARE(QFileInfo(fs::path(u"./filæ.txt")).absoluteFilePath(), + QFileInfo(u"./filæ.txt"_s).absoluteFilePath()); + QCOMPARE(QFileInfo(base, fs::path(u"./filæ.txt")).absoluteFilePath(), + QFileInfo(base, u"./filæ.txt"_s).absoluteFilePath()); +#ifdef __cpp_char8_t + QCOMPARE(QFileInfo(fs::path(u8"./filæ.txt")).absoluteFilePath(), + QFileInfo(u8"./filæ.txt").absoluteFilePath()); + QCOMPARE(QFileInfo(base, fs::path(u8"./filæ.txt")).absoluteFilePath(), + QFileInfo(base, u8"./filæ.txt").absoluteFilePath()); +#endif + #undef COMPARE_CONSTRUCTION { // One proper comparison with operator== for each ctor