feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Rename results executable

Browse Source 
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>
This commit is contained in:
Christian Stenger
2018-05-09 10:48:23 +02:00
committed by David Schulz
parent 1f3381a3c2
commit 78bd3f9ec3
13 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/autotest/qtest/qttestresult.cpp
View File

@@ -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;