Refactor blackbox tests.

We want runQbs() to be more flexible while not adding even more function
parameters, so aggregate the possible parameters in a new data
structure.

Change-Id: Ia2f47b7555c8ec5e4ad85ce6b69861e32c764478
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 33 insertions, 2 deletions

diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index f2ca762ef..72a50c7ed 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -34,8 +34,40 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QProcess>
+#include <QProcessEnvironment>
 #include <QtTest>
 
+class QbsRunParameters
+{
+public:
+    QbsRunParameters()
+    {
+        init();
+    }
+
+    QbsRunParameters(const QStringList &args) : arguments(args)
+    {
+        init();
+    }
+
+    QbsRunParameters(const QString &arg) : arguments(arg)
+    {
+        init();
+    }
+
+    void init()
+    {
+        expectFailure = false;
+        useProfile = true;
+        environment = QProcessEnvironment::systemEnvironment();
+    }
+
+    QStringList arguments;
+    QProcessEnvironment environment;
+    bool expectFailure;
+    bool useProfile;
+};
+
 class TestBlackbox : public QObject
 {
     Q_OBJECT
@@ -51,8 +83,7 @@ public:
     TestBlackbox();
 
 protected:
-    int runQbs(QStringList arguments = QStringList(), bool expectFailure = false,
-               bool useProfile = true);
+    int runQbs(const QbsRunParameters &params = QbsRunParameters());
     void rmDirR(const QString &dir);
     void touch(const QString &fn);
     static void waitForNewTimestamp();