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

AutoTest: Use TestResult as value type

Browse Source 
Don't construct it on heap and don't use shared pointer for it.

Change-Id: I51c9da405ed14d24b5f20242b4d049f9e2958f09
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2023-01-14 16:25:51 +01:00
parent 3ff5661327
commit d05c5b7d07
54 changed files with 396 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/autotest/testresult.cpp
View File

@@ -15,6 +15,11 @@ TestResult::TestResult(const QString &id, const QString &name, const ResultHooks
{
}
bool TestResult::isValid() const
{
return !m_id.isEmpty();
}
const QString TestResult::outputString(bool selected) const
{
if (m_hooks.outputString)
@@ -113,10 +118,10 @@ QString TestResult::resultToString(const ResultType type)
return QString("BXFAIL");
case ResultType::MessageLocation:
case ResultType::Application:
return QString();
return {};
default:
if (type >= ResultType::INTERNAL_MESSAGES_BEGIN && type <= ResultType::INTERNAL_MESSAGES_END)
return QString();
return {};
return QString("UNKNOWN");
}
}
@@ -156,34 +161,30 @@ QColor TestResult::colorForType(const ResultType type)
}
}
bool TestResult::isDirectParentOf(const TestResult *other, bool *needsIntermediate) const
bool TestResult::isDirectParentOf(const TestResult &other, bool *needsIntermediate) const
{
QTC_ASSERT(other, return false);
const bool ret = !m_id.isEmpty() && m_id == other->m_id && m_name == other->m_name;
QTC_ASSERT(other.isValid(), return false);
const bool ret = !m_id.isEmpty() && m_id == other.m_id && m_name == other.m_name;
if (!ret)
return false;
if (m_hooks.directParent)
return m_hooks.directParent(*this, *other, needsIntermediate);
return m_hooks.directParent(*this, other, needsIntermediate);
return true;
}
bool TestResult::isIntermediateFor(const TestResult *other) const
bool TestResult::isIntermediateFor(const TestResult &other) const
{
QTC_ASSERT(other, return false);
QTC_ASSERT(other.isValid(), return false);
if (m_hooks.intermediate)
return m_hooks.intermediate(*this, *other);
return !m_id.isEmpty() && m_id == other->m_id && m_name == other->m_name;
return m_hooks.intermediate(*this, other);
return !m_id.isEmpty() && m_id == other.m_id && m_name == other.m_name;
}
TestResult *TestResult::createIntermediateResult() const
TestResult TestResult::intermediateResult() const
{
if (m_hooks.createResult) {
TestResult *newResult = new TestResult;
*newResult = m_hooks.createResult(*this);
return newResult;
}
TestResult *intermediate = new TestResult(m_id, m_name);
return intermediate;
if (m_hooks.createResult)
return m_hooks.createResult(*this);
return {m_id, m_name};
}
} // namespace Autotest