diff options
| author | Tor Arne Vestbø <[email protected]> | 2021-07-29 17:37:58 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <[email protected]> | 2021-08-05 03:58:50 +0200 |
| commit | fb16a66b71250f83a9249a0a04064f56d70c9fd3 (patch) | |
| tree | 369dce7ece617e57442753a02be12ab559163bab | |
| parent | 58f1c0c146aa678b8140cc17388b5e7f3997fcc6 (diff) | |
testlib: Report skipped tests in JUnit reporter as <skipped> elements
The Apache Ant and Surefire Maven specs document a <skipped> element that
can be used to signify skipped test, with a corresponding total skipped
test attribute on the <testsuite>.
The element includes an optional message attribute, documented in the
Surefire spec, and in the Ant source code, but not yet documented in
the reverse-engineered Ant spec:
https://github.com/windyroad/JUnit-Schema/pull/11
Pick-to: 6.2
Task-number: QTBUG-95424
Change-Id: Ib6417a41b9c328836f4017e6ebf7f7e9cd91288d
Reviewed-by: Mårten Nordheim <[email protected]>
53 files changed, 122 insertions, 157 deletions
diff --git a/src/testlib/qjunittestlogger.cpp b/src/testlib/qjunittestlogger.cpp index eb4dc4dee87..a120171c3a2 100644 --- a/src/testlib/qjunittestlogger.cpp +++ b/src/testlib/qjunittestlogger.cpp @@ -139,6 +139,9 @@ void QJUnitTestLogger::stopLogging() qsnprintf(buf, sizeof(buf), "%i", errorCounter); currentTestSuite->addAttribute(QTest::AI_Errors, buf); + qsnprintf(buf, sizeof(buf), "%i", QTestLog::skipCount()); + currentTestSuite->addAttribute(QTest::AI_Skipped, buf); + currentTestSuite->addAttribute(QTest::AI_Time, toSecondsFormat(QTestLog::msecsTotalTime()).constData()); @@ -273,6 +276,13 @@ void QJUnitTestLogger::addMessage(MessageTypes type, const QString &message, con Q_UNUSED(file); Q_UNUSED(line); + if (type == QAbstractTestLogger::Skip) { + auto skippedElement = new QTestElement(QTest::LET_Skipped); + skippedElement->addAttribute(QTest::AI_Message, message.toUtf8().constData()); + currentLogElement->addLogElement(skippedElement); + return; + } + auto messageElement = new QTestElement(QTest::LET_Message); auto systemLogElement = systemOutputElement; const char *typeBuf = nullptr; @@ -300,7 +310,7 @@ void QJUnitTestLogger::addMessage(MessageTypes type, const QString &message, con typeBuf = "qfatal"; break; case QAbstractTestLogger::Skip: - typeBuf = "skip"; + Q_UNREACHABLE(); break; case QAbstractTestLogger::Info: typeBuf = "info"; diff --git a/src/testlib/qtestcoreelement_p.h b/src/testlib/qtestcoreelement_p.h index 98de54ccffc..458792a7383 100644 --- a/src/testlib/qtestcoreelement_p.h +++ b/src/testlib/qtestcoreelement_p.h @@ -141,7 +141,8 @@ const char *QTestCoreElement<ElementType>::elementName() const "benchmark", "message", "system-err", - "system-out" + "system-out", + "skipped" }; if (type != QTest::LET_Undefined) diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp index d091804f8c1..8609de6d18a 100644 --- a/src/testlib/qtestelementattribute.cpp +++ b/src/testlib/qtestelementattribute.cpp @@ -145,7 +145,8 @@ const char *QTestElementAttribute::name() const "time", "timestamp", "hostname", - "classname" + "classname", + "skipped" }; if (attributeIndex != QTest::AI_Undefined) diff --git a/src/testlib/qtestelementattribute_p.h b/src/testlib/qtestelementattribute_p.h index 762ac13430e..6c49bda5880 100644 --- a/src/testlib/qtestelementattribute_p.h +++ b/src/testlib/qtestelementattribute_p.h @@ -81,6 +81,7 @@ namespace QTest { AI_Timestamp = 17, AI_Hostname = 18, AI_Classname = 19, + AI_Skipped = 20 }; enum LogElementType @@ -95,7 +96,8 @@ namespace QTest { LET_Benchmark = 6, LET_Message = 7, LET_SystemError = 8, - LET_SystemOutput = 9 + LET_SystemOutput = 9, + LET_Skipped = 10 }; } diff --git a/tests/auto/testlib/selftests/expected_assert.junitxml b/tests/auto/testlib/selftests/expected_assert.junitxml index 1af01241669..dd99920fa18 100644 --- a/tests/auto/testlib/selftests/expected_assert.junitxml +++ b/tests/auto/testlib/selftests/expected_assert.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Assert" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="1" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Assert" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="1" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_badxml.junitxml b/tests/auto/testlib/selftests/expected_badxml.junitxml index 9483c5e01cf..93fe8d73f0b 100644 --- a/tests/auto/testlib/selftests/expected_badxml.junitxml +++ b/tests/auto/testlib/selftests/expected_badxml.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BadXml" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="16" failures="5" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_BadXml" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="16" failures="5" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml index e0e1d7fe6d3..e2309d583f8 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibCallgrind" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_BenchlibCallgrind" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="1" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -7,11 +7,9 @@ </properties> <testcase name="initTestCase" classname="tst_BenchlibCallgrind" time="@TEST_DURATION@"/> <testcase name="twoHundredMillionInstructions" classname="tst_BenchlibCallgrind" time="@TEST_DURATION@"> - <!-- type="skip" message="This test is only defined for gcc and x86." --> + <skipped message="This test is only defined for gcc and x86."/> </testcase> <testcase name="cleanupTestCase" classname="tst_BenchlibCallgrind" time="@TEST_DURATION@"/> - <system-out> -<![CDATA[This test is only defined for gcc and x86.]]> - </system-out> + <system-out/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml index ee308c0554c..c542a491cce 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibCounting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="1" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_BenchlibCounting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="1" errors="0" skipped="1" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -8,14 +8,12 @@ <testcase name="initTestCase" classname="tst_BenchlibCounting" time="@TEST_DURATION@"/> <testcase name="passingBenchmark" classname="tst_BenchlibCounting" time="@TEST_DURATION@"/> <testcase name="skippingBenchmark" classname="tst_BenchlibCounting" time="@TEST_DURATION@"> - <!-- type="skip" message="This is a skipping benchmark" --> + <skipped message="This is a skipping benchmark"/> </testcase> <testcase name="failingBenchmark" classname="tst_BenchlibCounting" time="@TEST_DURATION@"> <failure type="fail" message="This is a failing benchmark"/> </testcase> <testcase name="cleanupTestCase" classname="tst_BenchlibCounting" time="@TEST_DURATION@"/> - <system-out> -<![CDATA[This is a skipping benchmark]]> - </system-out> + <system-out/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml index 059299b017f..9dccff69a41 100644 --- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibEventCounter" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_BenchlibEventCounter" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.junitxml b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml index b2546057da5..d7269f7b55d 100644 --- a/tests/auto/testlib/selftests/expected_benchliboptions.junitxml +++ b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibOptions" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_BenchlibOptions" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -12,7 +12,7 @@ <system-err/> </testsuite> <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibFifteenIterations" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_BenchlibFifteenIterations" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -25,7 +25,7 @@ <system-err/> </testsuite> <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibOneHundredMinimum" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_BenchlibOneHundredMinimum" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml index 7ad245c7eee..afb0a97b8b3 100644 --- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibTickCounter" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_BenchlibTickCounter" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml index 1c525faf8dc..6ca6fd40dcb 100644 --- a/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibWalltime" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_BenchlibWalltime" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_blacklisted.junitxml b/tests/auto/testlib/selftests/expected_blacklisted.junitxml index 823b6667faf..cf32c0fa553 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.junitxml +++ b/tests/auto/testlib/selftests/expected_blacklisted.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Blacklisted" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Blacklisted" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="0" skipped="1" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -8,7 +8,7 @@ <testcase name="initTestCase" classname="tst_Blacklisted" time="@TEST_DURATION@"/> <testcase name="pass" classname="tst_Blacklisted" time="@TEST_DURATION@"/> <testcase name="skip" classname="tst_Blacklisted" time="@TEST_DURATION@"> - <!-- type="skip" message="This test should SKIP" --> + <skipped message="This test should SKIP"/> </testcase> <testcase name="fail" classname="tst_Blacklisted" time="@TEST_DURATION@"/> <testcase name="xfail" classname="tst_Blacklisted" time="@TEST_DURATION@"/> @@ -23,7 +23,6 @@ <!-- type="qfatal" message="This is a fatal error message that should still appear in silent test output" --> </testcase> <system-out> -<![CDATA[This test should SKIP]]> <![CDATA[This is a debug message that should not appear in silent test output]]> <![CDATA[This is a critical message that should not appear in silent test output]]> <![CDATA[This is an info message that should not appear in silent test output]]> diff --git a/tests/auto/testlib/selftests/expected_cmptest.junitxml b/tests/auto/testlib/selftests/expected_cmptest.junitxml index be8a0f36fe7..153e3878b4f 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.junitxml +++ b/tests/auto/testlib/selftests/expected_cmptest.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Cmptest" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="67" failures="46" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Cmptest" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="67" failures="46" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.junitxml b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml index b0e686d7b79..e590d77f080 100644 --- a/tests/auto/testlib/selftests/expected_commandlinedata.junitxml +++ b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_DataTable" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_DataTable" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_counting.junitxml b/tests/auto/testlib/selftests/expected_counting.junitxml index 19dcb2fcc1a..79b4f5df96e 100644 --- a/tests/auto/testlib/selftests/expected_counting.junitxml +++ b/tests/auto/testlib/selftests/expected_counting.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="0" skipped="8" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -10,24 +10,24 @@ <testcase name="testPassPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testPassSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testPassSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testPassFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testPassFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> <failure type="fail" message="'false' returned FALSE. ()"/> </testcase> <testcase name="testSkipPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testSkipPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testSkipSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testSkipSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testSkipFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testSkipFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> <failure type="fail" message="'false' returned FALSE. ()"/> @@ -40,7 +40,7 @@ <failure type="fail" message="'false' returned FALSE. ()"/> </testcase> <testcase name="testFailSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testFailFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@"> <failure type="fail" message="'false' returned FALSE. ()"/> @@ -61,27 +61,19 @@ <testcase name="testFailInCleanup(after)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testSkipInInit(before)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testSkipInInit(skip)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skip in init()" --> + <skipped message="Skip in init()"/> </testcase> <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()" --> - <!-- type="skip" message="Skip in cleanup()" --> + <skipped message="Skip in cleanup()"/> </testcase> <testcase name="testSkipInCleanup(after)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="cleanupTestCase" classname="tst_Counting" time="@TEST_DURATION@"/> <system-out> -<![CDATA[Skipping]]> -<![CDATA[Skipping]]> -<![CDATA[Skipping]]> -<![CDATA[Skipping]]> -<![CDATA[Skipping]]> -<![CDATA[Skipping]]> <![CDATA[This test function should execute and then QFAIL in cleanup()]]> -<![CDATA[Skip in init()]]> <![CDATA[This test function should execute and then QSKIP in cleanup()]]> -<![CDATA[Skip in cleanup()]]> </system-out> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_datatable.junitxml b/tests/auto/testlib/selftests/expected_datatable.junitxml index 179309d8408..0a938441462 100644 --- a/tests/auto/testlib/selftests/expected_datatable.junitxml +++ b/tests/auto/testlib/selftests/expected_datatable.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_DataTable" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="34" failures="13" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_DataTable" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="34" failures="13" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_datetime.junitxml b/tests/auto/testlib/selftests/expected_datetime.junitxml index 4d69961f0da..610fc13e344 100644 --- a/tests/auto/testlib/selftests/expected_datetime.junitxml +++ b/tests/auto/testlib/selftests/expected_datetime.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_DateTime" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_DateTime" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml index fba0ecdbd3d..8f0b6410f25 100644 --- a/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml +++ b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Exception" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Exception" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_expectfail.junitxml b/tests/auto/testlib/selftests/expected_expectfail.junitxml index 6058ee5a851..a7b3f48ec43 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.junitxml +++ b/tests/auto/testlib/selftests/expected_expectfail.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_ExpectFail" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="24" failures="6" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_ExpectFail" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="24" failures="6" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_failcleanup.junitxml b/tests/auto/testlib/selftests/expected_failcleanup.junitxml index 2234e999fbb..059353c7dfd 100644 --- a/tests/auto/testlib/selftests/expected_failcleanup.junitxml +++ b/tests/auto/testlib/selftests/expected_failcleanup.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_FailCleanup" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="1" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_FailCleanup" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="1" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_faildatatype.junitxml b/tests/auto/testlib/selftests/expected_faildatatype.junitxml index 3b132c4c54c..716033dab4d 100644 --- a/tests/auto/testlib/selftests/expected_faildatatype.junitxml +++ b/tests/auto/testlib/selftests/expected_faildatatype.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_FailDataType" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_FailDataType" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_failfetchtype.junitxml b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml index 6241138083b..4b89a97ae87 100644 --- a/tests/auto/testlib/selftests/expected_failfetchtype.junitxml +++ b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_FailFetchType" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_FailFetchType" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_failinit.junitxml b/tests/auto/testlib/selftests/expected_failinit.junitxml index 3540f8e2a44..f0a6d2f528b 100644 --- a/tests/auto/testlib/selftests/expected_failinit.junitxml +++ b/tests/auto/testlib/selftests/expected_failinit.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_FailInit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_FailInit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_failinitdata.junitxml b/tests/auto/testlib/selftests/expected_failinitdata.junitxml index c99a7d493f1..b57d3f8fd37 100644 --- a/tests/auto/testlib/selftests/expected_failinitdata.junitxml +++ b/tests/auto/testlib/selftests/expected_failinitdata.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_FailInitData" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="1" failures="1" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_FailInitData" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="1" failures="1" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.junitxml b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml index 72c4058e3dc..5ee53fd1b97 100644 --- a/tests/auto/testlib/selftests/expected_fetchbogus.junitxml +++ b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_FetchBogus" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_FetchBogus" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_findtestdata.junitxml b/tests/auto/testlib/selftests/expected_findtestdata.junitxml index c21c3cfc81b..8e5beb8965f 100644 --- a/tests/auto/testlib/selftests/expected_findtestdata.junitxml +++ b/tests/auto/testlib/selftests/expected_findtestdata.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="FindTestData" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="FindTestData" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_globaldata.junitxml b/tests/auto/testlib/selftests/expected_globaldata.junitxml index b8362ec6e42..7a2baf1f089 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.junitxml +++ b/tests/auto/testlib/selftests/expected_globaldata.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_globaldata" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="15" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_globaldata" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="15" failures="0" errors="0" skipped="7" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -33,26 +33,26 @@ <!-- type="qdebug" message="cleanup testGlobal local=true" --> </testcase> <testcase name="skip" classname="tst_globaldata" time="@TEST_DURATION@"> - <!-- type="skip" message="skipping" --> + <skipped message="skipping"/> </testcase> <testcase name="skipLocal(global=false:local=false)" classname="tst_globaldata" time="@TEST_DURATION@"> <!-- type="qdebug" message="init skipLocal local=false" --> - <!-- type="skip" message="skipping" --> + <skipped message="skipping"/> <!-- type="qdebug" message="cleanup skipLocal local=false" --> </testcase> <testcase name="skipLocal(global=false:local=true)" classname="tst_globaldata" time="@TEST_DURATION@"> <!-- type="qdebug" message="init skipLocal local=true" --> - <!-- type="skip" message="skipping" --> + <skipped message="skipping"/> <!-- type="qdebug" message="cleanup skipLocal local=true" --> </testcase> <testcase name="skipLocal(global=true:local=false)" classname="tst_globaldata" time="@TEST_DURATION@"> <!-- type="qdebug" message="init skipLocal local=false" --> - <!-- type="skip" message="skipping" --> + <skipped message="skipping"/> <!-- type="qdebug" message="cleanup skipLocal local=false" --> </testcase> <testcase name="skipLocal(global=true:local=true)" classname="tst_globaldata" time="@TEST_DURATION@"> <!-- type="qdebug" message="init skipLocal local=true" --> - <!-- type="skip" message="skipping" --> + <skipped message="skipping"/> <!-- type="qdebug" message="cleanup skipLocal local=true" --> </testcase> <testcase name="skipSingle(global=false:local=false)" classname="tst_globaldata" time="@TEST_DURATION@"> @@ -62,12 +62,12 @@ </testcase> <testcase name="skipSingle(global=false:local=true)" classname="tst_globaldata" time="@TEST_DURATION@"> <!-- type="qdebug" message="init skipSingle local=true" --> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> <!-- type="qdebug" message="cleanup skipSingle local=true" --> </testcase> <testcase name="skipSingle(global=true:local=false)" classname="tst_globaldata" time="@TEST_DURATION@"> <!-- type="qdebug" message="init skipSingle local=false" --> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> <!-- type="qdebug" message="cleanup skipSingle local=false" --> </testcase> <testcase name="skipSingle(global=true:local=true)" classname="tst_globaldata" time="@TEST_DURATION@"> @@ -96,27 +96,20 @@ <![CDATA[global: true]]> <![CDATA[local: true]]> <![CDATA[cleanup testGlobal local=true]]> -<![CDATA[skipping]]> <![CDATA[init skipLocal local=false]]> -<![CDATA[skipping]]> <![CDATA[cleanup skipLocal local=false]]> <![CDATA[init skipLocal local=true]]> -<![CDATA[skipping]]> <![CDATA[cleanup skipLocal local=true]]> <![CDATA[init skipLocal local=false]]> -<![CDATA[skipping]]> <![CDATA[cleanup skipLocal local=false]]> <![CDATA[init skipLocal local=true]]> -<![CDATA[skipping]]> <![CDATA[cleanup skipLocal local=true]]> <![CDATA[init skipSingle local=false]]> <![CDATA[global: false local: false]]> <![CDATA[cleanup skipSingle local=false]]> <![CDATA[init skipSingle local=true]]> -<![CDATA[Skipping]]> <![CDATA[cleanup skipSingle local=true]]> <![CDATA[init skipSingle local=false]]> -<![CDATA[Skipping]]> <![CDATA[cleanup skipSingle local=false]]> <![CDATA[init skipSingle local=true]]> <![CDATA[global: true local: true]]> diff --git a/tests/auto/testlib/selftests/expected_junit.junitxml b/tests/auto/testlib/selftests/expected_junit.junitxml index 30cc0d49763..c6c6e9affac 100644 --- a/tests/auto/testlib/selftests/expected_junit.junitxml +++ b/tests/auto/testlib/selftests/expected_junit.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_JUnit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="3" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_JUnit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="3" errors="0" skipped="1" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -16,7 +16,7 @@ Expected (3): 3"/> </testcase> <testcase name="testFunc3" classname="tst_JUnit" time="@TEST_DURATION@"> - <!-- type="skip" message="skipping this function!" --> + <skipped message="skipping this function!"/> </testcase> <testcase name="testFunc4" classname="tst_JUnit" time="@TEST_DURATION@"> <failure type="fail" message="a forced failure!"/> @@ -33,7 +33,6 @@ <testcase name="cleanupTestCase" classname="tst_JUnit" time="@TEST_DURATION@"/> <system-out> <![CDATA[a qDebug() call with comment-ending stuff -->]]> -<![CDATA[skipping this function!]]> <![CDATA[this failure is expected]]> <![CDATA[this failure is also expected]]> </system-out> diff --git a/tests/auto/testlib/selftests/expected_keyboard.junitxml b/tests/auto/testlib/selftests/expected_keyboard.junitxml index f3f15f8ea36..b34c710e246 100644 --- a/tests/auto/testlib/selftests/expected_keyboard.junitxml +++ b/tests/auto/testlib/selftests/expected_keyboard.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Keyboard" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Keyboard" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_longstring.junitxml b/tests/auto/testlib/selftests/expected_longstring.junitxml index cdb953a861c..613e38688db 100644 --- a/tests/auto/testlib/selftests/expected_longstring.junitxml +++ b/tests/auto/testlib/selftests/expected_longstring.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_LongString" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="1" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_LongString" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="1" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.junitxml b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml index 052395d5738..70a5eab0dfe 100644 --- a/tests/auto/testlib/selftests/expected_maxwarnings.junitxml +++ b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="MaxWarnings" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="MaxWarnings" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_multiexec.junitxml b/tests/auto/testlib/selftests/expected_multiexec.junitxml index dfc8e2afb34..0c0852aa1ed 100644 --- a/tests/auto/testlib/selftests/expected_multiexec.junitxml +++ b/tests/auto/testlib/selftests/expected_multiexec.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -12,7 +12,7 @@ <system-err/> </testsuite> <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -25,7 +25,7 @@ <system-err/> </testsuite> <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -38,7 +38,7 @@ <system-err/> </testsuite> <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -51,7 +51,7 @@ <system-err/> </testsuite> <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml index f8d90cc14c4..b3c115fa48a 100644 --- a/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml +++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_PairDiagnostics" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="4" failures="2" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_PairDiagnostics" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="4" failures="2" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_pass.junitxml b/tests/auto/testlib/selftests/expected_pass.junitxml index 406e1c1f0d3..7d9d034c27c 100644 --- a/tests/auto/testlib/selftests/expected_pass.junitxml +++ b/tests/auto/testlib/selftests/expected_pass.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Pass" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Pass" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml index a066bf6a5f3..10b86be4a81 100644 --- a/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml +++ b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_QExecStringList" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_QExecStringList" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_signaldumper.junitxml b/tests/auto/testlib/selftests/expected_signaldumper.junitxml index 396d11fb36a..6b24c007e29 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.junitxml +++ b/tests/auto/testlib/selftests/expected_signaldumper.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Signaldumper" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="21" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Signaldumper" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="21" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_silent.junitxml b/tests/auto/testlib/selftests/expected_silent.junitxml index d05a3a0c7b7..d2d2799b82e 100644 --- a/tests/auto/testlib/selftests/expected_silent.junitxml +++ b/tests/auto/testlib/selftests/expected_silent.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Silent" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Silent" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="0" skipped="1" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -8,7 +8,7 @@ <testcase name="initTestCase" classname="tst_Silent" time="@TEST_DURATION@"/> <testcase name="pass" classname="tst_Silent" time="@TEST_DURATION@"/> <testcase name="skip" classname="tst_Silent" time="@TEST_DURATION@"> - <!-- type="skip" message="This test should skip" --> + <skipped message="This test should skip"/> </testcase> <testcase name="fail" classname="tst_Silent" time="@TEST_DURATION@"> <failure type="fail" message="'false' returned FALSE. (This test should fail)"/> @@ -30,7 +30,6 @@ <failure type="fail" message="Received a fatal error."/> </testcase> <system-out> -<![CDATA[This test should skip]]> <![CDATA[This test should XFAIL]]> <![CDATA[This is a debug message that should not appear in silent test output]]> <![CDATA[This is a critical message that should not appear in silent test output]]> diff --git a/tests/auto/testlib/selftests/expected_singleskip.junitxml b/tests/auto/testlib/selftests/expected_singleskip.junitxml index 704c820d3f0..b41884fc3e8 100644 --- a/tests/auto/testlib/selftests/expected_singleskip.junitxml +++ b/tests/auto/testlib/selftests/expected_singleskip.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_SingleSkip" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_SingleSkip" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="1" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -7,11 +7,9 @@ </properties> <testcase name="initTestCase" classname="tst_SingleSkip" time="@TEST_DURATION@"/> <testcase name="myTest" classname="tst_SingleSkip" time="@TEST_DURATION@"> - <!-- type="skip" message="skipping test" --> + <skipped message="skipping test"/> </testcase> <testcase name="cleanupTestCase" classname="tst_SingleSkip" time="@TEST_DURATION@"/> - <system-out> -<![CDATA[skipping test]]> - </system-out> + <system-out/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_skip.junitxml b/tests/auto/testlib/selftests/expected_skip.junitxml index 1a09b2f06b7..fccb7d856a9 100644 --- a/tests/auto/testlib/selftests/expected_skip.junitxml +++ b/tests/auto/testlib/selftests/expected_skip.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Skip" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="6" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Skip" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="6" failures="0" errors="0" skipped="3" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -7,22 +7,19 @@ </properties> <testcase name="initTestCase" classname="tst_Skip" time="@TEST_DURATION@"/> <testcase name="test" classname="tst_Skip" time="@TEST_DURATION@"> - <!-- type="skip" message="skipping all" --> + <skipped message="skipping all"/> </testcase> <testcase name="emptytest" classname="tst_Skip" time="@TEST_DURATION@"> - <!-- type="skip" message="skipping all" --> + <skipped message="skipping all"/> </testcase> <testcase name="singleSkip(local 1)" classname="tst_Skip" time="@TEST_DURATION@"> - <!-- type="skip" message="skipping one" --> + <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)" --> </testcase> <testcase name="cleanupTestCase" classname="tst_Skip" time="@TEST_DURATION@"/> <system-out> -<![CDATA[skipping all]]> -<![CDATA[skipping all]]> -<![CDATA[skipping one]]> <![CDATA[this line should only be reached once (true)]]> </system-out> <system-err/> diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.junitxml b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml index e8d1717016d..4ae58e6e14a 100644 --- a/tests/auto/testlib/selftests/expected_skipcleanup.junitxml +++ b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_SkipCleanup" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_SkipCleanup" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="1" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -8,10 +8,8 @@ <testcase name="initTestCase" classname="tst_SkipCleanup" time="@TEST_DURATION@"/> <testcase name="aTestFunction" classname="tst_SkipCleanup" time="@TEST_DURATION@"/> <testcase name="cleanupTestCase" classname="tst_SkipCleanup" time="@TEST_DURATION@"> - <!-- type="skip" message="Skip inside cleanupTestCase." --> + <skipped message="Skip inside cleanupTestCase."/> </testcase> - <system-out> -<![CDATA[Skip inside cleanupTestCase.]]> - </system-out> + <system-out/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_skipinit.junitxml b/tests/auto/testlib/selftests/expected_skipinit.junitxml index 803e5e27498..f7d2b5a1240 100644 --- a/tests/auto/testlib/selftests/expected_skipinit.junitxml +++ b/tests/auto/testlib/selftests/expected_skipinit.junitxml @@ -1,16 +1,14 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_SkipInit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_SkipInit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="0" errors="0" skipped="1" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtBuild" value=""/> </properties> <testcase name="initTestCase" classname="tst_SkipInit" time="@TEST_DURATION@"> - <!-- type="skip" message="Skip inside initTestCase. This should skip all tests in the class." --> + <skipped message="Skip inside initTestCase. This should skip all tests in the class."/> </testcase> <testcase name="cleanupTestCase" classname="tst_SkipInit" time="@TEST_DURATION@"/> - <system-out> -<![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]> - </system-out> + <system-out/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.junitxml b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml index 497b9ec8cbf..c434ee157ad 100644 --- a/tests/auto/testlib/selftests/expected_skipinitdata.junitxml +++ b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_SkipInitData" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="1" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_SkipInitData" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="1" failures="0" errors="0" skipped="1" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtBuild" value=""/> </properties> <testcase name="initTestCase" classname="tst_SkipInitData" time="@TEST_DURATION@"> - <!-- type="skip" message="Skip inside initTestCase_data. This should skip all tests in the class." --> + <skipped message="Skip inside initTestCase_data. This should skip all tests in the class."/> </testcase> - <system-out> -<![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]> - </system-out> + <system-out/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_sleep.junitxml b/tests/auto/testlib/selftests/expected_sleep.junitxml index 1997144f21e..ba6cfa8c3aa 100644 --- a/tests/auto/testlib/selftests/expected_sleep.junitxml +++ b/tests/auto/testlib/selftests/expected_sleep.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Sleep" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="4" failures="0" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Sleep" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="4" failures="0" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_strcmp.junitxml b/tests/auto/testlib/selftests/expected_strcmp.junitxml index 0fa2a3851a3..f21ee1f03aa 100644 --- a/tests/auto/testlib/selftests/expected_strcmp.junitxml +++ b/tests/auto/testlib/selftests/expected_strcmp.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_StrCmp" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="8" failures="5" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_StrCmp" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="8" failures="5" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_subtest.junitxml b/tests/auto/testlib/selftests/expected_subtest.junitxml index 0a67143b042..6d173bd3896 100644 --- a/tests/auto/testlib/selftests/expected_subtest.junitxml +++ b/tests/auto/testlib/selftests/expected_subtest.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Subtest" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="2" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Subtest" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="2" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_testlib.junitxml b/tests/auto/testlib/selftests/expected_testlib.junitxml index c26fbe54e11..1008c4ea70e 100644 --- a/tests/auto/testlib/selftests/expected_testlib.junitxml +++ b/tests/auto/testlib/selftests/expected_testlib.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_TestLib" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="10" failures="1" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_TestLib" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="10" failures="1" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml index 23ea603c37f..9c97826828c 100644 --- a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml +++ b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_TupleDiagnostics" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="2" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_TupleDiagnostics" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="2" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_verbose1.junitxml b/tests/auto/testlib/selftests/expected_verbose1.junitxml index 19dcb2fcc1a..79b4f5df96e 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.junitxml +++ b/tests/auto/testlib/selftests/expected_verbose1.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="0" skipped="8" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -10,24 +10,24 @@ <testcase name="testPassPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testPassSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testPassSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testPassFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testPassFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> <failure type="fail" message="'false' returned FALSE. ()"/> </testcase> <testcase name="testSkipPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testSkipPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testSkipSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testSkipSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testSkipFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testSkipFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> <failure type="fail" message="'false' returned FALSE. ()"/> @@ -40,7 +40,7 @@ <failure type="fail" message="'false' returned FALSE. ()"/> </testcase> <testcase name="testFailSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testFailFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@"> <failure type="fail" message="'false' returned FALSE. ()"/> @@ -61,27 +61,19 @@ <testcase name="testFailInCleanup(after)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testSkipInInit(before)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testSkipInInit(skip)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skip in init()" --> + <skipped message="Skip in init()"/> </testcase> <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()" --> - <!-- type="skip" message="Skip in cleanup()" --> + <skipped message="Skip in cleanup()"/> </testcase> <testcase name="testSkipInCleanup(after)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="cleanupTestCase" classname="tst_Counting" time="@TEST_DURATION@"/> <system-out> -<![CDATA[Skipping]]> -<![CDATA[Skipping]]> -<![CDATA[Skipping]]> -<![CDATA[Skipping]]> -<![CDATA[Skipping]]> -<![CDATA[Skipping]]> <![CDATA[This test function should execute and then QFAIL in cleanup()]]> -<![CDATA[Skip in init()]]> <![CDATA[This test function should execute and then QSKIP in cleanup()]]> -<![CDATA[Skip in cleanup()]]> </system-out> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_verbose2.junitxml b/tests/auto/testlib/selftests/expected_verbose2.junitxml index cd61538f86e..d7eef073660 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.junitxml +++ b/tests/auto/testlib/selftests/expected_verbose2.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="0" skipped="8" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -19,7 +19,7 @@ <!-- type="info" message="QCOMPARE(2 + 1, 3)" --> </testcase> <testcase name="testPassSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testPassFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@"> <!-- type="info" message="QVERIFY(true)" --> @@ -30,20 +30,20 @@ <failure type="fail" message="'false' returned FALSE. ()"/> </testcase> <testcase name="testSkipPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <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)" --> </testcase> <testcase name="testSkipSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testSkipSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testSkipFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testSkipFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> <!-- type="info" message="QVERIFY(false)" --> @@ -62,7 +62,7 @@ <failure type="fail" message="'false' returned FALSE. ()"/> </testcase> <testcase name="testFailSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skipping" --> + <skipped message="Skipping"/> </testcase> <testcase name="testFailFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@"> <!-- type="info" message="QVERIFY(false)" --> @@ -85,13 +85,13 @@ <testcase name="testFailInCleanup(after)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testSkipInInit(before)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="testSkipInInit(skip)" classname="tst_Counting" time="@TEST_DURATION@"> - <!-- type="skip" message="Skip in init()" --> + <skipped message="Skip in init()"/> </testcase> <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()" --> - <!-- type="skip" message="Skip in cleanup()" --> + <skipped message="Skip in cleanup()"/> </testcase> <testcase name="testSkipInCleanup(after)" classname="tst_Counting" time="@TEST_DURATION@"/> <testcase name="cleanupTestCase" classname="tst_Counting" time="@TEST_DURATION@"/> @@ -102,28 +102,20 @@ <![CDATA[QCOMPARE(2 + 1, 3)]]> <![CDATA[QVERIFY(true)]]> <![CDATA[QCOMPARE(2 + 1, 3)]]> -<![CDATA[Skipping]]> <![CDATA[QVERIFY(true)]]> <![CDATA[QCOMPARE(2 + 1, 3)]]> <![CDATA[QVERIFY(false)]]> -<![CDATA[Skipping]]> <![CDATA[QVERIFY(true)]]> <![CDATA[QCOMPARE(2 + 1, 3)]]> -<![CDATA[Skipping]]> -<![CDATA[Skipping]]> -<![CDATA[Skipping]]> <![CDATA[QVERIFY(false)]]> <![CDATA[QVERIFY(false)]]> <![CDATA[QVERIFY(true)]]> <![CDATA[QCOMPARE(2 + 1, 3)]]> <![CDATA[QVERIFY(false)]]> -<![CDATA[Skipping]]> <![CDATA[QVERIFY(false)]]> <![CDATA[QVERIFY(false)]]> <![CDATA[This test function should execute and then QFAIL in cleanup()]]> -<![CDATA[Skip in init()]]> <![CDATA[This test function should execute and then QSKIP in cleanup()]]> -<![CDATA[Skip in cleanup()]]> </system-out> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml index 1ad839080d5..f1915fd3c39 100644 --- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_VerifyExceptionThrown" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="11" failures="6" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_VerifyExceptionThrown" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="11" failures="6" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_warnings.junitxml b/tests/auto/testlib/selftests/expected_warnings.junitxml index a8db9077f46..6d4a5a5967c 100644 --- a/tests/auto/testlib/selftests/expected_warnings.junitxml +++ b/tests/auto/testlib/selftests/expected_warnings.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Warnings" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="4" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Warnings" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="4" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> diff --git a/tests/auto/testlib/selftests/expected_watchdog.junitxml b/tests/auto/testlib/selftests/expected_watchdog.junitxml index a5f7f078085..3fdca1841d4 100644 --- a/tests/auto/testlib/selftests/expected_watchdog.junitxml +++ b/tests/auto/testlib/selftests/expected_watchdog.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Watchdog" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@"> +<testsuite name="tst_Watchdog" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> |