AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tidy up in QTapTestLogger::addIncident()

Browse Source 
After we've checked m_wasExpectedFail, we might as well set it
promptly, since one of our earlier checks is on the same
condition. Explain what that check is about, fix a typo in another
comment and make the local ok variable const, since it can be.

Change-Id: Ie04c0ad4248e47b116d3e22046116d39cf2ac6df
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Edward Welbourne 2021-12-02 12:17:56 +01:00
parent 6729a4b29c
commit 91e8d8027d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/testlib/qtaptestlogger.cpp
View File

@ -121,9 +121,9 @@ void QTapTestLogger::addIncident(IncidentTypes type, const char *description,
// to emit a single test point for it, so skip the this pass.
return;
}
bool ok = type == Pass || type == BlacklistedPass || type == Skip
|| type == XPass || type == BlacklistedXPass;
m_wasExpectedFail = type == XFail || type == BlacklistedXFail;
const bool ok = type == Pass || type == BlacklistedPass || type == Skip
|| type == XPass || type == BlacklistedXPass;
const char *const incident = [type]() {
switch (type) {
@ -150,15 +150,15 @@ void QTapTestLogger::addIncident(IncidentTypes type, const char *description,
}
int testNumber = QTestLog::totalCount();
if (type == XFail || type == BlacklistedXFail) {
// The global test counter hasn't been updated yet for XFail
// That counts Pass, Fail, Skip and blacklisted; the XFail will eventually
// be added to it as a Pass, but that hasn't heppened yet, so count it now:
if (m_wasExpectedFail)
testNumber += 1;
}
outputTestLine(ok, testNumber, directive);
if (!ok) {
// All failures need a diagnostics sections to not confuse consumers
// All failures need a diagnostics section to not confuse consumers
// The indent needs to be two spaces for maximum compatibility
#define YAML_INDENT " "
@ -250,8 +250,6 @@ void QTapTestLogger::addIncident(IncidentTypes type, const char *description,
outputString(YAML_INDENT "...\n");
}
m_wasExpectedFail = (type == XFail || type == BlacklistedXFail);
}
void QTapTestLogger::addMessage(MessageTypes type, const QString &message,