qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tst_QDir: use COMPARE_EQ when comparing QStringLists 

It prints the computed and expected lists if they don't match.

Also rename a duplicate test data tag name.

Pick-to: 6.10 6.9 6.8 6.5
Change-Id: Id2d438cdbebd5262fdacdfb3cc29660619aead18
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Ahmad Samir 2025-07-27 23:47:55 +03:00
parent 6ed3789f62
commit fb640ad2f4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/corelib/io/qdir/tst_qdir.cpp
View File

@ -856,7 +856,7 @@ void tst_QDir::entryListWithTestFiles_data()
<< filterLinks(QString(".,..,directory,file,linktodirectory.lnk,linktofile.lnk,writable").split(',')); << filterLinks(QString(".,..,directory,file,linktodirectory.lnk,linktofile.lnk,writable").split(','));
// Tests an assert in QDirSortItemComparator, when QDir::LocaleAware is set // Tests an assert in QDirSortItemComparator, when QDir::LocaleAware is set
// a QCollator is used // a QCollator is used
QTest::newRow("QDir::AllEntries") QTest::newRow("QDir::AllEntries-LocaleAware")
<< (m_dataPath + "/entrylist/") << QStringList("*") << (m_dataPath + "/entrylist/") << QStringList("*")
<< int(QDir::AllEntries) << int(QDir::Name | QDir::LocaleAware) << int(QDir::AllEntries) << int(QDir::Name | QDir::LocaleAware)
<< filterLinks(QString(".,..,directory,file,linktodirectory.lnk,linktofile.lnk,writable").split(',')); << filterLinks(QString(".,..,directory,file,linktodirectory.lnk,linktofile.lnk,writable").split(','));
@ -1031,7 +1031,7 @@ void tst_QDir::entryListWithTestFiles()
QVERIFY2(QFile::remove(testFiles.at(i)), qPrintable(testFiles.at(i))); QVERIFY2(QFile::remove(testFiles.at(i)), qPrintable(testFiles.at(i)));
if (doContentCheck) if (doContentCheck)
QCOMPARE(actual, expected); QCOMPARE_EQ(actual, expected);
} }
void tst_QDir::entryListTimedSort() void tst_QDir::entryListTimedSort()