whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <thiago.macieira@intel.com>
bb10
Ahmad Samir 2023-12-16 20:18:24 +02:00
parent b492582b9c
commit 4488dad13b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
View File

@ -23,6 +23,8 @@
#include <QStandardPaths>
#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);