diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-23 15:59:32 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-12-09 20:54:26 +0100 |
commit | 77a93e6df331e5ed22aef4335d8de38abe2ca586 (patch) | |
tree | ace152ec3685282a07f890e4c95aac057693b5e5 /src/testlib/qplaintestlogger.cpp | |
parent | 1c24b4b8d9fe16eaa4bc1598df117593d814bf50 (diff) |
Make Skip an incident in test logging
Skip ends the test (albeit inconclusively). Rearrange the enums in
the abstract logger, move code to handle skip between relevant
function and tidy up various things that became simpler as a result.
Also reorder the message enum, and its switches, to separate testlib's
internals from the usual Qt messages, and put each group in ascending
order of severity.
Task-number: QTBUG-96844
Change-Id: I2c7a634b9f849830d64eafa750155e66e244b729
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/testlib/qplaintestlogger.cpp')
-rw-r--r-- | src/testlib/qplaintestlogger.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index 463fae0e34..75517ac060 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -77,6 +77,8 @@ namespace QTest { static const char *incidentType2String(QAbstractTestLogger::IncidentTypes type) { switch (type) { + case QAbstractTestLogger::Skip: + return "SKIP "; case QAbstractTestLogger::Pass: return "PASS "; case QAbstractTestLogger::XFail: @@ -105,22 +107,20 @@ namespace QTest { static const char *messageType2String(QAbstractTestLogger::MessageTypes type) { switch (type) { - case QAbstractTestLogger::Skip: - return "SKIP "; - case QAbstractTestLogger::Warn: - return "WARNING"; - case QAbstractTestLogger::QWarning: - return "QWARN "; case QAbstractTestLogger::QDebug: return "QDEBUG "; case QAbstractTestLogger::QInfo: return "QINFO "; + case QAbstractTestLogger::QWarning: + return "QWARN "; case QAbstractTestLogger::QCritical: return "QCRITICAL"; case QAbstractTestLogger::QFatal: return "QFATAL "; case QAbstractTestLogger::Info: return "INFO "; + case QAbstractTestLogger::Warn: + return "WARNING"; } return "??????"; } |