From b47b512ab9a767039b629e26daa75b2d2528b025 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Wed, 7 Mar 2018 13:25:40 -0800
Subject: [PATCH] Completed recursive creation of recursive scripts.

---
 tools/auto-tester/src/Test.cpp | 58 ++++++++++++++++++++++++++++++----
 tools/auto-tester/src/Test.h   |  2 ++
 2 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/tools/auto-tester/src/Test.cpp b/tools/auto-tester/src/Test.cpp
index 8267435fad..1078ce1bc4 100644
--- a/tools/auto-tester/src/Test.cpp
+++ b/tools/auto-tester/src/Test.cpp
@@ -311,6 +311,52 @@ void Test::createRecursiveScript() {
         return;
     }
 
+    createRecursiveScript(topLevelDirectory, true);
+}
+
+// This method creates a `testRecursive.js` script in every sub-folder.
+void Test::createRecursiveScriptsRecursively() {
+    // Select folder to start recursing from
+    QString topLevelDirectory = QFileDialog::getExistingDirectory(nullptr, "Please select the root folder for the recursive scripts", ".", QFileDialog::ShowDirsOnly);
+    if (topLevelDirectory == "") {
+        return;
+    }
+
+    createRecursiveScript(topLevelDirectory, false);
+
+    QDirIterator it(topLevelDirectory.toStdString().c_str(), QDirIterator::Subdirectories);
+    while (it.hasNext()) {
+        QString directory = it.next();
+
+        // Only process directories
+        QDir dir();
+        if (!isAValidDirectory(directory)) {
+            continue;
+        }
+
+        // Only process directories that have sub-directories
+        bool hasNoSubDirectories{ true };
+        QDirIterator it2(directory.toStdString().c_str(), QDirIterator::Subdirectories);
+        while (it2.hasNext()) {
+            QString directory2 = it2.next();
+
+            // Only process directories
+            QDir dir();
+            if (isAValidDirectory(directory2)) {
+                hasNoSubDirectories = false;
+                break;
+            }
+        }
+
+        if (!hasNoSubDirectories) {
+            createRecursiveScript(directory, false);
+        }
+    }
+
+    messageBox.information(0, "Success", "Scripts have been created");
+}
+
+void Test::createRecursiveScript(QString topLevelDirectory, bool interactiveMode) {
     const QString recursiveTestsFilename("testRecursive.js");
     QFile allTestsFilename(topLevelDirectory + "/" + recursiveTestsFilename);
     if (!allTestsFilename.open(QIODevice::WriteOnly | QIODevice::Text)) {
@@ -350,7 +396,7 @@ void Test::createRecursiveScript() {
             continue;
         }
 
-        const QString testPathname{ directory + "/" + TEST_FILENAME };
+        const QString testPathname { directory + "/" + TEST_FILENAME };
         QFileInfo fileInfo(testPathname);
         if (fileInfo.exists()) {
             // Current folder contains a test
@@ -360,7 +406,7 @@ void Test::createRecursiveScript() {
         }
     }
 
-    if (testPathnames.length() <= 0) {
+    if (interactiveMode && testPathnames.length() <= 0) {
         messageBox.information(0, "Failure", "No \"" + TEST_FILENAME + "\" files found");
         allTestsFilename.close();
         return;
@@ -370,10 +416,10 @@ void Test::createRecursiveScript() {
     textStream << "autoTester.runRecursive();" << endl;
 
     allTestsFilename.close();
-    messageBox.information(0, "Success", "Script has been created");
-}
-
-void Test::createRecursiveScriptsRecursively() {
+    
+    if (interactiveMode) {
+        messageBox.information(0, "Success", "Script has been created");
+    }
 }
 
 void Test::createTest() {
diff --git a/tools/auto-tester/src/Test.h b/tools/auto-tester/src/Test.h
index 2a26e042b9..411f27eae6 100644
--- a/tools/auto-tester/src/Test.h
+++ b/tools/auto-tester/src/Test.h
@@ -28,6 +28,8 @@ public:
 
     void createRecursiveScript();
     void createRecursiveScriptsRecursively();
+    void createRecursiveScript(QString topLevelDirectory, bool interactiveMode);
+
     void createTest();
     void deleteOldSnapshots();