diff options
| author | Tor Arne Vestbø <[email protected]> | 2020-07-21 12:10:32 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <[email protected]> | 2020-07-24 00:52:01 +0200 |
| commit | af7a3430edfc4deff494c9ec88b803f468b5cf2a (patch) | |
| tree | 2ff7efa23349f7aea53a5525f45b0e6b8444b8d7 | |
| parent | 67c877562b18ea5c591d2884d2b14f7bf3a39149 (diff) | |
testlib: Add start time and test duration to JUnit XML
As defined by https://llg.cubic.org/docs/junit/
Change-Id: Ic7683f3d49c529674f8467d591528d4a65d3add8
Reviewed-by: Friedemann Kleint <[email protected]>
55 files changed, 386 insertions, 363 deletions
diff --git a/src/testlib/qjunittestlogger.cpp b/src/testlib/qjunittestlogger.cpp index 62cbac4164f..bba1c777c5c 100644 --- a/src/testlib/qjunittestlogger.cpp +++ b/src/testlib/qjunittestlogger.cpp @@ -81,6 +81,11 @@ void QJUnitTestLogger::startLogging() currentTestSuite = new QTestElement(QTest::LET_TestSuite); currentTestSuite->addAttribute(QTest::AI_Name, QTestResult::currentTestObjectName()); + auto localTime = QDateTime::currentDateTime(); + auto localTimeWithUtcOffset = localTime.toOffsetFromUtc(localTime.offsetFromUtc()); + currentTestSuite->addAttribute(QTest::AI_Timestamp, + localTimeWithUtcOffset.toString(Qt::ISODate).toUtf8().constData()); + QTestElement *property; QTestElement *properties = new QTestElement(QTest::LET_Properties); @@ -115,6 +120,9 @@ void QJUnitTestLogger::stopLogging() qsnprintf(buf, sizeof(buf), "%i", errorCounter); currentTestSuite->addAttribute(QTest::AI_Errors, buf); + currentTestSuite->addAttribute(QTest::AI_Time, + QByteArray::number(QTestLog::msecsTotalTime() / 1000, 'f').constData()); + currentTestSuite->addLogElement(listOfTestcases); // For correct indenting, make sure every testcase knows its parent @@ -147,6 +155,8 @@ void QJUnitTestLogger::enterTestFunction(const char *function) void QJUnitTestLogger::leaveTestFunction() { + currentLogElement->addAttribute(QTest::AI_Time, + QByteArray::number(QTestLog::msecsFunctionTime() / 1000, 'f').constData()); } void QJUnitTestLogger::addIncident(IncidentTypes type, const char *description, diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp index e194ee50f75..134804a0609 100644 --- a/src/testlib/qtestelementattribute.cpp +++ b/src/testlib/qtestelementattribute.cpp @@ -135,7 +135,9 @@ const char *QTestElementAttribute::name() const "metric", "tag", "value", - "iterations" + "iterations", + "time", + "timestamp" }; if (attributeIndex != QTest::AI_Undefined) diff --git a/src/testlib/qtestelementattribute_p.h b/src/testlib/qtestelementattribute_p.h index f3815b72d1f..4f899c3a80c 100644 --- a/src/testlib/qtestelementattribute_p.h +++ b/src/testlib/qtestelementattribute_p.h @@ -76,7 +76,9 @@ namespace QTest { AI_Metric = 12, AI_Tag = 13, AI_Value = 14, - AI_Iterations = 15 + AI_Iterations = 15, + AI_Time = 16, + AI_Timestamp = 17 }; enum LogElementType diff --git a/tests/auto/testlib/selftests/expected_assert.junitxml b/tests/auto/testlib/selftests/expected_assert.junitxml index 96ece2a8510..4905ec73c5a 100644 --- a/tests/auto/testlib/selftests/expected_assert.junitxml +++ b/tests/auto/testlib/selftests/expected_assert.junitxml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Assert" tests="3" failures="1" errors="1"> +<testsuite name="tst_Assert" timestamp="@TEST_START_TIME@" tests="3" failures="1" errors="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" result="pass"/> - <testcase name="testNumber1" result="pass"/> - <testcase name="testNumber2" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="testNumber1" result="pass" time="@TEST_DURATION@"/> + <testcase name="testNumber2" result="fail" time="@TEST_DURATION@"> <!-- type="qfatal" message="ASSERT: "false" in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0" --> <failure result="fail" message="Received a fatal error."/> </testcase> diff --git a/tests/auto/testlib/selftests/expected_badxml.junitxml b/tests/auto/testlib/selftests/expected_badxml.junitxml index de8fcb67f70..0781f1c92e2 100644 --- a/tests/auto/testlib/selftests/expected_badxml.junitxml +++ b/tests/auto/testlib/selftests/expected_badxml.junitxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BadXml" tests="6" failures="5" errors="13"> +<testsuite name="tst_BadXml" timestamp="@TEST_START_TIME@" tests="6" failures="5" errors="13" 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" result="pass"/> - <testcase name="badDataTag" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="badDataTag" result="fail" time="@TEST_DURATION@"> <!-- type="qdebug" message="a message" tag="fail end cdata ]]> text ]]> more text" --> <failure result="fail" message="a failure" tag="fail end cdata ]]> text ]]> more text"/> <!-- type="qdebug" message="a message" tag="pass end cdata ]]> text ]]> more text" --> @@ -20,19 +20,19 @@ <failure result="fail" message="a failure" tag="fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs"/> <!-- type="qdebug" message="a message" tag="pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" --> </testcase> - <testcase name="badMessage" result="pass"> + <testcase name="badMessage" result="pass" time="@TEST_DURATION@"> <!-- type="qdebug" message="end cdata ]]> text ]]> more text" tag="string 0" --> <!-- type="qdebug" message="quotes " text" more text" tag="string 1" --> <!-- type="qdebug" message="xml close > open < tags < text" tag="string 2" --> <!-- type="qdebug" message="all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" tag="string 3" --> </testcase> - <testcase name="failWithNoFile" result="fail"> + <testcase name="failWithNoFile" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="failure message"/> </testcase> - <testcase name="encoding" result="pass"> + <testcase name="encoding" result="pass" time="@TEST_DURATION@"> <!-- type="qdebug" message=""Ülrich Ümläut"" --> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[a message]]> <![CDATA[a message]]> diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml index 8fe792a4a80..e0eed37d3e1 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibCallgrind" tests="3" failures="0" errors="1"> +<testsuite name="tst_BenchlibCallgrind" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="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" result="pass"/> - <testcase name="twoHundredMillionInstructions"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="twoHundredMillionInstructions" time="@TEST_DURATION@"> <!-- type="skip" message="This test is only defined for gcc and x86." --> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[This test is only defined for gcc and x86.]]> </system-err> diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml index a9708bf36e1..09e3de7ef0f 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibCounting" tests="5" failures="1" errors="1"> +<testsuite name="tst_BenchlibCounting" timestamp="@TEST_START_TIME@" tests="5" failures="1" errors="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" result="pass"/> - <testcase name="passingBenchmark" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="passingBenchmark" result="pass" time="@TEST_DURATION@"> </testcase> - <testcase name="skippingBenchmark"> + <testcase name="skippingBenchmark" time="@TEST_DURATION@"> <!-- type="skip" message="This is a skipping benchmark" --> </testcase> - <testcase name="failingBenchmark" result="fail"> + <testcase name="failingBenchmark" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="This is a failing benchmark"/> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[This is a skipping benchmark]]> </system-err> diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml index 2945a67b06d..c268450f69e 100644 --- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibEventCounter" tests="3" failures="0" errors="0"> +<testsuite name="tst_BenchlibEventCounter" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" 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" result="pass"/> - <testcase name="events" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="events" result="pass" time="@TEST_DURATION@"> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.junitxml b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml index cfb5a142b04..c54113f0313 100644 --- a/tests/auto/testlib/selftests/expected_benchliboptions.junitxml +++ b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml @@ -1,39 +1,39 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibOptions" tests="3" failures="0" errors="0"> +<testsuite name="tst_BenchlibOptions" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" 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" result="pass"/> - <testcase name="threeEvents" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="threeEvents" result="pass" time="@TEST_DURATION@"> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibFifteenIterations" tests="3" failures="0" errors="0"> +<testsuite name="tst_BenchlibFifteenIterations" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" 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" result="pass"/> - <testcase name="threeEvents" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="threeEvents" result="pass" time="@TEST_DURATION@"> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibOneHundredMinimum" tests="3" failures="0" errors="0"> +<testsuite name="tst_BenchlibOneHundredMinimum" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" 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" result="pass"/> - <testcase name="threeEvents" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="threeEvents" result="pass" time="@TEST_DURATION@"> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml index f32060b1b01..641ece34ef7 100644 --- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibTickCounter" tests="3" failures="0" errors="0"> +<testsuite name="tst_BenchlibTickCounter" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" 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" result="pass"/> - <testcase name="threeBillionTicks" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="threeBillionTicks" result="pass" time="@TEST_DURATION@"> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml index 9f42e25ee24..b08b0376141 100644 --- a/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_BenchlibWalltime" tests="5" failures="0" errors="0"> +<testsuite name="tst_BenchlibWalltime" timestamp="@TEST_START_TIME@" tests="5" failures="0" errors="0" 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" result="pass"/> - <testcase name="waitForOneThousand" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="waitForOneThousand" result="pass" time="@TEST_DURATION@"> </testcase> - <testcase name="waitForFourThousand" result="pass"> + <testcase name="waitForFourThousand" result="pass" time="@TEST_DURATION@"> </testcase> - <testcase name="qbenchmark_once" result="pass"> + <testcase name="qbenchmark_once" result="pass" time="@TEST_DURATION@"> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_blacklisted.junitxml b/tests/auto/testlib/selftests/expected_blacklisted.junitxml index 67204946a79..a9779140fbd 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.junitxml +++ b/tests/auto/testlib/selftests/expected_blacklisted.junitxml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Blacklisted" tests="7" failures="3" errors="8"> +<testsuite name="tst_Blacklisted" timestamp="@TEST_START_TIME@" tests="7" failures="3" errors="8" 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" result="pass"/> - <testcase name="pass" result="bpass"/> - <testcase name="skip"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="pass" result="bpass" time="@TEST_DURATION@"/> + <testcase name="skip" time="@TEST_DURATION@"> <!-- type="skip" message="This test should SKIP" --> </testcase> - <testcase name="fail" result="bfail"/> - <testcase name="xfail" result="bxfail"/> - <testcase name="xpass" result="bxpass"/> - <testcase name="messages" result="bfail"> + <testcase name="fail" result="bfail" time="@TEST_DURATION@"/> + <testcase name="xfail" result="bxfail" time="@TEST_DURATION@"/> + <testcase name="xpass" result="bxpass" time="@TEST_DURATION@"/> + <testcase name="messages" result="bfail" time="@TEST_DURATION@"> <!-- type="qwarn" message="This is a warning that should not appear in silent test output" --> <!-- type="warn" message="This is an internal testlib warning that should not appear in silent test output" --> <!-- type="qdebug" message="This is a debug 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 2bdfabd9bb0..667cfaad443 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.junitxml +++ b/tests/auto/testlib/selftests/expected_cmptest.junitxml @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Cmptest" tests="28" failures="45" errors="0"> +<testsuite name="tst_Cmptest" timestamp="@TEST_START_TIME@" tests="28" failures="45" errors="0" 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" result="pass"/> - <testcase name="compare_unregistered_enums" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="compare_unregistered_enums" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same"/> </testcase> - <testcase name="compare_registered_enums" result="fail"> + <testcase name="compare_registered_enums" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (Qt::Monday): Monday Expected (Qt::Sunday): Sunday"/> </testcase> - <testcase name="compare_class_enums" result="fail"> + <testcase name="compare_class_enums" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1 Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2"/> </testcase> - <testcase name="test_windowflags" result="fail"> + <testcase name="test_windowflags" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (actualWindowFlags) : Window|WindowSystemMenuHint|WindowStaysOnBottomHint Expected (expectedWindowFlags): Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint" tag="fail1"/> @@ -27,7 +27,7 @@ Actual (actualWindowFlags) : Window Expected (expectedWindowFlags): Window|FramelessWindowHint" tag="fail2"/> </testcase> - <testcase name="test_unregistered_flags" result="fail"> + <testcase name="test_unregistered_flags" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (actualFlags) : 0x3 Expected (expectedFlags): 0x5" tag="fail1"/> @@ -35,10 +35,10 @@ Actual (actualFlags) : 0x1 Expected (expectedFlags): 0x5" tag="fail2"/> </testcase> - <testcase name="compare_boolfuncs" result="pass"/> - <testcase name="compare_to_nullptr" result="pass"/> - <testcase name="compare_pointerfuncs" result="pass"/> - <testcase name="compare_tostring" result="fail"> + <testcase name="compare_boolfuncs" result="pass" time="@TEST_DURATION@"/> + <testcase name="compare_to_nullptr" result="pass" time="@TEST_DURATION@"/> + <testcase name="compare_pointerfuncs" result="pass" time="@TEST_DURATION@"/> + <testcase name="compare_tostring" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (actual) : QVariant(int,123) Expected (expected): QVariant(QString,hi)" tag="int, string"/> @@ -52,7 +52,7 @@ Actual (actual) : QVariant(PhonyClass,<value not representable as string>) Expected (expected): QVariant(PhonyClass,<value not representable as string>)" tag="both non-null user type"/> </testcase> - <testcase name="compareQStringLists" result="fail"> + <testcase name="compareQStringLists" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared lists differ at index 2. Actual (opA): "string3" Expected (opB): "DIFFERS"" tag="last item different"/> @@ -69,7 +69,7 @@ Actual (opA) size: 1 Expected (opB) size: 12" tag="short list first"/> </testcase> - <testcase name="compareQListInt" result="fail"> + <testcase name="compareQListInt" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared lists have different sizes. Actual (actual) size: 2 Expected (expected) size: 3" tag="size mismatch"/> @@ -77,7 +77,7 @@ Actual (actual): 4 Expected (expected): 3" tag="value mismatch"/> </testcase> - <testcase name="compareQListIntToArray" result="fail"> + <testcase name="compareQListIntToArray" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared lists have different sizes. Actual (actual) size: 2 Expected (expected) size: 3" tag="size mismatch"/> @@ -85,7 +85,7 @@ Actual (actual): 4 Expected (expected): 3" tag="value mismatch"/> </testcase> - <testcase name="compareQListIntToInitializerList" result="fail"> + <testcase name="compareQListIntToInitializerList" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared lists have different sizes. Actual (actual) size: 2 Expected (ARG({1, 2, 3})) size: 3" tag="size mismatch"/> @@ -93,12 +93,12 @@ Actual (actual): 4 Expected (ARG({1, 2, 3})): 3" tag="value mismatch"/> </testcase> - <testcase name="compareQListDouble" result="fail"> + <testcase name="compareQListDouble" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared lists differ at index 0. Actual (double1): 1.5 Expected (double2): 1"/> </testcase> - <testcase name="compareQColor" result="fail"> + <testcase name="compareQColor" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (colorA): #ffffff00 Expected (colorB): #ff00ff00" tag="Qt::yellow vs Qt::green"/> @@ -106,7 +106,7 @@ Actual (colorA): #88ff0000 Expected (colorB): #ffff0000" tag="0x88ff0000 vs 0xffff0000"/> </testcase> - <testcase name="compareQPixmaps" result="fail"> + <testcase name="compareQPixmaps" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared QPixmaps differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0" tag="one null"/> @@ -121,7 +121,7 @@ Actual (opA): 1 Expected (opB): 2" tag="different dpr"/> </testcase> - <testcase name="compareQImages" result="fail"> + <testcase name="compareQImages" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared QImages differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0" tag="one null"/> @@ -139,7 +139,7 @@ Actual (opA): 1 Expected (opB): 2" tag="different dpr"/> </testcase> - <testcase name="compareQRegion" result="fail"> + <testcase name="compareQRegion" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (rA): QRegion(200x50+10+10) Expected (rB): QRegion(null)" tag="1-empty"/> @@ -147,34 +147,34 @@ Actual (rA): QRegion(200x50+10+10) Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)" tag="different lists"/> </testcase> - <testcase name="compareQVector2D" result="fail"> + <testcase name="compareQVector2D" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (v2a): QVector2D(1, 2) Expected (v2b): QVector2D(1, 3)"/> </testcase> - <testcase name="compareQVector3D" result="fail"> + <testcase name="compareQVector3D" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (v3a): QVector3D(1, 2, 3) Expected (v3b): QVector3D(1, 3, 3)"/> </testcase> - <testcase name="compareQVector4D" result="fail"> + <testcase name="compareQVector4D" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (v4a): QVector4D(1, 2, 3, 4) Expected (v4b): QVector4D(1, 3, 3, 4)"/> </testcase> - <testcase name="verify" result="fail"> + <testcase name="verify" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'opaqueFunc() < 2' returned FALSE. ()"/> </testcase> - <testcase name="verify2" result="fail"> + <testcase name="verify2" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'opaqueFunc() < 2' returned FALSE. (42)"/> </testcase> - <testcase name="tryVerify" result="fail"> + <testcase name="tryVerify" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'opaqueFunc() < 2' returned FALSE. ()"/> </testcase> - <testcase name="tryVerify2" result="fail"> + <testcase name="tryVerify2" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'opaqueFunc() < 2' returned FALSE. (42)"/> </testcase> - <testcase name="verifyExplicitOperatorBool" result="pass"/> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="verifyExplicitOperatorBool" result="pass" time="@TEST_DURATION@"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.junitxml b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml index 2a8df68568b..e5cd575d343 100644 --- a/tests/auto/testlib/selftests/expected_commandlinedata.junitxml +++ b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_DataTable" tests="4" failures="0" errors="6"> +<testsuite name="tst_DataTable" timestamp="@TEST_START_TIME@" tests="4" failures="0" errors="6" 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" result="pass"/> - <testcase name="fiveTablePasses" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="fiveTablePasses" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data1" --> <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data2" --> <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data3" --> <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data4" --> <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data5" --> </testcase> - <testcase name="fiveTablePasses" result="pass"> + <testcase name="fiveTablePasses" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data1" --> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[QVERIFY(test)]]> <![CDATA[QVERIFY(test)]]> diff --git a/tests/auto/testlib/selftests/expected_counting.junitxml b/tests/auto/testlib/selftests/expected_counting.junitxml index d0b75525552..49632731d0b 100644 --- a/tests/auto/testlib/selftests/expected_counting.junitxml +++ b/tests/auto/testlib/selftests/expected_counting.junitxml @@ -1,55 +1,55 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Counting" tests="15" failures="8" errors="10"> +<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" tests="15" failures="8" errors="10" 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" result="pass"/> - <testcase name="testPassPass" result="pass"/> - <testcase name="testPassSkip" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="testPassPass" result="pass" time="@TEST_DURATION@"/> + <testcase name="testPassSkip" result="pass" time="@TEST_DURATION@"> <!-- type="skip" message="Skipping" tag="row 2" --> </testcase> - <testcase name="testPassFail" result="fail"> + <testcase name="testPassFail" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'false' returned FALSE. ()" tag="row 2"/> </testcase> - <testcase name="testSkipPass" result="pass"> + <testcase name="testSkipPass" result="pass" time="@TEST_DURATION@"> <!-- type="skip" message="Skipping" tag="row 1" --> </testcase> - <testcase name="testSkipSkip"> + <testcase name="testSkipSkip" time="@TEST_DURATION@"> <!-- type="skip" message="Skipping" tag="row 1" --> <!-- type="skip" message="Skipping" tag="row 2" --> </testcase> - <testcase name="testSkipFail" result="fail"> + <testcase name="testSkipFail" result="fail" time="@TEST_DURATION@"> <!-- type="skip" message="Skipping" tag="row 1" --> <failure result="fail" message="'false' returned FALSE. ()" tag="row 2"/> </testcase> - <testcase name="testFailPass" result="fail"> + <testcase name="testFailPass" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'false' returned FALSE. ()" tag="row 1"/> </testcase> - <testcase name="testFailSkip" result="fail"> + <testcase name="testFailSkip" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'false' returned FALSE. ()" tag="row 1"/> <!-- type="skip" message="Skipping" tag="row 2" --> </testcase> - <testcase name="testFailFail" result="fail"> + <testcase name="testFailFail" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'false' returned FALSE. ()" tag="row 1"/> <failure result="fail" message="'false' returned FALSE. ()" tag="row 2"/> </testcase> - <testcase name="testFailInInit" result="fail"> + <testcase name="testFailInInit" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Fail in init()" tag="fail"/> </testcase> - <testcase name="testFailInCleanup" result="fail"> + <testcase name="testFailInCleanup" result="fail" time="@TEST_DURATION@"> <!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" tag="fail" --> <failure result="fail" message="Fail in cleanup()" tag="fail"/> </testcase> - <testcase name="testSkipInInit" result="pass"> + <testcase name="testSkipInInit" result="pass" time="@TEST_DURATION@"> <!-- type="skip" message="Skip in init()" tag="skip" --> </testcase> - <testcase name="testSkipInCleanup" result="pass"> + <testcase name="testSkipInCleanup" result="pass" time="@TEST_DURATION@"> <!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" tag="skip" --> <!-- type="skip" message="Skip in cleanup()" tag="skip" --> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[Skipping]]> <![CDATA[Skipping]]> diff --git a/tests/auto/testlib/selftests/expected_datatable.junitxml b/tests/auto/testlib/selftests/expected_datatable.junitxml index 0857cb55934..c3db9c584d3 100644 --- a/tests/auto/testlib/selftests/expected_datatable.junitxml +++ b/tests/auto/testlib/selftests/expected_datatable.junitxml @@ -1,37 +1,37 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_DataTable" tests="10" failures="13" errors="0"> +<testsuite name="tst_DataTable" timestamp="@TEST_START_TIME@" tests="10" failures="13" errors="0" 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" result="pass"/> - <testcase name="singleTestFunction1" result="pass"/> - <testcase name="singleTestFunction2" result="pass"/> - <testcase name="fiveTablePasses" result="pass"/> - <testcase name="fiveTableFailures" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="singleTestFunction1" result="pass" time="@TEST_DURATION@"/> + <testcase name="singleTestFunction2" result="pass" time="@TEST_DURATION@"/> + <testcase name="fiveTablePasses" result="pass" time="@TEST_DURATION@"/> + <testcase name="fiveTableFailures" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'test' returned FALSE. ()" tag="fiveTableFailures_data 1"/> <failure result="fail" message="'test' returned FALSE. ()" tag="fiveTableFailures_data 2"/> <failure result="fail" message="'test' returned FALSE. ()" tag="fiveTableFailures_data 3"/> <failure result="fail" message="'test' returned FALSE. ()" tag="fiveTableFailures_data 4"/> <failure result="fail" message="'test' returned FALSE. ()" tag="fiveTableFailures_data 5"/> </testcase> - <testcase name="startsWithFailure" result="fail"> + <testcase name="startsWithFailure" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'test' returned FALSE. ()" tag="startsWithFailure_data 1"/> </testcase> - <testcase name="endsWithFailure" result="fail"> + <testcase name="endsWithFailure" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'test' returned FALSE. ()" tag="endsWithFailure 5"/> </testcase> - <testcase name="failureInMiddle" result="fail"> + <testcase name="failureInMiddle" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'test' returned FALSE. ()" tag="failureInMiddle_data 3"/> </testcase> - <testcase name="fiveIsolatedFailures" result="fail"> + <testcase name="fiveIsolatedFailures" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'!test' returned FALSE. ()" tag="fiveIsolatedFailures_data 1"/> <failure result="fail" message="'!test' returned FALSE. ()" tag="fiveIsolatedFailures_data 2"/> <failure result="fail" message="'!test' returned FALSE. ()" tag="fiveIsolatedFailures_data 3"/> <failure result="fail" message="'!test' returned FALSE. ()" tag="fiveIsolatedFailures_data 4"/> <failure result="fail" message="'!test' returned FALSE. ()" tag="fiveIsolatedFailures_data 5"/> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_datetime.junitxml b/tests/auto/testlib/selftests/expected_datetime.junitxml index a95cc57fafb..607fa861226 100644 --- a/tests/auto/testlib/selftests/expected_datetime.junitxml +++ b/tests/auto/testlib/selftests/expected_datetime.junitxml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_DateTime" tests="4" failures="3" errors="0"> +<testsuite name="tst_DateTime" timestamp="@TEST_START_TIME@" tests="4" failures="3" errors="0" 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" result="pass"/> - <testcase name="dateTime" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="dateTime" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (local): 2000/05/03 04:03:04.000[UTC+00:02] Expected (utc) : 2000/05/03 04:03:04.000[UTC]"/> </testcase> - <testcase name="qurl" result="fail"> + <testcase name="qurl" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (operandA): http://example.com Expected (operandB): Invalid URL: " tag="empty rhs"/> @@ -19,6 +19,6 @@ Actual (operandA): Invalid URL: Expected (operandB): http://example.com" tag="empty lhs"/> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml index f4f920ca6fc..d92e9dcd509 100644 --- a/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml +++ b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Exception" tests="2" failures="1" errors="0"> +<testsuite name="tst_Exception" timestamp="@TEST_START_TIME@" tests="2" failures="1" errors="0" 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" result="pass"/> - <testcase name="throwException" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="throwException" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Caught unhandled exception"/> </testcase> <system-err/> diff --git a/tests/auto/testlib/selftests/expected_expectfail.junitxml b/tests/auto/testlib/selftests/expected_expectfail.junitxml index 03d9b2c32d4..e38933a3dfb 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.junitxml +++ b/tests/auto/testlib/selftests/expected_expectfail.junitxml @@ -1,54 +1,54 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_ExpectFail" tests="14" failures="6" errors="13"> +<testsuite name="tst_ExpectFail" timestamp="@TEST_START_TIME@" tests="14" failures="6" errors="13" 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" result="pass"/> - <testcase name="xfailAndContinue" result="xfail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="xfailAndContinue" result="xfail" time="@TEST_DURATION@"> <!-- type="qdebug" message="begin" --> <!-- type="info" message="This should xfail" --> <!-- type="qdebug" message="after" --> </testcase> - <testcase name="xfailAndAbort" result="xfail"> + <testcase name="xfailAndAbort" result="xfail" time="@TEST_DURATION@"> <!-- type="qdebug" message="begin" --> <!-- type="info" message="This should xfail" --> </testcase> - <testcase name="xfailTwice" result="fail"> + <testcase name="xfailTwice" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Already expecting a fail"/> </testcase> - <testcase name="xfailWithQString" result="xfail"> + <testcase name="xfailWithQString" result="xfail" time="@TEST_DURATION@"> <!-- type="info" message="A string" --> <!-- type="info" message="Bug 5 (The message)" --> </testcase> - <testcase name="xfailDataDrivenWithQVerify" result="xfail"> + <testcase name="xfailDataDrivenWithQVerify" result="xfail" time="@TEST_DURATION@"> <!-- type="info" message="This test should xfail" tag="Abort" --> <!-- type="info" message="This test should xfail" tag="Continue" --> </testcase> - <testcase name="xfailDataDrivenWithQCompare" result="xfail"> + <testcase name="xfailDataDrivenWithQCompare" result="xfail" time="@TEST_DURATION@"> <!-- type="info" message="This test should xfail" tag="Abort" --> <!-- type="info" message="This test should xfail" tag="Continue" --> </testcase> - <testcase name="xfailOnWrongRow" result="pass"/> - <testcase name="xfailOnAnyRow" result="xfail"> + <testcase name="xfailOnWrongRow" result="pass" time="@TEST_DURATION@"/> + <testcase name="xfailOnAnyRow" result="xfail" time="@TEST_DURATION@"> <!-- type="info" message="This test should xfail" tag="first row" --> <!-- type="info" message="This test should xfail" tag="second row" --> </testcase> - <testcase name="xfailWithoutVerify" result="fail"> + <testcase name="xfailWithoutVerify" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="QEXPECT_FAIL was called without any subsequent verification statements" tag="first row"/> <failure result="fail" message="QEXPECT_FAIL was called without any subsequent verification statements" tag="second row"/> </testcase> - <testcase name="xpass" result="xpass"> + <testcase name="xpass" result="xpass" time="@TEST_DURATION@"> <failure result="xpass" message="'true' returned TRUE unexpectedly. ()"/> </testcase> - <testcase name="xpassDataDrivenWithQVerify" result="xpass"> + <testcase name="xpassDataDrivenWithQVerify" result="xpass" time="@TEST_DURATION@"> <failure result="xpass" message="'true' returned TRUE unexpectedly. ()" tag="XPass"/> </testcase> - <testcase name="xpassDataDrivenWithQCompare" result="xpass"> + <testcase name="xpassDataDrivenWithQCompare" result="xpass" time="@TEST_DURATION@"> <failure result="xpass" message="QCOMPARE(1, 1) returned TRUE unexpectedly." tag="XPass"/> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[begin]]> <![CDATA[This should xfail]]> diff --git a/tests/auto/testlib/selftests/expected_failcleanup.junitxml b/tests/auto/testlib/selftests/expected_failcleanup.junitxml index 6481c960669..36b47036701 100644 --- a/tests/auto/testlib/selftests/expected_failcleanup.junitxml +++ b/tests/auto/testlib/selftests/expected_failcleanup.junitxml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_FailCleanup" tests="3" failures="1" errors="0"> +<testsuite name="tst_FailCleanup" timestamp="@TEST_START_TIME@" tests="3" failures="1" errors="0" 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" result="pass"/> - <testcase name="aTestFunction" result="pass"/> - <testcase name="cleanupTestCase" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="aTestFunction" result="pass" time="@TEST_DURATION@"/> + <testcase name="cleanupTestCase" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'false' returned FALSE. (Fail inside cleanupTestCase)"/> </testcase> <system-err/> diff --git a/tests/auto/testlib/selftests/expected_faildatatype.junitxml b/tests/auto/testlib/selftests/expected_faildatatype.junitxml index 105452238ca..e654fa44417 100644 --- a/tests/auto/testlib/selftests/expected_faildatatype.junitxml +++ b/tests/auto/testlib/selftests/expected_faildatatype.junitxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_FailDataType" tests="2" failures="1" errors="2"> +<testsuite name="tst_FailDataType" timestamp="@TEST_START_TIME@" tests="2" failures="1" errors="2" 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" result="pass"/> - <testcase name="value" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="value" result="fail" time="@TEST_DURATION@"> <!-- type="qdebug" message="expected data of type 'QString', got 'bool' for element 0 of data with tag 'bool-as-string'" --> <!-- type="qfatal" message="ASSERT: "false" in file qtbase/src/testlib/qtestdata.cpp, line 0" --> <failure result="fail" message="Received a fatal error."/> diff --git a/tests/auto/testlib/selftests/expected_failfetchtype.junitxml b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml index 1c177edd78e..a8263b8963d 100644 --- a/tests/auto/testlib/selftests/expected_failfetchtype.junitxml +++ b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_FailFetchType" tests="2" failures="1" errors="1"> +<testsuite name="tst_FailFetchType" timestamp="@TEST_START_TIME@" tests="2" failures="1" errors="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" result="pass"/> - <testcase name="fetch" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="fetch" result="fail" time="@TEST_DURATION@"> <!-- type="qfatal" message="Requested type 'QString' does not match available type 'bool'." tag="bool" --> <failure result="fail" message="Received a fatal error." tag="bool"/> </testcase> diff --git a/tests/auto/testlib/selftests/expected_failinit.junitxml b/tests/auto/testlib/selftests/expected_failinit.junitxml index cc57286c9ee..04ccad6d2b9 100644 --- a/tests/auto/testlib/selftests/expected_failinit.junitxml +++ b/tests/auto/testlib/selftests/expected_failinit.junitxml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_FailInit" tests="2" failures="1" errors="0"> +<testsuite name="tst_FailInit" timestamp="@TEST_START_TIME@" tests="2" failures="1" errors="0" 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" result="fail"> + <testcase name="initTestCase" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'false' returned FALSE. ()"/> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_failinitdata.junitxml b/tests/auto/testlib/selftests/expected_failinitdata.junitxml index 5a446c24c6b..c0ad679d1b8 100644 --- a/tests/auto/testlib/selftests/expected_failinitdata.junitxml +++ b/tests/auto/testlib/selftests/expected_failinitdata.junitxml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_FailInitData" tests="1" failures="1" errors="0"> +<testsuite name="tst_FailInitData" timestamp="@TEST_START_TIME@" tests="1" failures="1" errors="0" 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" result="fail"> + <testcase name="initTestCase" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'false' returned FALSE. ()"/> </testcase> <system-err/> diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.junitxml b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml index a921649e1e0..a967cc8b3d7 100644 --- a/tests/auto/testlib/selftests/expected_fetchbogus.junitxml +++ b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_FetchBogus" tests="2" failures="1" errors="1"> +<testsuite name="tst_FetchBogus" timestamp="@TEST_START_TIME@" tests="2" failures="1" errors="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" result="pass"/> - <testcase name="fetchBogus" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="fetchBogus" result="fail" time="@TEST_DURATION@"> <!-- type="qfatal" message="QFETCH: Requested testdata 'bubu' not available, check your _data function." tag="foo" --> <failure result="fail" message="Received a fatal error." tag="foo"/> </testcase> diff --git a/tests/auto/testlib/selftests/expected_findtestdata.junitxml b/tests/auto/testlib/selftests/expected_findtestdata.junitxml index 4cec09b8c96..1a0eebca8e9 100644 --- a/tests/auto/testlib/selftests/expected_findtestdata.junitxml +++ b/tests/auto/testlib/selftests/expected_findtestdata.junitxml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="FindTestData" tests="3" failures="0" errors="1"> +<testsuite name="FindTestData" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="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" result="pass"/> - <testcase name="paths" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="paths" result="pass" time="@TEST_DURATION@"> <!-- type="warn" message="testdata testfile could not be located!" --> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[testdata testfile could not be located!]]> </system-err> diff --git a/tests/auto/testlib/selftests/expected_float.junitxml b/tests/auto/testlib/selftests/expected_float.junitxml index fa361d96d1b..831f8fefd88 100644 --- a/tests/auto/testlib/selftests/expected_float.junitxml +++ b/tests/auto/testlib/selftests/expected_float.junitxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_float" tests="6" failures="96" errors="0"> +<testsuite name="tst_float" timestamp="@TEST_START_TIME@" tests="6" failures="96" errors="0" 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" result="pass"/> - <testcase name="doubleComparisons" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="doubleComparisons" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared doubles are not the same (fuzzy compare) Actual (operandLeft) : 1 Expected (operandRight): 3" tag="should FAIL 1"/> @@ -101,7 +101,7 @@ Actual (operandLeft) : -1.79769313486e+308 Expected (operandRight): -inf" tag="should FAIL: -max != -inf"/> </testcase> - <testcase name="floatComparisons" result="fail"> + <testcase name="floatComparisons" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared floats are not the same (fuzzy compare) Actual (operandLeft) : 1 Expected (operandRight): 3" tag="should FAIL 1"/> @@ -196,7 +196,7 @@ Actual (operandLeft) : -3.40282e+38 Expected (operandRight): -inf" tag="should FAIL: -max != -inf"/> </testcase> - <testcase name="float16Comparisons" result="fail"> + <testcase name="float16Comparisons" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare) Actual (operandLeft) : 1 Expected (operandRight): 3" tag="should FAIL 1"/> @@ -291,7 +291,7 @@ Actual (operandLeft) : -6.55e+04 Expected (operandRight): -inf" tag="should FAIL: -max != -inf"/> </testcase> - <testcase name="compareFloatTests" result="fail"> + <testcase name="compareFloatTests" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared floats are not the same (fuzzy compare) Actual (t1): 1 Expected (t3): 3" tag="1e0"/> @@ -302,6 +302,6 @@ Actual (t1): 1e+07 Expected (t3): 3e+07" tag="1e+7"/> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_globaldata.junitxml b/tests/auto/testlib/selftests/expected_globaldata.junitxml index 2ce288720f4..6a24fd099b9 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.junitxml +++ b/tests/auto/testlib/selftests/expected_globaldata.junitxml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_globaldata" tests="6" failures="0" errors="43"> +<testsuite name="tst_globaldata" timestamp="@TEST_START_TIME@" tests="6" failures="0" errors="43" 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" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"> <!-- type="qdebug" message="initTestCase initTestCase (null)" --> </testcase> - <testcase name="testGlobal" result="pass"> + <testcase name="testGlobal" result="pass" time="@TEST_DURATION@"> <!-- type="qdebug" message="init testGlobal local=false" tag="global=false:local=false" --> <!-- type="qdebug" message="global: false" tag="global=false:local=false" --> <!-- type="qdebug" message="local: false" tag="global=false:local=false" --> @@ -26,10 +26,10 @@ <!-- type="qdebug" message="local: true" tag="global=true:local=true" --> <!-- type="qdebug" message="cleanup testGlobal local=true" tag="global=true:local=true" --> </testcase> - <testcase name="skip"> + <testcase name="skip" time="@TEST_DURATION@"> <!-- type="skip" message="skipping" tag="global=false" --> </testcase> - <testcase name="skipLocal"> + <testcase name="skipLocal" time="@TEST_DURATION@"> <!-- type="qdebug" message="init skipLocal local=false" tag="global=false:local=false" --> <!-- type="skip" message="skipping" tag="global=false:local=false" --> <!-- type="qdebug" message="cleanup skipLocal local=false" tag="global=false:local=false" --> @@ -43,7 +43,7 @@ <!-- type="skip" message="skipping" tag="global=true:local=true" --> <!-- type="qdebug" message="cleanup skipLocal local=true" tag="global=true:local=true" --> </testcase> - <testcase name="skipSingle" result="pass"> + <testcase name="skipSingle" result="pass" time="@TEST_DURATION@"> <!-- type="qdebug" message="init skipSingle local=false" tag="global=false:local=false" --> <!-- type="qdebug" message="global: false local: false" tag="global=false:local=false" --> <!-- type="qdebug" message="cleanup skipSingle local=false" tag="global=false:local=false" --> @@ -57,7 +57,7 @@ <!-- type="qdebug" message="global: true local: true" tag="global=true:local=true" --> <!-- type="qdebug" message="cleanup skipSingle local=true" tag="global=true:local=true" --> </testcase> - <testcase name="cleanupTestCase" result="pass"> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"> <!-- type="qdebug" message="cleanupTestCase cleanupTestCase (null)" --> </testcase> <system-err> diff --git a/tests/auto/testlib/selftests/expected_keyboard.junitxml b/tests/auto/testlib/selftests/expected_keyboard.junitxml index 66d8e80e584..22e41dff3aa 100644 --- a/tests/auto/testlib/selftests/expected_keyboard.junitxml +++ b/tests/auto/testlib/selftests/expected_keyboard.junitxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Keyboard" tests="3" failures="0" errors="0"> +<testsuite name="tst_Keyboard" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" 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" result="pass"/> - <testcase name="keyPressAndRelease" result="pass"/> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="keyPressAndRelease" result="pass" time="@TEST_DURATION@"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_longstring.junitxml b/tests/auto/testlib/selftests/expected_longstring.junitxml index 045aebc9bb1..c84eaddd6a0 100644 --- a/tests/auto/testlib/selftests/expected_longstring.junitxml +++ b/tests/auto/testlib/selftests/expected_longstring.junitxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_LongString" tests="3" failures="1" errors="0"> +<testsuite name="tst_LongString" timestamp="@TEST_START_TIME@" tests="3" failures="1" errors="0" 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" result="pass"/> - <testcase name="failWithLongString" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="failWithLongString" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. @@ -17,6 +17,6 @@ Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. M Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas."/> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.junitxml b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml index cec2c459fac..def32cdb169 100644 --- a/tests/auto/testlib/selftests/expected_maxwarnings.junitxml +++ b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="MaxWarnings" tests="3" failures="0" errors="2002"> +<testsuite name="MaxWarnings" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="2002" 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" result="pass"/> - <testcase name="warn" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="warn" result="pass" time="@TEST_DURATION@"> <!-- type="qwarn" message="0" --> <!-- type="qwarn" message="1" --> <!-- type="qwarn" message="2" --> @@ -2010,7 +2010,7 @@ <!-- type="qwarn" message="2000" --> <!-- type="system" message="Maximum amount of warnings exceeded. Use -maxwarnings to override." --> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[0]]> <![CDATA[1]]> diff --git a/tests/auto/testlib/selftests/expected_multiexec.junitxml b/tests/auto/testlib/selftests/expected_multiexec.junitxml index 642dee30d38..de4e05c5d81 100644 --- a/tests/auto/testlib/selftests/expected_multiexec.junitxml +++ b/tests/auto/testlib/selftests/expected_multiexec.junitxml @@ -1,60 +1,60 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Nothing" tests="3" failures="0" errors="0"> +<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" 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" result="pass"/> - <testcase name="nothing" result="pass"/> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="nothing" result="pass" time="@TEST_DURATION@"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Nothing" tests="3" failures="0" errors="0"> +<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" 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" result="pass"/> - <testcase name="nothing" result="pass"/> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="nothing" result="pass" time="@TEST_DURATION@"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Nothing" tests="3" failures="0" errors="0"> +<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" 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" result="pass"/> - <testcase name="nothing" result="pass"/> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="nothing" result="pass" time="@TEST_DURATION@"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Nothing" tests="3" failures="0" errors="0"> +<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" 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" result="pass"/> - <testcase name="nothing" result="pass"/> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="nothing" result="pass" time="@TEST_DURATION@"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Nothing" tests="3" failures="0" errors="0"> +<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" 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" result="pass"/> - <testcase name="nothing" result="pass"/> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="nothing" result="pass" time="@TEST_DURATION@"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml index 96b481b3f5e..4086bd82732 100644 --- a/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml +++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_PairDiagnostics" tests="4" failures="2" errors="0"> +<testsuite name="tst_PairDiagnostics" timestamp="@TEST_START_TIME@" tests="4" failures="2" errors="0" 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" result="pass"/> - <testcase name="testQPair" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="testQPair" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (pair1): "std::pair(1,1)" Expected (pair2): "std::pair(1,2)""/> </testcase> - <testcase name="testStdPair" result="fail"> + <testcase name="testStdPair" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (pair1): "std::pair(1,1)" Expected (pair2): "std::pair(1,2)""/> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_pass.junitxml b/tests/auto/testlib/selftests/expected_pass.junitxml index 127cf67b4d3..d35c7984990 100644 --- a/tests/auto/testlib/selftests/expected_pass.junitxml +++ b/tests/auto/testlib/selftests/expected_pass.junitxml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Pass" tests="5" failures="0" errors="0"> +<testsuite name="tst_Pass" timestamp="@TEST_START_TIME@" tests="5" failures="0" errors="0" 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" result="pass"/> - <testcase name="testNumber1" result="pass"/> - <testcase name="testNumber2" result="pass"/> - <testcase name="testNumber3" result="pass"/> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="testNumber1" result="pass" time="@TEST_DURATION@"/> + <testcase name="testNumber2" result="pass" time="@TEST_DURATION@"/> + <testcase name="testNumber3" result="pass" time="@TEST_DURATION@"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml index e0a2930dd79..441562fa5a1 100644 --- a/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml +++ b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_QExecStringList" tests="5" failures="0" errors="0"> +<testsuite name="tst_QExecStringList" timestamp="@TEST_START_TIME@" tests="5" failures="0" errors="0" 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" result="pass"/> - <testcase name="testA" result="pass"/> - <testcase name="testB" result="pass"/> - <testcase name="testC" result="pass"/> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="testA" result="pass" time="@TEST_DURATION@"/> + <testcase name="testB" result="pass" time="@TEST_DURATION@"/> + <testcase name="testC" result="pass" time="@TEST_DURATION@"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> ********* Start testing of tst_QExecStringList ********* diff --git a/tests/auto/testlib/selftests/expected_signaldumper.junitxml b/tests/auto/testlib/selftests/expected_signaldumper.junitxml index 5d4a5717f64..a6f34414f81 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.junitxml +++ b/tests/auto/testlib/selftests/expected_signaldumper.junitxml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Signaldumper" tests="13" failures="0" errors="124"> +<testsuite name="tst_Signaldumper" timestamp="@TEST_START_TIME@" tests="13" failures="0" errors="124" 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" result="pass"/> - <testcase name="noConnections" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="noConnections" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" --> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" --> </testcase> - <testcase name="oneSlot" result="pass"> + <testcase name="oneSlot" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" --> <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" --> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" --> @@ -24,7 +24,7 @@ <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" --> <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" --> </testcase> - <testcase name="oneSlotOldSyntax" result="pass"> + <testcase name="oneSlotOldSyntax" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" --> <!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" --> <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" --> @@ -41,7 +41,7 @@ <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" --> <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" --> </testcase> - <testcase name="twoSlots" result="pass"> + <testcase name="twoSlots" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" --> <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" --> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" --> @@ -55,7 +55,7 @@ <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" --> <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" --> </testcase> - <testcase name="twoSlotsOldSyntax" result="pass"> + <testcase name="twoSlotsOldSyntax" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" --> <!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" --> <!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" --> @@ -75,7 +75,7 @@ <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" --> <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" --> </testcase> - <testcase name="signalForwarding" result="pass"> + <testcase name="signalForwarding" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" --> <!-- type="info" message=" Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" --> <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" --> @@ -95,7 +95,7 @@ <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" --> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" --> </testcase> - <testcase name="signalForwardingOldSyntax" result="pass"> + <testcase name="signalForwardingOldSyntax" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" --> <!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) nestedSignal()" tag="direct" --> <!-- type="info" message=" Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" --> @@ -118,7 +118,7 @@ <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" --> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" --> </testcase> - <testcase name="slotEmittingSignal" result="pass"> + <testcase name="slotEmittingSignal" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" --> <!-- type="info" message=" Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" --> <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" --> @@ -126,7 +126,7 @@ <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" --> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" --> </testcase> - <testcase name="slotEmittingSignalOldSyntax" result="pass"> + <testcase name="slotEmittingSignalOldSyntax" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" --> <!-- type="info" message=" Slot: SignalSlotClass(_POINTER_) emitSecondSignal()" tag="direct" --> <!-- type="info" message=" Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" --> @@ -135,7 +135,7 @@ <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" --> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" --> </testcase> - <testcase name="variousTypes" result="pass"> + <testcase name="variousTypes" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))" --> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)" --> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))" --> @@ -149,10 +149,10 @@ <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" --> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" --> </testcase> - <testcase name="deletingSender" result="pass"> + <testcase name="deletingSender" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" --> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]> <![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]> diff --git a/tests/auto/testlib/selftests/expected_silent.junitxml b/tests/auto/testlib/selftests/expected_silent.junitxml index 266641d88de..10d8151d2ec 100644 --- a/tests/auto/testlib/selftests/expected_silent.junitxml +++ b/tests/auto/testlib/selftests/expected_silent.junitxml @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Silent" tests="7" failures="3" errors="9"> +<testsuite name="tst_Silent" timestamp="@TEST_START_TIME@" tests="7" failures="3" errors="9" 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" result="pass"/> - <testcase name="pass" result="pass"/> - <testcase name="skip"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="pass" result="pass" time="@TEST_DURATION@"/> + <testcase name="skip" time="@TEST_DURATION@"> <!-- type="skip" message="This test should skip" --> </testcase> - <testcase name="fail" result="fail"> + <testcase name="fail" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'false' returned FALSE. (This test should fail)"/> </testcase> - <testcase name="xfail" result="xfail"> + <testcase name="xfail" result="xfail" time="@TEST_DURATION@"> <!-- type="info" message="This test should XFAIL" --> </testcase> - <testcase name="xpass" result="xpass"> + <testcase name="xpass" result="xpass" time="@TEST_DURATION@"> <failure result="xpass" message="'true' returned TRUE unexpectedly. (This test should XPASS)"/> </testcase> - <testcase name="messages" result="fail"> + <testcase name="messages" result="fail" time="@TEST_DURATION@"> <!-- type="qwarn" message="This is a warning that should not appear in silent test output" --> <!-- type="warn" message="This is an internal testlib warning that should not appear in silent test output" --> <!-- type="qdebug" message="This is a debug 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 9057868930a..a2568ca5531 100644 --- a/tests/auto/testlib/selftests/expected_singleskip.junitxml +++ b/tests/auto/testlib/selftests/expected_singleskip.junitxml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_SingleSkip" tests="3" failures="0" errors="1"> +<testsuite name="tst_SingleSkip" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="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" result="pass"/> - <testcase name="myTest"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="myTest" time="@TEST_DURATION@"> <!-- type="skip" message="skipping test" --> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[skipping test]]> </system-err> diff --git a/tests/auto/testlib/selftests/expected_skip.junitxml b/tests/auto/testlib/selftests/expected_skip.junitxml index 27e1324e2c7..b82b176ecca 100644 --- a/tests/auto/testlib/selftests/expected_skip.junitxml +++ b/tests/auto/testlib/selftests/expected_skip.junitxml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Skip" tests="5" failures="0" errors="4"> +<testsuite name="tst_Skip" timestamp="@TEST_START_TIME@" tests="5" failures="0" errors="4" 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" result="pass"/> - <testcase name="test"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="test" time="@TEST_DURATION@"> <!-- type="skip" message="skipping all" --> </testcase> - <testcase name="emptytest"> + <testcase name="emptytest" time="@TEST_DURATION@"> <!-- type="skip" message="skipping all" --> </testcase> - <testcase name="singleSkip" result="pass"> + <testcase name="singleSkip" result="pass" time="@TEST_DURATION@"> <!-- type="skip" message="skipping one" tag="local 1" --> <!-- type="qdebug" message="this line should only be reached once (true)" tag="local 2" --> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[skipping all]]> <![CDATA[skipping all]]> diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.junitxml b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml index e6e8c875c08..cb45485b4b0 100644 --- a/tests/auto/testlib/selftests/expected_skipcleanup.junitxml +++ b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_SkipCleanup" tests="3" failures="0" errors="1"> +<testsuite name="tst_SkipCleanup" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="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" result="pass"/> - <testcase name="aTestFunction" result="pass"/> - <testcase name="cleanupTestCase"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="aTestFunction" result="pass" time="@TEST_DURATION@"/> + <testcase name="cleanupTestCase" time="@TEST_DURATION@"> <!-- type="skip" message="Skip inside cleanupTestCase." --> </testcase> <system-err> diff --git a/tests/auto/testlib/selftests/expected_skipinit.junitxml b/tests/auto/testlib/selftests/expected_skipinit.junitxml index 1158a530ee4..9bdb22230a4 100644 --- a/tests/auto/testlib/selftests/expected_skipinit.junitxml +++ b/tests/auto/testlib/selftests/expected_skipinit.junitxml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_SkipInit" tests="2" failures="0" errors="1"> +<testsuite name="tst_SkipInit" timestamp="@TEST_START_TIME@" tests="2" failures="0" errors="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"> + <testcase name="initTestCase" time="@TEST_DURATION@"> <!-- type="skip" message="Skip inside initTestCase. This should skip all tests in the class." --> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]> </system-err> diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.junitxml b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml index 0ec652deb6e..56ffbcba862 100644 --- a/tests/auto/testlib/selftests/expected_skipinitdata.junitxml +++ b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_SkipInitData" tests="1" failures="0" errors="1"> +<testsuite name="tst_SkipInitData" timestamp="@TEST_START_TIME@" tests="1" failures="0" errors="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"> + <testcase name="initTestCase" time="@TEST_DURATION@"> <!-- type="skip" message="Skip inside initTestCase_data. This should skip all tests in the class." --> </testcase> <system-err> diff --git a/tests/auto/testlib/selftests/expected_sleep.junitxml b/tests/auto/testlib/selftests/expected_sleep.junitxml index 688719ebe2d..871fdf32c04 100644 --- a/tests/auto/testlib/selftests/expected_sleep.junitxml +++ b/tests/auto/testlib/selftests/expected_sleep.junitxml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Sleep" tests="4" failures="0" errors="0"> +<testsuite name="tst_Sleep" timestamp="@TEST_START_TIME@" tests="4" failures="0" errors="0" 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" result="pass"/> - <testcase name="sleep" result="pass"/> - <testcase name="wait" result="pass"/> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="sleep" result="pass" time="@TEST_DURATION@"/> + <testcase name="wait" result="pass" time="@TEST_DURATION@"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_strcmp.junitxml b/tests/auto/testlib/selftests/expected_strcmp.junitxml index bed04dce93d..9d51829f4fc 100644 --- a/tests/auto/testlib/selftests/expected_strcmp.junitxml +++ b/tests/auto/testlib/selftests/expected_strcmp.junitxml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_StrCmp" tests="8" failures="5" errors="3"> +<testsuite name="tst_StrCmp" timestamp="@TEST_START_TIME@" tests="8" failures="5" errors="3" 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" result="pass"/> - <testcase name="compareCharStars" result="pass"/> - <testcase name="compareByteArray" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="compareCharStars" result="pass" time="@TEST_DURATION@"/> + <testcase name="compareByteArray" result="fail" time="@TEST_DURATION@"> <!-- type="info" message="Next test should fail" --> <!-- type="info" message="Next test should fail" --> <!-- type="info" message="Next test should fail" --> @@ -15,27 +15,27 @@ Actual (a): "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"... Expected (b): "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"..."/> </testcase> - <testcase name="failByteArray" result="fail"> + <testcase name="failByteArray" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (QByteArray("abc")): "abc" Expected (QByteArray("cba")): "cba""/> </testcase> - <testcase name="failByteArrayNull" result="fail"> + <testcase name="failByteArrayNull" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (QByteArray("foo")): "foo" Expected (QByteArray()) : """/> </testcase> - <testcase name="failByteArrayEmpty" result="fail"> + <testcase name="failByteArrayEmpty" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (QByteArray("")) : "" Expected (QByteArray("foo")): "foo""/> </testcase> - <testcase name="failByteArraySingleChars" result="fail"> + <testcase name="failByteArraySingleChars" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (QByteArray("6")): "6" Expected (QByteArray("7")): "7""/> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[Next test should fail]]> <![CDATA[Next test should fail]]> diff --git a/tests/auto/testlib/selftests/expected_subtest.junitxml b/tests/auto/testlib/selftests/expected_subtest.junitxml index a75e9b39a1c..27996a49924 100644 --- a/tests/auto/testlib/selftests/expected_subtest.junitxml +++ b/tests/auto/testlib/selftests/expected_subtest.junitxml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Subtest" tests="5" failures="2" errors="31"> +<testsuite name="tst_Subtest" timestamp="@TEST_START_TIME@" tests="5" failures="2" errors="31" 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" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"> <!-- type="qdebug" message="initTestCase initTestCase (null)" --> </testcase> - <testcase name="test1" result="pass"> + <testcase name="test1" result="pass" time="@TEST_DURATION@"> <!-- type="qdebug" message="init test1 (null)" --> <!-- type="qdebug" message="test1 test1 (null)" --> <!-- type="qdebug" message="cleanup test1 (null)" --> </testcase> - <testcase name="test2" result="pass"> + <testcase name="test2" result="pass" time="@TEST_DURATION@"> <!-- type="qdebug" message="test2_data test2 (null)" --> <!-- type="qdebug" message="test2_data end" --> <!-- type="qdebug" message="init test2 data0" tag="data0" --> @@ -29,7 +29,7 @@ <!-- type="qdebug" message="test2 end" tag="data2" --> <!-- type="qdebug" message="cleanup test2 data2" tag="data2" --> </testcase> - <testcase name="test3" result="fail"> + <testcase name="test3" result="fail" time="@TEST_DURATION@"> <!-- type="qdebug" message="test3_data test3 (null)" --> <!-- type="qdebug" message="test3_data end" --> <!-- type="qdebug" message="init test3 data0" tag="data0" --> @@ -49,7 +49,7 @@ Expected (QString("hello0")): "hello0"" tag="data2"/> <!-- type="qdebug" message="cleanup test3 data2" tag="data2" --> </testcase> - <testcase name="cleanupTestCase" result="pass"> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"> <!-- type="qdebug" message="cleanupTestCase cleanupTestCase (null)" --> </testcase> <system-err> diff --git a/tests/auto/testlib/selftests/expected_testlib.junitxml b/tests/auto/testlib/selftests/expected_testlib.junitxml index 27eaf2fa979..a68ce7b58cc 100644 --- a/tests/auto/testlib/selftests/expected_testlib.junitxml +++ b/tests/auto/testlib/selftests/expected_testlib.junitxml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_TestLib" tests="5" failures="1" errors="0"> +<testsuite name="tst_TestLib" timestamp="@TEST_START_TIME@" tests="5" failures="1" errors="0" 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" result="pass"/> - <testcase name="basics" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="basics" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared pointers are not the same"/> </testcase> - <testcase name="delays" result="pass"/> - <testcase name="reals" result="pass"/> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="delays" result="pass" time="@TEST_DURATION@"/> + <testcase name="reals" result="pass" time="@TEST_DURATION@"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml index e1c9a049ca3..cc56990deee 100644 --- a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml +++ b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_TupleDiagnostics" tests="5" failures="2" errors="0"> +<testsuite name="tst_TupleDiagnostics" timestamp="@TEST_START_TIME@" tests="5" failures="2" errors="0" 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" result="pass"/> - <testcase name="testEmptyTuple" result="pass"/> - <testcase name="testSimpleTuple" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="testEmptyTuple" result="pass" time="@TEST_DURATION@"/> + <testcase name="testSimpleTuple" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (std::tuple<int>{1}): std::tuple(1) Expected (std::tuple<int>{2}): std::tuple(2)"/> </testcase> - <testcase name="testTuple" result="fail"> + <testcase name="testTuple" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Compared values are not the same Actual (tuple1): std::tuple(42, 'Y', "tuple1") Expected (tuple2): std::tuple(42, 'Y', "tuple2")"/> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_verbose1.junitxml b/tests/auto/testlib/selftests/expected_verbose1.junitxml index d0b75525552..49632731d0b 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.junitxml +++ b/tests/auto/testlib/selftests/expected_verbose1.junitxml @@ -1,55 +1,55 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Counting" tests="15" failures="8" errors="10"> +<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" tests="15" failures="8" errors="10" 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" result="pass"/> - <testcase name="testPassPass" result="pass"/> - <testcase name="testPassSkip" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="testPassPass" result="pass" time="@TEST_DURATION@"/> + <testcase name="testPassSkip" result="pass" time="@TEST_DURATION@"> <!-- type="skip" message="Skipping" tag="row 2" --> </testcase> - <testcase name="testPassFail" result="fail"> + <testcase name="testPassFail" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'false' returned FALSE. ()" tag="row 2"/> </testcase> - <testcase name="testSkipPass" result="pass"> + <testcase name="testSkipPass" result="pass" time="@TEST_DURATION@"> <!-- type="skip" message="Skipping" tag="row 1" --> </testcase> - <testcase name="testSkipSkip"> + <testcase name="testSkipSkip" time="@TEST_DURATION@"> <!-- type="skip" message="Skipping" tag="row 1" --> <!-- type="skip" message="Skipping" tag="row 2" --> </testcase> - <testcase name="testSkipFail" result="fail"> + <testcase name="testSkipFail" result="fail" time="@TEST_DURATION@"> <!-- type="skip" message="Skipping" tag="row 1" --> <failure result="fail" message="'false' returned FALSE. ()" tag="row 2"/> </testcase> - <testcase name="testFailPass" result="fail"> + <testcase name="testFailPass" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'false' returned FALSE. ()" tag="row 1"/> </testcase> - <testcase name="testFailSkip" result="fail"> + <testcase name="testFailSkip" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'false' returned FALSE. ()" tag="row 1"/> <!-- type="skip" message="Skipping" tag="row 2" --> </testcase> - <testcase name="testFailFail" result="fail"> + <testcase name="testFailFail" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="'false' returned FALSE. ()" tag="row 1"/> <failure result="fail" message="'false' returned FALSE. ()" tag="row 2"/> </testcase> - <testcase name="testFailInInit" result="fail"> + <testcase name="testFailInInit" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Fail in init()" tag="fail"/> </testcase> - <testcase name="testFailInCleanup" result="fail"> + <testcase name="testFailInCleanup" result="fail" time="@TEST_DURATION@"> <!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" tag="fail" --> <failure result="fail" message="Fail in cleanup()" tag="fail"/> </testcase> - <testcase name="testSkipInInit" result="pass"> + <testcase name="testSkipInInit" result="pass" time="@TEST_DURATION@"> <!-- type="skip" message="Skip in init()" tag="skip" --> </testcase> - <testcase name="testSkipInCleanup" result="pass"> + <testcase name="testSkipInCleanup" result="pass" time="@TEST_DURATION@"> <!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" tag="skip" --> <!-- type="skip" message="Skip in cleanup()" tag="skip" --> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[Skipping]]> <![CDATA[Skipping]]> diff --git a/tests/auto/testlib/selftests/expected_verbose2.junitxml b/tests/auto/testlib/selftests/expected_verbose2.junitxml index 9e368a0e53e..88dd82f620a 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.junitxml +++ b/tests/auto/testlib/selftests/expected_verbose2.junitxml @@ -1,74 +1,74 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Counting" tests="15" failures="8" errors="28"> +<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" tests="15" failures="8" errors="28" 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" result="pass"/> - <testcase name="testPassPass" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="testPassPass" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="QVERIFY(true)" tag="row 1" --> <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 1" --> <!-- type="info" message="QVERIFY(true)" tag="row 2" --> <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 2" --> </testcase> - <testcase name="testPassSkip" result="pass"> + <testcase name="testPassSkip" result="pass" time="@TEST_DURATION@"> <!-- type="info" message="QVERIFY(true)" tag="row 1" --> <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 1" --> <!-- type="skip" message="Skipping" tag="row 2" --> </testcase> - <testcase name="testPassFail" result="fail"> + <testcase name="testPassFail" result="fail" time="@TEST_DURATION@"> <!-- type="info" message="QVERIFY(true)" tag="row 1" --> <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 1" --> <!-- type="info" message="QVERIFY(false)" tag="row 2" --> <failure result="fail" message="'false' returned FALSE. ()" tag="row 2"/> </testcase> - <testcase name="testSkipPass" result="pass"> + <testcase name="testSkipPass" result="pass" time="@TEST_DURATION@"> <!-- type="skip" message="Skipping" tag="row 1" --> <!-- type="info" message="QVERIFY(true)" tag="row 2" --> <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 2" --> </testcase> - <testcase name="testSkipSkip"> + <testcase name="testSkipSkip" time="@TEST_DURATION@"> <!-- type="skip" message="Skipping" tag="row 1" --> <!-- type="skip" message="Skipping" tag="row 2" --> </testcase> - <testcase name="testSkipFail" result="fail"> + <testcase name="testSkipFail" result="fail" time="@TEST_DURATION@"> <!-- type="skip" message="Skipping" tag="row 1" --> <!-- type="info" message="QVERIFY(false)" tag="row 2" --> <failure result="fail" message="'false' returned FALSE. ()" tag="row 2"/> </testcase> - <testcase name="testFailPass" result="fail"> + <testcase name="testFailPass" result="fail" time="@TEST_DURATION@"> <!-- type="info" message="QVERIFY(false)" tag="row 1" --> <failure result="fail" message="'false' returned FALSE. ()" tag="row 1"/> <!-- type="info" message="QVERIFY(true)" tag="row 2" --> <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 2" --> </testcase> - <testcase name="testFailSkip" result="fail"> + <testcase name="testFailSkip" result="fail" time="@TEST_DURATION@"> <!-- type="info" message="QVERIFY(false)" tag="row 1" --> <failure result="fail" message="'false' returned FALSE. ()" tag="row 1"/> <!-- type="skip" message="Skipping" tag="row 2" --> </testcase> - <testcase name="testFailFail" result="fail"> + <testcase name="testFailFail" result="fail" time="@TEST_DURATION@"> <!-- type="info" message="QVERIFY(false)" tag="row 1" --> <failure result="fail" message="'false' returned FALSE. ()" tag="row 1"/> <!-- type="info" message="QVERIFY(false)" tag="row 2" --> <failure result="fail" message="'false' returned FALSE. ()" tag="row 2"/> </testcase> - <testcase name="testFailInInit" result="fail"> + <testcase name="testFailInInit" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Fail in init()" tag="fail"/> </testcase> - <testcase name="testFailInCleanup" result="fail"> + <testcase name="testFailInCleanup" result="fail" time="@TEST_DURATION@"> <!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" tag="fail" --> <failure result="fail" message="Fail in cleanup()" tag="fail"/> </testcase> - <testcase name="testSkipInInit" result="pass"> + <testcase name="testSkipInInit" result="pass" time="@TEST_DURATION@"> <!-- type="skip" message="Skip in init()" tag="skip" --> </testcase> - <testcase name="testSkipInCleanup" result="pass"> + <testcase name="testSkipInCleanup" result="pass" time="@TEST_DURATION@"> <!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" tag="skip" --> <!-- type="skip" message="Skip in cleanup()" tag="skip" --> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[QVERIFY(true)]]> <![CDATA[QCOMPARE(2 + 1, 3)]]> diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml index 38fcfed1090..2de587b4c6a 100644 --- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml @@ -1,32 +1,32 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_VerifyExceptionThrown" tests="11" failures="6" errors="0"> +<testsuite name="tst_VerifyExceptionThrown" timestamp="@TEST_START_TIME@" tests="11" failures="6" errors="0" 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" result="pass"/> - <testcase name="testCorrectStdTypes" result="pass"/> - <testcase name="testCorrectStdExceptions" result="pass"/> - <testcase name="testCorrectMyExceptions" result="pass"/> - <testcase name="testFailInt" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="testCorrectStdTypes" result="pass" time="@TEST_DURATION@"/> + <testcase name="testCorrectStdExceptions" result="pass" time="@TEST_DURATION@"/> + <testcase name="testCorrectMyExceptions" result="pass" time="@TEST_DURATION@"/> + <testcase name="testFailInt" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Expected exception of type double to be thrown but unknown exception caught"/> </testcase> - <testcase name="testFailStdString" result="fail"> + <testcase name="testFailStdString" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Expected exception of type char* to be thrown but unknown exception caught"/> </testcase> - <testcase name="testFailStdRuntimeError" result="fail"> + <testcase name="testFailStdRuntimeError" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error"/> </testcase> - <testcase name="testFailMyException" result="fail"> + <testcase name="testFailMyException" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error"/> </testcase> - <testcase name="testFailMyDerivedException" result="fail"> + <testcase name="testFailMyDerivedException" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException"/> </testcase> - <testcase name="testFailNoException" result="fail"> + <testcase name="testFailNoException" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="Expected exception of type std::exception to be thrown but no exception caught"/> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err/> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_warnings.junitxml b/tests/auto/testlib/selftests/expected_warnings.junitxml index f3001cef7c0..0a0a8aec269 100644 --- a/tests/auto/testlib/selftests/expected_warnings.junitxml +++ b/tests/auto/testlib/selftests/expected_warnings.junitxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Warnings" tests="6" failures="4" errors="17"> +<testsuite name="tst_Warnings" timestamp="@TEST_START_TIME@" tests="6" failures="4" errors="17" 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" result="pass"/> - <testcase name="testWarnings" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="testWarnings" result="pass" time="@TEST_DURATION@"> <!-- type="qwarn" message="Warning" --> <!-- type="qwarn" message="Warning" --> <!-- type="qdebug" message="Debug" --> @@ -18,16 +18,16 @@ <!-- type="qdebug" message="Bubublabla" --> <!-- type="qwarn" message="Babablabla" --> </testcase> - <testcase name="testMissingWarnings" result="fail"> + <testcase name="testMissingWarnings" result="fail" time="@TEST_DURATION@"> <!-- type="info" message="Did not receive message: "Warning0"" --> <!-- type="info" message="Did not receive message: "Warning1"" --> <failure result="fail" message="Not all expected messages were received"/> </testcase> - <testcase name="testMissingWarningsRegularExpression" result="fail"> + <testcase name="testMissingWarningsRegularExpression" result="fail" time="@TEST_DURATION@"> <!-- type="info" message="Did not receive any message matching: "Warning\s\d"" --> <failure result="fail" message="Not all expected messages were received"/> </testcase> - <testcase name="testMissingWarningsWithData" result="fail"> + <testcase name="testMissingWarningsWithData" result="fail" time="@TEST_DURATION@"> <!-- type="info" message="Did not receive message: "Warning0"" tag="first row" --> <!-- type="info" message="Did not receive message: "Warning1"" tag="first row" --> <failure result="fail" message="Not all expected messages were received" tag="first row"/> @@ -35,7 +35,7 @@ <!-- type="info" message="Did not receive message: "Warning1"" tag="second row" --> <failure result="fail" message="Not all expected messages were received" tag="second row"/> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[Warning]]> <![CDATA[Warning]]> diff --git a/tests/auto/testlib/selftests/expected_watchdog.junitxml b/tests/auto/testlib/selftests/expected_watchdog.junitxml index 79fe78483ac..8fc2fd48735 100644 --- a/tests/auto/testlib/selftests/expected_watchdog.junitxml +++ b/tests/auto/testlib/selftests/expected_watchdog.junitxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Watchdog" tests="2" failures="1" errors="1"> +<testsuite name="tst_Watchdog" timestamp="@TEST_START_TIME@" tests="2" failures="1" errors="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" result="pass"/> - <testcase name="delay" result="fail"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="delay" result="fail" time="@TEST_DURATION@"> <!-- type="qfatal" message="Test function timed out" --> <failure result="fail" message="Received a fatal error."/> </testcase> diff --git a/tests/auto/testlib/selftests/expected_xunit.junitxml b/tests/auto/testlib/selftests/expected_xunit.junitxml index 263681d6bcb..817f85e7f08 100644 --- a/tests/auto/testlib/selftests/expected_xunit.junitxml +++ b/tests/auto/testlib/selftests/expected_xunit.junitxml @@ -1,36 +1,36 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Xunit" tests="9" failures="3" errors="5"> +<testsuite name="tst_Xunit" timestamp="@TEST_START_TIME@" tests="9" failures="3" errors="5" 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" result="pass"/> - <testcase name="testFunc1" result="pass"> + <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/> + <testcase name="testFunc1" result="pass" time="@TEST_DURATION@"> <!-- type="warn" message="just a QWARN() !" --> </testcase> - <testcase name="testFunc2" result="fail"> + <testcase name="testFunc2" result="fail" time="@TEST_DURATION@"> <!-- type="qdebug" message="a qDebug() call with comment-ending stuff -->" --> <failure result="fail" message="Compared values are not the same Actual (2): 2 Expected (3): 3"/> </testcase> - <testcase name="testFunc3"> + <testcase name="testFunc3" time="@TEST_DURATION@"> <!-- type="skip" message="skipping this function!" --> </testcase> - <testcase name="testFunc4" result="fail"> + <testcase name="testFunc4" result="fail" time="@TEST_DURATION@"> <failure result="fail" message="a forced failure!"/> </testcase> - <testcase name="testFunc5" result="xfail"> + <testcase name="testFunc5" result="xfail" time="@TEST_DURATION@"> <!-- type="info" message="this failure is expected" --> </testcase> - <testcase name="testFunc6" result="xfail"> + <testcase name="testFunc6" result="xfail" time="@TEST_DURATION@"> <!-- type="info" message="this failure is also expected" --> </testcase> - <testcase name="testFunc7" result="xpass"> + <testcase name="testFunc7" result="xpass" time="@TEST_DURATION@"> <failure result="xpass" message="'true' returned TRUE unexpectedly. ()"/> </testcase> - <testcase name="cleanupTestCase" result="pass"/> + <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/> <system-err> <![CDATA[just a QWARN() !]]> <![CDATA[a qDebug() call with comment-ending stuff -->]]> diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py index 4c261327066..581ff380067 100755 --- a/tests/auto/testlib/selftests/generate_expected_output.py +++ b/tests/auto/testlib/selftests/generate_expected_output.py @@ -96,6 +96,8 @@ class Cleaner (object): # Timings: (r'( *<Duration msecs=)"[\d\.]+"/>', r'\1"0"/>'), # xml, lightxml (r'(Totals:.*,) *[0-9.]+ms', r'\1 0ms'), # txt + (r'(<testsuite .*? timestamp=")[^"]+(".*>)', r'\1@TEST_START_TIME@\2'), # junit + (r'(<(testsuite|testcase) .*? time=")[^"]+(".*>)', r'\1@TEST_DURATION@\3'), # junit # Benchmarks: (r'[0-9,.]+( (?:CPU ticks|msecs) per iteration \(total:) [0-9,.]+ ', r'0\1 0, '), # txt (r'(<BenchmarkResult metric="(?:CPUTicks|WalltimeMilliseconds)".*\bvalue=)"[^"]+"', r'\1"0"'), # xml, lightxml diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index d25ea571837..def96e8a654 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -229,6 +229,13 @@ bool compareOutput(const QString &logger, const QString &subdir, QString expectedLine = QString::fromLatin1(expected.at(i)); expectedLine.replace(qtVersionPlaceHolder(), qtVersion); + if (logger.endsWith(QLatin1String("junitxml"))) { + static QRegularExpression timestampRegex("timestamp=\".*?\""); + actualLine.replace(timestampRegex, "timestamp=\"@TEST_START_TIME@\""); + static QRegularExpression timeRegex("time=\".*?\""); + actualLine.replace(timeRegex, "time=\"@TEST_DURATION@\""); + } + // Special handling for ignoring _FILE_ and _LINE_ if logger is teamcity if (logger.endsWith(QLatin1String("teamcity"))) { static QRegularExpression teamcityLocRegExp("\\|\\[Loc: .*\\(\\d*\\)\\|\\]"); |