1 files changed, 24 insertions, 23 deletions
diff --git a/tests/auto/corelib/io/qdirlisting/tst_qdirlisting.cpp b/tests/auto/corelib/io/qdirlisting/tst_qdirlisting.cpp
index 593cae6ddfc..29b78415924 100644
--- a/tests/auto/corelib/io/qdirlisting/tst_qdirlisting.cpp
+++ b/tests/auto/corelib/io/qdirlisting/tst_qdirlisting.cpp
@@ -92,8 +92,8 @@ private slots:
     void uncPaths();
 #endif
 #ifndef Q_OS_WIN
-    void hiddenFiles();
-    void hiddenDirs();
+    void hidden_data();
+    void hidden();
 #endif
 
     void withStdAlgorithms();
@@ -871,45 +871,46 @@ void tst_QDirListing::uncPaths()
 // anything starting by a '.' is a hidden file.
 // For that reason these two tests aren't run on Windows.
 
-void tst_QDirListing::hiddenFiles()
+void tst_QDirListing::hidden_data()
 {
-    QStringList expected = {
+    QTest::addColumn<QDirListing::IteratorFlags>("flags");
+    QTest::addColumn<QStringList>("expected");
+
+    using F = QDirListing::IteratorFlag;
+
+    QTest::newRow("Recursive-ExcludeDirs")
+        << (F::ExcludeDirs | F::IncludeHidden | F::Recursive)
+        << QStringList{
         "hiddenDirs_hiddenFiles/.hiddenDirectory/.hiddenFile"_L1,
         "hiddenDirs_hiddenFiles/.hiddenDirectory/normalFile"_L1,
         "hiddenDirs_hiddenFiles/.hiddenFile"_L1,
         "hiddenDirs_hiddenFiles/normalDirectory/.hiddenFile"_L1,
         "hiddenDirs_hiddenFiles/normalDirectory/normalFile"_L1,
         "hiddenDirs_hiddenFiles/normalFile"_L1,
-    };
-
-    constexpr auto flags = ItFlag::ExcludeDirs | ItFlag::IncludeHidden | ItFlag::Recursive;
-    QStringList list;
-    list.reserve(expected.size());
-    for (const auto &dirEntry : QDirListing(u"hiddenDirs_hiddenFiles"_s, flags)) {
-        QVERIFY(dirEntry.isFile());
-        list.emplace_back(dirEntry.filePath());
-    }
-    list.sort();
-
-    QCOMPARE_EQ(list, expected);
-}
+        };
 
-void tst_QDirListing::hiddenDirs()
-{
-    QStringList expected = {
+    QTest::newRow("Recursive-ExcludeFiles")
+        << (F::ExcludeFiles | F::IncludeHidden | F::Recursive)
+        << QStringList{
         "hiddenDirs_hiddenFiles/.hiddenDirectory"_L1,
         "hiddenDirs_hiddenFiles/.hiddenDirectory/.hidden-subdir"_L1,
         "hiddenDirs_hiddenFiles/.hiddenDirectory/subdir"_L1,
         "hiddenDirs_hiddenFiles/normalDirectory"_L1,
         "hiddenDirs_hiddenFiles/normalDirectory/.hidden-subdir"_L1,
         "hiddenDirs_hiddenFiles/normalDirectory/subdir"_L1,
-    };
+        };
+}
+
+void tst_QDirListing::hidden()
+{
+    QFETCH(QDirListing::IteratorFlags, flags);
+    QFETCH(QStringList, expected);
 
-    constexpr auto flags = ItFlag::ExcludeFiles | ItFlag::IncludeHidden | ItFlag::Recursive;
     QStringList list;
     list.reserve(expected.size());
+    bool isDir = flags.testFlags(ItFlag::ExcludeFiles);
     for (const auto &dirEntry : QDirListing(u"hiddenDirs_hiddenFiles"_s, flags)) {
-        QVERIFY(dirEntry.isDir());
+        QVERIFY(isDir ? dirEntry.isDir() : dirEntry.isFile());
         list.emplace_back(dirEntry.filePath());
     }
     list.sort();