1 files changed, 68 insertions, 1 deletions
diff --git a/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp b/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp
index ad5ae98..84922f6 100644
--- a/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp
+++ b/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp
@@ -55,12 +55,24 @@ class bench_QDir_tree
 
 public:
     bench_QDir_tree()
-        : prefix("./test-tree/")
+        : prefix("./test-tree/"),
+          musicprefix(QLatin1String("music")),
+          photoprefix(QLatin1String("photos")),
+          sourceprefix(QLatin1String("source")),
+          musicsize(0),
+          photosize(0),
+          sourcesize(0)
     {
     }
 
 private:
     QByteArray prefix;
+    QString musicprefix;
+    QString photoprefix;
+    QString sourceprefix;
+    qint64 musicsize;
+    qint64 photosize;
+    qint64 sourcesize;
 
 private slots:
     void initTestCase()
@@ -105,6 +117,34 @@ private slots:
 
             line.clear();
         }
+
+        //Use case: music collection - 10 files in 100 directories (albums)
+        QVERIFY(fs.createDirectory(musicprefix));
+        for (int i=0;i<1000;i++) {
+            if ((i % 10) == 0)
+                QVERIFY(fs.createDirectory(QString("%1/directory%2").arg(musicprefix).arg(i/10)));
+            qint64 size = fs.createFileWithContent(QString("%1/directory%2/file%3").arg(musicprefix).arg(i/10).arg(i)); 
+            QVERIFY(size > 0);
+            musicsize += size;
+        }
+        //Use case: photos - 1000 files in 1 directory
+        QVERIFY(fs.createDirectory(photoprefix));
+        for (int i=0;i<1000;i++) {
+            qint64 size = fs.createFileWithContent(QString("%1/file%2").arg(photoprefix).arg(i)); 
+            QVERIFY(size > 0);
+            photosize += size;
+        }
+        //Use case: source - 10 files in 10 subdirectories in 10 directories (1000 total)
+        QVERIFY(fs.createDirectory(sourceprefix));
+        for (int i=0;i<1000;i++) {
+            if ((i % 100) == 0)
+                QVERIFY(fs.createDirectory(QString("%1/directory%2").arg(sourceprefix).arg(i/100)));
+            if ((i % 10) == 0)
+                QVERIFY(fs.createDirectory(QString("%1/directory%2/subdirectory%3").arg(sourceprefix).arg(i/100).arg(i/10)));
+            qint64 size = fs.createFileWithContent(QString("%1/directory%2/subdirectory%3/file%4").arg(sourceprefix).arg(i/100).arg(i/10).arg(i)); 
+            QVERIFY(size > 0);
+            sourcesize += size;
+        }
     }
 
     void fileSearch_data() const
@@ -154,6 +194,7 @@ private slots:
                     QDir::AllEntries | QDir::NoDotAndDotDot | QDir::Hidden | QDir::System,
                     QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
 
+            count = 0;
             while (iterator.hasNext()) {
                 iterator.next();
                 ++count;
@@ -165,6 +206,32 @@ private slots:
         QCOMPARE(count, 11963);
     }
 
+    void thousandFiles_data() const
+    {
+        QTest::addColumn<QString>("dirName");
+        QTest::addColumn<qint64>("expectedSize");
+        QTest::newRow("music") << musicprefix << musicsize;
+        QTest::newRow("photos") << photoprefix << photosize;
+        QTest::newRow("src") << sourceprefix << sourcesize;
+    }
+
+    void thousandFiles() const
+    {
+        QFETCH(QString, dirName);
+        QFETCH(qint64, expectedSize);
+        QBENCHMARK {
+            qint64 totalsize = 0;
+            int count = 0;
+            QDirIterator iter(dirName, QDir::Files, QDirIterator::Subdirectories);
+            while(iter.hasNext()) {
+                iter.next();
+                count++;
+                totalsize += iter.fileInfo().size();
+            }
+            QCOMPARE(count, 1000);
+            QCOMPARE(totalsize, expectedSize);
+        }
+    }
 private:
     FileSystem fs;
 };