Expose QTest::currentAppName() and remove hard-coded argv[0] in tests

Except where we're actually testing QCoreApplication::applicationName()
and friends.

Change-Id: I25514884c11f43a4f82b1f818f822dc3d79f69a3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>

5 files changed, 20 insertions, 10 deletions

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index bae4a29457..ff90ed1c0e 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1612,7 +1612,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml)
         }
     }
 
-    bool installedTestCoverage = installCoverageTool(QTestResult::currentAppname(), QTestResult::currentTestObjectName());
+    bool installedTestCoverage = installCoverageTool(QTestResult::currentAppName(), QTestResult::currentTestObjectName());
     QTestLog::setInstalledTestCoverage(installedTestCoverage);
 
     // If no loggers were created by the long version of the -o command-line
@@ -2167,7 +2167,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
 
     QTestResult::setCurrentTestObject(metaObject->className());
     if (argc > 0)
-        QTestResult::setCurrentAppname(argv[0]);
+        QTestResult::setCurrentAppName(argv[0]);
 
     qtest_qParseArgs(argc, argv, false);
 
@@ -2521,6 +2521,14 @@ QTestData &QTest::newRow(const char *dataTag)
 */
 
 /*!
+    Returns the name of the binary that is currently executed.
+*/
+const char *QTest::currentAppName()
+{
+    return QTestResult::currentAppName();
+}
+
+/*!
     Returns the name of the test function that is currently executed.
 
     Example:
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index 6b5e7a574b..ba727b5afe 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -200,6 +200,8 @@ namespace QTest
     Q_TESTLIB_EXPORT void *qElementData(const char *elementName, int metaTypeId);
     Q_TESTLIB_EXPORT QObject *testObject();
 
+    Q_TESTLIB_EXPORT const char *currentAppName();
+
     Q_TESTLIB_EXPORT const char *currentTestFunction();
     Q_TESTLIB_EXPORT const char *currentDataTag();
     Q_TESTLIB_EXPORT bool currentTestFailed();
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index 10936f5c03..5b6cbe658c 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -394,7 +394,7 @@ void QTestLog::stopLogging()
     QTest::TestLoggers::stopLogging();
     QTest::TestLoggers::destroyLoggers();
     QTest::loggerUsingStdout = false;
-    saveCoverageTool(QTestResult::currentAppname(), failCount() != 0, QTestLog::installedTestCoverage());
+    saveCoverageTool(QTestResult::currentAppName(), failCount() != 0, QTestLog::installedTestCoverage());
 }
 
 void QTestLog::addLogger(LogMode mode, const char *filename)
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index 7ab317f209..d94b2bf85c 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -63,7 +63,7 @@ namespace QTest
     static const char *expectFailComment = 0;
     static int expectFailMode = 0;
 
-    static const char *currentAppname = 0;
+    static const char *currentAppName = 0;
 }
 
 void QTestResult::reset()
@@ -318,14 +318,14 @@ bool QTestResult::skipCurrentTest()
     return QTest::skipCurrentTest;
 }
 
-void QTestResult::setCurrentAppname(const char *appname)
+void QTestResult::setCurrentAppName(const char *appName)
 {
-    QTest::currentAppname = appname;
+    QTest::currentAppName = appName;
 }
 
-const char *QTestResult::currentAppname()
+const char *QTestResult::currentAppName()
 {
-    return QTest::currentAppname;
+    return QTest::currentAppName;
 }
 
 QT_END_NAMESPACE
diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h
index 769800d90d..ea8173b169 100644
--- a/src/testlib/qtestresult_p.h
+++ b/src/testlib/qtestresult_p.h
@@ -93,8 +93,8 @@ public:
     static void setSkipCurrentTest(bool value);
     static bool skipCurrentTest();
 
-    static void setCurrentAppname(const char *appname);
-    static const char *currentAppname();
+    static void setCurrentAppName(const char *appName);
+    static const char *currentAppName();
 
 private:
     Q_DISABLE_COPY(QTestResult)