testlib: Rename QAbstractTestLogger::QSystem to QCritical
It's used to handle qCritical() messages, and corresponds to QtMsgType's QtCriticalMsg, so change its name to reflect what it really is. In the process, reclassify the -maxwarnings overflow message as a warning, rather than a critical message. Pick-to: 6.2 Change-Id: I87626117a547ae4498d5dc352b93bd6db8bfb332 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
parent
308280e7a9
commit
ca15cc0049
@ -135,7 +135,7 @@ void QAbstractTestLogger::addMessage(QtMsgType type, const QMessageLogContext &c
|
||||
switch (type) {
|
||||
case QtDebugMsg: return QAbstractTestLogger::QDebug;
|
||||
case QtInfoMsg: return QAbstractTestLogger::QInfo;
|
||||
case QtCriticalMsg: return QAbstractTestLogger::QSystem;
|
||||
case QtCriticalMsg: return QAbstractTestLogger::QCritical;
|
||||
case QtWarningMsg: return QAbstractTestLogger::QWarning;
|
||||
case QtFatalMsg: return QAbstractTestLogger::QFatal;
|
||||
}
|
||||
|
@ -79,7 +79,7 @@ public:
|
||||
Warn,
|
||||
QWarning,
|
||||
QDebug,
|
||||
QSystem,
|
||||
QCritical,
|
||||
QFatal,
|
||||
Skip,
|
||||
Info,
|
||||
|
@ -149,8 +149,8 @@ void QAppleTestLogger::addMessage(MessageTypes type, const QString &message, con
|
||||
return MessageData{QtWarningMsg, nullptr};
|
||||
case QAbstractTestLogger::QDebug:
|
||||
return MessageData{QtDebugMsg, nullptr};
|
||||
case QAbstractTestLogger::QSystem:
|
||||
return MessageData{QtWarningMsg, "system"};
|
||||
case QAbstractTestLogger::QCritical:
|
||||
return MessageData{QtWarningMsg, "critical"};
|
||||
case QAbstractTestLogger::QFatal:
|
||||
return MessageData{QtFatalMsg, nullptr};
|
||||
case QAbstractTestLogger::Skip:
|
||||
|
@ -304,8 +304,8 @@ void QJUnitTestLogger::addMessage(MessageTypes type, const QString &message, con
|
||||
systemLogElement = systemErrorElement;
|
||||
typeBuf = "warn";
|
||||
break;
|
||||
case QAbstractTestLogger::QSystem:
|
||||
typeBuf = "system";
|
||||
case QAbstractTestLogger::QCritical:
|
||||
typeBuf = "qcritical";
|
||||
break;
|
||||
case QAbstractTestLogger::QDebug:
|
||||
typeBuf = "qdebug";
|
||||
|
@ -115,8 +115,8 @@ namespace QTest {
|
||||
return "QDEBUG ";
|
||||
case QAbstractTestLogger::QInfo:
|
||||
return "QINFO ";
|
||||
case QAbstractTestLogger::QSystem:
|
||||
return "QSYSTEM";
|
||||
case QAbstractTestLogger::QCritical:
|
||||
return "QCRITICAL";
|
||||
case QAbstractTestLogger::QFatal:
|
||||
return "QFATAL ";
|
||||
case QAbstractTestLogger::Info:
|
||||
|
@ -87,8 +87,8 @@ namespace QTest {
|
||||
return "QDEBUG";
|
||||
case QAbstractTestLogger::QInfo:
|
||||
return "QINFO";
|
||||
case QAbstractTestLogger::QSystem:
|
||||
return "QSYSTEM";
|
||||
case QAbstractTestLogger::QCritical:
|
||||
return "QCRITICAL";
|
||||
case QAbstractTestLogger::QFatal:
|
||||
return "QFATAL";
|
||||
case QAbstractTestLogger::Info:
|
||||
|
@ -223,7 +223,7 @@ namespace QTest {
|
||||
|
||||
if (!counter.deref()) {
|
||||
FOREACH_TEST_LOGGER {
|
||||
logger->addMessage(QAbstractTestLogger::QSystem,
|
||||
logger->addMessage(QAbstractTestLogger::Warn,
|
||||
QStringLiteral("Maximum amount of warnings exceeded. Use -maxwarnings to override."));
|
||||
}
|
||||
return;
|
||||
|
@ -58,8 +58,8 @@ namespace QTest {
|
||||
switch (type) {
|
||||
case QAbstractTestLogger::Warn:
|
||||
return "warn";
|
||||
case QAbstractTestLogger::QSystem:
|
||||
return "system";
|
||||
case QAbstractTestLogger::QCritical:
|
||||
return "qcritical";
|
||||
case QAbstractTestLogger::QDebug:
|
||||
return "qdebug";
|
||||
case QAbstractTestLogger::QInfo:
|
||||
|
@ -2008,10 +2008,7 @@
|
||||
<!-- type="qwarn" message="1998" -->
|
||||
<!-- type="qwarn" message="1999" -->
|
||||
<!-- type="qwarn" message="2000" -->
|
||||
<!-- type="system" message="Maximum amount of warnings exceeded. Use -maxwarnings to override." -->
|
||||
<system-out>
|
||||
<![CDATA[Maximum amount of warnings exceeded. Use -maxwarnings to override.]]>
|
||||
</system-out>
|
||||
<!-- type="warn" message="Maximum amount of warnings exceeded. Use -maxwarnings to override." -->
|
||||
<system-err>
|
||||
<![CDATA[0]]>
|
||||
<![CDATA[1]]>
|
||||
@ -4014,6 +4011,7 @@
|
||||
<![CDATA[1998]]>
|
||||
<![CDATA[1999]]>
|
||||
<![CDATA[2000]]>
|
||||
<![CDATA[Maximum amount of warnings exceeded. Use -maxwarnings to override.]]>
|
||||
</system-err>
|
||||
</testcase>
|
||||
<testcase name="cleanupTestCase" classname="MaxWarnings" time="@TEST_DURATION@"/>
|
||||
|
@ -6011,7 +6011,7 @@
|
||||
<Message type="qwarn" file="" line="0">
|
||||
<Description><![CDATA[2000]]></Description>
|
||||
</Message>
|
||||
<Message type="system" file="" line="0">
|
||||
<Message type="warn" file="" line="0">
|
||||
<Description><![CDATA[Maximum amount of warnings exceeded. Use -maxwarnings to override.]]></Description>
|
||||
</Message>
|
||||
<Incident type="pass" file="" line="0" />
|
||||
|
File diff suppressed because one or more lines are too long
@ -2002,7 +2002,7 @@ QWARN : MaxWarnings::warn() 1997
|
||||
QWARN : MaxWarnings::warn() 1998
|
||||
QWARN : MaxWarnings::warn() 1999
|
||||
QWARN : MaxWarnings::warn() 2000
|
||||
QSYSTEM: MaxWarnings::warn() Maximum amount of warnings exceeded. Use -maxwarnings to override.
|
||||
WARNING: MaxWarnings::warn() Maximum amount of warnings exceeded. Use -maxwarnings to override.
|
||||
PASS : MaxWarnings::warn()
|
||||
PASS : MaxWarnings::cleanupTestCase()
|
||||
Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
|
||||
|
@ -6013,7 +6013,7 @@
|
||||
<Message type="qwarn" file="" line="0">
|
||||
<Description><![CDATA[2000]]></Description>
|
||||
</Message>
|
||||
<Message type="system" file="" line="0">
|
||||
<Message type="warn" file="" line="0">
|
||||
<Description><![CDATA[Maximum amount of warnings exceeded. Use -maxwarnings to override.]]></Description>
|
||||
</Message>
|
||||
<Incident type="pass" file="" line="0" />
|
||||
|
Loading…
x
Reference in New Issue
Block a user