From 4fcc45716d80e3f02baf78b002ac76240a51e831 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 2 Nov 2018 08:50:55 +0100 Subject: [PATCH] AutoTest: Display number of skipped in summary If a test run had skipped tests display count of them on the summary as well. Change-Id: Icfc573a4bea4f3081d61767068f151814b8c4033 Reviewed-by: David Schulz --- src/plugins/autotest/testresultspane.cpp | 27 ++++++++++++++---------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index b16b4525142..0c4b9eac652 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/src/plugins/autotest/testresultspane.cpp @@ -454,27 +454,32 @@ void TestResultsPane::initializeFilterMenu() void TestResultsPane::updateSummaryLabel() { - QString labelText = QString("

Test summary:   %1 %2, %3 %4") - .arg(QString::number(m_model->resultTypeCount(Result::Pass)), tr("passes"), - QString::number(m_model->resultTypeCount(Result::Fail)), tr("fails")); - int count = m_model->resultTypeCount(Result::UnexpectedPass); + QString labelText = QString("

"); + labelText.append(tr("Test summary")); + labelText.append(":   "); + int count = m_model->resultTypeCount(Result::Pass); + labelText += QString::number(count) + ' ' + tr("passes"); + count = m_model->resultTypeCount(Result::Fail); + labelText += ", " + QString::number(count) + ' ' + tr("fails"); + count = m_model->resultTypeCount(Result::UnexpectedPass); if (count) - labelText.append(QString(", %1 %2").arg(QString::number(count), tr("unexpected passes"))); + labelText += ", " + QString::number(count) + ' ' + tr("unexpected passes"); count = m_model->resultTypeCount(Result::ExpectedFail); if (count) - labelText.append(QString(", %1 %2").arg(QString::number(count), tr("expected fails"))); + labelText += ", " + QString::number(count) + ' ' + tr("expected fails"); count = m_model->resultTypeCount(Result::MessageFatal); if (count) - labelText.append(QString(", %1 %2").arg(QString::number(count), tr("fatals"))); + labelText += ", " + QString::number(count) + ' ' + tr("fatals"); count = m_model->resultTypeCount(Result::BlacklistedFail) + m_model->resultTypeCount(Result::BlacklistedPass); if (count) - labelText.append(QString(", %1 %2").arg(QString::number(count), tr("blacklisted"))); - + labelText += ", " + QString::number(count) + ' ' + tr("blacklisted"); + count = m_model->resultTypeCount(Result::Skip); + if (count) + labelText += ", " + QString::number(count) + ' ' + tr("skipped"); count = m_model->disabledTests(); if (count) - labelText.append(tr(", %1 disabled").arg(count)); - + labelText += ", " + QString::number(count) + ' ' + tr("disabled"); labelText.append(".

"); m_summaryLabel->setText(labelText); }