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

AutoTest: Display duration inside summary if available

Browse Source 
If the test framework reports durations for the test execution
take these into account and display them inside the summary.
This will display wrong times when mixing test frameworks with
and without displaying durations.

Fixes: QTCREATORBUG-31242
Change-Id: I3d01f53ed370cf0ce631c80979d3d505a895dc16
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2024-07-17 12:18:50 +02:00
parent db23abfb29
commit 4ba039fefa
8 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/autotest/gtest/gtestoutputreader.cpp
View File

@@ -71,6 +71,7 @@ void GTestOutputReader::processOutputLine(const QByteArray &outputLine)
testResult.setResult(ResultType::TestEnd);
testResult.setDescription(Tr::tr("Test execution took %1.").arg(match.captured(2)));
testResult.setDuration(match.captured(3));
m_executionDuration = m_executionDuration.value_or(0) + match.captured(3).toInt();
reportResult(testResult);
m_currentTestSuite.clear();
m_currentTestCase.clear();

5
src/plugins/autotest/qtest/qttestoutputreader.cpp
View File

@@ -283,6 +283,7 @@ void QtTestOutputReader::processXMLOutput(const QByteArray &outputLine)
m_testCase.clear();
} else if (currentTag == QStringLiteral("TestCase")) {
sendFinishMessage(false);
m_executionDuration = qRound(m_duration.toDouble());
} else if (validEndTags.contains(currentTag.toString())) {
if (m_parseMessages && isTestMessage(m_result)) {
const QRegularExpressionMatch match = userFileLocation().match(m_description);
@@ -343,7 +344,7 @@ void QtTestOutputReader::processPlainTextOutput(const QByteArray &outputLine)
static const QRegularExpression config("^Config: Using QtTest library (.*), "
"(Qt (\\d+(\\.\\d+){2}) \\(.*\\))$");
static const QRegularExpression summary("^Totals: (\\d+) passed, (\\d+) failed, "
"(\\d+) skipped(, (\\d+) blacklisted)?(, \\d+ms)?$");
"(\\d+) skipped(, (\\d+) blacklisted)?(, (\\d+)ms)?$");
static const QRegularExpression finish("^[*]{9} Finished testing of (.*) [*]{9}$");
static const QRegularExpression result("^(PASS |FAIL! |XFAIL |XPASS |SKIP |RESULT "
@@ -389,6 +390,8 @@ void QtTestOutputReader::processPlainTextOutput(const QByteArray &outputLine)
// BlacklistedXYZ is wrong here, but we use it for convenience (avoids another enum value)
if (int blacklisted = match.captured(5).toInt())
m_summary[ResultType::BlacklistedPass] = blacklisted;
if (match.hasCaptured(7))
m_executionDuration.emplace(match.captured(7).toInt());
processSummaryFinishOutput();
} else if (finish.match(line).hasMatch()) {
processSummaryFinishOutput();

4
src/plugins/autotest/testoutputreader.h
View File

@@ -25,6 +25,8 @@ public:
int disabledTests() const { return m_disabled; }
bool hasSummary() const { return !m_summary.isEmpty(); }
QHash<ResultType, int> summary() const { return m_summary; }
bool hasDuration() const { return m_executionDuration.has_value(); }
int duration() const { return m_executionDuration.value(); }
void setId(const QString &id) { m_id = id; }
QString id() const { return m_id; }
@@ -49,6 +51,8 @@ protected:
QString m_id;
QHash<ResultType, int> m_summary;
int m_disabled = -1;
std::optional<int> m_executionDuration;
private:
enum class SanitizerOutputMode { None, Asan, Ubsan};
TestResult m_sanitizerResult;

5
src/plugins/autotest/testresultmodel.cpp
View File

@@ -238,6 +238,10 @@ TestResultModel::TestResultModel(QObject *parent)
this, [this](const QString &id, const QHash<ResultType, int> &summary){
m_reportedSummary.insert(id, summary);
});
connect(TestRunner::instance(), &TestRunner::reportDuration,
this, [this](int duration){
m_reportedDurations.emplace(m_reportedDurations.value_or(0) + duration);
});
}
void TestResultModel::updateParent(const TestResultItem *item)
@@ -354,6 +358,7 @@ void TestResultModel::clearTestResults()
clear();
m_testResultCount.clear();
m_reportedSummary.clear();
m_reportedDurations.reset();
m_disabled = 0;
m_fileNames.clear();
m_maxWidthOfFileName = 0;

2
src/plugins/autotest/testresultmodel.h
View File

@@ -70,6 +70,7 @@ public:
int resultTypeCount(ResultType type) const;
int disabledTests() const { return m_disabled; }
std::optional<int> reportedDuration() const { return m_reportedDurations; }
void raiseDisabledTests(int amount) { m_disabled += amount; }
private:
@@ -80,6 +81,7 @@ private:
void updateParent(const TestResultItem *item);
QHash<QString, QMap<ResultType, int>> m_testResultCount;
QHash<QString, QHash<ResultType, int>> m_reportedSummary;
std::optional<int> m_reportedDurations = std::nullopt;
int m_widthOfLineNumber = 0;
int m_maxWidthOfFileName = 0;
int m_disabled = 0;

5
src/plugins/autotest/testresultspane.cpp
View File

@@ -500,7 +500,10 @@ void TestResultsPane::updateSummaryLabel()
count = m_model->disabledTests();
if (count)
labelText += ", " + QString::number(count) + ' ' + Tr::tr("disabled");
labelText.append(".</p>");
if (auto millisec = m_model->reportedDuration())
labelText += ".&nbsp;&nbsp;&nbsp;(" + QString::number(*millisec) + " ms)</p>";
else
labelText.append(".</p>");
m_summaryLabel->setText(labelText);
}

2
src/plugins/autotest/testrunner.cpp
View File

@@ -454,6 +454,8 @@ void TestRunner::runTestsHelper()
emit hadDisabledTests(disabled);
if (testStorage->m_outputReader->hasSummary())
emit reportSummary(testStorage->m_outputReader->id(), testStorage->m_outputReader->summary());
if (testStorage->m_outputReader->hasDuration())
emit reportDuration(testStorage->m_outputReader->duration());
testStorage->m_outputReader->resetCommandlineColor();
}

1
src/plugins/autotest/testrunner.h
View File

@@ -57,6 +57,7 @@ signals:
void testResultReady(const TestResult &result);
void hadDisabledTests(int disabled);
void reportSummary(const QString &id, const QHash<ResultType, int> &summary);
void reportDuration(int duration);
private:
void buildProject(ProjectExplorer::Project *project);