whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testlib: Don't write redundant log message information in JUnit reporter 

The separation between <system-out> and <system-err> is sufficient, and
we can't expect consumers to interpret our custom comment format.

The type of the text node has been renamed to more accurately identify
its purpose.

Pick-to: 6.2
Change-Id: I63c8ff17529fc087e1b695698350a6711eb5e68d
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Tor Arne Vestbø 2021-08-03 14:27:45 +02:00
parent c08d56be1f
commit 4632be1b4d
19 changed files with 29 additions and 2369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/testlib/qjunittestlogger.cpp
View File

@ -270,9 +270,9 @@ void QJUnitTestLogger::addFailure(QTest::LogElementType elementType,
failureElement->addAttribute(QTest::AI_Message, message.toUtf8().constData());
if (!details.isEmpty()) {
auto messageElement = new QTestElement(QTest::LET_Message);
messageElement->addAttribute(QTest::AI_Message, details.toUtf8().constData());
failureElement->addLogElement(messageElement);
auto textNode = new QTestElement(QTest::LET_Text);
textNode->addAttribute(QTest::AI_Value, details.toUtf8().constData());
failureElement->addLogElement(textNode);
}
currentTestCase->addLogElement(failureElement);
@ -294,62 +294,29 @@ void QJUnitTestLogger::addMessage(MessageTypes type, const QString &message, con
skippedElement->addAttribute(QTest::AI_Message, message.toUtf8().constData());
currentTestCase->addLogElement(skippedElement);
return;
}
auto systemLogElement = systemOutputElement;
const char *typeBuf = nullptr;
switch (type) {
case QAbstractTestLogger::Warn:
systemLogElement = systemErrorElement;
typeBuf = "warn";
break;
case QAbstractTestLogger::QCritical:
systemLogElement = systemErrorElement;
typeBuf = "qcritical";
break;
case QAbstractTestLogger::QDebug:
typeBuf = "qdebug";
break;
case QAbstractTestLogger::QInfo:
typeBuf = "qinfo";
break;
case QAbstractTestLogger::QWarning:
systemLogElement = systemErrorElement;
typeBuf = "qwarn";
break;
case QAbstractTestLogger::QFatal:
systemLogElement = systemErrorElement;
typeBuf = "qfatal";
break;
case QAbstractTestLogger::Skip:
Q_UNREACHABLE();
break;
case QAbstractTestLogger::Info:
typeBuf = "info";
break;
default:
typeBuf = "??????";
break;
}
if (type == QAbstractTestLogger::QFatal) {
addFailure(QTest::LET_Error, typeBuf, message);
} else if (type == QAbstractTestLogger::QFatal) {
addFailure(QTest::LET_Error, "qfatal", message);
return;
}
auto messageElement = new QTestElement(QTest::LET_Message);
messageElement->addAttribute(QTest::AI_Type, typeBuf);
messageElement->addAttribute(QTest::AI_Message, message.toUtf8().constData());
auto systemLogElement = [&]() {
switch (type) {
case QAbstractTestLogger::QDebug:
case QAbstractTestLogger::Info:
case QAbstractTestLogger::QInfo:
return systemOutputElement;
case QAbstractTestLogger::Warn:
case QAbstractTestLogger::QWarning:
case QAbstractTestLogger::QCritical:
return systemErrorElement;
default:
Q_UNREACHABLE();
}
}();
currentTestCase->addLogElement(messageElement);
// Also add the message to the system log (stdout/stderr), if one exists
if (systemLogElement) {
auto messageElement = new QTestElement(QTest::LET_Message);
messageElement->addAttribute(QTest::AI_Message, message.toUtf8().constData());
systemLogElement->addLogElement(messageElement);
}
auto textNode = new QTestElement(QTest::LET_Text);
textNode->addAttribute(QTest::AI_Value, message.toUtf8().constData());
systemLogElement->addLogElement(textNode);
}
QT_END_NAMESPACE

2
src/testlib/qtestelementattribute_p.h
View File

