diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-03-23 18:18:41 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-03-23 18:18:41 (GMT) |
| commit | 237b528f518f541d2f6c2ffcbaccca1a776a6f8b (patch) | |
| tree | f11186b016de9729d1bd907f45e9286672971d37 | |
| parent | c6ef7c0cbd2ad7ac486cd6bcabaac4d090df0c03 (diff) | |
| download | Qt-237b528f518f541d2f6c2ffcbaccca1a776a6f8b.zip Qt-237b528f518f541d2f6c2ffcbaccca1a776a6f8b.tar.gz Qt-237b528f518f541d2f6c2ffcbaccca1a776a6f8b.tar.bz2 | |
Fix the test of QDirIterator with NoDot and NoDotDot
The test introduce by c6ef7c0cbd2ad7ac486cd6bcabaac4d090df0c03
would not work because no file would match the filter.
| -rw-r--r-- | tests/auto/qdiriterator/tst_qdiriterator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qdiriterator/tst_qdiriterator.cpp b/tests/auto/qdiriterator/tst_qdiriterator.cpp index 5dc17f3..c1db8f2 100644 --- a/tests/auto/qdiriterator/tst_qdiriterator.cpp +++ b/tests/auto/qdiriterator/tst_qdiriterator.cpp @@ -200,7 +200,7 @@ void tst_QDirIterator::iterateRelativeDirectory_data() QTest::newRow("NoDot") << QString("entrylist") << QDirIterator::IteratorFlags(0) - << QDir::Filters(QDir::NoDot) << QStringList("*") + << QDir::Filters(QDir::AllEntries | QDir::NoDot) << QStringList("*") << QString( #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) "entrylist/..," @@ -217,7 +217,7 @@ void tst_QDirIterator::iterateRelativeDirectory_data() QTest::newRow("NoDotDot") << QString("entrylist") << QDirIterator::IteratorFlags(0) - << QDir::Filters(QDir::NoDotDot) << QStringList("*") + << QDir::Filters(QDir::AllEntries | QDir::NoDotDot) << QStringList("*") << QString( #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) "entrylist/.," @@ -234,7 +234,7 @@ void tst_QDirIterator::iterateRelativeDirectory_data() QTest::newRow("NoDotAndDotDot") << QString("entrylist") << QDirIterator::IteratorFlags(0) - << QDir::Filters(QDir::NoDotAndDotDot) << QStringList("*") + << QDir::Filters(QDir::AllEntries | QDir::NoDotAndDotDot) << QStringList("*") << QString( "entrylist/file," #ifndef Q_NO_SYMLINKS |