From 4488dad13b9d898d3c0fe802e19943682accea7b Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Sat, 16 Dec 2023 20:18:24 +0200 Subject: [PATCH] tst_qdiriterator: cleanup - Match QCOMPARE logic when printing stringlists that don't match, it's "actual" then "expected" - Use row tag names that don't interfere with the shell; e.g. using `tst_qdiriterator iterateResouce:':/testdata'` doesn't work for some reason, so just add a qrc prefix Change-Id: I3d556b83ec34f2dab15ea3178273af10fb2c62e6 Reviewed-by: Thiago Macieira --- .../corelib/io/qdiriterator/tst_qdiriterator.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp index bd36b937f1..2d69a36810 100644 --- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp +++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp @@ -23,6 +23,8 @@ #include #endif +using namespace Qt::StringLiterals; + Q_DECLARE_METATYPE(QDirIterator::IteratorFlags) Q_DECLARE_METATYPE(QDir::Filters) @@ -356,8 +358,8 @@ void tst_QDirIterator::iterateRelativeDirectory() sortedEntries.sort(); if (sortedEntries != list) { - qDebug() << "EXPECTED:" << sortedEntries; qDebug() << "ACTUAL: " << list; + qDebug() << "EXPECTED:" << sortedEntries; } QCOMPARE(list, sortedEntries); @@ -374,13 +376,14 @@ void tst_QDirIterator::iterateResource_data() QTest::newRow("invalid") << QString::fromLatin1(":/testdata/burpaburpa") << QDirIterator::IteratorFlags{} << QDir::Filters(QDir::NoFilter) << QStringList(QLatin1String("*")) << QStringList(); - QTest::newRow(":/testdata") << QString::fromLatin1(":/testdata/") << QDirIterator::IteratorFlags{} + QTest::newRow("qrc:/testdata") << u":/testdata/"_s << QDirIterator::IteratorFlags{} << QDir::Filters(QDir::NoFilter) << QStringList(QLatin1String("*")) << QString::fromLatin1(":/testdata/entrylist").split(QLatin1String(",")); - QTest::newRow(":/testdata/entrylist") << QString::fromLatin1(":/testdata/entrylist") << QDirIterator::IteratorFlags{} + QTest::newRow("qrc:/testdata/entrylist") << u":/testdata/entrylist"_s << QDirIterator::IteratorFlags{} << QDir::Filters(QDir::NoFilter) << QStringList(QLatin1String("*")) << QString::fromLatin1(":/testdata/entrylist/directory,:/testdata/entrylist/file").split(QLatin1String(",")); - QTest::newRow(":/testdata recursive") << QString::fromLatin1(":/testdata") << QDirIterator::IteratorFlags(QDirIterator::Subdirectories) + QTest::newRow("qrc:/testdata recursive") << u":/testdata"_s + << QDirIterator::IteratorFlags(QDirIterator::Subdirectories) << QDir::Filters(QDir::NoFilter) << QStringList(QLatin1String("*")) << QString::fromLatin1(":/testdata/entrylist,:/testdata/entrylist/directory,:/testdata/entrylist/directory/dummy,:/testdata/entrylist/file").split(QLatin1String(",")); } @@ -406,8 +409,8 @@ void tst_QDirIterator::iterateResource() sortedEntries.sort(); if (sortedEntries != list) { - qDebug() << "EXPECTED:" << sortedEntries; qDebug() << "ACTUAL:" << list; + qDebug() << "EXPECTED:" << sortedEntries; } QCOMPARE(list, sortedEntries);