Restructure tst_QDir::mkdirRmdir_data()

Iterate over a struct array rather than having a list of strings to
pull things out of, by individual index; this makes it easy to include
the non-existence check for directories in the same loop. In the
process, give the absolute-path tests a prefix to mirror the relative-
prefix on their partners. This prepares the way for adding more
test-cases.

Change-Id: Id839caedf92387dfa9b94f31253410285f72ff70
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 15 insertions, 15 deletions

diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp
index 34588b19bc..6cca360fef 100644
--- a/tests/auto/corelib/io/qdir/tst_qdir.cpp
+++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp
@@ -349,21 +349,21 @@ void tst_QDir::mkdirRmdir_data()
     QTest::addColumn<QString>("path");
     QTest::addColumn<bool>("recurse");
 
-    QStringList dirs;
-    dirs << "testdir/one"
-         << "testdir/two/three/four"
-         << "testdir/../testdir/three";
-    QTest::newRow("plain") << QDir::currentPath() + "/" + dirs.at(0) << false;
-    QTest::newRow("recursive") << QDir::currentPath() + "/" + dirs.at(1) << true;
-    QTest::newRow("with-..") << QDir::currentPath() + "/" + dirs.at(2) << false;
-
-    QTest::newRow("relative-plain") << dirs.at(0) << false;
-    QTest::newRow("relative-recursive") << dirs.at(1) << true;
-    QTest::newRow("relative-with-..") << dirs.at(2) << false;
-
-    // Ensure that none of these directories already exist
-    for (int i = 0; i < dirs.count(); ++i)
-        QVERIFY(!QFile::exists(dirs.at(i)));
+    const struct {
+        const char *name; // shall have a prefix added
+        const char *path; // relative
+        bool recurse;
+    } cases[] = {
+        { "plain", "testdir/one", false },
+        { "recursive", "testdir/two/three/four", true },
+        { "with-..", "testdir/../testdir/three", false },
+    };
+
+    for (const auto &it : cases) {
+        QVERIFY(!QFile::exists(it.path));
+        QTest::addRow("absolute-%s", it.name) << (QDir::currentPath() + "/") + it.path << it.recurse;
+        QTest::addRow("relative-%s", it.name) << QString::fromLatin1(it.path) << it.recurse;
+    }
 }
 
 void tst_QDir::mkdirRmdir()