From 18aebc785f80685ce46b45185f30833adf62098e Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Sat, 14 Jan 2023 13:37:33 +0100 Subject: [PATCH] TestResult: Change semantic for createIntermediateResultFor Don't pass the other test result into createIntermediateResultFor(). Rename it to createIntermediateResult() and create a new result based on this object. Fix the caller so that it calls createIntermediateResult() for previously passed "other". Change-Id: I2c87cee1daa4f400c867852d071bd5c91b84dfd5 Reviewed-by: Reviewed-by: Christian Stenger --- src/plugins/autotest/testresult.cpp | 9 ++++----- src/plugins/autotest/testresult.h | 2 +- src/plugins/autotest/testresultmodel.cpp | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/plugins/autotest/testresult.cpp b/src/plugins/autotest/testresult.cpp index fc1f481dfe4..b718b843dba 100644 --- a/src/plugins/autotest/testresult.cpp +++ b/src/plugins/autotest/testresult.cpp @@ -175,15 +175,14 @@ bool TestResult::isIntermediateFor(const TestResult *other) const return !m_id.isEmpty() && m_id == other->m_id && m_name == other->m_name; } -TestResult *TestResult::createIntermediateResultFor(const TestResult *other) const +TestResult *TestResult::createIntermediateResult() const { - QTC_ASSERT(other, return nullptr); - if (other->m_hooks.createResult) { + if (m_hooks.createResult) { TestResult *newResult = new TestResult; - *newResult = other->m_hooks.createResult(*other); + *newResult = m_hooks.createResult(*this); return newResult; } - TestResult *intermediate = new TestResult(other->m_id, other->m_name); + TestResult *intermediate = new TestResult(m_id, m_name); return intermediate; } diff --git a/src/plugins/autotest/testresult.h b/src/plugins/autotest/testresult.h index a136d356e18..08136db6f54 100644 --- a/src/plugins/autotest/testresult.h +++ b/src/plugins/autotest/testresult.h @@ -105,7 +105,7 @@ public: bool isDirectParentOf(const TestResult *other, bool *needsIntermediate) const; bool isIntermediateFor(const TestResult *other) const; - TestResult *createIntermediateResultFor(const TestResult *other) const; + TestResult *createIntermediateResult() const; private: QString m_id; diff --git a/src/plugins/autotest/testresultmodel.cpp b/src/plugins/autotest/testresultmodel.cpp index b975fb34ee8..0eb9faf52e5 100644 --- a/src/plugins/autotest/testresultmodel.cpp +++ b/src/plugins/autotest/testresultmodel.cpp @@ -179,7 +179,7 @@ TestResultItem *TestResultItem::intermediateFor(const TestResultItem *item) cons TestResultItem *TestResultItem::createAndAddIntermediateFor(const TestResultItem *child) { - TestResultPtr result(m_testResult->createIntermediateResultFor(child->testResult())); + TestResultPtr result(child->testResult()->createIntermediateResult()); QTC_ASSERT(!result.isNull(), return nullptr); result->setResult(ResultType::TestStart); TestResultItem *intermediate = new TestResultItem(result);