AutoTest: Rename results executable

Rename member to better reflect its meaning. It is used
as an identifier and might be something else than an
executable.

Change-Id: I082e3caaa3d94fcd7ab26ebc43bb0eb6da136d57
Reviewed-by: David Schulz <david.schulz@qt.io>

13 files changed, 25 insertions, 27 deletions

diff --git a/src/plugins/autotest/gtest/gtestoutputreader.cpp b/src/plugins/autotest/gtest/gtestoutputreader.cpp
index 287e144a27..29445f23c6 100644
--- a/src/plugins/autotest/gtest/gtestoutputreader.cpp
+++ b/src/plugins/autotest/gtest/gtestoutputreader.cpp
@@ -45,7 +45,6 @@ GTestOutputReader::GTestOutputReader(const QFutureInterface<TestResultPtr> &futu
                                      QProcess *testApplication, const QString &buildDirectory,
                                      const QString &projectFile)
     : TestOutputReader(futureInterface, testApplication, buildDirectory)
-    , m_executable(testApplication ? testApplication->program() : QString())
     , m_projectFile(projectFile)
 {
     if (m_testApplication) {
@@ -54,7 +53,7 @@ GTestOutputReader::GTestOutputReader(const QFutureInterface<TestResultPtr> &futu
                 this, [this] (int exitCode, QProcess::ExitStatus /*exitStatus*/) {
             if (exitCode == 1 && !m_description.isEmpty()) {
                 createAndReportResult(tr("Running tests failed.\n %1\nExecutable: %2")
-                        .arg(m_description).arg(m_executable), Result::MessageFatal);
+                        .arg(m_description).arg(id()), Result::MessageFatal);
             }
             // on Windows abort() will result in normal termination, but exit code will be set to 3
             if (Utils::HostOsInfo::isWindowsHost() && exitCode == 3)
@@ -176,7 +175,7 @@ void GTestOutputReader::processOutput(const QByteArray &outputLine)
 
 TestResultPtr GTestOutputReader::createDefaultResult() const
 {
-    GTestResult *result = new GTestResult(m_executable, m_projectFile, m_currentTestName);
+    GTestResult *result = new GTestResult(id(), m_projectFile, m_currentTestName);
     result->setTestSetName(m_currentTestSet);
     result->setIteration(m_iteration);
 
diff --git a/src/plugins/autotest/gtest/gtestoutputreader.h b/src/plugins/autotest/gtest/gtestoutputreader.h
index c51faa08e3..fd60b9fbed 100644
--- a/src/plugins/autotest/gtest/gtestoutputreader.h
+++ b/src/plugins/autotest/gtest/gtestoutputreader.h
@@ -51,7 +51,6 @@ private:
     void setCurrentTestSet(const QString &testSet);
     void setCurrentTestName(const QString &testName);
 
-    QString m_executable;
     QString m_projectFile;
     QString m_currentTestName;
     QString m_currentTestSet;
diff --git a/src/plugins/autotest/gtest/gtestresult.cpp b/src/plugins/autotest/gtest/gtestresult.cpp
index 9c7210ffba..9ffd361ce6 100644
--- a/src/plugins/autotest/gtest/gtestresult.cpp
+++ b/src/plugins/autotest/gtest/gtestresult.cpp
@@ -38,9 +38,9 @@ GTestResult::GTestResult(const QString &projectFile, const QString &name)
 {
 }
 
-GTestResult::GTestResult(const QString &executable, const QString &projectFile,
+GTestResult::GTestResult(const QString &id, const QString &projectFile,
                          const QString &name)
-    : TestResult(executable, name), m_projectFile(projectFile)
+    : TestResult(id, name), m_projectFile(projectFile)
 {
 }
 
diff --git a/src/plugins/autotest/gtest/gtestresult.h b/src/plugins/autotest/gtest/gtestresult.h
index a498184d36..a0f33fa11a 100644
--- a/src/plugins/autotest/gtest/gtestresult.h
+++ b/src/plugins/autotest/gtest/gtestresult.h
@@ -34,7 +34,7 @@ class GTestResult : public TestResult
 {
 public:
     GTestResult(const QString &projectFile, const QString &name = QString());
-    GTestResult(const QString &executable, const QString &projectFile, const QString &name);
+    GTestResult(const QString &id, const QString &projectFile, const QString &name);
     const QString outputString(bool selected) const override;
 
     void setTestSetName(const QString &testSetName) { m_testSetName = testSetName; }
diff --git a/src/plugins/autotest/qtest/qttestoutputreader.cpp b/src/plugins/autotest/qtest/qttestoutputreader.cpp
index 2c046e1a33..d56a1658ec 100644
--- a/src/plugins/autotest/qtest/qttestoutputreader.cpp
+++ b/src/plugins/autotest/qtest/qttestoutputreader.cpp
@@ -133,7 +133,6 @@ QtTestOutputReader::QtTestOutputReader(const QFutureInterface<TestResultPtr> &fu
                                        QProcess *testApplication, const QString &buildDirectory,
                                        const QString &projectFile, OutputMode mode, TestType type)
     : TestOutputReader(futureInterface, testApplication, buildDirectory)
-    , m_executable(testApplication ? testApplication->program() : QString())
     , m_projectFile(projectFile)
     , m_mode(mode)
     , m_testType(type)
@@ -157,7 +156,7 @@ void QtTestOutputReader::processOutput(const QByteArray &outputLine)
 
 TestResultPtr QtTestOutputReader::createDefaultResult() const
 {
-    QtTestResult *result = new QtTestResult(m_executable, m_projectFile, m_testType, m_className);
+    QtTestResult *result = new QtTestResult(id(), m_projectFile, m_testType, m_className);
     result->setFunctionName(m_testCase);
     result->setDataTag(m_dataTag);
     return TestResultPtr(result);
diff --git a/src/plugins/autotest/qtest/qttestoutputreader.h b/src/plugins/autotest/qtest/qttestoutputreader.h
index 1c18c88408..3487cce066 100644
--- a/src/plugins/autotest/qtest/qttestoutputreader.h
+++ b/src/plugins/autotest/qtest/qttestoutputreader.h
@@ -78,7 +78,6 @@ private:
     };
 
     CDATAMode m_cdataMode = None;
-    QString m_executable;
     QString m_projectFile;
     QString m_className;
     QString m_testCase;
diff --git a/src/plugins/autotest/qtest/qttestresult.cpp b/src/plugins/autotest/qtest/qttestresult.cpp
index 39e62faa3d..8655f690cd 100644
--- a/src/plugins/autotest/qtest/qttestresult.cpp
+++ b/src/plugins/autotest/qtest/qttestresult.cpp
@@ -39,9 +39,9 @@ QtTestResult::QtTestResult(const QString &projectFile, TestType type, const QStr
 {
 }
 
-QtTestResult::QtTestResult(const QString &executable, const QString &projectFile, TestType type,
+QtTestResult::QtTestResult(const QString &id, const QString &projectFile, TestType type,
                            const QString &className)
-    : TestResult(executable, className), m_projectFile(projectFile), m_type(type)
+    : TestResult(id, className), m_projectFile(projectFile), m_type(type)
 {
 }
 
@@ -111,7 +111,7 @@ bool QtTestResult::isIntermediateFor(const TestResult *other) const
     QTC_ASSERT(other, return false);
     const QtTestResult *qtOther = static_cast<const QtTestResult *>(other);
     return m_dataTag == qtOther->m_dataTag && m_function == qtOther->m_function
-            && name() == qtOther->name() && executable() == qtOther->executable()
+            && name() == qtOther->name() && id() == qtOther->id()
             && m_projectFile == qtOther->m_projectFile;
 }
 
@@ -119,7 +119,7 @@ TestResult *QtTestResult::createIntermediateResultFor(const TestResult *other)
 {
     QTC_ASSERT(other, return nullptr);
     const QtTestResult *qtOther = static_cast<const QtTestResult *>(other);
-    QtTestResult *intermediate = new QtTestResult(qtOther->executable(), qtOther->m_projectFile,
+    QtTestResult *intermediate = new QtTestResult(qtOther->id(), qtOther->m_projectFile,
                                                   m_type, qtOther->name());
     intermediate->m_function = qtOther->m_function;
     intermediate->m_dataTag = qtOther->m_dataTag;
diff --git a/src/plugins/autotest/qtest/qttestresult.h b/src/plugins/autotest/qtest/qttestresult.h
index 04b4e00d20..a0735a90c7 100644
--- a/src/plugins/autotest/qtest/qttestresult.h
+++ b/src/plugins/autotest/qtest/qttestresult.h
@@ -35,7 +35,7 @@ class QtTestResult : public TestResult
 {
 public:
     QtTestResult(const QString &projectFile, TestType type, const QString &className = QString());
-    QtTestResult(const QString &executable, const QString &projectFile, TestType type,
+    QtTestResult(const QString &id, const QString &projectFile, TestType type,
                  const QString &className);
     const QString outputString(bool selected) const override;
 
diff --git a/src/plugins/autotest/testoutputreader.cpp b/src/plugins/autotest/testoutputreader.cpp
index a0e5807298..f888f7b34c 100644
--- a/src/plugins/autotest/testoutputreader.cpp
+++ b/src/plugins/autotest/testoutputreader.cpp
@@ -38,6 +38,7 @@ TestOutputReader::TestOutputReader(const QFutureInterface<TestResultPtr> &future
     : m_futureInterface(futureInterface)
     , m_testApplication(testApplication)
     , m_buildDir(buildDirectory)
+    , m_id(testApplication ? testApplication->program() : QString())
 {
     if (m_testApplication) {
         connect(m_testApplication, &QProcess::readyRead,
diff --git a/src/plugins/autotest/testoutputreader.h b/src/plugins/autotest/testoutputreader.h
index e4935a1149..225ad3de33 100644
--- a/src/plugins/autotest/testoutputreader.h
+++ b/src/plugins/autotest/testoutputreader.h
@@ -47,6 +47,8 @@ public:
     void reportCrash();
     void createAndReportResult(const QString &message, Result::Type type);
     bool hadValidOutput() const { return m_hadValidOutput; }
+    void setId(const QString &id) { m_id = id; }
+    QString id() const { return m_id; }
 
 signals:
     void newOutputAvailable(const QByteArray &output);
@@ -57,6 +59,7 @@ protected:
     QFutureInterface<TestResultPtr> m_futureInterface;
     QProcess *m_testApplication;  // not owned
     QString m_buildDir;
+    QString m_id;
 private:
     bool m_hadValidOutput = false;
 };
diff --git a/src/plugins/autotest/testresult.cpp b/src/plugins/autotest/testresult.cpp
index b93aa50849..47c4b3dba6 100644
--- a/src/plugins/autotest/testresult.cpp
+++ b/src/plugins/autotest/testresult.cpp
@@ -47,8 +47,8 @@ TestResult::TestResult(const QString &name)
 {
 }
 
-TestResult::TestResult(const QString &executable, const QString &name)
-    : m_executable(executable)
+TestResult::TestResult(const QString &id, const QString &name)
+    : m_id(id)
     , m_name(name)
 {
 }
@@ -185,21 +185,19 @@ bool TestResult::isMessageCaseStart(const Result::Type type)
 bool TestResult::isDirectParentOf(const TestResult *other, bool * /*needsIntermediate*/) const
 {
     QTC_ASSERT(other, return false);
-    return !m_executable.isEmpty() && m_executable == other->m_executable
-            && m_name == other->m_name;
+    return !m_id.isEmpty() && m_id == other->m_id && m_name == other->m_name;
 }
 
 bool TestResult::isIntermediateFor(const TestResult *other) const
 {
     QTC_ASSERT(other, return false);
-    return !m_executable.isEmpty() && m_executable == other->m_executable
-            && m_name == other->m_name;
+    return !m_id.isEmpty() && m_id == other->m_id && m_name == other->m_name;
 }
 
 TestResult *TestResult::createIntermediateResultFor(const TestResult *other)
 {
     QTC_ASSERT(other, return nullptr);
-    TestResult *intermediate = new TestResult(other->m_executable, other->m_name);
+    TestResult *intermediate = new TestResult(other->m_id, other->m_name);
     return intermediate;
 }
 
diff --git a/src/plugins/autotest/testresult.h b/src/plugins/autotest/testresult.h
index d094c345ed..d7f931da17 100644
--- a/src/plugins/autotest/testresult.h
+++ b/src/plugins/autotest/testresult.h
@@ -74,13 +74,13 @@ class TestResult
 public:
     TestResult();
     explicit TestResult(const QString &name);
-    TestResult(const QString &executable, const QString &name);
+    TestResult(const QString &id, const QString &name);
     virtual ~TestResult() {}
 
     virtual const QString outputString(bool selected) const;
     virtual const TestTreeItem *findTestTreeItem() const;
 
-    QString executable() const { return m_executable; }
+    QString id() const { return m_id; }
     QString name() const { return m_name; }
     Result::Type result() const { return m_result; }
     QString description() const { return m_description; }
@@ -103,7 +103,7 @@ public:
     virtual TestResult *createIntermediateResultFor(const TestResult *other);
 
 private:
-    QString m_executable;
+    QString m_id;
     QString m_name;
     Result::Type m_result = Result::Invalid;
     QString m_description;
diff --git a/src/plugins/autotest/testresultmodel.cpp b/src/plugins/autotest/testresultmodel.cpp
index ce15f7ec9c..4702894105 100644
--- a/src/plugins/autotest/testresultmodel.cpp
+++ b/src/plugins/autotest/testresultmodel.cpp
@@ -311,13 +311,13 @@ TestResultItem *TestResultModel::findParentItemFor(const TestResultItem *item,
     TestResultItem *root = startItem ? const_cast<TestResultItem *>(startItem) : nullptr;
     const TestResult *result = item->testResult();
     const QString &name = result->name();
-    const QString &executable = result->executable();
+    const QString &id = result->id();
 
     if (root == nullptr && !name.isEmpty()) {
         for (int row = rootItem()->childCount() - 1; row >= 0; --row) {
             TestResultItem *tmp = static_cast<TestResultItem *>(rootItem()->childAt(row));
             auto tmpTestResult = tmp->testResult();
-            if (tmpTestResult->executable() == executable && tmpTestResult->name() == name) {
+            if (tmpTestResult->id() == id && tmpTestResult->name() == name) {
                 root = tmp;
                 break;
             }