@ -94,7 +94,7 @@ namespace QTest {
LET_TestCase = 4,
LET_TestSuite = 5,
LET_Benchmark = 6,
LET_Message = 7,
LET_Text = 7,
LET_SystemError = 8,
LET_SystemOutput = 9,
LET_Skipped = 10

43
src/testlib/qtestjunitstreamer.cpp
View File

@ -82,20 +82,8 @@ void QTestJUnitStreamer::formatStart(const QTestElement *element, QTestCharBuffe
char indent[20];
indentForElement(element, indent, sizeof(indent));
// Messages/errors are written as CDATA within system-out, system-err,
// error, and failure respectively, comments elsewhere
if (element->elementType() == QTest::LET_Message) {
switch (element->parentElement()->elementType()) {
case QTest::LET_SystemOutput:
case QTest::LET_SystemError:
case QTest::LET_Failure:
case QTest::LET_Error:
QTest::qt_asprintf(formatted, "%s<![CDATA[", indent);
break;
default:
QTest::qt_asprintf(formatted, "%s<!--", indent);
break;
}
if (element->elementType() == QTest::LET_Text) {
QTest::qt_asprintf(formatted, "%s<![CDATA[", indent);
return;
}
@ -125,15 +113,8 @@ void QTestJUnitStreamer::formatAttributes(const QTestElement* element, const QTe
QTest::AttributeIndex attrindex = attribute->index();
// For messages we only want to output the `message' attribute value
if (element && element->elementType() == QTest::LET_Message
&& (element->parentElement()->elementType() == QTest::LET_SystemOutput
|| element->parentElement()->elementType() == QTest::LET_SystemError
|| element->parentElement()->elementType() == QTest::LET_Failure
|| element->parentElement()->elementType() == QTest::LET_Error)) {
if (attrindex != QTest::AI_Message) return;
if (element && element->elementType() == QTest::LET_Text) {
QTEST_ASSERT(attrindex == QTest::AI_Value);
QXmlTestLogger::xmlCdata(formatted, attribute->value());
return;
}
@ -149,20 +130,8 @@ void QTestJUnitStreamer::formatAfterAttributes(const QTestElement *element, QTes
if (!element || !formatted )
return;
// Messages are written as CDATA within system-out, system-err,
// error, and failure respectively, comments elsewhere
if (element->elementType() == QTest::LET_Message) {
switch (element->parentElement()->elementType()) {
case QTest::LET_SystemOutput:
case QTest::LET_SystemError:
case QTest::LET_Failure:
case QTest::LET_Error:
QTest::qt_asprintf(formatted, "]]>\n");
break;
default:
QTest::qt_asprintf(formatted, " -->\n");
break;
}
if (element->elementType() == QTest::LET_Text) {
QTest::qt_asprintf(formatted, "]]>\n");
return;
}

13
tests/auto/testlib/selftests/expected_badxml.junitxml
View File

@ -7,77 +7,65 @@
</properties>
<testcase name="initTestCase" classname="tst_BadXml" time="@TEST_DURATION@"/>
<testcase name="badDataTag(fail end cdata ]]&gt; text ]]&gt; more text)" classname="tst_BadXml" time="@TEST_DURATION@">
<!-- type="qdebug" message="a message" -->
<failure type="fail" message="a failure"/>
<system-out>
<![CDATA[a message]]>
</system-out>
</testcase>
<testcase name="badDataTag(pass end cdata ]]&gt; text ]]&gt; more text)" classname="tst_BadXml" time="@TEST_DURATION@">
<!-- type="qdebug" message="a message" -->
<system-out>
<![CDATA[a message]]>
</system-out>
</testcase>
<testcase name="badDataTag(fail quotes &quot; text&quot; more text)" classname="tst_BadXml" time="@TEST_DURATION@">
<!-- type="qdebug" message="a message" -->
<failure type="fail" message="a failure"/>
<system-out>
<![CDATA[a message]]>
</system-out>
</testcase>
<testcase name="badDataTag(pass quotes &quot; text&quot; more text)" classname="tst_BadXml" time="@TEST_DURATION@">
<!-- type="qdebug" message="a message" -->
<system-out>
<![CDATA[a message]]>
</system-out>
</testcase>
<testcase name="badDataTag(fail xml close &gt; open &lt; tags &lt; text)" classname="tst_BadXml" time="@TEST_DURATION@">
<!-- type="qdebug" message="a message" -->
<failure type="fail" message="a failure"/>
<system-out>
<![CDATA[a message]]>
</system-out>
</testcase>
<testcase name="badDataTag(pass xml close &gt; open &lt; tags &lt; text)" classname="tst_BadXml" time="@TEST_DURATION@">
<!-- type="qdebug" message="a message" -->
<system-out>
<![CDATA[a message]]>
</system-out>
</testcase>
<testcase name="badDataTag(fail all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs)" classname="tst_BadXml" time="@TEST_DURATION@">
<!-- type="qdebug" message="a message" -->
<failure type="fail" message="a failure"/>
<system-out>
<![CDATA[a message]]>
</system-out>
</testcase>
<testcase name="badDataTag(pass all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs)" classname="tst_BadXml" time="@TEST_DURATION@">
<!-- type="qdebug" message="a message" -->
<system-out>
<![CDATA[a message]]>
</system-out>
</testcase>
<testcase name="badMessage(string 0)" classname="tst_BadXml" time="@TEST_DURATION@">
<!-- type="qdebug" message="end cdata ]]&gt; text ]]&gt; more text" -->
<system-out>
<![CDATA[end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]>
</system-out>
</testcase>
<testcase name="badMessage(string 1)" classname="tst_BadXml" time="@TEST_DURATION@">
<!-- type="qdebug" message="quotes &quot; text&quot; more text" -->
<system-out>
<![CDATA[quotes " text" more text]]>
</system-out>
</testcase>
<testcase name="badMessage(string 2)" classname="tst_BadXml" time="@TEST_DURATION@">
<!-- type="qdebug" message="xml close &gt; open &lt; tags &lt; text" -->
<system-out>
<![CDATA[xml close > open < tags < text]]>
</system-out>
</testcase>
<testcase name="badMessage(string 3)" classname="tst_BadXml" time="@TEST_DURATION@">
<!-- type="qdebug" message="all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" -->
<system-out>
<![CDATA[all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]>
</system-out>
@ -86,7 +74,6 @@
<failure type="fail" message="failure message"/>
</testcase>
<testcase name="encoding" classname="tst_BadXml" time="@TEST_DURATION@">
<!-- type="qdebug" message="&quot;Ülrich Ümläut&quot;" -->
<system-out>
<![CDATA["Ülrich Ümläut"]]>
</system-out>

6
tests/auto/testlib/selftests/expected_commandlinedata.junitxml
View File

@ -7,38 +7,32 @@
</properties>
<testcase name="initTestCase" classname="tst_DataTable" time="@TEST_DURATION@"/>
<testcase name="fiveTablePasses(fiveTablePasses_data1)" classname="tst_DataTable" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(test)" -->
<system-out>
<![CDATA[QVERIFY(test)]]>
</system-out>
</testcase>
<testcase name="fiveTablePasses(fiveTablePasses_data2)" classname="tst_DataTable" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(test)" -->
<system-out>
<![CDATA[QVERIFY(test)]]>
</system-out>
</testcase>
<testcase name="fiveTablePasses(fiveTablePasses_data3)" classname="tst_DataTable" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(test)" -->
<system-out>
<![CDATA[QVERIFY(test)]]>
</system-out>
</testcase>
<testcase name="fiveTablePasses(fiveTablePasses_data4)" classname="tst_DataTable" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(test)" -->
<system-out>
<![CDATA[QVERIFY(test)]]>
</system-out>
</testcase>
<testcase name="fiveTablePasses(fiveTablePasses_data5)" classname="tst_DataTable" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(test)" -->
<system-out>
<![CDATA[QVERIFY(test)]]>
</system-out>
</testcase>
<testcase name="fiveTablePasses" classname="tst_DataTable" time="@TEST_DURATION@"/>
<testcase name="fiveTablePasses(fiveTablePasses_data1)" classname="tst_DataTable" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(test)" -->
<system-out>
<![CDATA[QVERIFY(test)]]>
</system-out>

2
tests/auto/testlib/selftests/expected_counting.junitxml
View File

@ -55,7 +55,6 @@
<testcase name="testFailInInit(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
<testcase name="testFailInCleanup(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
<testcase name="testFailInCleanup(fail)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" -->
<failure type="fail" message="Fail in cleanup()"/>
<system-out>
<![CDATA[This test function should execute and then QFAIL in cleanup()]]>
@ -69,7 +68,6 @@
<testcase name="testSkipInInit(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
<testcase name="testSkipInCleanup(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
<testcase name="testSkipInCleanup(skip)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" -->
<skipped message="Skip in cleanup()"/>
<system-out>
<![CDATA[This test function should execute and then QSKIP in cleanup()]]>

13
tests/auto/testlib/selftests/expected_expectfail.junitxml
View File

@ -7,9 +7,6 @@
</properties>
<testcase name="initTestCase" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
<testcase name="xfailAndContinue" classname="tst_ExpectFail" time="@TEST_DURATION@">
<!-- type="qdebug" message="begin" -->
<!-- type="info" message="This should xfail" -->
<!-- type="qdebug" message="after" -->
<system-out>
<![CDATA[begin]]>
<![CDATA[This should xfail]]>
@ -17,8 +14,6 @@
</system-out>
</testcase>
<testcase name="xfailAndAbort" classname="tst_ExpectFail" time="@TEST_DURATION@">
<!-- type="qdebug" message="begin" -->
<!-- type="info" message="This should xfail" -->
<system-out>
<![CDATA[begin]]>
<![CDATA[This should xfail]]>
@ -28,8 +23,6 @@
<failure type="fail" message="Already expecting a fail"/>
</testcase>
<testcase name="xfailWithQString" classname="tst_ExpectFail" time="@TEST_DURATION@">
<!-- type="info" message="A string" -->
<!-- type="info" message="Bug 5 (The message)" -->
<system-out>
<![CDATA[A string]]>
<![CDATA[Bug 5 (The message)]]>
@ -38,13 +31,11 @@
<testcase name="xfailDataDrivenWithQVerify(Pass 1)" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
<testcase name="xfailDataDrivenWithQVerify(Pass 2)" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
<testcase name="xfailDataDrivenWithQVerify(Abort)" classname="tst_ExpectFail" time="@TEST_DURATION@">
<!-- type="info" message="This test should xfail" -->
<system-out>
<![CDATA[This test should xfail]]>
</system-out>
</testcase>
<testcase name="xfailDataDrivenWithQVerify(Continue)" classname="tst_ExpectFail" time="@TEST_DURATION@">
<!-- type="info" message="This test should xfail" -->
<system-out>
<![CDATA[This test should xfail]]>
</system-out>
@ -52,26 +43,22 @@
<testcase name="xfailDataDrivenWithQCompare(Pass 1)" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
<testcase name="xfailDataDrivenWithQCompare(Pass 2)" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
<testcase name="xfailDataDrivenWithQCompare(Abort)" classname="tst_ExpectFail" time="@TEST_DURATION@">
<!-- type="info" message="This test should xfail" -->
<system-out>
<![CDATA[This test should xfail]]>
</system-out>
</testcase>
<testcase name="xfailDataDrivenWithQCompare(Continue)" classname="tst_ExpectFail" time="@TEST_DURATION@">
<!-- type="info" message="This test should xfail" -->
<system-out>
<![CDATA[This test should xfail]]>
</system-out>
</testcase>
<testcase name="xfailOnWrongRow(right row)" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
<testcase name="xfailOnAnyRow(first row)" classname="tst_ExpectFail" time="@TEST_DURATION@">
<!-- type="info" message="This test should xfail" -->
<system-out>
<![CDATA[This test should xfail]]>
</system-out>
</testcase>
<testcase name="xfailOnAnyRow(second row)" classname="tst_ExpectFail" time="@TEST_DURATION@">
<!-- type="info" message="This test should xfail" -->
<system-out>
<![CDATA[This test should xfail]]>
</system-out>

1
tests/auto/testlib/selftests/expected_faildatatype.junitxml
View File

@ -7,7 +7,6 @@
</properties>
<testcase name="initTestCase" classname="tst_FailDataType" time="@TEST_DURATION@"/>
<testcase name="value" classname="tst_FailDataType" time="@TEST_DURATION@">
<!-- type="qdebug" message="expected data of type &apos;QString&apos;, got &apos;bool&apos; for element 0 of data with tag &apos;bool&#x002D;as&#x002D;string&apos;" -->
<error type="qfatal" message="ASSERT: &quot;false&quot; in file qtbase/src/testlib/qtestdata.cpp, line 0"/>
<system-out>
<![CDATA[expected data of type 'QString', got 'bool' for element 0 of data with tag 'bool-as-string']]>

1
tests/auto/testlib/selftests/expected_findtestdata.junitxml
View File

@ -7,7 +7,6 @@
</properties>
<testcase name="initTestCase" classname="FindTestData" time="@TEST_DURATION@"/>
<testcase name="paths" classname="FindTestData" time="@TEST_DURATION@">
<!-- type="warn" message="testdata testfile could not be located!" -->
<system-err>
<![CDATA[testdata testfile could not be located!]]>
</system-err>

36
tests/auto/testlib/selftests/expected_globaldata.junitxml
View File

@ -6,16 +6,11 @@
<property name="QtBuild" value=""/>
</properties>
<testcase name="initTestCase" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="initTestCase initTestCase (null)" -->
<system-out>
<![CDATA[initTestCase initTestCase (null)]]>
</system-out>
</testcase>
<testcase name="testGlobal(global=false:local=false)" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="init testGlobal local=false" -->
<!-- type="qdebug" message="global: false" -->
<!-- type="qdebug" message="local: false" -->
<!-- type="qdebug" message="cleanup testGlobal local=false" -->
<system-out>
<![CDATA[init testGlobal local=false]]>
<![CDATA[global: false]]>
@ -24,10 +19,6 @@
</system-out>
</testcase>
<testcase name="testGlobal(global=false:local=true)" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="init testGlobal local=true" -->
<!-- type="qdebug" message="global: false" -->
<!-- type="qdebug" message="local: true" -->
<!-- type="qdebug" message="cleanup testGlobal local=true" -->
<system-out>
<![CDATA[init testGlobal local=true]]>
<![CDATA[global: false]]>
@ -36,10 +27,6 @@
</system-out>
</testcase>
<testcase name="testGlobal(global=true:local=false)" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="init testGlobal local=false" -->
<!-- type="qdebug" message="global: true" -->
<!-- type="qdebug" message="local: false" -->
<!-- type="qdebug" message="cleanup testGlobal local=false" -->
<system-out>
<![CDATA[init testGlobal local=false]]>
<![CDATA[global: true]]>
@ -48,10 +35,6 @@
</system-out>
</testcase>
<testcase name="testGlobal(global=true:local=true)" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="init testGlobal local=true" -->
<!-- type="qdebug" message="global: true" -->
<!-- type="qdebug" message="local: true" -->
<!-- type="qdebug" message="cleanup testGlobal local=true" -->
<system-out>
<![CDATA[init testGlobal local=true]]>
<![CDATA[global: true]]>
@ -63,45 +46,34 @@
<skipped message="skipping"/>
</testcase>
<testcase name="skipLocal(global=false:local=false)" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="init skipLocal local=false" -->
<skipped message="skipping"/>
<!-- type="qdebug" message="cleanup skipLocal local=false" -->
<system-out>
<![CDATA[init skipLocal local=false]]>
<![CDATA[cleanup skipLocal local=false]]>
</system-out>
</testcase>
<testcase name="skipLocal(global=false:local=true)" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="init skipLocal local=true" -->
<skipped message="skipping"/>
<!-- type="qdebug" message="cleanup skipLocal local=true" -->
<system-out>
<![CDATA[init skipLocal local=true]]>
<![CDATA[cleanup skipLocal local=true]]>
</system-out>
</testcase>
<testcase name="skipLocal(global=true:local=false)" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="init skipLocal local=false" -->
<skipped message="skipping"/>
<!-- type="qdebug" message="cleanup skipLocal local=false" -->
<system-out>
<![CDATA[init skipLocal local=false]]>
<![CDATA[cleanup skipLocal local=false]]>
</system-out>
</testcase>
<testcase name="skipLocal(global=true:local=true)" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="init skipLocal local=true" -->
<skipped message="skipping"/>
<!-- type="qdebug" message="cleanup skipLocal local=true" -->
<system-out>
<![CDATA[init skipLocal local=true]]>
<![CDATA[cleanup skipLocal local=true]]>
</system-out>
</testcase>
<testcase name="skipSingle(global=false:local=false)" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="init skipSingle local=false" -->
<!-- type="qdebug" message="global: false local: false" -->
<!-- type="qdebug" message="cleanup skipSingle local=false" -->
<system-out>
<![CDATA[init skipSingle local=false]]>
<![CDATA[global: false local: false]]>
@ -109,27 +81,20 @@
</system-out>
</testcase>
<testcase name="skipSingle(global=false:local=true)" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="init skipSingle local=true" -->
<skipped message="Skipping"/>
<!-- type="qdebug" message="cleanup skipSingle local=true" -->
<system-out>
<![CDATA[init skipSingle local=true]]>
<![CDATA[cleanup skipSingle local=true]]>
</system-out>
</testcase>
<testcase name="skipSingle(global=true:local=false)" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="init skipSingle local=false" -->
<skipped message="Skipping"/>
<!-- type="qdebug" message="cleanup skipSingle local=false" -->
<system-out>
<![CDATA[init skipSingle local=false]]>
<![CDATA[cleanup skipSingle local=false]]>
</system-out>
</testcase>
<testcase name="skipSingle(global=true:local=true)" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="init skipSingle local=true" -->
<!-- type="qdebug" message="global: true local: true" -->
<!-- type="qdebug" message="cleanup skipSingle local=true" -->
<system-out>
<![CDATA[init skipSingle local=true]]>
<![CDATA[global: true local: true]]>
@ -137,7 +102,6 @@
</system-out>
</testcase>
<testcase name="cleanupTestCase" classname="tst_globaldata" time="@TEST_DURATION@">
<!-- type="qdebug" message="cleanupTestCase cleanupTestCase (null)" -->
<system-out>
<![CDATA[cleanupTestCase cleanupTestCase (null)]]>
</system-out>

4
tests/auto/testlib/selftests/expected_junit.junitxml
View File

@ -7,13 +7,11 @@
</properties>
<testcase name="initTestCase" classname="tst_JUnit" time="@TEST_DURATION@"/>
<testcase name="testFunc1" classname="tst_JUnit" time="@TEST_DURATION@">
<!-- type="qwarn" message="just a qWarning() !" -->
<system-err>
<![CDATA[just a qWarning() !]]>
</system-err>
</testcase>
<testcase name="testFunc2" classname="tst_JUnit" time="@TEST_DURATION@">
<!-- type="qdebug" message="a qDebug() call with comment&#x002D;ending stuff &#x002D;&#x002D;&gt;" -->
<failure type="fail" message="Compared values are not the same">
<![CDATA[ Actual (2): 2
Expected (3): 3]]>
@ -29,13 +27,11 @@
<failure type="fail" message="a forced failure!"/>
</testcase>
<testcase name="testFunc5" classname="tst_JUnit" time="@TEST_DURATION@">
<!-- type="info" message="this failure is expected" -->
<system-out>
<![CDATA[this failure is expected]]>
</system-out>
</testcase>
<testcase name="testFunc6" classname="tst_JUnit" time="@TEST_DURATION@">
<!-- type="info" message="this failure is also expected" -->
<system-out>
<![CDATA[this failure is also expected]]>
</system-out>

2002
tests/auto/testlib/selftests/expected_maxwarnings.junitxml
View File

File diff suppressed because it is too large Load Diff

124
tests/auto/testlib/selftests/expected_signaldumper.junitxml
View File

@ -7,20 +7,12 @@
</properties>
<testcase name="initTestCase" classname="tst_Signaldumper" time="@TEST_DURATION@"/>
<testcase name="noConnections" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
</system-out>
</testcase>
<testcase name="oneSlot(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
@ -31,12 +23,6 @@
</system-out>
</testcase>
<testcase name="oneSlot(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
@ -47,15 +33,6 @@
</system-out>
</testcase>
<testcase name="oneSlotOldSyntax(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[ Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]>
@ -69,12 +46,6 @@
</system-out>
</testcase>
<testcase name="oneSlotOldSyntax(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
@ -85,12 +56,6 @@
</system-out>
</testcase>
<testcase name="twoSlots(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
@ -101,12 +66,6 @@
</system-out>
</testcase>
<testcase name="twoSlots(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
@ -117,18 +76,6 @@
</system-out>
</testcase>
<testcase name="twoSlotsOldSyntax(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" -->
<!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" -->
<!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" -->
<!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[ Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]>
@ -145,12 +92,6 @@
</system-out>
</testcase>
<testcase name="twoSlotsOldSyntax(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
@ -161,15 +102,6 @@
</system-out>
</testcase>
<testcase name="signalForwarding(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message=" Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message=" Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message=" Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[ Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
@ -183,15 +115,6 @@
</system-out>
</testcase>
<testcase name="signalForwarding(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
@ -205,18 +128,6 @@
</system-out>
</testcase>
<testcase name="signalForwardingOldSyntax(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) nestedSignal()" -->
<!-- type="info" message=" Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) nestedSignalWithParameters(int,char)" -->
<!-- type="info" message=" Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) nestedSignal()" -->
<!-- type="info" message=" Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[ Slot: SignalSlotClass(_POINTER_) nestedSignal()]]>
@ -233,15 +144,6 @@
</system-out>
</testcase>
<testcase name="signalForwardingOldSyntax(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
@ -255,9 +157,6 @@
</system-out>
</testcase>
<testcase name="slotEmittingSignal(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message=" Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[ Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
@ -265,9 +164,6 @@
</system-out>
</testcase>
<testcase name="slotEmittingSignal(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
@ -275,10 +171,6 @@
</system-out>
</testcase>
<testcase name="slotEmittingSignalOldSyntax(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) emitSecondSignal()" -->
<!-- type="info" message=" Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[ Slot: SignalSlotClass(_POINTER_) emitSecondSignal()]]>
@ -287,9 +179,6 @@
</system-out>
</testcase>
<testcase name="slotEmittingSignalOldSyntax(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
@ -297,18 +186,6 @@
</system-out>
</testcase>
<testcase name="variousTypes" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&amp;)@_POINTER_)" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qListSignal (QList&lt;int&gt;())" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVectorSignal (QList&lt;int&gt;())" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QList&lt;int&gt;&amp;)@_POINTER_)" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QList&lt;int&gt;())" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QList&lt;int&gt;*)_POINTER_)" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QList&lt;int&gt;*)_POINTER_)" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" -->
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))]]>
<![CDATA[Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)]]>
@ -325,7 +202,6 @@
</system-out>
</testcase>
<testcase name="deletingSender" classname="tst_Signaldumper" time="@TEST_DURATION@">
<!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
<system-out>
<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
</system-out>

1
tests/auto/testlib/selftests/expected_skip.junitxml
View File

@ -16,7 +16,6 @@
<skipped message="skipping one"/>
</testcase>
<testcase name="singleSkip(local 2)" classname="tst_Skip" time="@TEST_DURATION@">
<!-- type="qdebug" message="this line should only be reached once (true)" -->
<system-out>
<![CDATA[this line should only be reached once (true)]]>
</system-out>

3
tests/auto/testlib/selftests/expected_strcmp.junitxml
View File

@ -8,9 +8,6 @@
<testcase name="initTestCase" classname="tst_StrCmp" time="@TEST_DURATION@"/>
<testcase name="compareCharStars" classname="tst_StrCmp" time="@TEST_DURATION@"/>
<testcase name="compareByteArray" classname="tst_StrCmp" time="@TEST_DURATION@">
<!-- type="info" message="Next test should fail" -->
<!-- type="info" message="Next test should fail" -->
<!-- type="info" message="Next test should fail" -->
<failure type="fail" message="Compared values are not the same">
<![CDATA[ Actual (a): "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"...
Expected (b): "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"...]]>

31
tests/auto/testlib/selftests/expected_subtest.junitxml
View File

@ -6,15 +6,11 @@
<property name="QtBuild" value=""/>
</properties>
<testcase name="initTestCase" classname="tst_Subtest" time="@TEST_DURATION@">
<!-- type="qdebug" message="initTestCase initTestCase (null)" -->
<system-out>
<![CDATA[initTestCase initTestCase (null)]]>
</system-out>
</testcase>
<testcase name="test1" classname="tst_Subtest" time="@TEST_DURATION@">
<!-- type="qdebug" message="init test1 (null)" -->
<!-- type="qdebug" message="test1 test1 (null)" -->
<!-- type="qdebug" message="cleanup test1 (null)" -->
<system-out>
<![CDATA[init test1 (null)]]>
<![CDATA[test1 test1 (null)]]>
@ -22,12 +18,6 @@
</system-out>
</testcase>
<testcase name="test2(data0)" classname="tst_Subtest" time="@TEST_DURATION@">
<!-- type="qdebug" message="test2_data test2 (null)" -->
<!-- type="qdebug" message="test2_data end" -->
<!-- type="qdebug" message="init test2 data0" -->
<!-- type="qdebug" message="test2 test2 data0" -->
<!-- type="qdebug" message="test2 end" -->
<!-- type="qdebug" message="cleanup test2 data0" -->
<system-out>
<![CDATA[test2_data test2 (null)]]>
<![CDATA[test2_data end]]>
@ -38,10 +28,6 @@
</system-out>
</testcase>
<testcase name="test2(data1)" classname="tst_Subtest" time="@TEST_DURATION@">
<!-- type="qdebug" message="init test2 data1" -->
<!-- type="qdebug" message="test2 test2 data1" -->
<!-- type="qdebug" message="test2 end" -->
<!-- type="qdebug" message="cleanup test2 data1" -->
<system-out>
<![CDATA[init test2 data1]]>
<![CDATA[test2 test2 data1]]>
@ -50,10 +36,6 @@
</system-out>
</testcase>
<testcase name="test2(data2)" classname="tst_Subtest" time="@TEST_DURATION@">
<!-- type="qdebug" message="init test2 data2" -->
<!-- type="qdebug" message="test2 test2 data2" -->
<!-- type="qdebug" message="test2 end" -->
<!-- type="qdebug" message="cleanup test2 data2" -->
<system-out>
<![CDATA[init test2 data2]]>
<![CDATA[test2 test2 data2]]>
@ -62,12 +44,6 @@
</system-out>
</testcase>
<testcase name="test3(data0)" classname="tst_Subtest" time="@TEST_DURATION@">
<!-- type="qdebug" message="test3_data test3 (null)" -->
<!-- type="qdebug" message="test3_data end" -->
<!-- type="qdebug" message="init test3 data0" -->
<!-- type="qdebug" message="test2 test3 data0" -->
<!-- type="qdebug" message="test2 end" -->
<!-- type="qdebug" message="cleanup test3 data0" -->
<system-out>
<![CDATA[test3_data test3 (null)]]>
<![CDATA[test3_data end]]>
@ -78,13 +54,10 @@
</system-out>
</testcase>
<testcase name="test3(data1)" classname="tst_Subtest" time="@TEST_DURATION@">
<!-- type="qdebug" message="init test3 data1" -->
<!-- type="qdebug" message="test2 test3 data1" -->
<failure type="fail" message="Compared values are not the same">
<![CDATA[ Actual (str) : "hello1"
Expected (QString("hello0")): "hello0"]]>
</failure>
<!-- type="qdebug" message="cleanup test3 data1" -->
<system-out>
<![CDATA[init test3 data1]]>
<![CDATA[test2 test3 data1]]>
@ -92,13 +65,10 @@
</system-out>
</testcase>
<testcase name="test3(data2)" classname="tst_Subtest" time="@TEST_DURATION@">
<!-- type="qdebug" message="init test3 data2" -->
<!-- type="qdebug" message="test2 test3 data2" -->
<failure type="fail" message="Compared values are not the same">
<![CDATA[ Actual (str) : "hello2"
Expected (QString("hello0")): "hello0"]]>
</failure>
<!-- type="qdebug" message="cleanup test3 data2" -->
<system-out>
<![CDATA[init test3 data2]]>
<![CDATA[test2 test3 data2]]>
@ -106,7 +76,6 @@
</system-out>
</testcase>
<testcase name="cleanupTestCase" classname="tst_Subtest" time="@TEST_DURATION@">
<!-- type="qdebug" message="cleanupTestCase cleanupTestCase (null)" -->
<system-out>
<![CDATA[cleanupTestCase cleanupTestCase (null)]]>
</system-out>

2
tests/auto/testlib/selftests/expected_verbose1.junitxml
View File

@ -55,7 +55,6 @@
<testcase name="testFailInInit(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
<testcase name="testFailInCleanup(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
<testcase name="testFailInCleanup(fail)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" -->
<failure type="fail" message="Fail in cleanup()"/>
<system-out>
<![CDATA[This test function should execute and then QFAIL in cleanup()]]>
@ -69,7 +68,6 @@
<testcase name="testSkipInInit(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
<testcase name="testSkipInCleanup(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
<testcase name="testSkipInCleanup(skip)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" -->
<skipped message="Skip in cleanup()"/>
<system-out>
<![CDATA[This test function should execute and then QSKIP in cleanup()]]>

20
tests/auto/testlib/selftests/expected_verbose2.junitxml
View File

@ -7,24 +7,18 @@
</properties>
<testcase name="initTestCase" classname="tst_Counting" time="@TEST_DURATION@"/>
<testcase name="testPassPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(true)" -->
<!-- type="info" message="QCOMPARE(2 + 1, 3)" -->
<system-out>
<![CDATA[QVERIFY(true)]]>
<![CDATA[QCOMPARE(2 + 1, 3)]]>
</system-out>
</testcase>
<testcase name="testPassPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(true)" -->
<!-- type="info" message="QCOMPARE(2 + 1, 3)" -->
<system-out>
<![CDATA[QVERIFY(true)]]>
<![CDATA[QCOMPARE(2 + 1, 3)]]>
</system-out>
</testcase>
<testcase name="testPassSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(true)" -->
<!-- type="info" message="QCOMPARE(2 + 1, 3)" -->
<system-out>
<![CDATA[QVERIFY(true)]]>
<![CDATA[QCOMPARE(2 + 1, 3)]]>
@ -34,15 +28,12 @@
<skipped message="Skipping"/>
</testcase>
<testcase name="testPassFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(true)" -->
<!-- type="info" message="QCOMPARE(2 + 1, 3)" -->
<system-out>
<![CDATA[QVERIFY(true)]]>
<![CDATA[QCOMPARE(2 + 1, 3)]]>
</system-out>
</testcase>
<testcase name="testPassFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(false)" -->
<failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
<system-out>
<![CDATA[QVERIFY(false)]]>
@ -52,8 +43,6 @@
<skipped message="Skipping"/>
</testcase>
<testcase name="testSkipPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(true)" -->
<!-- type="info" message="QCOMPARE(2 + 1, 3)" -->
<system-out>
<![CDATA[QVERIFY(true)]]>
<![CDATA[QCOMPARE(2 + 1, 3)]]>
@ -69,29 +58,24 @@
<skipped message="Skipping"/>
</testcase>
<testcase name="testSkipFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(false)" -->
<failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
<system-out>
<![CDATA[QVERIFY(false)]]>
</system-out>
</testcase>
<testcase name="testFailPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(false)" -->
<failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
<system-out>
<![CDATA[QVERIFY(false)]]>
</system-out>
</testcase>
<testcase name="testFailPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(true)" -->
<!-- type="info" message="QCOMPARE(2 + 1, 3)" -->
<system-out>
<![CDATA[QVERIFY(true)]]>
<![CDATA[QCOMPARE(2 + 1, 3)]]>
</system-out>
</testcase>
<testcase name="testFailSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(false)" -->
<failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
<system-out>
<![CDATA[QVERIFY(false)]]>
@ -101,14 +85,12 @@
<skipped message="Skipping"/>
</testcase>
<testcase name="testFailFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(false)" -->
<failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
<system-out>
<![CDATA[QVERIFY(false)]]>
</system-out>
</testcase>
<testcase name="testFailFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="info" message="QVERIFY(false)" -->
<failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
<system-out>
<![CDATA[QVERIFY(false)]]>
@ -121,7 +103,6 @@
<testcase name="testFailInInit(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
<testcase name="testFailInCleanup(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
<testcase name="testFailInCleanup(fail)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" -->
<failure type="fail" message="Fail in cleanup()"/>
<system-out>
<![CDATA[This test function should execute and then QFAIL in cleanup()]]>
@ -135,7 +116,6 @@
<testcase name="testSkipInInit(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
<testcase name="testSkipInCleanup(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
<testcase name="testSkipInCleanup(skip)" classname="tst_Counting" time="@TEST_DURATION@">
<!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" -->
<skipped message="Skip in cleanup()"/>
<system-out>
<![CDATA[This test function should execute and then QSKIP in cleanup()]]>

17
tests/auto/testlib/selftests/expected_warnings.junitxml
View File

@ -7,16 +7,6 @@
</properties>
<testcase name="initTestCase" classname="tst_Warnings" time="@TEST_DURATION@"/>
<testcase name="testWarnings" classname="tst_Warnings" time="@TEST_DURATION@">
<!-- type="qwarn" message="Warning" -->
<!-- type="qwarn" message="Warning" -->
<!-- type="qdebug" message="Debug" -->
<!-- type="qdebug" message="Debug" -->
<!-- type="qinfo" message="Info" -->
<!-- type="qinfo" message="Info" -->
<!-- type="qdebug" message="Baba" -->
<!-- type="qdebug" message="Baba" -->
<!-- type="qdebug" message="Bubublabla" -->
<!-- type="qwarn" message="Babablabla" -->
<system-out>
<![CDATA[Debug]]>
<![CDATA[Debug]]>
@ -33,8 +23,6 @@
</system-err>
</testcase>
<testcase name="testMissingWarnings" classname="tst_Warnings" time="@TEST_DURATION@">
<!-- type="info" message="Did not receive message: &quot;Warning0&quot;" -->
<!-- type="info" message="Did not receive message: &quot;Warning1&quot;" -->
<failure type="fail" message="Not all expected messages were received"/>
<system-out>
<![CDATA[Did not receive message: "Warning0"]]>
@ -42,15 +30,12 @@
</system-out>
</testcase>
<testcase name="testMissingWarningsRegularExpression" classname="tst_Warnings" time="@TEST_DURATION@">
<!-- type="info" message="Did not receive any message matching: &quot;Warning\s\d&quot;" -->
<failure type="fail" message="Not all expected messages were received"/>
<system-out>
<![CDATA[Did not receive any message matching: "Warning\s\d"]]>
</system-out>
</testcase>
<testcase name="testMissingWarningsWithData(first row)" classname="tst_Warnings" time="@TEST_DURATION@">
<!-- type="info" message="Did not receive message: &quot;Warning0&quot;" -->
<!-- type="info" message="Did not receive message: &quot;Warning1&quot;" -->
<failure type="fail" message="Not all expected messages were received"/>
<system-out>
<![CDATA[Did not receive message: "Warning0"]]>
@ -58,8 +43,6 @@
</system-out>
</testcase>
<testcase name="testMissingWarningsWithData(second row)" classname="tst_Warnings" time="@TEST_DURATION@">
<!-- type="info" message="Did not receive message: &quot;Warning0&quot;" -->
<!-- type="info" message="Did not receive message: &quot;Warning1&quot;" -->
<failure type="fail" message="Not all expected messages were received"/>
<system-out>
<![CDATA[Did not receive message: "Warning0"]]>