diff options
Diffstat (limited to 'tests/auto/testlib')
112 files changed, 1849 insertions, 875 deletions
diff --git a/tests/auto/testlib/selftests/crashes/tst_crashes.cpp b/tests/auto/testlib/selftests/crashes/tst_crashes.cpp index 067c2a9f4f..3b73d87876 100644 --- a/tests/auto/testlib/selftests/crashes/tst_crashes.cpp +++ b/tests/auto/testlib/selftests/crashes/tst_crashes.cpp @@ -57,7 +57,7 @@ private slots: void tst_Crashes::crash() { -#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT) //we avoid the error dialogbox to appear on windows SetErrorMode( SEM_NOGPFAULTERRORBOX | SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); #endif diff --git a/tests/auto/testlib/selftests/expected_assert.lightxml b/tests/auto/testlib/selftests/expected_assert.lightxml index c2cc1da7ab..d2d4ae5153 100644 --- a/tests/auto/testlib/selftests/expected_assert.lightxml +++ b/tests/auto/testlib/selftests/expected_assert.lightxml @@ -4,9 +4,11 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testNumber1"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testNumber2"> <Message type="qfatal" file="" line="0"> @@ -15,4 +17,6 @@ <Incident type="fail" file="Unknown file" line="0"> <Description><![CDATA[Received a fatal error.]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_assert.xml b/tests/auto/testlib/selftests/expected_assert.xml index 8dc20628af..9e5ea760ae 100644 --- a/tests/auto/testlib/selftests/expected_assert.xml +++ b/tests/auto/testlib/selftests/expected_assert.xml @@ -6,9 +6,11 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testNumber1"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testNumber2"> <Message type="qfatal" file="" line="0"> @@ -17,5 +19,7 @@ <Incident type="fail" file="Unknown file" line="0"> <Description><![CDATA[Received a fatal error.]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_badxml.lightxml b/tests/auto/testlib/selftests/expected_badxml.lightxml index 08ba497efa..15981b12be 100644 --- a/tests/auto/testlib/selftests/expected_badxml.lightxml +++ b/tests/auto/testlib/selftests/expected_badxml.lightxml @@ -4,13 +4,14 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="badDataTag"> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[fail end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111"> +<Incident type="fail" file="tst_badxml.cpp" line="111"> <DataTag><![CDATA[fail end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -26,7 +27,7 @@ <DataTag><![CDATA[fail quotes " text" more text]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111"> +<Incident type="fail" file="tst_badxml.cpp" line="111"> <DataTag><![CDATA[fail quotes " text" more text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -42,7 +43,7 @@ <DataTag><![CDATA[fail xml close > open < tags < text]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111"> +<Incident type="fail" file="tst_badxml.cpp" line="111"> <DataTag><![CDATA[fail xml close > open < tags < text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -58,7 +59,7 @@ <DataTag><![CDATA[fail all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111"> +<Incident type="fail" file="tst_badxml.cpp" line="111"> <DataTag><![CDATA[fail all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -70,6 +71,7 @@ <DataTag><![CDATA[pass all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag> </Incident> <BenchmarkResult metric="Events" tag="pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" value="0" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="badMessage"> <Message type="qdebug" file="" line="0"> @@ -100,12 +102,16 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[string 3]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failWithNoFile"> <Incident type="fail" file="" line="0"> <Description><![CDATA[failure message]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_badxml.txt b/tests/auto/testlib/selftests/expected_badxml.txt index 0458401b44..3c65231529 100644 --- a/tests/auto/testlib/selftests/expected_badxml.txt +++ b/tests/auto/testlib/selftests/expected_badxml.txt @@ -3,28 +3,28 @@ Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HER PASS : tst_BadXml::initTestCase() QDEBUG : tst_BadXml::badDataTag(fail end cdata ]]> text ]]> more text) a message FAIL! : tst_BadXml::badDataTag(fail end cdata ]]> text ]]> more text) a failure - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(111)] + Loc: [tst_badxml.cpp(111)] QDEBUG : tst_BadXml::badDataTag(pass end cdata ]]> text ]]> more text) a message PASS : tst_BadXml::badDataTag(pass end cdata ]]> text ]]> more text) RESULT : tst_BadXml::badDataTag():"pass end cdata ]]> text ]]> more text": 0 events per iteration (total: 0, iterations: 1) QDEBUG : tst_BadXml::badDataTag(fail quotes " text" more text) a message FAIL! : tst_BadXml::badDataTag(fail quotes " text" more text) a failure - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(111)] + Loc: [tst_badxml.cpp(111)] QDEBUG : tst_BadXml::badDataTag(pass quotes " text" more text) a message PASS : tst_BadXml::badDataTag(pass quotes " text" more text) RESULT : tst_BadXml::badDataTag():"pass quotes " text" more text": 0 events per iteration (total: 0, iterations: 1) QDEBUG : tst_BadXml::badDataTag(fail xml close > open < tags < text) a message FAIL! : tst_BadXml::badDataTag(fail xml close > open < tags < text) a failure - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(111)] + Loc: [tst_badxml.cpp(111)] QDEBUG : tst_BadXml::badDataTag(pass xml close > open < tags < text) a message PASS : tst_BadXml::badDataTag(pass xml close > open < tags < text) RESULT : tst_BadXml::badDataTag():"pass xml close > open < tags < text": 0 events per iteration (total: 0, iterations: 1) QDEBUG : tst_BadXml::badDataTag(fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a message FAIL! : tst_BadXml::badDataTag(fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a failure - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(111)] + Loc: [tst_badxml.cpp(111)] QDEBUG : tst_BadXml::badDataTag(pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a message PASS : tst_BadXml::badDataTag(pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) RESULT : tst_BadXml::badDataTag():"pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs": diff --git a/tests/auto/testlib/selftests/expected_badxml.xml b/tests/auto/testlib/selftests/expected_badxml.xml index 97e917602e..c3330a6b97 100644 --- a/tests/auto/testlib/selftests/expected_badxml.xml +++ b/tests/auto/testlib/selftests/expected_badxml.xml @@ -6,13 +6,14 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="badDataTag"> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[fail end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111"> +<Incident type="fail" file="tst_badxml.cpp" line="111"> <DataTag><![CDATA[fail end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -28,7 +29,7 @@ <DataTag><![CDATA[fail quotes " text" more text]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111"> +<Incident type="fail" file="tst_badxml.cpp" line="111"> <DataTag><![CDATA[fail quotes " text" more text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -44,7 +45,7 @@ <DataTag><![CDATA[fail xml close > open < tags < text]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111"> +<Incident type="fail" file="tst_badxml.cpp" line="111"> <DataTag><![CDATA[fail xml close > open < tags < text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -60,7 +61,7 @@ <DataTag><![CDATA[fail all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111"> +<Incident type="fail" file="tst_badxml.cpp" line="111"> <DataTag><![CDATA[fail all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -72,6 +73,7 @@ <DataTag><![CDATA[pass all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag> </Incident> <BenchmarkResult metric="Events" tag="pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" value="0" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="badMessage"> <Message type="qdebug" file="" line="0"> @@ -102,13 +104,17 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[string 3]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failWithNoFile"> <Incident type="fail" file="" line="0"> <Description><![CDATA[failure message]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml b/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml index 5c436a53e0..08872be733 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml @@ -4,21 +4,27 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="passingBenchmark"> <Incident type="pass" file="" line="0" /> <BenchmarkResult metric="Events" tag="" value="0" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="skippingBenchmark"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="64"> +<Message type="skip" file="tst_benchlibcounting.cpp" line="64"> <Description><![CDATA[This is a skipping benchmark]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failingBenchmark"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="71"> +<Incident type="fail" file="tst_benchlibcounting.cpp" line="71"> <Description><![CDATA[This is a failing benchmark]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.txt b/tests/auto/testlib/selftests/expected_benchlibcounting.txt index 23dd19d2cd..8be8206afc 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcounting.txt +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.txt @@ -5,9 +5,9 @@ PASS : tst_BenchlibCounting::passingBenchmark() RESULT : tst_BenchlibCounting::passingBenchmark(): 0 events per iteration (total: 0, iterations: 1) SKIP : tst_BenchlibCounting::skippingBenchmark() This is a skipping benchmark - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp(64)] + Loc: [tst_benchlibcounting.cpp(64)] FAIL! : tst_BenchlibCounting::failingBenchmark() This is a failing benchmark - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp(71)] + Loc: [tst_benchlibcounting.cpp(71)] PASS : tst_BenchlibCounting::cleanupTestCase() Totals: 3 passed, 1 failed, 1 skipped ********* Finished testing of tst_BenchlibCounting ********* diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.xml b/tests/auto/testlib/selftests/expected_benchlibcounting.xml index 1e0f4531e2..ee6fd98ef2 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcounting.xml +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.xml @@ -6,22 +6,28 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="passingBenchmark"> <Incident type="pass" file="" line="0" /> <BenchmarkResult metric="Events" tag="" value="0" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="skippingBenchmark"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="64"> +<Message type="skip" file="tst_benchlibcounting.cpp" line="64"> <Description><![CDATA[This is a skipping benchmark]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failingBenchmark"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="71"> +<Incident type="fail" file="tst_benchlibcounting.cpp" line="71"> <Description><![CDATA[This is a failing benchmark]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml index 3cb59d209b..cba91a374f 100644 --- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml +++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml @@ -4,6 +4,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="events"> <Incident type="pass" file="" line="0"> @@ -34,7 +35,10 @@ <DataTag><![CDATA[100000]]></DataTag> </Incident> <BenchmarkResult metric="Events" tag="100000" value="100000" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml index cead0adf8c..7d28975ead 100644 --- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml +++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml @@ -6,6 +6,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="events"> <Incident type="pass" file="" line="0"> @@ -36,8 +37,11 @@ <DataTag><![CDATA[100000]]></DataTag> </Incident> <BenchmarkResult metric="Events" tag="100000" value="100000" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml index 845fd9c161..97422240d9 100644 --- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml @@ -4,12 +4,15 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="threeBillionTicks"> -<Incident type="pass" file="" line="0"> -<BenchmarkResult metric="walltime" tag="" value="1059" iterations="1" /> -</Incident> +<Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="CPUTicks" tag="" value="3.00001e+09" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.txt b/tests/auto/testlib/selftests/expected_benchlibtickcounter.txt index 9519e1d340..ee2f0f28c4 100644 --- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.txt +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.txt @@ -1,9 +1,9 @@ ********* Start testing of tst_BenchlibTickCounter ********* Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : tst_BenchlibTickCounter::initTestCase() -RESULT : tst_BenchlibTickCounter::threeBillionTicks(): - 3,000,000,000 ticks per iteration (total: 3000000000, iterations: 1) PASS : tst_BenchlibTickCounter::threeBillionTicks() +RESULT : tst_BenchlibTickCounter::threeBillionTicks(): + 3,000,005,772 CPU ticks per iteration (total: 3,000,005,772, iterations: 1) PASS : tst_BenchlibTickCounter::cleanupTestCase() Totals: 3 passed, 0 failed, 0 skipped ********* Finished testing of tst_BenchlibTickCounter ********* diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml index 8c9d823485..24c2e51084 100644 --- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml @@ -6,12 +6,16 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="threeBillionTicks"> -<BenchmarkResult metric="walltime" tag="" value="1059" iterations="1" /> <Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="CPUTicks" tag="" value="3.00002e+09" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml index f1d89328ef..b2e819b26d 100644 --- a/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml +++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml @@ -3,23 +3,26 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<ncident type="pass" file="" line="0" /> +<Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="waitForOneThousand"> -<Incident type="pass" file="" line="0"> -<BenchmarkResult metric="walltime" tag="" value="1004" iterations="1" /> -</Incident> +<Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="1004" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="waitForFourThousand"> -<Incident type="pass" file="" line="0"> -<BenchmarkResult metric="walltime" tag="" value="4007" iterations="1" /> -</Incident> +<Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="4004" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="qbenchmark_once"> -<Incident type="pass" file="" line="0"> -<BenchmarkResult metric="walltime" tag="" value="0" iterations="1" /> -</Incident> +<Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="0" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.txt b/tests/auto/testlib/selftests/expected_benchlibwalltime.txt index b0e78ae78d..f1e353703b 100644 --- a/tests/auto/testlib/selftests/expected_benchlibwalltime.txt +++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.txt @@ -1,15 +1,15 @@ ********* Start testing of tst_BenchlibWalltime ********* Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : tst_BenchlibWalltime::initTestCase() -RESULT : tst_BenchlibWalltime::waitForOneThousand(): - 1,000 msec per iteration (total: 1000, iterations: 1) PASS : tst_BenchlibWalltime::waitForOneThousand() -RESULT : tst_BenchlibWalltime::waitForFourThousand(): - 4,000 msec per iteration (total: 4000, iterations: 1) +RESULT : tst_BenchlibWalltime::waitForOneThousand(): + 1,006 msecs per iteration (total: 1,006, iterations: 1) PASS : tst_BenchlibWalltime::waitForFourThousand() -RESULT : tst_BenchlibWalltime::qbenchmark_once(): - 0 msec per iteration (total: 0, iterations: 1) +RESULT : tst_BenchlibWalltime::waitForFourThousand(): + 4,008 msecs per iteration (total: 4,008, iterations: 1) PASS : tst_BenchlibWalltime::qbenchmark_once() +RESULT : tst_BenchlibWalltime::qbenchmark_once(): + 0 msecs per iteration (total: 0, iterations: 1) PASS : tst_BenchlibWalltime::cleanupTestCase() Totals: 5 passed, 0 failed, 0 skipped ********* Finished testing of tst_BenchlibWalltime ********* diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.xml b/tests/auto/testlib/selftests/expected_benchlibwalltime.xml index 69d025b9cf..6ae355783a 100644 --- a/tests/auto/testlib/selftests/expected_benchlibwalltime.xml +++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.xml @@ -6,20 +6,26 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="waitForOneThousand"> -<BenchmarkResult metric="walltime" tag="" value="1005" iterations="1" /> <Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="1008" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="waitForFourThousand"> -<BenchmarkResult metric="walltime" tag="" value="4008" iterations="1" /> <Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="4002" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="qbenchmark_once"> -<BenchmarkResult metric="walltime" tag="" value="0" iterations="1" /> <Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="0" iterations="1" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_cmptest.lightxml b/tests/auto/testlib/selftests/expected_cmptest.lightxml index 99e2e825c0..a83a971d8a 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.lightxml +++ b/tests/auto/testlib/selftests/expected_cmptest.lightxml @@ -4,15 +4,18 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compare_boolfuncs"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compare_pointerfuncs"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compare_tostring"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="214"> +<Incident type="fail" file="tst_cmptest.cpp" line="219"> <DataTag><![CDATA[int, string]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual) : QVariant(int,123) @@ -21,24 +24,25 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both invalid]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="214"> +<Incident type="fail" file="tst_cmptest.cpp" line="219"> <DataTag><![CDATA[null hash, invalid]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual) : QVariant(QVariantHash) Expected (expected): QVariant()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="214"> +<Incident type="fail" file="tst_cmptest.cpp" line="219"> <DataTag><![CDATA[string, null user type]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual) : QVariant(QString,A simple string) Expected (expected): QVariant(PhonyClass)]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="214"> +<Incident type="fail" file="tst_cmptest.cpp" line="219"> <DataTag><![CDATA[both non-null user type]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual) : QVariant(PhonyClass,<value not representable as string>) Expected (expected): QVariant(PhonyClass,<value not representable as string>)]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareQStringLists"> <Incident type="pass" file="" line="0"> @@ -47,62 +51,65 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal lists]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> +<Incident type="fail" file="tst_cmptest.cpp" line="313"> <DataTag><![CDATA[last item different]]></DataTag> <Description><![CDATA[Compared lists differ at index 2. Actual (opA): 'string3' Expected (opB): 'DIFFERS']]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> +<Incident type="fail" file="tst_cmptest.cpp" line="313"> <DataTag><![CDATA[second-last item different]]></DataTag> <Description><![CDATA[Compared lists differ at index 2. Actual (opA): 'string3' Expected (opB): 'DIFFERS']]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> +<Incident type="fail" file="tst_cmptest.cpp" line="313"> <DataTag><![CDATA[prefix]]></DataTag> <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: '2' Expected (opB) size: '1']]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> +<Incident type="fail" file="tst_cmptest.cpp" line="313"> <DataTag><![CDATA[short list second]]></DataTag> <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: '12' Expected (opB) size: '1']]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> +<Incident type="fail" file="tst_cmptest.cpp" line="313"> <DataTag><![CDATA[short list first]]></DataTag> <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: '1' Expected (opB) size: '12']]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareQListInt"> -<Incident type="fail" file="tst_cmptest.cpp" line="316"> +<Incident type="fail" file="tst_cmptest.cpp" line="320"> <Description><![CDATA[Compared lists differ at index 2. Actual (int1): '3' Expected (int2): '4']]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareQListDouble"> -<Incident type="fail" file="tst_cmptest.cpp" line="323"> +<Incident type="fail" file="tst_cmptest.cpp" line="327"> <Description><![CDATA[Compared lists differ at index 0. Actual (double1): '1.5' Expected (double2): '1']]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareQPixmaps"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both null]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="333"> +<Incident type="fail" file="tst_cmptest.cpp" line="353"> <DataTag><![CDATA[one null]]></DataTag> <Description><![CDATA[Compared QPixmaps differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="333"> +<Incident type="fail" file="tst_cmptest.cpp" line="353"> <DataTag><![CDATA[other null]]></DataTag> <Description><![CDATA[Compared QPixmaps differ. Actual (opA).isNull(): 0 @@ -111,28 +118,29 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="333"> +<Incident type="fail" file="tst_cmptest.cpp" line="353"> <DataTag><![CDATA[different size]]></DataTag> <Description><![CDATA[Compared QPixmaps differ in size. Actual (opA): 11x20 Expected (opB): 20x20]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="333"> +<Incident type="fail" file="tst_cmptest.cpp" line="353"> <DataTag><![CDATA[different pixels]]></DataTag> <Description><![CDATA[Compared values are not the same]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareQImages"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both null]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="360"> +<Incident type="fail" file="tst_cmptest.cpp" line="380"> <DataTag><![CDATA[one null]]></DataTag> <Description><![CDATA[Compared QImages differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="360"> +<Incident type="fail" file="tst_cmptest.cpp" line="380"> <DataTag><![CDATA[other null]]></DataTag> <Description><![CDATA[Compared QImages differ. Actual (opA).isNull(): 0 @@ -141,23 +149,26 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="360"> +<Incident type="fail" file="tst_cmptest.cpp" line="380"> <DataTag><![CDATA[different size]]></DataTag> <Description><![CDATA[Compared QImages differ in size. Actual (opA): 11x20 Expected (opB): 20x20]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="360"> +<Incident type="fail" file="tst_cmptest.cpp" line="380"> <DataTag><![CDATA[different format]]></DataTag> <Description><![CDATA[Compared QImages differ in format. Actual (opA): 6 Expected (opB): 3]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="360"> +<Incident type="fail" file="tst_cmptest.cpp" line="380"> <DataTag><![CDATA[different pixels]]></DataTag> <Description><![CDATA[Compared values are not the same]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_cmptest.txt b/tests/auto/testlib/selftests/expected_cmptest.txt index 504507f032..b3d34d49de 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.txt +++ b/tests/auto/testlib/selftests/expected_cmptest.txt @@ -6,86 +6,86 @@ PASS : tst_Cmptest::compare_pointerfuncs() FAIL! : tst_Cmptest::compare_tostring(int, string) Compared values are not the same Actual (actual) : QVariant(int,123) Expected (expected): QVariant(QString,hi) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(214)] + Loc: [tst_cmptest.cpp(219)] PASS : tst_Cmptest::compare_tostring(both invalid) FAIL! : tst_Cmptest::compare_tostring(null hash, invalid) Compared values are not the same Actual (actual) : QVariant(QVariantHash) Expected (expected): QVariant() - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(214)] + Loc: [tst_cmptest.cpp(219)] FAIL! : tst_Cmptest::compare_tostring(string, null user type) Compared values are not the same Actual (actual) : QVariant(QString,A simple string) Expected (expected): QVariant(PhonyClass) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(214)] + Loc: [tst_cmptest.cpp(219)] FAIL! : tst_Cmptest::compare_tostring(both non-null user type) Compared values are not the same Actual (actual) : QVariant(PhonyClass,<value not representable as string>) Expected (expected): QVariant(PhonyClass,<value not representable as string>) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(214)] + Loc: [tst_cmptest.cpp(219)] PASS : tst_Cmptest::compareQStringLists(empty lists) PASS : tst_Cmptest::compareQStringLists(equal lists) FAIL! : tst_Cmptest::compareQStringLists(last item different) Compared lists differ at index 2. Actual (opA): 'string3' Expected (opB): 'DIFFERS' - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(308)] + Loc: [tst_cmptest.cpp(313)] FAIL! : tst_Cmptest::compareQStringLists(second-last item different) Compared lists differ at index 2. Actual (opA): 'string3' Expected (opB): 'DIFFERS' - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(308)] + Loc: [tst_cmptest.cpp(313)] FAIL! : tst_Cmptest::compareQStringLists(prefix) Compared lists have different sizes. Actual (opA) size: '2' Expected (opB) size: '1' - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(308)] + Loc: [tst_cmptest.cpp(313)] FAIL! : tst_Cmptest::compareQStringLists(short list second) Compared lists have different sizes. Actual (opA) size: '12' Expected (opB) size: '1' - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(308)] + Loc: [tst_cmptest.cpp(313)] FAIL! : tst_Cmptest::compareQStringLists(short list first) Compared lists have different sizes. Actual (opA) size: '1' Expected (opB) size: '12' - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(308)] + Loc: [tst_cmptest.cpp(313)] FAIL! : tst_Cmptest::compareQListInt() Compared lists differ at index 2. Actual (int1): '3' Expected (int2): '4' - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(316)] + Loc: [tst_cmptest.cpp(320)] FAIL! : tst_Cmptest::compareQListDouble() Compared lists differ at index 0. Actual (double1): '1.5' Expected (double2): '1' - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(323)] + Loc: [tst_cmptest.cpp(327)] PASS : tst_Cmptest::compareQPixmaps(both null) FAIL! : tst_Cmptest::compareQPixmaps(one null) Compared QPixmaps differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(333)] + Loc: [tst_cmptest.cpp(353)] FAIL! : tst_Cmptest::compareQPixmaps(other null) Compared QPixmaps differ. Actual (opA).isNull(): 0 Expected (opB).isNull(): 1 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(333)] + Loc: [tst_cmptest.cpp(353)] PASS : tst_Cmptest::compareQPixmaps(equal) FAIL! : tst_Cmptest::compareQPixmaps(different size) Compared QPixmaps differ in size. Actual (opA): 11x20 Expected (opB): 20x20 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(333)] + Loc: [tst_cmptest.cpp(353)] FAIL! : tst_Cmptest::compareQPixmaps(different pixels) Compared values are not the same - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(333)] + Loc: [tst_cmptest.cpp(353)] PASS : tst_Cmptest::compareQImages(both null) FAIL! : tst_Cmptest::compareQImages(one null) Compared QImages differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(360)] + Loc: [tst_cmptest.cpp(380)] FAIL! : tst_Cmptest::compareQImages(other null) Compared QImages differ. Actual (opA).isNull(): 0 Expected (opB).isNull(): 1 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(360)] + Loc: [tst_cmptest.cpp(380)] PASS : tst_Cmptest::compareQImages(equal) FAIL! : tst_Cmptest::compareQImages(different size) Compared QImages differ in size. Actual (opA): 11x20 Expected (opB): 20x20 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(360)] + Loc: [tst_cmptest.cpp(380)] FAIL! : tst_Cmptest::compareQImages(different format) Compared QImages differ in format. Actual (opA): 6 Expected (opB): 3 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(360)] + Loc: [tst_cmptest.cpp(380)] FAIL! : tst_Cmptest::compareQImages(different pixels) Compared values are not the same - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(360)] + Loc: [tst_cmptest.cpp(380)] PASS : tst_Cmptest::cleanupTestCase() Totals: 11 passed, 20 failed, 0 skipped ********* Finished testing of tst_Cmptest ********* diff --git a/tests/auto/testlib/selftests/expected_cmptest.xml b/tests/auto/testlib/selftests/expected_cmptest.xml index df35058acc..08a40fb466 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.xml +++ b/tests/auto/testlib/selftests/expected_cmptest.xml @@ -6,15 +6,18 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compare_boolfuncs"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compare_pointerfuncs"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compare_tostring"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="214"> +<Incident type="fail" file="tst_cmptest.cpp" line="219"> <DataTag><![CDATA[int, string]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual) : QVariant(int,123) @@ -23,24 +26,25 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both invalid]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="214"> +<Incident type="fail" file="tst_cmptest.cpp" line="219"> <DataTag><![CDATA[null hash, invalid]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual) : QVariant(QVariantHash) Expected (expected): QVariant()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="214"> +<Incident type="fail" file="tst_cmptest.cpp" line="219"> <DataTag><![CDATA[string, null user type]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual) : QVariant(QString,A simple string) Expected (expected): QVariant(PhonyClass)]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="214"> +<Incident type="fail" file="tst_cmptest.cpp" line="219"> <DataTag><![CDATA[both non-null user type]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual) : QVariant(PhonyClass,<value not representable as string>) Expected (expected): QVariant(PhonyClass,<value not representable as string>)]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareQStringLists"> <Incident type="pass" file="" line="0"> @@ -49,62 +53,65 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal lists]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> +<Incident type="fail" file="tst_cmptest.cpp" line="313"> <DataTag><![CDATA[last item different]]></DataTag> <Description><![CDATA[Compared lists differ at index 2. Actual (opA): 'string3' Expected (opB): 'DIFFERS']]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> +<Incident type="fail" file="tst_cmptest.cpp" line="313"> <DataTag><![CDATA[second-last item different]]></DataTag> <Description><![CDATA[Compared lists differ at index 2. Actual (opA): 'string3' Expected (opB): 'DIFFERS']]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> +<Incident type="fail" file="tst_cmptest.cpp" line="313"> <DataTag><![CDATA[prefix]]></DataTag> <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: '2' Expected (opB) size: '1']]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> +<Incident type="fail" file="tst_cmptest.cpp" line="313"> <DataTag><![CDATA[short list second]]></DataTag> <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: '12' Expected (opB) size: '1']]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> +<Incident type="fail" file="tst_cmptest.cpp" line="313"> <DataTag><![CDATA[short list first]]></DataTag> <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: '1' Expected (opB) size: '12']]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareQListInt"> -<Incident type="fail" file="tst_cmptest.cpp" line="316"> +<Incident type="fail" file="tst_cmptest.cpp" line="320"> <Description><![CDATA[Compared lists differ at index 2. Actual (int1): '3' Expected (int2): '4']]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareQListDouble"> -<Incident type="fail" file="tst_cmptest.cpp" line="323"> +<Incident type="fail" file="tst_cmptest.cpp" line="327"> <Description><![CDATA[Compared lists differ at index 0. Actual (double1): '1.5' Expected (double2): '1']]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareQPixmaps"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both null]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="333"> +<Incident type="fail" file="tst_cmptest.cpp" line="353"> <DataTag><![CDATA[one null]]></DataTag> <Description><![CDATA[Compared QPixmaps differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="333"> +<Incident type="fail" file="tst_cmptest.cpp" line="353"> <DataTag><![CDATA[other null]]></DataTag> <Description><![CDATA[Compared QPixmaps differ. Actual (opA).isNull(): 0 @@ -113,28 +120,29 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="333"> +<Incident type="fail" file="tst_cmptest.cpp" line="353"> <DataTag><![CDATA[different size]]></DataTag> <Description><![CDATA[Compared QPixmaps differ in size. Actual (opA): 11x20 Expected (opB): 20x20]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="333"> +<Incident type="fail" file="tst_cmptest.cpp" line="353"> <DataTag><![CDATA[different pixels]]></DataTag> <Description><![CDATA[Compared values are not the same]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareQImages"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both null]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="360"> +<Incident type="fail" file="tst_cmptest.cpp" line="380"> <DataTag><![CDATA[one null]]></DataTag> <Description><![CDATA[Compared QImages differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="360"> +<Incident type="fail" file="tst_cmptest.cpp" line="380"> <DataTag><![CDATA[other null]]></DataTag> <Description><![CDATA[Compared QImages differ. Actual (opA).isNull(): 0 @@ -143,24 +151,27 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="360"> +<Incident type="fail" file="tst_cmptest.cpp" line="380"> <DataTag><![CDATA[different size]]></DataTag> <Description><![CDATA[Compared QImages differ in size. Actual (opA): 11x20 Expected (opB): 20x20]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="360"> +<Incident type="fail" file="tst_cmptest.cpp" line="380"> <DataTag><![CDATA[different format]]></DataTag> <Description><![CDATA[Compared QImages differ in format. Actual (opA): 6 Expected (opB): 3]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="360"> +<Incident type="fail" file="tst_cmptest.cpp" line="380"> <DataTag><![CDATA[different pixels]]></DataTag> <Description><![CDATA[Compared values are not the same]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.lightxml b/tests/auto/testlib/selftests/expected_commandlinedata.lightxml index 37eb5f5a2b..c11017f022 100644 --- a/tests/auto/testlib/selftests/expected_commandlinedata.lightxml +++ b/tests/auto/testlib/selftests/expected_commandlinedata.lightxml @@ -4,53 +4,58 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTablePasses"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> +<Message type="info" file="tst_commandlinedata.cpp" line="65"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> +<Message type="info" file="tst_commandlinedata.cpp" line="65"> <DataTag><![CDATA[fiveTablePasses_data2]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data2]]></DataTag> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> +<Message type="info" file="tst_commandlinedata.cpp" line="65"> <DataTag><![CDATA[fiveTablePasses_data3]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data3]]></DataTag> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> +<Message type="info" file="tst_commandlinedata.cpp" line="65"> <DataTag><![CDATA[fiveTablePasses_data4]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data4]]></DataTag> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> +<Message type="info" file="tst_commandlinedata.cpp" line="65"> <DataTag><![CDATA[fiveTablePasses_data5]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data5]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTablePasses"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> +<Message type="info" file="tst_commandlinedata.cpp" line="65"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.txt b/tests/auto/testlib/selftests/expected_commandlinedata.txt index 7c16267b74..509f6a2de5 100644 --- a/tests/auto/testlib/selftests/expected_commandlinedata.txt +++ b/tests/auto/testlib/selftests/expected_commandlinedata.txt @@ -4,23 +4,23 @@ INFO : tst_DataTable::initTestCase() entering PASS : tst_DataTable::initTestCase() INFO : tst_DataTable::fiveTablePasses() entering INFO : tst_DataTable::fiveTablePasses(fiveTablePasses_data1) QVERIFY(test) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(65)] + Loc: [tst_commandlinedata.cpp(65)] PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data1) INFO : tst_DataTable::fiveTablePasses(fiveTablePasses_data2) QVERIFY(test) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(65)] + Loc: [tst_commandlinedata.cpp(65)] PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data2) INFO : tst_DataTable::fiveTablePasses(fiveTablePasses_data3) QVERIFY(test) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(65)] + Loc: [tst_commandlinedata.cpp(65)] PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data3) INFO : tst_DataTable::fiveTablePasses(fiveTablePasses_data4) QVERIFY(test) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(65)] + Loc: [tst_commandlinedata.cpp(65)] PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data4) INFO : tst_DataTable::fiveTablePasses(fiveTablePasses_data5) QVERIFY(test) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(65)] + Loc: [tst_commandlinedata.cpp(65)] PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data5) INFO : tst_DataTable::fiveTablePasses() entering INFO : tst_DataTable::fiveTablePasses(fiveTablePasses_data1) QVERIFY(test) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(65)] + Loc: [tst_commandlinedata.cpp(65)] PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data1) INFO : tst_DataTable::cleanupTestCase() entering PASS : tst_DataTable::cleanupTestCase() diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.xml b/tests/auto/testlib/selftests/expected_commandlinedata.xml index 76e297801c..20dc0c6a7c 100644 --- a/tests/auto/testlib/selftests/expected_commandlinedata.xml +++ b/tests/auto/testlib/selftests/expected_commandlinedata.xml @@ -6,54 +6,59 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTablePasses"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> +<Message type="info" file="tst_commandlinedata.cpp" line="65"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> +<Message type="info" file="tst_commandlinedata.cpp" line="65"> <DataTag><![CDATA[fiveTablePasses_data2]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data2]]></DataTag> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> +<Message type="info" file="tst_commandlinedata.cpp" line="65"> <DataTag><![CDATA[fiveTablePasses_data3]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data3]]></DataTag> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> +<Message type="info" file="tst_commandlinedata.cpp" line="65"> <DataTag><![CDATA[fiveTablePasses_data4]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data4]]></DataTag> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> +<Message type="info" file="tst_commandlinedata.cpp" line="65"> <DataTag><![CDATA[fiveTablePasses_data5]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data5]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTablePasses"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> +<Message type="info" file="tst_commandlinedata.cpp" line="65"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_counting.lightxml b/tests/auto/testlib/selftests/expected_counting.lightxml index c49792fec4..e5fe1ee3cf 100644 --- a/tests/auto/testlib/selftests/expected_counting.lightxml +++ b/tests/auto/testlib/selftests/expected_counting.lightxml @@ -4,6 +4,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassPass"> <Incident type="pass" file="" line="0"> @@ -12,94 +13,104 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassSkip"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailPass"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailSkip"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="234"> +<Incident type="fail" file="tst_counting.cpp" line="234"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in init()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInCleanup"> <Incident type="pass" file="" line="0"> @@ -107,27 +118,29 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[fail]]></DataTag> - <Description><![CDATA[This test function should execute and then QFAIL in cleanup() ]]></Description> + <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="242"> +<Incident type="fail" file="tst_counting.cpp" line="242"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in cleanup()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="236"> +<Message type="skip" file="tst_counting.cpp" line="236"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInCleanup"> <Incident type="pass" file="" line="0"> @@ -135,16 +148,19 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[skip]]></DataTag> - <Description><![CDATA[This test function should execute and then QSKIP in cleanup() ]]></Description> + <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="244"> +<Message type="skip" file="tst_counting.cpp" line="244"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_counting.txt b/tests/auto/testlib/selftests/expected_counting.txt index f413882c2a..cdabf6770e 100644 --- a/tests/auto/testlib/selftests/expected_counting.txt +++ b/tests/auto/testlib/selftests/expected_counting.txt @@ -5,49 +5,49 @@ PASS : tst_Counting::testPassPass(row 1) PASS : tst_Counting::testPassPass(row 2) PASS : tst_Counting::testPassSkip(row 1) SKIP : tst_Counting::testPassSkip(row 2) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [tst_counting.cpp(118)] PASS : tst_Counting::testPassFail(row 1) FAIL! : tst_Counting::testPassFail(row 2) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [tst_counting.cpp(115)] SKIP : tst_Counting::testSkipPass(row 1) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [tst_counting.cpp(118)] PASS : tst_Counting::testSkipPass(row 2) SKIP : tst_Counting::testSkipSkip(row 1) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [tst_counting.cpp(118)] SKIP : tst_Counting::testSkipSkip(row 2) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [tst_counting.cpp(118)] SKIP : tst_Counting::testSkipFail(row 1) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [tst_counting.cpp(118)] FAIL! : tst_Counting::testSkipFail(row 2) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [tst_counting.cpp(115)] FAIL! : tst_Counting::testFailPass(row 1) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [tst_counting.cpp(115)] PASS : tst_Counting::testFailPass(row 2) FAIL! : tst_Counting::testFailSkip(row 1) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [tst_counting.cpp(115)] SKIP : tst_Counting::testFailSkip(row 2) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [tst_counting.cpp(118)] FAIL! : tst_Counting::testFailFail(row 1) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [tst_counting.cpp(115)] FAIL! : tst_Counting::testFailFail(row 2) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [tst_counting.cpp(115)] PASS : tst_Counting::testFailInInit(before) FAIL! : tst_Counting::testFailInInit(fail) Fail in init() - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(234)] + Loc: [tst_counting.cpp(234)] PASS : tst_Counting::testFailInInit(after) PASS : tst_Counting::testFailInCleanup(before) -QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup() +QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup() FAIL! : tst_Counting::testFailInCleanup(fail) Fail in cleanup() - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(242)] + Loc: [tst_counting.cpp(242)] PASS : tst_Counting::testFailInCleanup(after) PASS : tst_Counting::testSkipInInit(before) SKIP : tst_Counting::testSkipInInit(skip) Skip in init() - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(236)] + Loc: [tst_counting.cpp(236)] PASS : tst_Counting::testSkipInInit(after) PASS : tst_Counting::testSkipInCleanup(before) -QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup() +QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup() SKIP : tst_Counting::testSkipInCleanup(skip) Skip in cleanup() - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(244)] + Loc: [tst_counting.cpp(244)] PASS : tst_Counting::testSkipInCleanup(after) PASS : tst_Counting::cleanupTestCase() Totals: 16 passed, 8 failed, 8 skipped diff --git a/tests/auto/testlib/selftests/expected_counting.xml b/tests/auto/testlib/selftests/expected_counting.xml index 7caa915f65..e015dddcc6 100644 --- a/tests/auto/testlib/selftests/expected_counting.xml +++ b/tests/auto/testlib/selftests/expected_counting.xml @@ -6,6 +6,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassPass"> <Incident type="pass" file="" line="0"> @@ -14,94 +15,104 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassSkip"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailPass"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailSkip"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="234"> +<Incident type="fail" file="tst_counting.cpp" line="234"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in init()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInCleanup"> <Incident type="pass" file="" line="0"> @@ -109,27 +120,29 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[fail]]></DataTag> - <Description><![CDATA[This test function should execute and then QFAIL in cleanup() ]]></Description> + <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="242"> +<Incident type="fail" file="tst_counting.cpp" line="242"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in cleanup()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="236"> +<Message type="skip" file="tst_counting.cpp" line="236"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInCleanup"> <Incident type="pass" file="" line="0"> @@ -137,17 +150,20 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[skip]]></DataTag> - <Description><![CDATA[This test function should execute and then QSKIP in cleanup() ]]></Description> + <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="244"> +<Message type="skip" file="tst_counting.cpp" line="244"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_counting.xunitxml b/tests/auto/testlib/selftests/expected_counting.xunitxml index f317ed5923..72bf047ba8 100644 --- a/tests/auto/testlib/selftests/expected_counting.xunitxml +++ b/tests/auto/testlib/selftests/expected_counting.xunitxml @@ -38,14 +38,14 @@ <failure tag="fail" message="Fail in init()" result="fail"/> </testcase> <testcase result="fail" name="testFailInCleanup"> - <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup() " type="qdebug" --> + <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup()" type="qdebug" --> <failure tag="fail" message="Fail in cleanup()" result="fail"/> </testcase> <testcase result="pass" name="testSkipInInit"> <!-- tag="skip" message="Skip in init()" type="skip" --> </testcase> <testcase result="pass" name="testSkipInCleanup"> - <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup() " type="qdebug" --> + <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup()" type="qdebug" --> <!-- tag="skip" message="Skip in cleanup()" type="skip" --> </testcase> <testcase result="pass" name="cleanupTestCase"/> @@ -56,9 +56,9 @@ <![CDATA[Skipping]]> <![CDATA[Skipping]]> <![CDATA[Skipping]]> -<![CDATA[This test function should execute and then QFAIL in cleanup() ]]> +<![CDATA[This test function should execute and then QFAIL in cleanup()]]> <![CDATA[Skip in init()]]> -<![CDATA[This test function should execute and then QSKIP in cleanup() ]]> +<![CDATA[This test function should execute and then QSKIP in cleanup()]]> <![CDATA[Skip in cleanup()]]> </system-err> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_datatable.lightxml b/tests/auto/testlib/selftests/expected_datatable.lightxml index 83ac0c0b5d..6cc2d1c46f 100644 --- a/tests/auto/testlib/selftests/expected_datatable.lightxml +++ b/tests/auto/testlib/selftests/expected_datatable.lightxml @@ -4,12 +4,15 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="singleTestFunction1"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="singleTestFunction2"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTablePasses"> <Incident type="pass" file="" line="0"> @@ -27,31 +30,33 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data 5]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTableFailures"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[fiveTableFailures_data 1]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[fiveTableFailures_data 2]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[fiveTableFailures_data 3]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[fiveTableFailures_data 4]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[fiveTableFailures_data 5]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="startsWithFailure"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[startsWithFailure_data 1]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> @@ -67,6 +72,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[startsWithFailure_data 5]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="endsWithFailure"> <Incident type="pass" file="" line="0"> @@ -81,10 +87,11 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[endsWithFailure 4]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[endsWithFailure 5]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failureInMiddle"> <Incident type="pass" file="" line="0"> @@ -93,7 +100,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[failureInMiddle_data 2]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[failureInMiddle_data 3]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> @@ -103,29 +110,33 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[failureInMiddle_data 5]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="fiveIsolatedFailures"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="173"> +<Incident type="fail" file="tst_datatable.cpp" line="173"> <DataTag><![CDATA[fiveIsolatedFailures_data 1]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="173"> +<Incident type="fail" file="tst_datatable.cpp" line="173"> <DataTag><![CDATA[fiveIsolatedFailures_data 2]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="173"> +<Incident type="fail" file="tst_datatable.cpp" line="173"> <DataTag><![CDATA[fiveIsolatedFailures_data 3]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="173"> +<Incident type="fail" file="tst_datatable.cpp" line="173"> <DataTag><![CDATA[fiveIsolatedFailures_data 4]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="173"> +<Incident type="fail" file="tst_datatable.cpp" line="173"> <DataTag><![CDATA[fiveIsolatedFailures_data 5]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_datatable.txt b/tests/auto/testlib/selftests/expected_datatable.txt index 24b39becd2..63118b5d33 100644 --- a/tests/auto/testlib/selftests/expected_datatable.txt +++ b/tests/auto/testlib/selftests/expected_datatable.txt @@ -9,17 +9,17 @@ PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data 3) PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data 4) PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data 5) FAIL! : tst_DataTable::fiveTableFailures(fiveTableFailures_data 1) 'test' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(91)] + Loc: [tst_datatable.cpp(91)] FAIL! : tst_DataTable::fiveTableFailures(fiveTableFailures_data 2) 'test' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(91)] + Loc: [tst_datatable.cpp(91)] FAIL! : tst_DataTable::fiveTableFailures(fiveTableFailures_data 3) 'test' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(91)] + Loc: [tst_datatable.cpp(91)] FAIL! : tst_DataTable::fiveTableFailures(fiveTableFailures_data 4) 'test' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(91)] + Loc: [tst_datatable.cpp(91)] FAIL! : tst_DataTable::fiveTableFailures(fiveTableFailures_data 5) 'test' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(91)] + Loc: [tst_datatable.cpp(91)] FAIL! : tst_DataTable::startsWithFailure(startsWithFailure_data 1) 'test' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(91)] + Loc: [tst_datatable.cpp(91)] PASS : tst_DataTable::startsWithFailure(startsWithFailure_data 2) PASS : tst_DataTable::startsWithFailure(startsWithFailure_data 3) PASS : tst_DataTable::startsWithFailure(startsWithFailure_data 4) @@ -29,23 +29,23 @@ PASS : tst_DataTable::endsWithFailure(endsWithFailure 2) PASS : tst_DataTable::endsWithFailure(endsWithFailure 3) PASS : tst_DataTable::endsWithFailure(endsWithFailure 4) FAIL! : tst_DataTable::endsWithFailure(endsWithFailure 5) 'test' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(91)] + Loc: [tst_datatable.cpp(91)] PASS : tst_DataTable::failureInMiddle(failureInMiddle_data 1) PASS : tst_DataTable::failureInMiddle(failureInMiddle_data 2) FAIL! : tst_DataTable::failureInMiddle(failureInMiddle_data 3) 'test' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(91)] + Loc: [tst_datatable.cpp(91)] PASS : tst_DataTable::failureInMiddle(failureInMiddle_data 4) PASS : tst_DataTable::failureInMiddle(failureInMiddle_data 5) FAIL! : tst_DataTable::fiveIsolatedFailures(fiveIsolatedFailures_data 1) '!test' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(173)] + Loc: [tst_datatable.cpp(173)] FAIL! : tst_DataTable::fiveIsolatedFailures(fiveIsolatedFailures_data 2) '!test' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(173)] + Loc: [tst_datatable.cpp(173)] FAIL! : tst_DataTable::fiveIsolatedFailures(fiveIsolatedFailures_data 3) '!test' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(173)] + Loc: [tst_datatable.cpp(173)] FAIL! : tst_DataTable::fiveIsolatedFailures(fiveIsolatedFailures_data 4) '!test' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(173)] + Loc: [tst_datatable.cpp(173)] FAIL! : tst_DataTable::fiveIsolatedFailures(fiveIsolatedFailures_data 5) '!test' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(173)] + Loc: [tst_datatable.cpp(173)] PASS : tst_DataTable::cleanupTestCase() Totals: 21 passed, 13 failed, 0 skipped ********* Finished testing of tst_DataTable ********* diff --git a/tests/auto/testlib/selftests/expected_datatable.xml b/tests/auto/testlib/selftests/expected_datatable.xml index 2579ff24cc..79963db0a4 100644 --- a/tests/auto/testlib/selftests/expected_datatable.xml +++ b/tests/auto/testlib/selftests/expected_datatable.xml @@ -6,12 +6,15 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="singleTestFunction1"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="singleTestFunction2"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTablePasses"> <Incident type="pass" file="" line="0"> @@ -29,31 +32,33 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data 5]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTableFailures"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[fiveTableFailures_data 1]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[fiveTableFailures_data 2]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[fiveTableFailures_data 3]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[fiveTableFailures_data 4]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[fiveTableFailures_data 5]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="startsWithFailure"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[startsWithFailure_data 1]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> @@ -69,6 +74,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[startsWithFailure_data 5]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="endsWithFailure"> <Incident type="pass" file="" line="0"> @@ -83,10 +89,11 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[endsWithFailure 4]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[endsWithFailure 5]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failureInMiddle"> <Incident type="pass" file="" line="0"> @@ -95,7 +102,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[failureInMiddle_data 2]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="91"> +<Incident type="fail" file="tst_datatable.cpp" line="91"> <DataTag><![CDATA[failureInMiddle_data 3]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> @@ -105,30 +112,34 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[failureInMiddle_data 5]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="fiveIsolatedFailures"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="173"> +<Incident type="fail" file="tst_datatable.cpp" line="173"> <DataTag><![CDATA[fiveIsolatedFailures_data 1]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="173"> +<Incident type="fail" file="tst_datatable.cpp" line="173"> <DataTag><![CDATA[fiveIsolatedFailures_data 2]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="173"> +<Incident type="fail" file="tst_datatable.cpp" line="173"> <DataTag><![CDATA[fiveIsolatedFailures_data 3]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="173"> +<Incident type="fail" file="tst_datatable.cpp" line="173"> <DataTag><![CDATA[fiveIsolatedFailures_data 4]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="173"> +<Incident type="fail" file="tst_datatable.cpp" line="173"> <DataTag><![CDATA[fiveIsolatedFailures_data 5]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_datetime.lightxml b/tests/auto/testlib/selftests/expected_datetime.lightxml index 183744b2e2..02c60d04f9 100644 --- a/tests/auto/testlib/selftests/expected_datetime.lightxml +++ b/tests/auto/testlib/selftests/expected_datetime.lightxml @@ -4,25 +4,27 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="dateTime"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="66"> +<Incident type="fail" file="tst_datetime.cpp" line="65"> <Description><![CDATA[Compared values are not the same Actual (local): 2000/05/03 04:03:04.000[local time] Expected (utc) : 2000/05/03 04:03:04.000[UTC]]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="qurl"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[empty urls]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="74"> +<Incident type="fail" file="tst_datetime.cpp" line="73"> <DataTag><![CDATA[empty rhs]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (operandA): http://example.com Expected (operandB): Invalid URL: ]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="74"> +<Incident type="fail" file="tst_datetime.cpp" line="73"> <DataTag><![CDATA[empty lhs]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (operandA): Invalid URL: @@ -31,7 +33,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[same urls]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_datetime.txt b/tests/auto/testlib/selftests/expected_datetime.txt index 0cbc6506d5..f48e28ea38 100644 --- a/tests/auto/testlib/selftests/expected_datetime.txt +++ b/tests/auto/testlib/selftests/expected_datetime.txt @@ -4,16 +4,16 @@ PASS : tst_DateTime::initTestCase() FAIL! : tst_DateTime::dateTime() Compared values are not the same Actual (local): 2000/05/03 04:03:04.000[local time] Expected (utc) : 2000/05/03 04:03:04.000[UTC] - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp(33)] + Loc: [tst_datetime.cpp(65)] PASS : tst_DateTime::qurl(empty urls) FAIL! : tst_DateTime::qurl(empty rhs) Compared values are not the same Actual (operandA): http://example.com Expected (operandB): Invalid URL: - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp(41)] + Loc: [tst_datetime.cpp(73)] FAIL! : tst_DateTime::qurl(empty lhs) Compared values are not the same Actual (operandA): Invalid URL: Expected (operandB): http://example.com - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp(41)] + Loc: [tst_datetime.cpp(73)] PASS : tst_DateTime::qurl(same urls) PASS : tst_DateTime::cleanupTestCase() Totals: 4 passed, 3 failed, 0 skipped diff --git a/tests/auto/testlib/selftests/expected_datetime.xml b/tests/auto/testlib/selftests/expected_datetime.xml index 42b566c074..03aec4430e 100644 --- a/tests/auto/testlib/selftests/expected_datetime.xml +++ b/tests/auto/testlib/selftests/expected_datetime.xml @@ -6,25 +6,27 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="dateTime"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="66"> +<Incident type="fail" file="tst_datetime.cpp" line="65"> <Description><![CDATA[Compared values are not the same Actual (local): 2000/05/03 04:03:04.000[local time] Expected (utc) : 2000/05/03 04:03:04.000[UTC]]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="qurl"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[empty urls]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="74"> +<Incident type="fail" file="tst_datetime.cpp" line="73"> <DataTag><![CDATA[empty rhs]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (operandA): http://example.com Expected (operandB): Invalid URL: ]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="74"> +<Incident type="fail" file="tst_datetime.cpp" line="73"> <DataTag><![CDATA[empty lhs]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (operandA): Invalid URL: @@ -33,8 +35,11 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[same urls]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml b/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml index e4f87fa611..6c9675a2aa 100644 --- a/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml +++ b/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml @@ -4,9 +4,12 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="throwException"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase//src/testlib/qtestcase.cpp" line="1691"> +<Incident type="fail" file="/home/frederik/dev/qt/qt-src-dev/qtbase/src/testlib/qtestcase.cpp" line="2229"> <Description><![CDATA[Caught unhandled exception]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.txt b/tests/auto/testlib/selftests/expected_exceptionthrow.txt index ecbc7da01a..671e609230 100644 --- a/tests/auto/testlib/selftests/expected_exceptionthrow.txt +++ b/tests/auto/testlib/selftests/expected_exceptionthrow.txt @@ -2,6 +2,6 @@ Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : tst_Exception::initTestCase() FAIL! : tst_Exception::throwException() Caught unhandled exception - Loc: [/home/user/dev/qt5/qtbase/src/testlib/qtestcase.cpp(1220)] + Loc: [/home/frederik/dev/qt/qt-src-dev/qtbase/src/testlib/qtestcase.cpp(2229)] Totals: 1 passed, 1 failed, 0 skipped ********* Finished testing of tst_Exception ********* diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.xml b/tests/auto/testlib/selftests/expected_exceptionthrow.xml index ab0f9a917e..87d9d2d431 100644 --- a/tests/auto/testlib/selftests/expected_exceptionthrow.xml +++ b/tests/auto/testlib/selftests/expected_exceptionthrow.xml @@ -6,10 +6,13 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="throwException"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/src/testlib/qtestcase.cpp" line="1691"> +<Incident type="fail" file="/home/frederik/dev/qt/qt-src-dev/qtbase/src/testlib/qtestcase.cpp" line="2229"> <Description><![CDATA[Caught unhandled exception]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_expectfail.lightxml b/tests/auto/testlib/selftests/expected_expectfail.lightxml index 55bd9578a8..e5fcca5875 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.lightxml +++ b/tests/auto/testlib/selftests/expected_expectfail.lightxml @@ -4,41 +4,46 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailAndContinue"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[begin]]></Description> </Message> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="78"> +<Incident type="xfail" file="tst_expectfail.cpp" line="78"> <Description><![CDATA[This should xfail]]></Description> </Incident> <Message type="qdebug" file="" line="0"> <Description><![CDATA[after]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailAndAbort"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[begin]]></Description> </Message> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="86"> +<Incident type="xfail" file="tst_expectfail.cpp" line="86"> <Description><![CDATA[This should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailTwice"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="96"> +<Incident type="fail" file="tst_expectfail.cpp" line="96"> <Description><![CDATA[Already expecting a fail]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailWithQString"> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="105"> +<Incident type="xfail" file="tst_expectfail.cpp" line="105"> <Description><![CDATA[A string]]></Description> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="110"> +<Incident type="xfail" file="tst_expectfail.cpp" line="110"> <Description><![CDATA[Bug 5 (The message)]]></Description> </Incident> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQVerify"> <Incident type="pass" file="" line="0"> @@ -47,20 +52,21 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass 2]]></DataTag> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="139"> +<Incident type="xfail" file="tst_expectfail.cpp" line="139"> <DataTag><![CDATA[Abort]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Abort]]></DataTag> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="139"> +<Incident type="xfail" file="tst_expectfail.cpp" line="139"> <DataTag><![CDATA[Continue]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Continue]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQCompare"> <Incident type="pass" file="" line="0"> @@ -69,41 +75,44 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass 2]]></DataTag> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="173"> +<Incident type="xfail" file="tst_expectfail.cpp" line="173"> <DataTag><![CDATA[Abort]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Abort]]></DataTag> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="173"> +<Incident type="xfail" file="tst_expectfail.cpp" line="173"> <DataTag><![CDATA[Continue]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Continue]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailOnWrongRow"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[right row]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailOnAnyRow"> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="208"> +<Incident type="xfail" file="tst_expectfail.cpp" line="208"> <DataTag><![CDATA[first row]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[first row]]></DataTag> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="208"> +<Incident type="xfail" file="tst_expectfail.cpp" line="208"> <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[second row]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailWithoutVerify"> <Incident type="fail" file="" line="0"> @@ -114,30 +123,36 @@ <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[QEXPECT_FAIL was called without any subsequent verification statements]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xpass"> -<Incident type="xpass" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="228"> +<Incident type="xpass" file="tst_expectfail.cpp" line="228"> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xpassDataDrivenWithQVerify"> -<Incident type="xpass" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="250"> +<Incident type="xpass" file="tst_expectfail.cpp" line="250"> <DataTag><![CDATA[XPass]]></DataTag> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xpassDataDrivenWithQCompare"> -<Incident type="xpass" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="271"> +<Incident type="xpass" file="tst_expectfail.cpp" line="271"> <DataTag><![CDATA[XPass]]></DataTag> <Description><![CDATA[QCOMPARE(1, 1) returned TRUE unexpectedly.]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_expectfail.txt b/tests/auto/testlib/selftests/expected_expectfail.txt index abd1cdc32c..39f3c17f70 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.txt +++ b/tests/auto/testlib/selftests/expected_expectfail.txt @@ -3,52 +3,52 @@ Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HER PASS : tst_ExpectFail::initTestCase() QDEBUG : tst_ExpectFail::xfailAndContinue() begin XFAIL : tst_ExpectFail::xfailAndContinue() This should xfail - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(78)] + Loc: [tst_expectfail.cpp(78)] QDEBUG : tst_ExpectFail::xfailAndContinue() after PASS : tst_ExpectFail::xfailAndContinue() QDEBUG : tst_ExpectFail::xfailAndAbort() begin XFAIL : tst_ExpectFail::xfailAndAbort() This should xfail - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(86)] + Loc: [tst_expectfail.cpp(86)] PASS : tst_ExpectFail::xfailAndAbort() FAIL! : tst_ExpectFail::xfailTwice() Already expecting a fail - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(96)] + Loc: [tst_expectfail.cpp(96)] XFAIL : tst_ExpectFail::xfailWithQString() A string - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(105)] + Loc: [tst_expectfail.cpp(105)] XFAIL : tst_ExpectFail::xfailWithQString() Bug 5 (The message) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(110)] + Loc: [tst_expectfail.cpp(110)] PASS : tst_ExpectFail::xfailWithQString() PASS : tst_ExpectFail::xfailDataDrivenWithQVerify(Pass 1) PASS : tst_ExpectFail::xfailDataDrivenWithQVerify(Pass 2) XFAIL : tst_ExpectFail::xfailDataDrivenWithQVerify(Abort) This test should xfail - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(139)] + Loc: [tst_expectfail.cpp(139)] PASS : tst_ExpectFail::xfailDataDrivenWithQVerify(Abort) XFAIL : tst_ExpectFail::xfailDataDrivenWithQVerify(Continue) This test should xfail - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(139)] + Loc: [tst_expectfail.cpp(139)] PASS : tst_ExpectFail::xfailDataDrivenWithQVerify(Continue) PASS : tst_ExpectFail::xfailDataDrivenWithQCompare(Pass 1) PASS : tst_ExpectFail::xfailDataDrivenWithQCompare(Pass 2) XFAIL : tst_ExpectFail::xfailDataDrivenWithQCompare(Abort) This test should xfail - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(173)] + Loc: [tst_expectfail.cpp(173)] PASS : tst_ExpectFail::xfailDataDrivenWithQCompare(Abort) XFAIL : tst_ExpectFail::xfailDataDrivenWithQCompare(Continue) This test should xfail - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(173)] + Loc: [tst_expectfail.cpp(173)] PASS : tst_ExpectFail::xfailDataDrivenWithQCompare(Continue) PASS : tst_ExpectFail::xfailOnWrongRow(right row) XFAIL : tst_ExpectFail::xfailOnAnyRow(first row) This test should xfail - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(208)] + Loc: [tst_expectfail.cpp(208)] PASS : tst_ExpectFail::xfailOnAnyRow(first row) XFAIL : tst_ExpectFail::xfailOnAnyRow(second row) This test should xfail - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(208)] + Loc: [tst_expectfail.cpp(208)] PASS : tst_ExpectFail::xfailOnAnyRow(second row) FAIL! : tst_ExpectFail::xfailWithoutVerify(first row) QEXPECT_FAIL was called without any subsequent verification statements FAIL! : tst_ExpectFail::xfailWithoutVerify(second row) QEXPECT_FAIL was called without any subsequent verification statements XPASS : tst_ExpectFail::xpass() 'true' returned TRUE unexpectedly. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(228)] + Loc: [tst_expectfail.cpp(228)] XPASS : tst_ExpectFail::xpassDataDrivenWithQVerify(XPass) 'true' returned TRUE unexpectedly. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(250)] + Loc: [tst_expectfail.cpp(250)] PASS : tst_ExpectFail::xpassDataDrivenWithQVerify(Pass) XPASS : tst_ExpectFail::xpassDataDrivenWithQCompare(XPass) QCOMPARE(1, 1) returned TRUE unexpectedly. - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(271)] + Loc: [tst_expectfail.cpp(271)] PASS : tst_ExpectFail::xpassDataDrivenWithQCompare(Pass) PASS : tst_ExpectFail::cleanupTestCase() Totals: 18 passed, 6 failed, 0 skipped diff --git a/tests/auto/testlib/selftests/expected_expectfail.xml b/tests/auto/testlib/selftests/expected_expectfail.xml index 58a48197b0..14fee2129e 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.xml +++ b/tests/auto/testlib/selftests/expected_expectfail.xml @@ -6,41 +6,46 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailAndContinue"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[begin]]></Description> </Message> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="78"> +<Incident type="xfail" file="tst_expectfail.cpp" line="78"> <Description><![CDATA[This should xfail]]></Description> </Incident> <Message type="qdebug" file="" line="0"> <Description><![CDATA[after]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailAndAbort"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[begin]]></Description> </Message> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="86"> +<Incident type="xfail" file="tst_expectfail.cpp" line="86"> <Description><![CDATA[This should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailTwice"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="96"> +<Incident type="fail" file="tst_expectfail.cpp" line="96"> <Description><![CDATA[Already expecting a fail]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailWithQString"> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="105"> +<Incident type="xfail" file="tst_expectfail.cpp" line="105"> <Description><![CDATA[A string]]></Description> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="110"> +<Incident type="xfail" file="tst_expectfail.cpp" line="110"> <Description><![CDATA[Bug 5 (The message)]]></Description> </Incident> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQVerify"> <Incident type="pass" file="" line="0"> @@ -49,20 +54,21 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass 2]]></DataTag> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="139"> +<Incident type="xfail" file="tst_expectfail.cpp" line="139"> <DataTag><![CDATA[Abort]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Abort]]></DataTag> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="139"> +<Incident type="xfail" file="tst_expectfail.cpp" line="139"> <DataTag><![CDATA[Continue]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Continue]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQCompare"> <Incident type="pass" file="" line="0"> @@ -71,41 +77,44 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass 2]]></DataTag> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="173"> +<Incident type="xfail" file="tst_expectfail.cpp" line="173"> <DataTag><![CDATA[Abort]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Abort]]></DataTag> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="173"> +<Incident type="xfail" file="tst_expectfail.cpp" line="173"> <DataTag><![CDATA[Continue]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Continue]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailOnWrongRow"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[right row]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailOnAnyRow"> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="208"> +<Incident type="xfail" file="tst_expectfail.cpp" line="208"> <DataTag><![CDATA[first row]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[first row]]></DataTag> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="208"> +<Incident type="xfail" file="tst_expectfail.cpp" line="208"> <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[second row]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xfailWithoutVerify"> <Incident type="fail" file="" line="0"> @@ -116,31 +125,37 @@ <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[QEXPECT_FAIL was called without any subsequent verification statements]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xpass"> -<Incident type="xpass" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="228"> +<Incident type="xpass" file="tst_expectfail.cpp" line="228"> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xpassDataDrivenWithQVerify"> -<Incident type="xpass" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="250"> +<Incident type="xpass" file="tst_expectfail.cpp" line="250"> <DataTag><![CDATA[XPass]]></DataTag> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="xpassDataDrivenWithQCompare"> -<Incident type="xpass" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="271"> +<Incident type="xpass" file="tst_expectfail.cpp" line="271"> <DataTag><![CDATA[XPass]]></DataTag> <Description><![CDATA[QCOMPARE(1, 1) returned TRUE unexpectedly.]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_failcleanup.lightxml b/tests/auto/testlib/selftests/expected_failcleanup.lightxml index 83ce7a7b15..cfc18ef5da 100644 --- a/tests/auto/testlib/selftests/expected_failcleanup.lightxml +++ b/tests/auto/testlib/selftests/expected_failcleanup.lightxml @@ -4,12 +4,16 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="aTestFunction"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp" line="59"> +<Incident type="fail" file="tst_failcleanup.cpp" line="59"> <Description><![CDATA['false' returned FALSE. (Fail inside cleanupTestCase)]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_failcleanup.txt b/tests/auto/testlib/selftests/expected_failcleanup.txt index 1d9405b326..59d0c26794 100644 --- a/tests/auto/testlib/selftests/expected_failcleanup.txt +++ b/tests/auto/testlib/selftests/expected_failcleanup.txt @@ -3,6 +3,6 @@ Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HER PASS : tst_FailCleanup::initTestCase() PASS : tst_FailCleanup::aTestFunction() FAIL! : tst_FailCleanup::cleanupTestCase() 'false' returned FALSE. (Fail inside cleanupTestCase) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp(59)] + Loc: [tst_failcleanup.cpp(59)] Totals: 2 passed, 1 failed, 0 skipped ********* Finished testing of tst_FailCleanup ********* diff --git a/tests/auto/testlib/selftests/expected_failcleanup.xml b/tests/auto/testlib/selftests/expected_failcleanup.xml index 13633a8a0d..3aa7aa265d 100644 --- a/tests/auto/testlib/selftests/expected_failcleanup.xml +++ b/tests/auto/testlib/selftests/expected_failcleanup.xml @@ -6,13 +6,17 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="aTestFunction"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp" line="59"> +<Incident type="fail" file="tst_failcleanup.cpp" line="59"> <Description><![CDATA['false' returned FALSE. (Fail inside cleanupTestCase)]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_failinit.lightxml b/tests/auto/testlib/selftests/expected_failinit.lightxml index f80d8075ca..c0d193998d 100644 --- a/tests/auto/testlib/selftests/expected_failinit.lightxml +++ b/tests/auto/testlib/selftests/expected_failinit.lightxml @@ -3,10 +3,13 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/failinit/tst_failinit.cpp" line="55"> +<Incident type="fail" file="tst_failinit.cpp" line="55"> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_failinit.txt b/tests/auto/testlib/selftests/expected_failinit.txt index a6cf55b2e2..2265898d69 100644 --- a/tests/auto/testlib/selftests/expected_failinit.txt +++ b/tests/auto/testlib/selftests/expected_failinit.txt @@ -1,7 +1,7 @@ ********* Start testing of tst_FailInit ********* Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ FAIL! : tst_FailInit::initTestCase() 'false' returned FALSE. () - Loc: [tst_failinit.cpp(22)] + Loc: [tst_failinit.cpp(55)] PASS : tst_FailInit::cleanupTestCase() Totals: 1 passed, 1 failed, 0 skipped ********* Finished testing of tst_FailInit ********* diff --git a/tests/auto/testlib/selftests/expected_failinit.xml b/tests/auto/testlib/selftests/expected_failinit.xml index 4ab455c966..70ad613f3f 100644 --- a/tests/auto/testlib/selftests/expected_failinit.xml +++ b/tests/auto/testlib/selftests/expected_failinit.xml @@ -5,11 +5,14 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/failinit/tst_failinit.cpp" line="55"> +<Incident type="fail" file="tst_failinit.cpp" line="55"> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_failinitdata.lightxml b/tests/auto/testlib/selftests/expected_failinitdata.lightxml index 11ba1f0c2e..285471470f 100644 --- a/tests/auto/testlib/selftests/expected_failinitdata.lightxml +++ b/tests/auto/testlib/selftests/expected_failinitdata.lightxml @@ -3,7 +3,9 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp" line="56"> +<Incident type="fail" file="tst_failinitdata.cpp" line="56"> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_failinitdata.txt b/tests/auto/testlib/selftests/expected_failinitdata.txt index 40b36526ba..982db4b2c2 100644 --- a/tests/auto/testlib/selftests/expected_failinitdata.txt +++ b/tests/auto/testlib/selftests/expected_failinitdata.txt @@ -1,6 +1,6 @@ ********* Start testing of tst_FailInitData ********* Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ FAIL! : tst_FailInitData::initTestCase() 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp(23)] + Loc: [tst_failinitdata.cpp(56)] Totals: 0 passed, 1 failed, 0 skipped ********* Finished testing of tst_FailInitData ********* diff --git a/tests/auto/testlib/selftests/expected_failinitdata.xml b/tests/auto/testlib/selftests/expected_failinitdata.xml index e4da823112..e86e102202 100644 --- a/tests/auto/testlib/selftests/expected_failinitdata.xml +++ b/tests/auto/testlib/selftests/expected_failinitdata.xml @@ -5,8 +5,10 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp" line="56"> +<Incident type="fail" file="tst_failinitdata.cpp" line="56"> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.lightxml b/tests/auto/testlib/selftests/expected_fetchbogus.lightxml index 1812c0e6b5..c5587cf031 100644 --- a/tests/auto/testlib/selftests/expected_fetchbogus.lightxml +++ b/tests/auto/testlib/selftests/expected_fetchbogus.lightxml @@ -4,6 +4,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="fetchBogus"> <Message type="qfatal" file="" line="0"> @@ -14,4 +15,6 @@ <DataTag><![CDATA[foo]]></DataTag> <Description><![CDATA[Received a fatal error.]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.xml b/tests/auto/testlib/selftests/expected_fetchbogus.xml index ee33a85dc4..40295bdebc 100644 --- a/tests/auto/testlib/selftests/expected_fetchbogus.xml +++ b/tests/auto/testlib/selftests/expected_fetchbogus.xml @@ -6,6 +6,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="fetchBogus"> <Message type="qfatal" file="" line="0"> @@ -16,5 +17,7 @@ <DataTag><![CDATA[foo]]></DataTag> <Description><![CDATA[Received a fatal error.]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_findtestdata.lightxml b/tests/auto/testlib/selftests/expected_findtestdata.lightxml index f1944c4897..4c1c7298ed 100644 --- a/tests/auto/testlib/selftests/expected_findtestdata.lightxml +++ b/tests/auto/testlib/selftests/expected_findtestdata.lightxml @@ -4,13 +4,17 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="paths"> -<Message type="warn" file="findtestdata.cpp" line="131"> +<Message type="warn" file="findtestdata.cpp" line="154"> <Description><![CDATA[testdata testfile could not be located!]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_findtestdata.txt b/tests/auto/testlib/selftests/expected_findtestdata.txt index 22c2e851d4..d92b167d3e 100644 --- a/tests/auto/testlib/selftests/expected_findtestdata.txt +++ b/tests/auto/testlib/selftests/expected_findtestdata.txt @@ -2,7 +2,7 @@ Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : FindTestData::initTestCase() WARNING: FindTestData::paths() testdata testfile could not be located! - Loc: [findtestdata.cpp(131)] + Loc: [findtestdata.cpp(154)] PASS : FindTestData::paths() PASS : FindTestData::cleanupTestCase() Totals: 3 passed, 0 failed, 0 skipped diff --git a/tests/auto/testlib/selftests/expected_findtestdata.xml b/tests/auto/testlib/selftests/expected_findtestdata.xml index dd1fc08f68..b1f33abaf6 100644 --- a/tests/auto/testlib/selftests/expected_findtestdata.xml +++ b/tests/auto/testlib/selftests/expected_findtestdata.xml @@ -6,14 +6,18 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="paths"> -<Message type="warn" file="findtestdata.cpp" line="131"> +<Message type="warn" file="findtestdata.cpp" line="154"> <Description><![CDATA[testdata testfile could not be located!]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_float.txt b/tests/auto/testlib/selftests/expected_float.txt index da98f9c19d..6d0588981c 100644 --- a/tests/auto/testlib/selftests/expected_float.txt +++ b/tests/auto/testlib/selftests/expected_float.txt @@ -5,28 +5,28 @@ PASS : tst_float::floatComparisons(should SUCCEED 1) FAIL! : tst_float::floatComparisons(should FAIL 1) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : 1 Expected (operandRight): 3 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(61)] + Loc: [tst_float.cpp(61)] FAIL! : tst_float::floatComparisons(should FAIL 2) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : 1e-07 Expected (operandRight): 3e-07 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(61)] + Loc: [tst_float.cpp(61)] FAIL! : tst_float::floatComparisons(should FAIL 3) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : 99998 Expected (operandRight): 99999 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(61)] + Loc: [tst_float.cpp(61)] PASS : tst_float::floatComparisons(should SUCCEED 2) FAIL! : tst_float::compareFloatTests(1e0) Compared floats are not the same (fuzzy compare) Actual (t1): 1 Expected (t3): 3 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(104)] + Loc: [tst_float.cpp(109)] FAIL! : tst_float::compareFloatTests(1e-7) Compared floats are not the same (fuzzy compare) Actual (t1): 1e-07 Expected (t3): 3e-07 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(104)] + Loc: [tst_float.cpp(109)] FAIL! : tst_float::compareFloatTests(1e+7) Compared floats are not the same (fuzzy compare) Actual (t1): 1e+07 Expected (t3): 3e+07 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(104)] + Loc: [tst_float.cpp(109)] PASS : tst_float::cleanupTestCase() Totals: 4 passed, 6 failed, 0 skipped ********* Finished testing of tst_float ********* diff --git a/tests/auto/testlib/selftests/expected_globaldata.lightxml b/tests/auto/testlib/selftests/expected_globaldata.lightxml index 6d68bfbdb5..fd128d2c61 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.lightxml +++ b/tests/auto/testlib/selftests/expected_globaldata.lightxml @@ -4,182 +4,189 @@ </Environment> <TestFunction name="initTestCase"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[initTestCase initTestCase (null) ]]></Description> + <Description><![CDATA[initTestCase initTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testGlobal"> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[init testGlobal local 1 ]]></Description> + <Description><![CDATA[init testGlobal local 1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[global: false ]]></Description> + <Description><![CDATA[global: false]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[local: false ]]></Description> + <Description><![CDATA[local: false]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[cleanup testGlobal local 1 ]]></Description> + <Description><![CDATA[cleanup testGlobal local 1]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[init testGlobal local 2 ]]></Description> + <Description><![CDATA[init testGlobal local 2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[global: false ]]></Description> + <Description><![CDATA[global: false]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[local: true ]]></Description> + <Description><![CDATA[local: true]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[cleanup testGlobal local 2 ]]></Description> + <Description><![CDATA[cleanup testGlobal local 2]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> - <Description><![CDATA[init testGlobal local 1 ]]></Description> + <Description><![CDATA[init testGlobal local 1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> - <Description><![CDATA[global: true ]]></Description> + <Description><![CDATA[global: true]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> - <Description><![CDATA[local: false ]]></Description> + <Description><![CDATA[local: false]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> - <Description><![CDATA[cleanup testGlobal local 1 ]]></Description> + <Description><![CDATA[cleanup testGlobal local 1]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[init testGlobal local 2 ]]></Description> + <Description><![CDATA[init testGlobal local 2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[global: true ]]></Description> + <Description><![CDATA[global: true]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[local: true ]]></Description> + <Description><![CDATA[local: true]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[cleanup testGlobal local 2 ]]></Description> + <Description><![CDATA[cleanup testGlobal local 2]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="skip"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="129"> +<Message type="skip" file="tst_globaldata.cpp" line="129"> <DataTag><![CDATA[1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="skipLocal"> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[init skipLocal local 1 ]]></Description> + <Description><![CDATA[init skipLocal local 1]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="149"> +<Message type="skip" file="tst_globaldata.cpp" line="149"> <DataTag><![CDATA[1:local 1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[cleanup skipLocal local 1 ]]></Description> + <Description><![CDATA[cleanup skipLocal local 1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[init skipLocal local 2 ]]></Description> + <Description><![CDATA[init skipLocal local 2]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="149"> +<Message type="skip" file="tst_globaldata.cpp" line="149"> <DataTag><![CDATA[1:local 2]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[cleanup skipLocal local 2 ]]></Description> + <Description><![CDATA[cleanup skipLocal local 2]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="skipSingle"> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[init skipSingle local 1 ]]></Description> + <Description><![CDATA[init skipSingle local 1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[global: false local: false ]]></Description> + <Description><![CDATA[global: false local: false]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[cleanup skipSingle local 1 ]]></Description> + <Description><![CDATA[cleanup skipSingle local 1]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[init skipSingle local 2 ]]></Description> + <Description><![CDATA[init skipSingle local 2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[global: false local: true ]]></Description> + <Description><![CDATA[global: false local: true]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[cleanup skipSingle local 2 ]]></Description> + <Description><![CDATA[cleanup skipSingle local 2]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> - <Description><![CDATA[init skipSingle local 1 ]]></Description> + <Description><![CDATA[init skipSingle local 1]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="143"> +<Message type="skip" file="tst_globaldata.cpp" line="143"> <DataTag><![CDATA[2:local 1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> - <Description><![CDATA[cleanup skipSingle local 1 ]]></Description> + <Description><![CDATA[cleanup skipSingle local 1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[init skipSingle local 2 ]]></Description> + <Description><![CDATA[init skipSingle local 2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[global: true local: true ]]></Description> + <Description><![CDATA[global: true local: true]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[cleanup skipSingle local 2 ]]></Description> + <Description><![CDATA[cleanup skipSingle local 2]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[cleanupTestCase cleanupTestCase (null) ]]></Description> + <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_globaldata.txt b/tests/auto/testlib/selftests/expected_globaldata.txt index e5d9cacc9c..a7c18e765b 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.txt +++ b/tests/auto/testlib/selftests/expected_globaldata.txt @@ -1,54 +1,54 @@ ********* Start testing of tst_globaldata ********* Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ -QDEBUG : tst_globaldata::initTestCase() initTestCase initTestCase (null) +QDEBUG : tst_globaldata::initTestCase() initTestCase initTestCase (null) PASS : tst_globaldata::initTestCase() -QDEBUG : tst_globaldata::testGlobal(1:local 1) init testGlobal local 1 -QDEBUG : tst_globaldata::testGlobal(1:local 1) global: false -QDEBUG : tst_globaldata::testGlobal(1:local 1) local: false -QDEBUG : tst_globaldata::testGlobal(1:local 1) cleanup testGlobal local 1 +QDEBUG : tst_globaldata::testGlobal(1:local 1) init testGlobal local 1 +QDEBUG : tst_globaldata::testGlobal(1:local 1) global: false +QDEBUG : tst_globaldata::testGlobal(1:local 1) local: false +QDEBUG : tst_globaldata::testGlobal(1:local 1) cleanup testGlobal local 1 PASS : tst_globaldata::testGlobal(1:local 1) -QDEBUG : tst_globaldata::testGlobal(1:local 2) init testGlobal local 2 -QDEBUG : tst_globaldata::testGlobal(1:local 2) global: false -QDEBUG : tst_globaldata::testGlobal(1:local 2) local: true -QDEBUG : tst_globaldata::testGlobal(1:local 2) cleanup testGlobal local 2 +QDEBUG : tst_globaldata::testGlobal(1:local 2) init testGlobal local 2 +QDEBUG : tst_globaldata::testGlobal(1:local 2) global: false +QDEBUG : tst_globaldata::testGlobal(1:local 2) local: true +QDEBUG : tst_globaldata::testGlobal(1:local 2) cleanup testGlobal local 2 PASS : tst_globaldata::testGlobal(1:local 2) -QDEBUG : tst_globaldata::testGlobal(2:local 1) init testGlobal local 1 -QDEBUG : tst_globaldata::testGlobal(2:local 1) global: true -QDEBUG : tst_globaldata::testGlobal(2:local 1) local: false -QDEBUG : tst_globaldata::testGlobal(2:local 1) cleanup testGlobal local 1 +QDEBUG : tst_globaldata::testGlobal(2:local 1) init testGlobal local 1 +QDEBUG : tst_globaldata::testGlobal(2:local 1) global: true +QDEBUG : tst_globaldata::testGlobal(2:local 1) local: false +QDEBUG : tst_globaldata::testGlobal(2:local 1) cleanup testGlobal local 1 PASS : tst_globaldata::testGlobal(2:local 1) -QDEBUG : tst_globaldata::testGlobal(2:local 2) init testGlobal local 2 -QDEBUG : tst_globaldata::testGlobal(2:local 2) global: true -QDEBUG : tst_globaldata::testGlobal(2:local 2) local: true -QDEBUG : tst_globaldata::testGlobal(2:local 2) cleanup testGlobal local 2 +QDEBUG : tst_globaldata::testGlobal(2:local 2) init testGlobal local 2 +QDEBUG : tst_globaldata::testGlobal(2:local 2) global: true +QDEBUG : tst_globaldata::testGlobal(2:local 2) local: true +QDEBUG : tst_globaldata::testGlobal(2:local 2) cleanup testGlobal local 2 PASS : tst_globaldata::testGlobal(2:local 2) SKIP : tst_globaldata::skip(1) skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(129)] -QDEBUG : tst_globaldata::skipLocal(1:local 1) init skipLocal local 1 + Loc: [tst_globaldata.cpp(129)] +QDEBUG : tst_globaldata::skipLocal(1:local 1) init skipLocal local 1 SKIP : tst_globaldata::skipLocal(1:local 1) skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(149)] -QDEBUG : tst_globaldata::skipLocal(1:local 1) cleanup skipLocal local 1 -QDEBUG : tst_globaldata::skipLocal(1:local 2) init skipLocal local 2 + Loc: [tst_globaldata.cpp(149)] +QDEBUG : tst_globaldata::skipLocal(1:local 1) cleanup skipLocal local 1 +QDEBUG : tst_globaldata::skipLocal(1:local 2) init skipLocal local 2 SKIP : tst_globaldata::skipLocal(1:local 2) skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(149)] -QDEBUG : tst_globaldata::skipLocal(1:local 2) cleanup skipLocal local 2 -QDEBUG : tst_globaldata::skipSingle(1:local 1) init skipSingle local 1 -QDEBUG : tst_globaldata::skipSingle(1:local 1) global: false local: false -QDEBUG : tst_globaldata::skipSingle(1:local 1) cleanup skipSingle local 1 + Loc: [tst_globaldata.cpp(149)] +QDEBUG : tst_globaldata::skipLocal(1:local 2) cleanup skipLocal local 2 +QDEBUG : tst_globaldata::skipSingle(1:local 1) init skipSingle local 1 +QDEBUG : tst_globaldata::skipSingle(1:local 1) global: false local: false +QDEBUG : tst_globaldata::skipSingle(1:local 1) cleanup skipSingle local 1 PASS : tst_globaldata::skipSingle(1:local 1) -QDEBUG : tst_globaldata::skipSingle(1:local 2) init skipSingle local 2 -QDEBUG : tst_globaldata::skipSingle(1:local 2) global: false local: true -QDEBUG : tst_globaldata::skipSingle(1:local 2) cleanup skipSingle local 2 +QDEBUG : tst_globaldata::skipSingle(1:local 2) init skipSingle local 2 +QDEBUG : tst_globaldata::skipSingle(1:local 2) global: false local: true +QDEBUG : tst_globaldata::skipSingle(1:local 2) cleanup skipSingle local 2 PASS : tst_globaldata::skipSingle(1:local 2) -QDEBUG : tst_globaldata::skipSingle(2:local 1) init skipSingle local 1 +QDEBUG : tst_globaldata::skipSingle(2:local 1) init skipSingle local 1 SKIP : tst_globaldata::skipSingle(2:local 1) skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(143)] -QDEBUG : tst_globaldata::skipSingle(2:local 1) cleanup skipSingle local 1 -QDEBUG : tst_globaldata::skipSingle(2:local 2) init skipSingle local 2 -QDEBUG : tst_globaldata::skipSingle(2:local 2) global: true local: true -QDEBUG : tst_globaldata::skipSingle(2:local 2) cleanup skipSingle local 2 + Loc: [tst_globaldata.cpp(143)] +QDEBUG : tst_globaldata::skipSingle(2:local 1) cleanup skipSingle local 1 +QDEBUG : tst_globaldata::skipSingle(2:local 2) init skipSingle local 2 +QDEBUG : tst_globaldata::skipSingle(2:local 2) global: true local: true +QDEBUG : tst_globaldata::skipSingle(2:local 2) cleanup skipSingle local 2 PASS : tst_globaldata::skipSingle(2:local 2) -QDEBUG : tst_globaldata::cleanupTestCase() cleanupTestCase cleanupTestCase (null) +QDEBUG : tst_globaldata::cleanupTestCase() cleanupTestCase cleanupTestCase (null) PASS : tst_globaldata::cleanupTestCase() Totals: 9 passed, 0 failed, 4 skipped ********* Finished testing of tst_globaldata ********* diff --git a/tests/auto/testlib/selftests/expected_globaldata.xml b/tests/auto/testlib/selftests/expected_globaldata.xml index 906e66ca68..0867619fde 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.xml +++ b/tests/auto/testlib/selftests/expected_globaldata.xml @@ -6,183 +6,190 @@ </Environment> <TestFunction name="initTestCase"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[initTestCase initTestCase (null) ]]></Description> + <Description><![CDATA[initTestCase initTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testGlobal"> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[init testGlobal local 1 ]]></Description> + <Description><![CDATA[init testGlobal local 1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[global: false ]]></Description> + <Description><![CDATA[global: false]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[local: false ]]></Description> + <Description><![CDATA[local: false]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[cleanup testGlobal local 1 ]]></Description> + <Description><![CDATA[cleanup testGlobal local 1]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[init testGlobal local 2 ]]></Description> + <Description><![CDATA[init testGlobal local 2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[global: false ]]></Description> + <Description><![CDATA[global: false]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[local: true ]]></Description> + <Description><![CDATA[local: true]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[cleanup testGlobal local 2 ]]></Description> + <Description><![CDATA[cleanup testGlobal local 2]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> - <Description><![CDATA[init testGlobal local 1 ]]></Description> + <Description><![CDATA[init testGlobal local 1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> - <Description><![CDATA[global: true ]]></Description> + <Description><![CDATA[global: true]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> - <Description><![CDATA[local: false ]]></Description> + <Description><![CDATA[local: false]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> - <Description><![CDATA[cleanup testGlobal local 1 ]]></Description> + <Description><![CDATA[cleanup testGlobal local 1]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[init testGlobal local 2 ]]></Description> + <Description><![CDATA[init testGlobal local 2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[global: true ]]></Description> + <Description><![CDATA[global: true]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[local: true ]]></Description> + <Description><![CDATA[local: true]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[cleanup testGlobal local 2 ]]></Description> + <Description><![CDATA[cleanup testGlobal local 2]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="skip"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="129"> +<Message type="skip" file="tst_globaldata.cpp" line="129"> <DataTag><![CDATA[1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="skipLocal"> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[init skipLocal local 1 ]]></Description> + <Description><![CDATA[init skipLocal local 1]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="149"> +<Message type="skip" file="tst_globaldata.cpp" line="149"> <DataTag><![CDATA[1:local 1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[cleanup skipLocal local 1 ]]></Description> + <Description><![CDATA[cleanup skipLocal local 1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[init skipLocal local 2 ]]></Description> + <Description><![CDATA[init skipLocal local 2]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="149"> +<Message type="skip" file="tst_globaldata.cpp" line="149"> <DataTag><![CDATA[1:local 2]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[cleanup skipLocal local 2 ]]></Description> + <Description><![CDATA[cleanup skipLocal local 2]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="skipSingle"> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[init skipSingle local 1 ]]></Description> + <Description><![CDATA[init skipSingle local 1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[global: false local: false ]]></Description> + <Description><![CDATA[global: false local: false]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> - <Description><![CDATA[cleanup skipSingle local 1 ]]></Description> + <Description><![CDATA[cleanup skipSingle local 1]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[init skipSingle local 2 ]]></Description> + <Description><![CDATA[init skipSingle local 2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[global: false local: true ]]></Description> + <Description><![CDATA[global: false local: true]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> - <Description><![CDATA[cleanup skipSingle local 2 ]]></Description> + <Description><![CDATA[cleanup skipSingle local 2]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> - <Description><![CDATA[init skipSingle local 1 ]]></Description> + <Description><![CDATA[init skipSingle local 1]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="143"> +<Message type="skip" file="tst_globaldata.cpp" line="143"> <DataTag><![CDATA[2:local 1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> - <Description><![CDATA[cleanup skipSingle local 1 ]]></Description> + <Description><![CDATA[cleanup skipSingle local 1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[init skipSingle local 2 ]]></Description> + <Description><![CDATA[init skipSingle local 2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[global: true local: true ]]></Description> + <Description><![CDATA[global: true local: true]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> - <Description><![CDATA[cleanup skipSingle local 2 ]]></Description> + <Description><![CDATA[cleanup skipSingle local 2]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[cleanupTestCase cleanupTestCase (null) ]]></Description> + <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_globaldata.xunitxml b/tests/auto/testlib/selftests/expected_globaldata.xunitxml index 9e0cd149dc..e8cd03a59c 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.xunitxml +++ b/tests/auto/testlib/selftests/expected_globaldata.xunitxml @@ -5,91 +5,91 @@ <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> </properties> <testcase result="pass" name="initTestCase"> - <!-- message="initTestCase initTestCase (null) " type="qdebug" --> + <!-- message="initTestCase initTestCase (null)" type="qdebug" --> </testcase> <testcase result="pass" name="testGlobal"> - <!-- tag="1:local 1" message="init testGlobal local 1 " type="qdebug" --> - <!-- tag="1:local 1" message="global: false " type="qdebug" --> - <!-- tag="1:local 1" message="local: false " type="qdebug" --> - <!-- tag="1:local 1" message="cleanup testGlobal local 1 " type="qdebug" --> - <!-- tag="1:local 2" message="init testGlobal local 2 " type="qdebug" --> - <!-- tag="1:local 2" message="global: false " type="qdebug" --> - <!-- tag="1:local 2" message="local: true " type="qdebug" --> - <!-- tag="1:local 2" message="cleanup testGlobal local 2 " type="qdebug" --> - <!-- tag="2:local 1" message="init testGlobal local 1 " type="qdebug" --> - <!-- tag="2:local 1" message="global: true " type="qdebug" --> - <!-- tag="2:local 1" message="local: false " type="qdebug" --> - <!-- tag="2:local 1" message="cleanup testGlobal local 1 " type="qdebug" --> - <!-- tag="2:local 2" message="init testGlobal local 2 " type="qdebug" --> - <!-- tag="2:local 2" message="global: true " type="qdebug" --> - <!-- tag="2:local 2" message="local: true " type="qdebug" --> - <!-- tag="2:local 2" message="cleanup testGlobal local 2 " type="qdebug" --> + <!-- tag="1:local 1" message="init testGlobal local 1" type="qdebug" --> + <!-- tag="1:local 1" message="global: false" type="qdebug" --> + <!-- tag="1:local 1" message="local: false" type="qdebug" --> + <!-- tag="1:local 1" message="cleanup testGlobal local 1" type="qdebug" --> + <!-- tag="1:local 2" message="init testGlobal local 2" type="qdebug" --> + <!-- tag="1:local 2" message="global: false" type="qdebug" --> + <!-- tag="1:local 2" message="local: true" type="qdebug" --> + <!-- tag="1:local 2" message="cleanup testGlobal local 2" type="qdebug" --> + <!-- tag="2:local 1" message="init testGlobal local 1" type="qdebug" --> + <!-- tag="2:local 1" message="global: true" type="qdebug" --> + <!-- tag="2:local 1" message="local: false" type="qdebug" --> + <!-- tag="2:local 1" message="cleanup testGlobal local 1" type="qdebug" --> + <!-- tag="2:local 2" message="init testGlobal local 2" type="qdebug" --> + <!-- tag="2:local 2" message="global: true" type="qdebug" --> + <!-- tag="2:local 2" message="local: true" type="qdebug" --> + <!-- tag="2:local 2" message="cleanup testGlobal local 2" type="qdebug" --> </testcase> <testcase name="skip"> <!-- tag="1" message="skipping" type="skip" --> </testcase> <testcase name="skipLocal"> - <!-- tag="1:local 1" message="init skipLocal local 1 " type="qdebug" --> + <!-- tag="1:local 1" message="init skipLocal local 1" type="qdebug" --> <!-- tag="1:local 1" message="skipping" type="skip" --> - <!-- tag="1:local 1" message="cleanup skipLocal local 1 " type="qdebug" --> - <!-- tag="1:local 2" message="init skipLocal local 2 " type="qdebug" --> + <!-- tag="1:local 1" message="cleanup skipLocal local 1" type="qdebug" --> + <!-- tag="1:local 2" message="init skipLocal local 2" type="qdebug" --> <!-- tag="1:local 2" message="skipping" type="skip" --> - <!-- tag="1:local 2" message="cleanup skipLocal local 2 " type="qdebug" --> + <!-- tag="1:local 2" message="cleanup skipLocal local 2" type="qdebug" --> </testcase> <testcase result="pass" name="skipSingle"> - <!-- tag="1:local 1" message="init skipSingle local 1 " type="qdebug" --> - <!-- tag="1:local 1" message="global: false local: false " type="qdebug" --> - <!-- tag="1:local 1" message="cleanup skipSingle local 1 " type="qdebug" --> - <!-- tag="1:local 2" message="init skipSingle local 2 " type="qdebug" --> - <!-- tag="1:local 2" message="global: false local: true " type="qdebug" --> - <!-- tag="1:local 2" message="cleanup skipSingle local 2 " type="qdebug" --> - <!-- tag="2:local 1" message="init skipSingle local 1 " type="qdebug" --> + <!-- tag="1:local 1" message="init skipSingle local 1" type="qdebug" --> + <!-- tag="1:local 1" message="global: false local: false" type="qdebug" --> + <!-- tag="1:local 1" message="cleanup skipSingle local 1" type="qdebug" --> + <!-- tag="1:local 2" message="init skipSingle local 2" type="qdebug" --> + <!-- tag="1:local 2" message="global: false local: true" type="qdebug" --> + <!-- tag="1:local 2" message="cleanup skipSingle local 2" type="qdebug" --> + <!-- tag="2:local 1" message="init skipSingle local 1" type="qdebug" --> <!-- tag="2:local 1" message="skipping" type="skip" --> - <!-- tag="2:local 1" message="cleanup skipSingle local 1 " type="qdebug" --> - <!-- tag="2:local 2" message="init skipSingle local 2 " type="qdebug" --> - <!-- tag="2:local 2" message="global: true local: true " type="qdebug" --> - <!-- tag="2:local 2" message="cleanup skipSingle local 2 " type="qdebug" --> + <!-- tag="2:local 1" message="cleanup skipSingle local 1" type="qdebug" --> + <!-- tag="2:local 2" message="init skipSingle local 2" type="qdebug" --> + <!-- tag="2:local 2" message="global: true local: true" type="qdebug" --> + <!-- tag="2:local 2" message="cleanup skipSingle local 2" type="qdebug" --> </testcase> <testcase result="pass" name="cleanupTestCase"> - <!-- message="cleanupTestCase cleanupTestCase (null) " type="qdebug" --> + <!-- message="cleanupTestCase cleanupTestCase (null)" type="qdebug" --> </testcase> <system-err> -<![CDATA[initTestCase initTestCase (null) ]]> -<![CDATA[init testGlobal local 1 ]]> -<![CDATA[global: false ]]> -<![CDATA[local: false ]]> -<![CDATA[cleanup testGlobal local 1 ]]> -<![CDATA[init testGlobal local 2 ]]> -<![CDATA[global: false ]]> -<![CDATA[local: true ]]> -<![CDATA[cleanup testGlobal local 2 ]]> -<![CDATA[init testGlobal local 1 ]]> -<![CDATA[global: true ]]> -<![CDATA[local: false ]]> -<![CDATA[cleanup testGlobal local 1 ]]> -<![CDATA[init testGlobal local 2 ]]> -<![CDATA[global: true ]]> -<![CDATA[local: true ]]> -<![CDATA[cleanup testGlobal local 2 ]]> +<![CDATA[initTestCase initTestCase (null)]]> +<![CDATA[init testGlobal local 1]]> +<![CDATA[global: false]]> +<![CDATA[local: false]]> +<![CDATA[cleanup testGlobal local 1]]> +<![CDATA[init testGlobal local 2]]> +<![CDATA[global: false]]> +<![CDATA[local: true]]> +<![CDATA[cleanup testGlobal local 2]]> +<![CDATA[init testGlobal local 1]]> +<![CDATA[global: true]]> +<![CDATA[local: false]]> +<![CDATA[cleanup testGlobal local 1]]> +<![CDATA[init testGlobal local 2]]> +<![CDATA[global: true]]> +<![CDATA[local: true]]> +<![CDATA[cleanup testGlobal local 2]]> <![CDATA[skipping]]> -<![CDATA[init skipLocal local 1 ]]> +<![CDATA[init skipLocal local 1]]> <![CDATA[skipping]]> -<![CDATA[cleanup skipLocal local 1 ]]> -<![CDATA[init skipLocal local 2 ]]> +<![CDATA[cleanup skipLocal local 1]]> +<![CDATA[init skipLocal local 2]]> <![CDATA[skipping]]> -<![CDATA[cleanup skipLocal local 2 ]]> -<![CDATA[init skipSingle local 1 ]]> -<![CDATA[global: false local: false ]]> -<![CDATA[cleanup skipSingle local 1 ]]> -<![CDATA[init skipSingle local 2 ]]> -<![CDATA[global: false local: true ]]> -<![CDATA[cleanup skipSingle local 2 ]]> -<![CDATA[init skipSingle local 1 ]]> +<![CDATA[cleanup skipLocal local 2]]> +<![CDATA[init skipSingle local 1]]> +<![CDATA[global: false local: false]]> +<![CDATA[cleanup skipSingle local 1]]> +<![CDATA[init skipSingle local 2]]> +<![CDATA[global: false local: true]]> +<![CDATA[cleanup skipSingle local 2]]> +<![CDATA[init skipSingle local 1]]> <![CDATA[skipping]]> -<![CDATA[cleanup skipSingle local 1 ]]> -<![CDATA[init skipSingle local 2 ]]> -<![CDATA[global: true local: true ]]> -<![CDATA[cleanup skipSingle local 2 ]]> -<![CDATA[cleanupTestCase cleanupTestCase (null) ]]> +<![CDATA[cleanup skipSingle local 1]]> +<![CDATA[init skipSingle local 2]]> +<![CDATA[global: true local: true]]> +<![CDATA[cleanup skipSingle local 2]]> +<![CDATA[cleanupTestCase cleanupTestCase (null)]]> </system-err> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_longstring.lightxml b/tests/auto/testlib/selftests/expected_longstring.lightxml index 80c528e0d7..45c6d3f78d 100644 --- a/tests/auto/testlib/selftests/expected_longstring.lightxml +++ b/tests/auto/testlib/selftests/expected_longstring.lightxml @@ -4,9 +4,10 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failWithLongString"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/longstring/tst_longstring.cpp" line="67"> +<Incident type="fail" file="tst_longstring.cpp" line="67"> <Description><![CDATA[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,7 +18,10 @@ 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.]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_longstring.txt b/tests/auto/testlib/selftests/expected_longstring.txt index b367e64959..364c8cf4a7 100644 --- a/tests/auto/testlib/selftests/expected_longstring.txt +++ b/tests/auto/testlib/selftests/expected_longstring.txt @@ -10,7 +10,7 @@ Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, impe Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis. 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. - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/longstring/tst_longstring.cpp(67)] + Loc: [tst_longstring.cpp(67)] PASS : tst_LongString::cleanupTestCase() Totals: 2 passed, 1 failed, 0 skipped ********* Finished testing of tst_LongString ********* diff --git a/tests/auto/testlib/selftests/expected_longstring.xml b/tests/auto/testlib/selftests/expected_longstring.xml index b3d1c5c846..efc29d6def 100644 --- a/tests/auto/testlib/selftests/expected_longstring.xml +++ b/tests/auto/testlib/selftests/expected_longstring.xml @@ -6,9 +6,10 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failWithLongString"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/longstring/tst_longstring.cpp" line="67"> +<Incident type="fail" file="tst_longstring.cpp" line="67"> <Description><![CDATA[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. @@ -19,8 +20,11 @@ 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.]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.lightxml b/tests/auto/testlib/selftests/expected_maxwarnings.lightxml index 054108fe6d..ce6d828eb2 100644 --- a/tests/auto/testlib/selftests/expected_maxwarnings.lightxml +++ b/tests/auto/testlib/selftests/expected_maxwarnings.lightxml @@ -4,6 +4,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="warn"> <Message type="qwarn" file="" line="0"> @@ -6013,7 +6014,10 @@ <Description><![CDATA[Maximum amount of warnings exceeded. Use -maxwarnings to override.]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.xml b/tests/auto/testlib/selftests/expected_maxwarnings.xml index d5845ebf1d..758af9d6d5 100644 --- a/tests/auto/testlib/selftests/expected_maxwarnings.xml +++ b/tests/auto/testlib/selftests/expected_maxwarnings.xml @@ -6,6 +6,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="warn"> <Message type="qwarn" file="" line="0"> @@ -6015,8 +6016,11 @@ <Description><![CDATA[Maximum amount of warnings exceeded. Use -maxwarnings to override.]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_silent.txt b/tests/auto/testlib/selftests/expected_silent.txt index 39e0bfc601..5d4c77bffd 100644 --- a/tests/auto/testlib/selftests/expected_silent.txt +++ b/tests/auto/testlib/selftests/expected_silent.txt @@ -1,8 +1,8 @@ Testing tst_Silent FAIL! : tst_Silent::fail() 'false' returned FALSE. (This test should fail) - Loc: [/home/jasmcdon/depot/qt5-test/qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp(73)] + Loc: [tst_silent.cpp(73)] XPASS : tst_Silent::xpass() 'true' returned TRUE unexpectedly. (This test should XPASS) - Loc: [/home/jasmcdon/depot/qt5-test/qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp(85)] + Loc: [tst_silent.cpp(85)] QFATAL : tst_Silent::messages() This is a fatal error message that should still appear in silent test output FAIL! : tst_Silent::messages() Received a fatal error. Loc: [Unknown file(0)] diff --git a/tests/auto/testlib/selftests/expected_singleskip.lightxml b/tests/auto/testlib/selftests/expected_singleskip.lightxml index b49b624ffe..685396a243 100644 --- a/tests/auto/testlib/selftests/expected_singleskip.lightxml +++ b/tests/auto/testlib/selftests/expected_singleskip.lightxml @@ -4,12 +4,16 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="myTest"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp" line="56"> +<Message type="skip" file="tst_singleskip.cpp" line="56"> <Description><![CDATA[skipping test]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_singleskip.txt b/tests/auto/testlib/selftests/expected_singleskip.txt index 46b40e5791..ba5415a216 100644 --- a/tests/auto/testlib/selftests/expected_singleskip.txt +++ b/tests/auto/testlib/selftests/expected_singleskip.txt @@ -2,7 +2,7 @@ Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : tst_SingleSkip::initTestCase() SKIP : tst_SingleSkip::myTest() skipping test - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp(56)] + Loc: [tst_singleskip.cpp(56)] PASS : tst_SingleSkip::cleanupTestCase() Totals: 2 passed, 0 failed, 1 skipped ********* Finished testing of tst_SingleSkip ********* diff --git a/tests/auto/testlib/selftests/expected_singleskip.xml b/tests/auto/testlib/selftests/expected_singleskip.xml index 393344b478..c10626ca41 100644 --- a/tests/auto/testlib/selftests/expected_singleskip.xml +++ b/tests/auto/testlib/selftests/expected_singleskip.xml @@ -6,13 +6,17 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="myTest"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp" line="56"> +<Message type="skip" file="tst_singleskip.cpp" line="56"> <Description><![CDATA[skipping test]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_skip.lightxml b/tests/auto/testlib/selftests/expected_skip.lightxml index b01570e275..408bc44871 100644 --- a/tests/auto/testlib/selftests/expected_skip.lightxml +++ b/tests/auto/testlib/selftests/expected_skip.lightxml @@ -4,19 +4,22 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="test"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="68"> +<Message type="skip" file="tst_skip.cpp" line="68"> <Description><![CDATA[skipping all]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="emptytest"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="78"> +<Message type="skip" file="tst_skip.cpp" line="78"> <Description><![CDATA[skipping all]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="singleSkip"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="97"> +<Message type="skip" file="tst_skip.cpp" line="97"> <DataTag><![CDATA[local 1]]></DataTag> <Description><![CDATA[skipping one]]></Description> </Message> @@ -27,7 +30,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[local 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_skip.txt b/tests/auto/testlib/selftests/expected_skip.txt index ef96d08d83..9a79e35de3 100644 --- a/tests/auto/testlib/selftests/expected_skip.txt +++ b/tests/auto/testlib/selftests/expected_skip.txt @@ -2,11 +2,11 @@ Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : tst_Skip::initTestCase() SKIP : tst_Skip::test() skipping all - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(68)] + Loc: [tst_skip.cpp(68)] SKIP : tst_Skip::emptytest() skipping all - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(78)] + Loc: [tst_skip.cpp(78)] SKIP : tst_Skip::singleSkip(local 1) skipping one - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(97)] + Loc: [tst_skip.cpp(97)] QDEBUG : tst_Skip::singleSkip(local 2) this line should only be reached once (true) PASS : tst_Skip::singleSkip(local 2) PASS : tst_Skip::cleanupTestCase() diff --git a/tests/auto/testlib/selftests/expected_skip.xml b/tests/auto/testlib/selftests/expected_skip.xml index 0f010860d4..b220722b6c 100644 --- a/tests/auto/testlib/selftests/expected_skip.xml +++ b/tests/auto/testlib/selftests/expected_skip.xml @@ -6,19 +6,22 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="test"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="68"> +<Message type="skip" file="tst_skip.cpp" line="68"> <Description><![CDATA[skipping all]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="emptytest"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="78"> +<Message type="skip" file="tst_skip.cpp" line="78"> <Description><![CDATA[skipping all]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="singleSkip"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="97"> +<Message type="skip" file="tst_skip.cpp" line="97"> <DataTag><![CDATA[local 1]]></DataTag> <Description><![CDATA[skipping one]]></Description> </Message> @@ -29,8 +32,11 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[local 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.lightxml b/tests/auto/testlib/selftests/expected_skipcleanup.lightxml index d2bc3b766e..49c9d148f5 100644 --- a/tests/auto/testlib/selftests/expected_skipcleanup.lightxml +++ b/tests/auto/testlib/selftests/expected_skipcleanup.lightxml @@ -4,12 +4,16 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="aTestFunction"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="59"> +<Message type="skip" file="tst_skipcleanup.cpp" line="59"> <Description><![CDATA[Skip inside cleanupTestCase.]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.txt b/tests/auto/testlib/selftests/expected_skipcleanup.txt index 52845c355e..35c5d3dccb 100644 --- a/tests/auto/testlib/selftests/expected_skipcleanup.txt +++ b/tests/auto/testlib/selftests/expected_skipcleanup.txt @@ -3,6 +3,6 @@ Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HER PASS : tst_SkipCleanup::initTestCase() PASS : tst_SkipCleanup::aTestFunction() SKIP : tst_SkipCleanup::cleanupTestCase() Skip inside cleanupTestCase. - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp(59)] + Loc: [tst_skipcleanup.cpp(59)] Totals: 2 passed, 0 failed, 1 skipped ********* Finished testing of tst_SkipCleanup ********* diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.xml b/tests/auto/testlib/selftests/expected_skipcleanup.xml index e6c5d85783..0bf1fe53a3 100644 --- a/tests/auto/testlib/selftests/expected_skipcleanup.xml +++ b/tests/auto/testlib/selftests/expected_skipcleanup.xml @@ -6,13 +6,17 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="aTestFunction"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="59"> +<Message type="skip" file="tst_skipcleanup.cpp" line="59"> <Description><![CDATA[Skip inside cleanupTestCase.]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_skipinit.lightxml b/tests/auto/testlib/selftests/expected_skipinit.lightxml index b5a73d614a..e06c745205 100644 --- a/tests/auto/testlib/selftests/expected_skipinit.lightxml +++ b/tests/auto/testlib/selftests/expected_skipinit.lightxml @@ -3,10 +3,13 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp" line="55"> +<Message type="skip" file="tst_skipinit.cpp" line="55"> <Description><![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_skipinit.txt b/tests/auto/testlib/selftests/expected_skipinit.txt index dcd0322e9d..f3de6cd2df 100644 --- a/tests/auto/testlib/selftests/expected_skipinit.txt +++ b/tests/auto/testlib/selftests/expected_skipinit.txt @@ -1,7 +1,7 @@ ********* Start testing of tst_SkipInit ********* Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ SKIP : tst_SkipInit::initTestCase() Skip inside initTestCase. This should skip all tests in the class. - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp(55)] + Loc: [tst_skipinit.cpp(55)] PASS : tst_SkipInit::cleanupTestCase() Totals: 1 passed, 0 failed, 1 skipped ********* Finished testing of tst_SkipInit ********* diff --git a/tests/auto/testlib/selftests/expected_skipinit.xml b/tests/auto/testlib/selftests/expected_skipinit.xml index bc6b7d12f8..6a62b93614 100644 --- a/tests/auto/testlib/selftests/expected_skipinit.xml +++ b/tests/auto/testlib/selftests/expected_skipinit.xml @@ -5,11 +5,14 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp" line="55"> +<Message type="skip" file="tst_skipinit.cpp" line="55"> <Description><![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.lightxml b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml index cd820240fd..41abd5dccd 100644 --- a/tests/auto/testlib/selftests/expected_skipinitdata.lightxml +++ b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml @@ -3,7 +3,9 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="56"> +<Message type="skip" file="tst_skipinitdata.cpp" line="56"> <Description><![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.txt b/tests/auto/testlib/selftests/expected_skipinitdata.txt index 1010f97689..912ab8cd6d 100644 --- a/tests/auto/testlib/selftests/expected_skipinitdata.txt +++ b/tests/auto/testlib/selftests/expected_skipinitdata.txt @@ -1,6 +1,6 @@ ********* Start testing of tst_SkipInitData ********* Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ SKIP : tst_SkipInitData::initTestCase() Skip inside initTestCase_data. This should skip all tests in the class. - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp(56)] + Loc: [tst_skipinitdata.cpp(56)] Totals: 0 passed, 0 failed, 1 skipped ********* Finished testing of tst_SkipInitData ********* diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.xml b/tests/auto/testlib/selftests/expected_skipinitdata.xml index eb42569598..8efe12195e 100644 --- a/tests/auto/testlib/selftests/expected_skipinitdata.xml +++ b/tests/auto/testlib/selftests/expected_skipinitdata.xml @@ -5,8 +5,10 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="56"> +<Message type="skip" file="tst_skipinitdata.cpp" line="56"> <Description><![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_strcmp.lightxml b/tests/auto/testlib/selftests/expected_strcmp.lightxml index 4c30c9f801..f0d266d400 100644 --- a/tests/auto/testlib/selftests/expected_strcmp.lightxml +++ b/tests/auto/testlib/selftests/expected_strcmp.lightxml @@ -4,54 +4,63 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareCharStars"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareByteArray"> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="88"> +<Incident type="xfail" file="tst_strcmp.cpp" line="88"> <Description><![CDATA[Next test should fail]]></Description> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="95"> +<Incident type="xfail" file="tst_strcmp.cpp" line="95"> <Description><![CDATA[Next test should fail]]></Description> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="102"> +<Incident type="xfail" file="tst_strcmp.cpp" line="102"> <Description><![CDATA[Next test should fail]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="109"> +<Incident type="fail" file="tst_strcmp.cpp" line="109"> <Description><![CDATA[Compared values are not the same Actual (a): 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 ... Expected (b): 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 ...]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArray"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="115"> +<Incident type="fail" file="tst_strcmp.cpp" line="115"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("abc")): 61 62 63 Expected (QByteArray("cba")): 63 62 61]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArrayNull"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="121"> +<Incident type="fail" file="tst_strcmp.cpp" line="121"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("foo")): 66 6F 6F Expected (QByteArray()) : ]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArrayEmpty"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="126"> +<Incident type="fail" file="tst_strcmp.cpp" line="126"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("")) : Expected (QByteArray("foo")): 66 6F 6F]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArraySingleChars"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="133"> +<Incident type="fail" file="tst_strcmp.cpp" line="133"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("6")): 36 Expected (QByteArray("7")): 37]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_strcmp.txt b/tests/auto/testlib/selftests/expected_strcmp.txt index f3ad169fb7..4bd3844d08 100644 --- a/tests/auto/testlib/selftests/expected_strcmp.txt +++ b/tests/auto/testlib/selftests/expected_strcmp.txt @@ -3,31 +3,31 @@ Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HER PASS : tst_StrCmp::initTestCase() PASS : tst_StrCmp::compareCharStars() XFAIL : tst_StrCmp::compareByteArray() Next test should fail - Loc: [./tst_strcmp.cpp(55)] + Loc: [tst_strcmp.cpp(88)] XFAIL : tst_StrCmp::compareByteArray() Next test should fail - Loc: [./tst_strcmp.cpp(62)] + Loc: [tst_strcmp.cpp(95)] XFAIL : tst_StrCmp::compareByteArray() Next test should fail - Loc: [./tst_strcmp.cpp(69)] + Loc: [tst_strcmp.cpp(102)] FAIL! : tst_StrCmp::compareByteArray() Compared values are not the same Actual (a): 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 ... Expected (b): 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 ... - Loc: [./tst_strcmp.cpp(76)] + Loc: [tst_strcmp.cpp(109)] FAIL! : tst_StrCmp::failByteArray() Compared values are not the same Actual (QByteArray("abc")): 61 62 63 Expected (QByteArray("cba")): 63 62 61 - Loc: [./tst_strcmp.cpp(82)] + Loc: [tst_strcmp.cpp(115)] FAIL! : tst_StrCmp::failByteArrayNull() Compared values are not the same Actual (QByteArray("foo")): 66 6F 6F Expected (QByteArray()) : - Loc: [./tst_strcmp.cpp(88)] + Loc: [tst_strcmp.cpp(121)] FAIL! : tst_StrCmp::failByteArrayEmpty() Compared values are not the same Actual (QByteArray("")) : Expected (QByteArray("foo")): 66 6F 6F - Loc: [./tst_strcmp.cpp(93)] + Loc: [tst_strcmp.cpp(126)] FAIL! : tst_StrCmp::failByteArraySingleChars() Compared values are not the same Actual (QByteArray("6")): 36 Expected (QByteArray("7")): 37 - Loc: [./tst_strcmp.cpp(100)] + Loc: [tst_strcmp.cpp(133)] PASS : tst_StrCmp::cleanupTestCase() Totals: 3 passed, 5 failed, 0 skipped ********* Finished testing of tst_StrCmp ********* diff --git a/tests/auto/testlib/selftests/expected_strcmp.xml b/tests/auto/testlib/selftests/expected_strcmp.xml index db9ed34bb8..20ffee0611 100644 --- a/tests/auto/testlib/selftests/expected_strcmp.xml +++ b/tests/auto/testlib/selftests/expected_strcmp.xml @@ -6,55 +6,64 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareCharStars"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="compareByteArray"> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="88"> +<Incident type="xfail" file="tst_strcmp.cpp" line="88"> <Description><![CDATA[Next test should fail]]></Description> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="95"> +<Incident type="xfail" file="tst_strcmp.cpp" line="95"> <Description><![CDATA[Next test should fail]]></Description> </Incident> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="102"> +<Incident type="xfail" file="tst_strcmp.cpp" line="102"> <Description><![CDATA[Next test should fail]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="109"> +<Incident type="fail" file="tst_strcmp.cpp" line="109"> <Description><![CDATA[Compared values are not the same Actual (a): 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 ... Expected (b): 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 ...]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArray"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="115"> +<Incident type="fail" file="tst_strcmp.cpp" line="115"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("abc")): 61 62 63 Expected (QByteArray("cba")): 63 62 61]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArrayNull"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="121"> +<Incident type="fail" file="tst_strcmp.cpp" line="121"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("foo")): 66 6F 6F Expected (QByteArray()) : ]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArrayEmpty"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="126"> +<Incident type="fail" file="tst_strcmp.cpp" line="126"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("")) : Expected (QByteArray("foo")): 66 6F 6F]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArraySingleChars"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="133"> +<Incident type="fail" file="tst_strcmp.cpp" line="133"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("6")): 36 Expected (QByteArray("7")): 37]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_subtest.lightxml b/tests/auto/testlib/selftests/expected_subtest.lightxml index 5adbb771af..90cfacbe0b 100644 --- a/tests/auto/testlib/selftests/expected_subtest.lightxml +++ b/tests/auto/testlib/selftests/expected_subtest.lightxml @@ -4,122 +4,125 @@ </Environment> <TestFunction name="initTestCase"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[initTestCase initTestCase (null) ]]></Description> + <Description><![CDATA[initTestCase initTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="test1"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[init test1 (null) ]]></Description> + <Description><![CDATA[init test1 (null)]]></Description> </Message> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[test1 test1 (null) ]]></Description> + <Description><![CDATA[test1 test1 (null)]]></Description> </Message> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[cleanup test1 (null) ]]></Description> + <Description><![CDATA[cleanup test1 (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="test2"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[test2_data test2 (null) ]]></Description> + <Description><![CDATA[test2_data test2 (null)]]></Description> </Message> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[test2_data end ]]></Description> + <Description><![CDATA[test2_data end]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[init test2 data0 ]]></Description> + <Description><![CDATA[init test2 data0]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[test2 test2 data0 ]]></Description> + <Description><![CDATA[test2 test2 data0]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[test2 end ]]></Description> + <Description><![CDATA[test2 end]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[cleanup test2 data0 ]]></Description> + <Description><![CDATA[cleanup test2 data0]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[init test2 data1 ]]></Description> + <Description><![CDATA[init test2 data1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[test2 test2 data1 ]]></Description> + <Description><![CDATA[test2 test2 data1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[test2 end ]]></Description> + <Description><![CDATA[test2 end]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[cleanup test2 data1 ]]></Description> + <Description><![CDATA[cleanup test2 data1]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[init test2 data2 ]]></Description> + <Description><![CDATA[init test2 data2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[test2 test2 data2 ]]></Description> + <Description><![CDATA[test2 test2 data2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[test2 end ]]></Description> + <Description><![CDATA[test2 end]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[cleanup test2 data2 ]]></Description> + <Description><![CDATA[cleanup test2 data2]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="test3"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[test3_data test3 (null) ]]></Description> + <Description><![CDATA[test3_data test3 (null)]]></Description> </Message> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[test3_data end ]]></Description> + <Description><![CDATA[test3_data end]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[init test3 data0 ]]></Description> + <Description><![CDATA[init test3 data0]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[test2 test3 data0 ]]></Description> + <Description><![CDATA[test2 test3 data0]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[test2 end ]]></Description> + <Description><![CDATA[test2 end]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[cleanup test3 data0 ]]></Description> + <Description><![CDATA[cleanup test3 data0]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[init test3 data1 ]]></Description> + <Description><![CDATA[init test3 data1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[test2 test3 data1 ]]></Description> + <Description><![CDATA[test2 test3 data1]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="154"> +<Incident type="fail" file="tst_subtest.cpp" line="154"> <DataTag><![CDATA[data1]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (str) : hello1 @@ -127,17 +130,17 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[cleanup test3 data1 ]]></Description> + <Description><![CDATA[cleanup test3 data1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[init test3 data2 ]]></Description> + <Description><![CDATA[init test3 data2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[test2 test3 data2 ]]></Description> + <Description><![CDATA[test2 test3 data2]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="154"> +<Incident type="fail" file="tst_subtest.cpp" line="154"> <DataTag><![CDATA[data2]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (str) : hello2 @@ -145,12 +148,15 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[cleanup test3 data2 ]]></Description> + <Description><![CDATA[cleanup test3 data2]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[cleanupTestCase cleanupTestCase (null) ]]></Description> + <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_subtest.txt b/tests/auto/testlib/selftests/expected_subtest.txt index bb88f189ec..e874e0c020 100644 --- a/tests/auto/testlib/selftests/expected_subtest.txt +++ b/tests/auto/testlib/selftests/expected_subtest.txt @@ -1,50 +1,50 @@ ********* Start testing of tst_Subtest ********* Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ -QDEBUG : tst_Subtest::initTestCase() initTestCase initTestCase (null) +QDEBUG : tst_Subtest::initTestCase() initTestCase initTestCase (null) PASS : tst_Subtest::initTestCase() -QDEBUG : tst_Subtest::test1() init test1 (null) -QDEBUG : tst_Subtest::test1() test1 test1 (null) -QDEBUG : tst_Subtest::test1() cleanup test1 (null) +QDEBUG : tst_Subtest::test1() init test1 (null) +QDEBUG : tst_Subtest::test1() test1 test1 (null) +QDEBUG : tst_Subtest::test1() cleanup test1 (null) PASS : tst_Subtest::test1() -QDEBUG : tst_Subtest::test2() test2_data test2 (null) -QDEBUG : tst_Subtest::test2() test2_data end -QDEBUG : tst_Subtest::test2(data0) init test2 data0 -QDEBUG : tst_Subtest::test2(data0) test2 test2 data0 -QDEBUG : tst_Subtest::test2(data0) test2 end -QDEBUG : tst_Subtest::test2(data0) cleanup test2 data0 +QDEBUG : tst_Subtest::test2() test2_data test2 (null) +QDEBUG : tst_Subtest::test2() test2_data end +QDEBUG : tst_Subtest::test2(data0) init test2 data0 +QDEBUG : tst_Subtest::test2(data0) test2 test2 data0 +QDEBUG : tst_Subtest::test2(data0) test2 end +QDEBUG : tst_Subtest::test2(data0) cleanup test2 data0 PASS : tst_Subtest::test2(data0) -QDEBUG : tst_Subtest::test2(data1) init test2 data1 -QDEBUG : tst_Subtest::test2(data1) test2 test2 data1 -QDEBUG : tst_Subtest::test2(data1) test2 end -QDEBUG : tst_Subtest::test2(data1) cleanup test2 data1 +QDEBUG : tst_Subtest::test2(data1) init test2 data1 +QDEBUG : tst_Subtest::test2(data1) test2 test2 data1 +QDEBUG : tst_Subtest::test2(data1) test2 end +QDEBUG : tst_Subtest::test2(data1) cleanup test2 data1 PASS : tst_Subtest::test2(data1) -QDEBUG : tst_Subtest::test2(data2) init test2 data2 -QDEBUG : tst_Subtest::test2(data2) test2 test2 data2 -QDEBUG : tst_Subtest::test2(data2) test2 end -QDEBUG : tst_Subtest::test2(data2) cleanup test2 data2 +QDEBUG : tst_Subtest::test2(data2) init test2 data2 +QDEBUG : tst_Subtest::test2(data2) test2 test2 data2 +QDEBUG : tst_Subtest::test2(data2) test2 end +QDEBUG : tst_Subtest::test2(data2) cleanup test2 data2 PASS : tst_Subtest::test2(data2) -QDEBUG : tst_Subtest::test3() test3_data test3 (null) -QDEBUG : tst_Subtest::test3() test3_data end -QDEBUG : tst_Subtest::test3(data0) init test3 data0 -QDEBUG : tst_Subtest::test3(data0) test2 test3 data0 -QDEBUG : tst_Subtest::test3(data0) test2 end -QDEBUG : tst_Subtest::test3(data0) cleanup test3 data0 +QDEBUG : tst_Subtest::test3() test3_data test3 (null) +QDEBUG : tst_Subtest::test3() test3_data end +QDEBUG : tst_Subtest::test3(data0) init test3 data0 +QDEBUG : tst_Subtest::test3(data0) test2 test3 data0 +QDEBUG : tst_Subtest::test3(data0) test2 end +QDEBUG : tst_Subtest::test3(data0) cleanup test3 data0 PASS : tst_Subtest::test3(data0) -QDEBUG : tst_Subtest::test3(data1) init test3 data1 -QDEBUG : tst_Subtest::test3(data1) test2 test3 data1 +QDEBUG : tst_Subtest::test3(data1) init test3 data1 +QDEBUG : tst_Subtest::test3(data1) test2 test3 data1 FAIL! : tst_Subtest::test3(data1) Compared values are not the same Actual (str) : hello1 Expected (QString("hello0")): hello0 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp(154)] -QDEBUG : tst_Subtest::test3(data1) cleanup test3 data1 -QDEBUG : tst_Subtest::test3(data2) init test3 data2 -QDEBUG : tst_Subtest::test3(data2) test2 test3 data2 + Loc: [tst_subtest.cpp(154)] +QDEBUG : tst_Subtest::test3(data1) cleanup test3 data1 +QDEBUG : tst_Subtest::test3(data2) init test3 data2 +QDEBUG : tst_Subtest::test3(data2) test2 test3 data2 FAIL! : tst_Subtest::test3(data2) Compared values are not the same Actual (str) : hello2 Expected (QString("hello0")): hello0 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp(154)] -QDEBUG : tst_Subtest::test3(data2) cleanup test3 data2 -QDEBUG : tst_Subtest::cleanupTestCase() cleanupTestCase cleanupTestCase (null) + Loc: [tst_subtest.cpp(154)] +QDEBUG : tst_Subtest::test3(data2) cleanup test3 data2 +QDEBUG : tst_Subtest::cleanupTestCase() cleanupTestCase cleanupTestCase (null) PASS : tst_Subtest::cleanupTestCase() Totals: 7 passed, 2 failed, 0 skipped ********* Finished testing of tst_Subtest ********* diff --git a/tests/auto/testlib/selftests/expected_subtest.xml b/tests/auto/testlib/selftests/expected_subtest.xml index 094e22383d..cda4df01f3 100644 --- a/tests/auto/testlib/selftests/expected_subtest.xml +++ b/tests/auto/testlib/selftests/expected_subtest.xml @@ -6,122 +6,125 @@ </Environment> <TestFunction name="initTestCase"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[initTestCase initTestCase (null) ]]></Description> + <Description><![CDATA[initTestCase initTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="test1"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[init test1 (null) ]]></Description> + <Description><![CDATA[init test1 (null)]]></Description> </Message> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[test1 test1 (null) ]]></Description> + <Description><![CDATA[test1 test1 (null)]]></Description> </Message> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[cleanup test1 (null) ]]></Description> + <Description><![CDATA[cleanup test1 (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="test2"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[test2_data test2 (null) ]]></Description> + <Description><![CDATA[test2_data test2 (null)]]></Description> </Message> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[test2_data end ]]></Description> + <Description><![CDATA[test2_data end]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[init test2 data0 ]]></Description> + <Description><![CDATA[init test2 data0]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[test2 test2 data0 ]]></Description> + <Description><![CDATA[test2 test2 data0]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[test2 end ]]></Description> + <Description><![CDATA[test2 end]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[cleanup test2 data0 ]]></Description> + <Description><![CDATA[cleanup test2 data0]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[init test2 data1 ]]></Description> + <Description><![CDATA[init test2 data1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[test2 test2 data1 ]]></Description> + <Description><![CDATA[test2 test2 data1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[test2 end ]]></Description> + <Description><![CDATA[test2 end]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[cleanup test2 data1 ]]></Description> + <Description><![CDATA[cleanup test2 data1]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[init test2 data2 ]]></Description> + <Description><![CDATA[init test2 data2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[test2 test2 data2 ]]></Description> + <Description><![CDATA[test2 test2 data2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[test2 end ]]></Description> + <Description><![CDATA[test2 end]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[cleanup test2 data2 ]]></Description> + <Description><![CDATA[cleanup test2 data2]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="test3"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[test3_data test3 (null) ]]></Description> + <Description><![CDATA[test3_data test3 (null)]]></Description> </Message> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[test3_data end ]]></Description> + <Description><![CDATA[test3_data end]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[init test3 data0 ]]></Description> + <Description><![CDATA[init test3 data0]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[test2 test3 data0 ]]></Description> + <Description><![CDATA[test2 test3 data0]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[test2 end ]]></Description> + <Description><![CDATA[test2 end]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> - <Description><![CDATA[cleanup test3 data0 ]]></Description> + <Description><![CDATA[cleanup test3 data0]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[data0]]></DataTag> </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[init test3 data1 ]]></Description> + <Description><![CDATA[init test3 data1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[test2 test3 data1 ]]></Description> + <Description><![CDATA[test2 test3 data1]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="154"> +<Incident type="fail" file="tst_subtest.cpp" line="154"> <DataTag><![CDATA[data1]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (str) : hello1 @@ -129,17 +132,17 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data1]]></DataTag> - <Description><![CDATA[cleanup test3 data1 ]]></Description> + <Description><![CDATA[cleanup test3 data1]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[init test3 data2 ]]></Description> + <Description><![CDATA[init test3 data2]]></Description> </Message> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[test2 test3 data2 ]]></Description> + <Description><![CDATA[test2 test3 data2]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="154"> +<Incident type="fail" file="tst_subtest.cpp" line="154"> <DataTag><![CDATA[data2]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (str) : hello2 @@ -147,13 +150,16 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> - <Description><![CDATA[cleanup test3 data2 ]]></Description> + <Description><![CDATA[cleanup test3 data2]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA[cleanupTestCase cleanupTestCase (null) ]]></Description> + <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_subtest.xunitxml b/tests/auto/testlib/selftests/expected_subtest.xunitxml index 6f8fc3db45..5f7024e8ba 100644 --- a/tests/auto/testlib/selftests/expected_subtest.xunitxml +++ b/tests/auto/testlib/selftests/expected_subtest.xunitxml @@ -5,83 +5,83 @@ <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> </properties> <testcase result="pass" name="initTestCase"> - <!-- message="initTestCase initTestCase (null) " type="qdebug" --> + <!-- message="initTestCase initTestCase (null)" type="qdebug" --> </testcase> <testcase result="pass" name="test1"> - <!-- message="init test1 (null) " type="qdebug" --> - <!-- message="test1 test1 (null) " type="qdebug" --> - <!-- message="cleanup test1 (null) " type="qdebug" --> + <!-- message="init test1 (null)" type="qdebug" --> + <!-- message="test1 test1 (null)" type="qdebug" --> + <!-- message="cleanup test1 (null)" type="qdebug" --> </testcase> <testcase result="pass" name="test2"> - <!-- message="test2_data test2 (null) " type="qdebug" --> - <!-- message="test2_data end " type="qdebug" --> - <!-- tag="data0" message="init test2 data0 " type="qdebug" --> - <!-- tag="data0" message="test2 test2 data0 " type="qdebug" --> - <!-- tag="data0" message="test2 end " type="qdebug" --> - <!-- tag="data0" message="cleanup test2 data0 " type="qdebug" --> - <!-- tag="data1" message="init test2 data1 " type="qdebug" --> - <!-- tag="data1" message="test2 test2 data1 " type="qdebug" --> - <!-- tag="data1" message="test2 end " type="qdebug" --> - <!-- tag="data1" message="cleanup test2 data1 " type="qdebug" --> - <!-- tag="data2" message="init test2 data2 " type="qdebug" --> - <!-- tag="data2" message="test2 test2 data2 " type="qdebug" --> - <!-- tag="data2" message="test2 end " type="qdebug" --> - <!-- tag="data2" message="cleanup test2 data2 " type="qdebug" --> + <!-- message="test2_data test2 (null)" type="qdebug" --> + <!-- message="test2_data end" type="qdebug" --> + <!-- tag="data0" message="init test2 data0" type="qdebug" --> + <!-- tag="data0" message="test2 test2 data0" type="qdebug" --> + <!-- tag="data0" message="test2 end" type="qdebug" --> + <!-- tag="data0" message="cleanup test2 data0" type="qdebug" --> + <!-- tag="data1" message="init test2 data1" type="qdebug" --> + <!-- tag="data1" message="test2 test2 data1" type="qdebug" --> + <!-- tag="data1" message="test2 end" type="qdebug" --> + <!-- tag="data1" message="cleanup test2 data1" type="qdebug" --> + <!-- tag="data2" message="init test2 data2" type="qdebug" --> + <!-- tag="data2" message="test2 test2 data2" type="qdebug" --> + <!-- tag="data2" message="test2 end" type="qdebug" --> + <!-- tag="data2" message="cleanup test2 data2" type="qdebug" --> </testcase> <testcase result="fail" name="test3"> - <!-- message="test3_data test3 (null) " type="qdebug" --> - <!-- message="test3_data end " type="qdebug" --> - <!-- tag="data0" message="init test3 data0 " type="qdebug" --> - <!-- tag="data0" message="test2 test3 data0 " type="qdebug" --> - <!-- tag="data0" message="test2 end " type="qdebug" --> - <!-- tag="data0" message="cleanup test3 data0 " type="qdebug" --> - <!-- tag="data1" message="init test3 data1 " type="qdebug" --> - <!-- tag="data1" message="test2 test3 data1 " type="qdebug" --> + <!-- message="test3_data test3 (null)" type="qdebug" --> + <!-- message="test3_data end" type="qdebug" --> + <!-- tag="data0" message="init test3 data0" type="qdebug" --> + <!-- tag="data0" message="test2 test3 data0" type="qdebug" --> + <!-- tag="data0" message="test2 end" type="qdebug" --> + <!-- tag="data0" message="cleanup test3 data0" type="qdebug" --> + <!-- tag="data1" message="init test3 data1" type="qdebug" --> + <!-- tag="data1" message="test2 test3 data1" type="qdebug" --> <failure tag="data1" message="Compared values are not the same Actual (str) : hello1 Expected (QString("hello0")): hello0" result="fail"/> - <!-- tag="data1" message="cleanup test3 data1 " type="qdebug" --> - <!-- tag="data2" message="init test3 data2 " type="qdebug" --> - <!-- tag="data2" message="test2 test3 data2 " type="qdebug" --> + <!-- tag="data1" message="cleanup test3 data1" type="qdebug" --> + <!-- tag="data2" message="init test3 data2" type="qdebug" --> + <!-- tag="data2" message="test2 test3 data2" type="qdebug" --> <failure tag="data2" message="Compared values are not the same Actual (str) : hello2 Expected (QString("hello0")): hello0" result="fail"/> - <!-- tag="data2" message="cleanup test3 data2 " type="qdebug" --> + <!-- tag="data2" message="cleanup test3 data2" type="qdebug" --> </testcase> <testcase result="pass" name="cleanupTestCase"> - <!-- message="cleanupTestCase cleanupTestCase (null) " type="qdebug" --> + <!-- message="cleanupTestCase cleanupTestCase (null)" type="qdebug" --> </testcase> <system-err> -<![CDATA[initTestCase initTestCase (null) ]]> -<![CDATA[init test1 (null) ]]> -<![CDATA[test1 test1 (null) ]]> -<![CDATA[cleanup test1 (null) ]]> -<![CDATA[test2_data test2 (null) ]]> -<![CDATA[test2_data end ]]> -<![CDATA[init test2 data0 ]]> -<![CDATA[test2 test2 data0 ]]> -<![CDATA[test2 end ]]> -<![CDATA[cleanup test2 data0 ]]> -<![CDATA[init test2 data1 ]]> -<![CDATA[test2 test2 data1 ]]> -<![CDATA[test2 end ]]> -<![CDATA[cleanup test2 data1 ]]> -<![CDATA[init test2 data2 ]]> -<![CDATA[test2 test2 data2 ]]> -<![CDATA[test2 end ]]> -<![CDATA[cleanup test2 data2 ]]> -<![CDATA[test3_data test3 (null) ]]> -<![CDATA[test3_data end ]]> -<![CDATA[init test3 data0 ]]> -<![CDATA[test2 test3 data0 ]]> -<![CDATA[test2 end ]]> -<![CDATA[cleanup test3 data0 ]]> -<![CDATA[init test3 data1 ]]> -<![CDATA[test2 test3 data1 ]]> -<![CDATA[cleanup test3 data1 ]]> -<![CDATA[init test3 data2 ]]> -<![CDATA[test2 test3 data2 ]]> -<![CDATA[cleanup test3 data2 ]]> -<![CDATA[cleanupTestCase cleanupTestCase (null) ]]> +<![CDATA[initTestCase initTestCase (null)]]> +<![CDATA[init test1 (null)]]> +<![CDATA[test1 test1 (null)]]> +<![CDATA[cleanup test1 (null)]]> +<![CDATA[test2_data test2 (null)]]> +<![CDATA[test2_data end]]> +<![CDATA[init test2 data0]]> +<![CDATA[test2 test2 data0]]> +<![CDATA[test2 end]]> +<![CDATA[cleanup test2 data0]]> +<![CDATA[init test2 data1]]> +<![CDATA[test2 test2 data1]]> +<![CDATA[test2 end]]> +<![CDATA[cleanup test2 data1]]> +<![CDATA[init test2 data2]]> +<![CDATA[test2 test2 data2]]> +<![CDATA[test2 end]]> +<![CDATA[cleanup test2 data2]]> +<![CDATA[test3_data test3 (null)]]> +<![CDATA[test3_data end]]> +<![CDATA[init test3 data0]]> +<![CDATA[test2 test3 data0]]> +<![CDATA[test2 end]]> +<![CDATA[cleanup test3 data0]]> +<![CDATA[init test3 data1]]> +<![CDATA[test2 test3 data1]]> +<![CDATA[cleanup test3 data1]]> +<![CDATA[init test3 data2]]> +<![CDATA[test2 test3 data2]]> +<![CDATA[cleanup test3 data2]]> +<![CDATA[cleanupTestCase cleanupTestCase (null)]]> </system-err> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_verbose1.lightxml b/tests/auto/testlib/selftests/expected_verbose1.lightxml index c49792fec4..45dca139fa 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.lightxml +++ b/tests/auto/testlib/selftests/expected_verbose1.lightxml @@ -4,6 +4,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassPass"> <Incident type="pass" file="" line="0"> @@ -12,94 +13,104 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassSkip"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailPass"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailSkip"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="234"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="234"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in init()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInCleanup"> <Incident type="pass" file="" line="0"> @@ -107,27 +118,29 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[fail]]></DataTag> - <Description><![CDATA[This test function should execute and then QFAIL in cleanup() ]]></Description> + <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="242"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="242"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in cleanup()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="236"> +<Message type="skip" file="../counting/tst_counting.cpp" line="236"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInCleanup"> <Incident type="pass" file="" line="0"> @@ -135,16 +148,19 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[skip]]></DataTag> - <Description><![CDATA[This test function should execute and then QSKIP in cleanup() ]]></Description> + <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="244"> +<Message type="skip" file="../counting/tst_counting.cpp" line="244"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_verbose1.txt b/tests/auto/testlib/selftests/expected_verbose1.txt index 4ba42c1c8e..1711a33004 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.txt +++ b/tests/auto/testlib/selftests/expected_verbose1.txt @@ -8,60 +8,60 @@ PASS : tst_Counting::testPassPass(row 2) INFO : tst_Counting::testPassSkip() entering PASS : tst_Counting::testPassSkip(row 1) SKIP : tst_Counting::testPassSkip(row 2) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [../counting/tst_counting.cpp(118)] INFO : tst_Counting::testPassFail() entering PASS : tst_Counting::testPassFail(row 1) FAIL! : tst_Counting::testPassFail(row 2) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] INFO : tst_Counting::testSkipPass() entering SKIP : tst_Counting::testSkipPass(row 1) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [../counting/tst_counting.cpp(118)] PASS : tst_Counting::testSkipPass(row 2) INFO : tst_Counting::testSkipSkip() entering SKIP : tst_Counting::testSkipSkip(row 1) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [../counting/tst_counting.cpp(118)] SKIP : tst_Counting::testSkipSkip(row 2) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [../counting/tst_counting.cpp(118)] INFO : tst_Counting::testSkipFail() entering SKIP : tst_Counting::testSkipFail(row 1) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [../counting/tst_counting.cpp(118)] FAIL! : tst_Counting::testSkipFail(row 2) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] INFO : tst_Counting::testFailPass() entering FAIL! : tst_Counting::testFailPass(row 1) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] PASS : tst_Counting::testFailPass(row 2) INFO : tst_Counting::testFailSkip() entering FAIL! : tst_Counting::testFailSkip(row 1) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] SKIP : tst_Counting::testFailSkip(row 2) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [../counting/tst_counting.cpp(118)] INFO : tst_Counting::testFailFail() entering FAIL! : tst_Counting::testFailFail(row 1) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] FAIL! : tst_Counting::testFailFail(row 2) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] INFO : tst_Counting::testFailInInit() entering PASS : tst_Counting::testFailInInit(before) FAIL! : tst_Counting::testFailInInit(fail) Fail in init() - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(234)] + Loc: [../counting/tst_counting.cpp(234)] PASS : tst_Counting::testFailInInit(after) INFO : tst_Counting::testFailInCleanup() entering PASS : tst_Counting::testFailInCleanup(before) -QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup() +QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup() FAIL! : tst_Counting::testFailInCleanup(fail) Fail in cleanup() - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(242)] + Loc: [../counting/tst_counting.cpp(242)] PASS : tst_Counting::testFailInCleanup(after) INFO : tst_Counting::testSkipInInit() entering PASS : tst_Counting::testSkipInInit(before) SKIP : tst_Counting::testSkipInInit(skip) Skip in init() - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(236)] + Loc: [../counting/tst_counting.cpp(236)] PASS : tst_Counting::testSkipInInit(after) INFO : tst_Counting::testSkipInCleanup() entering PASS : tst_Counting::testSkipInCleanup(before) -QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup() +QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup() SKIP : tst_Counting::testSkipInCleanup(skip) Skip in cleanup() - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(244)] + Loc: [../counting/tst_counting.cpp(244)] PASS : tst_Counting::testSkipInCleanup(after) INFO : tst_Counting::cleanupTestCase() entering PASS : tst_Counting::cleanupTestCase() diff --git a/tests/auto/testlib/selftests/expected_verbose1.xml b/tests/auto/testlib/selftests/expected_verbose1.xml index 7caa915f65..7a182183c1 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.xml +++ b/tests/auto/testlib/selftests/expected_verbose1.xml @@ -6,6 +6,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassPass"> <Incident type="pass" file="" line="0"> @@ -14,94 +15,104 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassSkip"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailPass"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailSkip"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="234"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="234"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in init()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInCleanup"> <Incident type="pass" file="" line="0"> @@ -109,27 +120,29 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[fail]]></DataTag> - <Description><![CDATA[This test function should execute and then QFAIL in cleanup() ]]></Description> + <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="242"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="242"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in cleanup()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="236"> +<Message type="skip" file="../counting/tst_counting.cpp" line="236"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInCleanup"> <Incident type="pass" file="" line="0"> @@ -137,17 +150,20 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[skip]]></DataTag> - <Description><![CDATA[This test function should execute and then QSKIP in cleanup() ]]></Description> + <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="244"> +<Message type="skip" file="../counting/tst_counting.cpp" line="244"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_verbose1.xunitxml b/tests/auto/testlib/selftests/expected_verbose1.xunitxml index f317ed5923..72bf047ba8 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.xunitxml +++ b/tests/auto/testlib/selftests/expected_verbose1.xunitxml @@ -38,14 +38,14 @@ <failure tag="fail" message="Fail in init()" result="fail"/> </testcase> <testcase result="fail" name="testFailInCleanup"> - <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup() " type="qdebug" --> + <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup()" type="qdebug" --> <failure tag="fail" message="Fail in cleanup()" result="fail"/> </testcase> <testcase result="pass" name="testSkipInInit"> <!-- tag="skip" message="Skip in init()" type="skip" --> </testcase> <testcase result="pass" name="testSkipInCleanup"> - <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup() " type="qdebug" --> + <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup()" type="qdebug" --> <!-- tag="skip" message="Skip in cleanup()" type="skip" --> </testcase> <testcase result="pass" name="cleanupTestCase"/> @@ -56,9 +56,9 @@ <![CDATA[Skipping]]> <![CDATA[Skipping]]> <![CDATA[Skipping]]> -<![CDATA[This test function should execute and then QFAIL in cleanup() ]]> +<![CDATA[This test function should execute and then QFAIL in cleanup()]]> <![CDATA[Skip in init()]]> -<![CDATA[This test function should execute and then QSKIP in cleanup() ]]> +<![CDATA[This test function should execute and then QSKIP in cleanup()]]> <![CDATA[Skip in cleanup()]]> </system-err> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_verbose2.lightxml b/tests/auto/testlib/selftests/expected_verbose2.lightxml index 2937adbe01..0ead76884c 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.lightxml +++ b/tests/auto/testlib/selftests/expected_verbose2.lightxml @@ -4,174 +4,185 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassPass"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="111"> +<Message type="info" file="../counting/tst_counting.cpp" line="111"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="112"> +<Message type="info" file="../counting/tst_counting.cpp" line="112"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="111"> +<Message type="info" file="../counting/tst_counting.cpp" line="111"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="112"> +<Message type="info" file="../counting/tst_counting.cpp" line="112"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassSkip"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="111"> +<Message type="info" file="../counting/tst_counting.cpp" line="111"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="112"> +<Message type="info" file="../counting/tst_counting.cpp" line="112"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="111"> +<Message type="info" file="../counting/tst_counting.cpp" line="111"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="112"> +<Message type="info" file="../counting/tst_counting.cpp" line="112"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Message type="info" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="111"> +<Message type="info" file="../counting/tst_counting.cpp" line="111"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="112"> +<Message type="info" file="../counting/tst_counting.cpp" line="112"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Message type="info" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailPass"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Message type="info" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="111"> +<Message type="info" file="../counting/tst_counting.cpp" line="111"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="112"> +<Message type="info" file="../counting/tst_counting.cpp" line="112"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailSkip"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Message type="info" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Message type="info" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Message type="info" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="234"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="234"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in init()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInCleanup"> <Incident type="pass" file="" line="0"> @@ -179,27 +190,29 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[fail]]></DataTag> - <Description><![CDATA[This test function should execute and then QFAIL in cleanup() ]]></Description> + <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="242"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="242"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in cleanup()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="236"> +<Message type="skip" file="../counting/tst_counting.cpp" line="236"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInCleanup"> <Incident type="pass" file="" line="0"> @@ -207,16 +220,19 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[skip]]></DataTag> - <Description><![CDATA[This test function should execute and then QSKIP in cleanup() ]]></Description> + <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="244"> +<Message type="skip" file="../counting/tst_counting.cpp" line="244"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_verbose2.txt b/tests/auto/testlib/selftests/expected_verbose2.txt index e9c7838f6d..068e7357e8 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.txt +++ b/tests/auto/testlib/selftests/expected_verbose2.txt @@ -4,100 +4,100 @@ INFO : tst_Counting::initTestCase() entering PASS : tst_Counting::initTestCase() INFO : tst_Counting::testPassPass() entering INFO : tst_Counting::testPassPass(row 1) QVERIFY(true) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(111)] + Loc: [../counting/tst_counting.cpp(111)] INFO : tst_Counting::testPassPass(row 1) QCOMPARE(2 + 1, 3) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(112)] + Loc: [../counting/tst_counting.cpp(112)] PASS : tst_Counting::testPassPass(row 1) INFO : tst_Counting::testPassPass(row 2) QVERIFY(true) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(111)] + Loc: [../counting/tst_counting.cpp(111)] INFO : tst_Counting::testPassPass(row 2) QCOMPARE(2 + 1, 3) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(112)] + Loc: [../counting/tst_counting.cpp(112)] PASS : tst_Counting::testPassPass(row 2) INFO : tst_Counting::testPassSkip() entering INFO : tst_Counting::testPassSkip(row 1) QVERIFY(true) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(111)] + Loc: [../counting/tst_counting.cpp(111)] INFO : tst_Counting::testPassSkip(row 1) QCOMPARE(2 + 1, 3) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(112)] + Loc: [../counting/tst_counting.cpp(112)] PASS : tst_Counting::testPassSkip(row 1) SKIP : tst_Counting::testPassSkip(row 2) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [../counting/tst_counting.cpp(118)] INFO : tst_Counting::testPassFail() entering INFO : tst_Counting::testPassFail(row 1) QVERIFY(true) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(111)] + Loc: [../counting/tst_counting.cpp(111)] INFO : tst_Counting::testPassFail(row 1) QCOMPARE(2 + 1, 3) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(112)] + Loc: [../counting/tst_counting.cpp(112)] PASS : tst_Counting::testPassFail(row 1) INFO : tst_Counting::testPassFail(row 2) QVERIFY(false) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] FAIL! : tst_Counting::testPassFail(row 2) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] INFO : tst_Counting::testSkipPass() entering SKIP : tst_Counting::testSkipPass(row 1) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [../counting/tst_counting.cpp(118)] INFO : tst_Counting::testSkipPass(row 2) QVERIFY(true) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(111)] + Loc: [../counting/tst_counting.cpp(111)] INFO : tst_Counting::testSkipPass(row 2) QCOMPARE(2 + 1, 3) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(112)] + Loc: [../counting/tst_counting.cpp(112)] PASS : tst_Counting::testSkipPass(row 2) INFO : tst_Counting::testSkipSkip() entering SKIP : tst_Counting::testSkipSkip(row 1) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [../counting/tst_counting.cpp(118)] SKIP : tst_Counting::testSkipSkip(row 2) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [../counting/tst_counting.cpp(118)] INFO : tst_Counting::testSkipFail() entering SKIP : tst_Counting::testSkipFail(row 1) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [../counting/tst_counting.cpp(118)] INFO : tst_Counting::testSkipFail(row 2) QVERIFY(false) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] FAIL! : tst_Counting::testSkipFail(row 2) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] INFO : tst_Counting::testFailPass() entering INFO : tst_Counting::testFailPass(row 1) QVERIFY(false) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] FAIL! : tst_Counting::testFailPass(row 1) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] INFO : tst_Counting::testFailPass(row 2) QVERIFY(true) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(111)] + Loc: [../counting/tst_counting.cpp(111)] INFO : tst_Counting::testFailPass(row 2) QCOMPARE(2 + 1, 3) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(112)] + Loc: [../counting/tst_counting.cpp(112)] PASS : tst_Counting::testFailPass(row 2) INFO : tst_Counting::testFailSkip() entering INFO : tst_Counting::testFailSkip(row 1) QVERIFY(false) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] FAIL! : tst_Counting::testFailSkip(row 1) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] SKIP : tst_Counting::testFailSkip(row 2) Skipping - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)] + Loc: [../counting/tst_counting.cpp(118)] INFO : tst_Counting::testFailFail() entering INFO : tst_Counting::testFailFail(row 1) QVERIFY(false) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] FAIL! : tst_Counting::testFailFail(row 1) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] INFO : tst_Counting::testFailFail(row 2) QVERIFY(false) - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] FAIL! : tst_Counting::testFailFail(row 2) 'false' returned FALSE. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)] + Loc: [../counting/tst_counting.cpp(115)] INFO : tst_Counting::testFailInInit() entering PASS : tst_Counting::testFailInInit(before) FAIL! : tst_Counting::testFailInInit(fail) Fail in init() - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(234)] + Loc: [../counting/tst_counting.cpp(234)] PASS : tst_Counting::testFailInInit(after) INFO : tst_Counting::testFailInCleanup() entering PASS : tst_Counting::testFailInCleanup(before) -QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup() +QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup() FAIL! : tst_Counting::testFailInCleanup(fail) Fail in cleanup() - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(242)] + Loc: [../counting/tst_counting.cpp(242)] PASS : tst_Counting::testFailInCleanup(after) INFO : tst_Counting::testSkipInInit() entering PASS : tst_Counting::testSkipInInit(before) SKIP : tst_Counting::testSkipInInit(skip) Skip in init() - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(236)] + Loc: [../counting/tst_counting.cpp(236)] PASS : tst_Counting::testSkipInInit(after) INFO : tst_Counting::testSkipInCleanup() entering PASS : tst_Counting::testSkipInCleanup(before) -QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup() +QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup() SKIP : tst_Counting::testSkipInCleanup(skip) Skip in cleanup() - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(244)] + Loc: [../counting/tst_counting.cpp(244)] PASS : tst_Counting::testSkipInCleanup(after) INFO : tst_Counting::cleanupTestCase() entering PASS : tst_Counting::cleanupTestCase() diff --git a/tests/auto/testlib/selftests/expected_verbose2.xml b/tests/auto/testlib/selftests/expected_verbose2.xml index bbdca567d3..6d592f4a52 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.xml +++ b/tests/auto/testlib/selftests/expected_verbose2.xml @@ -6,174 +6,185 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassPass"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="111"> +<Message type="info" file="../counting/tst_counting.cpp" line="111"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="112"> +<Message type="info" file="../counting/tst_counting.cpp" line="112"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="111"> +<Message type="info" file="../counting/tst_counting.cpp" line="111"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="112"> +<Message type="info" file="../counting/tst_counting.cpp" line="112"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassSkip"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="111"> +<Message type="info" file="../counting/tst_counting.cpp" line="111"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="112"> +<Message type="info" file="../counting/tst_counting.cpp" line="112"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="111"> +<Message type="info" file="../counting/tst_counting.cpp" line="111"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="112"> +<Message type="info" file="../counting/tst_counting.cpp" line="112"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Message type="info" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="111"> +<Message type="info" file="../counting/tst_counting.cpp" line="111"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="112"> +<Message type="info" file="../counting/tst_counting.cpp" line="112"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Message type="info" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailPass"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Message type="info" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="111"> +<Message type="info" file="../counting/tst_counting.cpp" line="111"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="112"> +<Message type="info" file="../counting/tst_counting.cpp" line="112"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailSkip"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Message type="info" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="118"> +<Message type="skip" file="../counting/tst_counting.cpp" line="118"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Message type="info" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="info" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Message type="info" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="234"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="234"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in init()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInCleanup"> <Incident type="pass" file="" line="0"> @@ -181,27 +192,29 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[fail]]></DataTag> - <Description><![CDATA[This test function should execute and then QFAIL in cleanup() ]]></Description> + <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="242"> +<Incident type="fail" file="../counting/tst_counting.cpp" line="242"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in cleanup()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="236"> +<Message type="skip" file="../counting/tst_counting.cpp" line="236"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInCleanup"> <Incident type="pass" file="" line="0"> @@ -209,17 +222,20 @@ </Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[skip]]></DataTag> - <Description><![CDATA[This test function should execute and then QSKIP in cleanup() ]]></Description> + <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="244"> +<Message type="skip" file="../counting/tst_counting.cpp" line="244"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_verbose2.xunitxml b/tests/auto/testlib/selftests/expected_verbose2.xunitxml index a774cb9d9f..6dabbd34fc 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.xunitxml +++ b/tests/auto/testlib/selftests/expected_verbose2.xunitxml @@ -57,14 +57,14 @@ <failure tag="fail" message="Fail in init()" result="fail"/> </testcase> <testcase result="fail" name="testFailInCleanup"> - <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup() " type="qdebug" --> + <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup()" type="qdebug" --> <failure tag="fail" message="Fail in cleanup()" result="fail"/> </testcase> <testcase result="pass" name="testSkipInInit"> <!-- tag="skip" message="Skip in init()" type="skip" --> </testcase> <testcase result="pass" name="testSkipInCleanup"> - <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup() " type="qdebug" --> + <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup()" type="qdebug" --> <!-- tag="skip" message="Skip in cleanup()" type="skip" --> </testcase> <testcase result="pass" name="cleanupTestCase"/> @@ -93,9 +93,9 @@ <![CDATA[Skipping]]> <![CDATA[QVERIFY(false)]]> <![CDATA[QVERIFY(false)]]> -<![CDATA[This test function should execute and then QFAIL in cleanup() ]]> +<![CDATA[This test function should execute and then QFAIL in cleanup()]]> <![CDATA[Skip in init()]]> -<![CDATA[This test function should execute and then QSKIP in cleanup() ]]> +<![CDATA[This test function should execute and then QSKIP in cleanup()]]> <![CDATA[Skip in cleanup()]]> </system-err> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.lightxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.lightxml new file mode 100644 index 0000000000..fb8f61503e --- /dev/null +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.lightxml @@ -0,0 +1,61 @@ +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testCorrectStdTypes"> +<Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testCorrectStdExceptions"> +<Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testCorrectMyExceptions"> +<Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testFailInt"> +<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="128"> + <Description><![CDATA[Expected exception of type double to be thrown but unknown exception caught]]></Description> +</Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testFailStdString"> +<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="133"> + <Description><![CDATA[Expected exception of type char* to be thrown but unknown exception caught]]></Description> +</Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testFailStdRuntimeError"> +<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="138"> + <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error]]></Description> +</Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testFailMyException"> +<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="143"> + <Description><![CDATA[Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error]]></Description> +</Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testFailMyDerivedException"> +<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="148"> + <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException]]></Description> +</Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testFailNoException"> +<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="153"> + <Description><![CDATA[Expected exception of type std::exception to be thrown but no exception caught]]></Description> +</Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.txt b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.txt new file mode 100644 index 0000000000..04db60eccd --- /dev/null +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.txt @@ -0,0 +1,21 @@ +********* Start testing of tst_VerifyExceptionThrown ********* +Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +PASS : tst_VerifyExceptionThrown::initTestCase() +PASS : tst_VerifyExceptionThrown::testCorrectStdTypes() +PASS : tst_VerifyExceptionThrown::testCorrectStdExceptions() +PASS : tst_VerifyExceptionThrown::testCorrectMyExceptions() +FAIL! : tst_VerifyExceptionThrown::testFailInt() Expected exception of type double to be thrown but unknown exception caught + Loc: [tst_verifyexceptionthrown.cpp(128)] +FAIL! : tst_VerifyExceptionThrown::testFailStdString() Expected exception of type char* to be thrown but unknown exception caught + Loc: [tst_verifyexceptionthrown.cpp(133)] +FAIL! : tst_VerifyExceptionThrown::testFailStdRuntimeError() Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error + Loc: [tst_verifyexceptionthrown.cpp(138)] +FAIL! : tst_VerifyExceptionThrown::testFailMyException() Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error + Loc: [tst_verifyexceptionthrown.cpp(143)] +FAIL! : tst_VerifyExceptionThrown::testFailMyDerivedException() Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException + Loc: [tst_verifyexceptionthrown.cpp(148)] +FAIL! : tst_VerifyExceptionThrown::testFailNoException() Expected exception of type std::exception to be thrown but no exception caught + Loc: [tst_verifyexceptionthrown.cpp(153)] +PASS : tst_VerifyExceptionThrown::cleanupTestCase() +Totals: 5 passed, 6 failed, 0 skipped +********* Finished testing of tst_VerifyExceptionThrown ********* diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml new file mode 100644 index 0000000000..a89528cfb8 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_VerifyExceptionThrown"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testCorrectStdTypes"> +<Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testCorrectStdExceptions"> +<Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testCorrectMyExceptions"> +<Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testFailInt"> +<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="128"> + <Description><![CDATA[Expected exception of type double to be thrown but unknown exception caught]]></Description> +</Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testFailStdString"> +<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="133"> + <Description><![CDATA[Expected exception of type char* to be thrown but unknown exception caught]]></Description> +</Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testFailStdRuntimeError"> +<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="138"> + <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error]]></Description> +</Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testFailMyException"> +<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="143"> + <Description><![CDATA[Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error]]></Description> +</Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testFailMyDerivedException"> +<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="148"> + <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException]]></Description> +</Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testFailNoException"> +<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="153"> + <Description><![CDATA[Expected exception of type std::exception to be thrown but no exception caught]]></Description> +</Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xunitxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xunitxml new file mode 100644 index 0000000000..f49746a9af --- /dev/null +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xunitxml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="6" tests="11" name="tst_VerifyExceptionThrown"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="testCorrectStdTypes"/> + <testcase result="pass" name="testCorrectStdExceptions"/> + <testcase result="pass" name="testCorrectMyExceptions"/> + <testcase result="fail" name="testFailInt"> + <failure message="Expected exception of type double to be thrown but unknown exception caught" result="fail"/> + </testcase> + <testcase result="fail" name="testFailStdString"> + <failure message="Expected exception of type char* to be thrown but unknown exception caught" result="fail"/> + </testcase> + <testcase result="fail" name="testFailStdRuntimeError"> + <failure message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error" result="fail"/> + </testcase> + <testcase result="fail" name="testFailMyException"> + <failure message="Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error" result="fail"/> + </testcase> + <testcase result="fail" name="testFailMyDerivedException"> + <failure message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException" result="fail"/> + </testcase> + <testcase result="fail" name="testFailNoException"> + <failure message="Expected exception of type std::exception to be thrown but no exception caught" result="fail"/> + </testcase> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> diff --git a/tests/auto/testlib/selftests/expected_warnings.lightxml b/tests/auto/testlib/selftests/expected_warnings.lightxml index ad786832ca..bbc96b7010 100644 --- a/tests/auto/testlib/selftests/expected_warnings.lightxml +++ b/tests/auto/testlib/selftests/expected_warnings.lightxml @@ -4,6 +4,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testWarnings"> <Message type="qwarn" file="" line="0"> @@ -24,7 +25,14 @@ <Message type="qdebug" file="" line="0"> <Description><![CDATA[Baba]]></Description> </Message> +<Message type="qdebug" file="" line="0"> + <Description><![CDATA[Bubublabla]]></Description> +</Message> +<Message type="qwarn" file="" line="0"> + <Description><![CDATA[Babablabla]]></Description> +</Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testMissingWarnings"> <Message type="info" file="" line="0"> @@ -36,6 +44,16 @@ <Incident type="fail" file="" line="0"> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testMissingWarningsRegularExpression"> +<Message type="info" file="" line="0"> + <Description><![CDATA[Did not receive any message matching: "Warning\s\d"]]></Description> +</Message> +<Incident type="fail" file="" line="0"> + <Description><![CDATA[Not all expected messages were received]]></Description> +</Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testMissingWarningsWithData"> <Message type="info" file="" line="0"> @@ -62,7 +80,10 @@ <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_warnings.txt b/tests/auto/testlib/selftests/expected_warnings.txt index d8064651b0..e73de980cb 100644 --- a/tests/auto/testlib/selftests/expected_warnings.txt +++ b/tests/auto/testlib/selftests/expected_warnings.txt @@ -7,10 +7,14 @@ QDEBUG : tst_Warnings::testWarnings() Debug QDEBUG : tst_Warnings::testWarnings() Debug QDEBUG : tst_Warnings::testWarnings() Baba QDEBUG : tst_Warnings::testWarnings() Baba +QDEBUG : tst_Warnings::testWarnings() Bubublabla +QWARN : tst_Warnings::testWarnings() Babablabla PASS : tst_Warnings::testWarnings() INFO : tst_Warnings::testMissingWarnings() Did not receive message: "Warning0" INFO : tst_Warnings::testMissingWarnings() Did not receive message: "Warning1" FAIL! : tst_Warnings::testMissingWarnings() Not all expected messages were received +INFO : tst_Warnings::testMissingWarningsRegularExpression() Did not receive any message matching: "Warning\s\d" +FAIL! : tst_Warnings::testMissingWarningsRegularExpression() Not all expected messages were received INFO : tst_Warnings::testMissingWarningsWithData(first row) Did not receive message: "Warning0" INFO : tst_Warnings::testMissingWarningsWithData(first row) Did not receive message: "Warning1" FAIL! : tst_Warnings::testMissingWarningsWithData(first row) Not all expected messages were received @@ -18,5 +22,5 @@ INFO : tst_Warnings::testMissingWarningsWithData(second row) Did not receive m INFO : tst_Warnings::testMissingWarningsWithData(second row) Did not receive message: "Warning1" FAIL! : tst_Warnings::testMissingWarningsWithData(second row) Not all expected messages were received PASS : tst_Warnings::cleanupTestCase() -Totals: 3 passed, 3 failed, 0 skipped +Totals: 3 passed, 4 failed, 0 skipped ********* Finished testing of tst_Warnings ********* diff --git a/tests/auto/testlib/selftests/expected_warnings.xml b/tests/auto/testlib/selftests/expected_warnings.xml index 8ad236b52a..acb80e4f2a 100644 --- a/tests/auto/testlib/selftests/expected_warnings.xml +++ b/tests/auto/testlib/selftests/expected_warnings.xml @@ -6,6 +6,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testWarnings"> <Message type="qwarn" file="" line="0"> @@ -26,7 +27,14 @@ <Message type="qdebug" file="" line="0"> <Description><![CDATA[Baba]]></Description> </Message> +<Message type="qdebug" file="" line="0"> + <Description><![CDATA[Bubublabla]]></Description> +</Message> +<Message type="qwarn" file="" line="0"> + <Description><![CDATA[Babablabla]]></Description> +</Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testMissingWarnings"> <Message type="info" file="" line="0"> @@ -38,6 +46,16 @@ <Incident type="fail" file="" line="0"> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> +<Duration msecs="0"/> +</TestFunction> +<TestFunction name="testMissingWarningsRegularExpression"> +<Message type="info" file="" line="0"> + <Description><![CDATA[Did not receive any message matching: "Warning\s\d"]]></Description> +</Message> +<Incident type="fail" file="" line="0"> + <Description><![CDATA[Not all expected messages were received]]></Description> +</Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testMissingWarningsWithData"> <Message type="info" file="" line="0"> @@ -64,8 +82,11 @@ <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_warnings.xunitxml b/tests/auto/testlib/selftests/expected_warnings.xunitxml index 3e3b9ce18e..7be47174c6 100644 --- a/tests/auto/testlib/selftests/expected_warnings.xunitxml +++ b/tests/auto/testlib/selftests/expected_warnings.xunitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite errors="12" failures="3" tests="5" name="tst_Warnings"> +<testsuite errors="15" failures="4" tests="6" name="tst_Warnings"> <properties> <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> @@ -12,12 +12,18 @@ <!-- message="Debug" type="qdebug" --> <!-- message="Baba" type="qdebug" --> <!-- message="Baba" type="qdebug" --> + <!-- message="Bubublabla" type="qdebug" --> + <!-- message="Babablabla" type="qwarn" --> </testcase> <testcase result="fail" name="testMissingWarnings"> <!-- message="Did not receive message: "Warning0"" type="info" --> <!-- message="Did not receive message: "Warning1"" type="info" --> <failure message="Not all expected messages were received" result="fail"/> </testcase> + <testcase result="fail" name="testMissingWarningsRegularExpression"> + <!-- message="Did not receive any message matching: "Warning\s\d"" type="info" --> + <failure message="Not all expected messages were received" result="fail"/> + </testcase> <testcase result="fail" name="testMissingWarningsWithData"> <!-- tag="first row" message="Did not receive message: "Warning0"" type="info" --> <!-- tag="first row" message="Did not receive message: "Warning1"" type="info" --> @@ -34,8 +40,11 @@ <![CDATA[Debug]]> <![CDATA[Baba]]> <![CDATA[Baba]]> +<![CDATA[Bubublabla]]> +<![CDATA[Babablabla]]> <![CDATA[Did not receive message: "Warning0"]]> <![CDATA[Did not receive message: "Warning1"]]> +<![CDATA[Did not receive any message matching: "Warning\s\d"]]> <![CDATA[Did not receive message: "Warning0"]]> <![CDATA[Did not receive message: "Warning1"]]> <![CDATA[Did not receive message: "Warning0"]]> diff --git a/tests/auto/testlib/selftests/expected_xunit.lightxml b/tests/auto/testlib/selftests/expected_xunit.lightxml index 0615f6fd61..6660cf4e7a 100644 --- a/tests/auto/testlib/selftests/expected_xunit.lightxml +++ b/tests/auto/testlib/selftests/expected_xunit.lightxml @@ -4,50 +4,60 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc1"> -<Message type="warn" file="" line="0"> +<Message type="warn" file="tst_xunit.cpp" line="67"> <Description><![CDATA[just a QWARN() !]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc2"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[a qDebug() call with comment-ending stuff -->]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="74"> +<Incident type="fail" file="tst_xunit.cpp" line="74"> <Description><![CDATA[Compared values are not the same Actual (2): 2 Expected (3): 3]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc3"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="79"> +<Message type="skip" file="tst_xunit.cpp" line="79"> <Description><![CDATA[skipping this function!]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc4"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="84"> +<Incident type="fail" file="tst_xunit.cpp" line="84"> <Description><![CDATA[a forced failure!]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc5"> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="98"> +<Incident type="xfail" file="tst_xunit.cpp" line="98"> <Description><![CDATA[this failure is expected]]></Description> </Incident> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc6"> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="104"> +<Incident type="xfail" file="tst_xunit.cpp" line="104"> <Description><![CDATA[this failure is also expected]]></Description> </Incident> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc7"> -<Incident type="xpass" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="110"> +<Incident type="xpass" file="tst_xunit.cpp" line="110"> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_xunit.txt b/tests/auto/testlib/selftests/expected_xunit.txt index 722db18de4..f0b14752f0 100644 --- a/tests/auto/testlib/selftests/expected_xunit.txt +++ b/tests/auto/testlib/selftests/expected_xunit.txt @@ -2,25 +2,25 @@ Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : tst_Xunit::initTestCase() WARNING: tst_Xunit::testFunc1() just a QWARN() ! - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(67)] + Loc: [tst_xunit.cpp(67)] PASS : tst_Xunit::testFunc1() QDEBUG : tst_Xunit::testFunc2() a qDebug() call with comment-ending stuff --> FAIL! : tst_Xunit::testFunc2() Compared values are not the same Actual (2): 2 Expected (3): 3 - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(74)] + Loc: [tst_xunit.cpp(74)] SKIP : tst_Xunit::testFunc3() skipping this function! - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(79)] + Loc: [tst_xunit.cpp(79)] FAIL! : tst_Xunit::testFunc4() a forced failure! - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(84)] + Loc: [tst_xunit.cpp(84)] XFAIL : tst_Xunit::testFunc5() this failure is expected - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(98)] + Loc: [tst_xunit.cpp(98)] PASS : tst_Xunit::testFunc5() XFAIL : tst_Xunit::testFunc6() this failure is also expected - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(104)] + Loc: [tst_xunit.cpp(104)] PASS : tst_Xunit::testFunc6() XPASS : tst_Xunit::testFunc7() 'true' returned TRUE unexpectedly. () - Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(110)] + Loc: [tst_xunit.cpp(110)] PASS : tst_Xunit::cleanupTestCase() Totals: 5 passed, 3 failed, 1 skipped ********* Finished testing of tst_Xunit ********* diff --git a/tests/auto/testlib/selftests/expected_xunit.xml b/tests/auto/testlib/selftests/expected_xunit.xml index e5d2876e20..af9fe1f502 100644 --- a/tests/auto/testlib/selftests/expected_xunit.xml +++ b/tests/auto/testlib/selftests/expected_xunit.xml @@ -6,51 +6,61 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc1"> -<Message type="warn" file="" line="0"> +<Message type="warn" file="tst_xunit.cpp" line="67"> <Description><![CDATA[just a QWARN() !]]></Description> </Message> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc2"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[a qDebug() call with comment-ending stuff -->]]></Description> </Message> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="74"> +<Incident type="fail" file="tst_xunit.cpp" line="74"> <Description><![CDATA[Compared values are not the same Actual (2): 2 Expected (3): 3]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc3"> -<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="79"> +<Message type="skip" file="tst_xunit.cpp" line="79"> <Description><![CDATA[skipping this function!]]></Description> </Message> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc4"> -<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="84"> +<Incident type="fail" file="tst_xunit.cpp" line="84"> <Description><![CDATA[a forced failure!]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc5"> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="98"> +<Incident type="xfail" file="tst_xunit.cpp" line="98"> <Description><![CDATA[this failure is expected]]></Description> </Incident> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc6"> -<Incident type="xfail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="104"> +<Incident type="xfail" file="tst_xunit.cpp" line="104"> <Description><![CDATA[this failure is also expected]]></Description> </Incident> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc7"> -<Incident type="xpass" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="110"> +<Incident type="xpass" file="tst_xunit.cpp" line="110"> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> +<Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> +<Duration msecs="0"/> </TestFunction> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py new file mode 100755 index 0000000000..1c09faf4db --- /dev/null +++ b/tests/auto/testlib/selftests/generate_expected_output.py @@ -0,0 +1,124 @@ +#!/usr/bin/env python3 +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Contact: http://www.qt-project.org/legal +## +## This file is part of the release tools of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Digia. For licensing terms and +## conditions see http://qt.digia.com/licensing. For further information +## use the contact form at http://qt.digia.com/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 2.1 requirements +## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## In addition, as a special exception, Digia gives you certain additional +## rights. These rights are described in the Digia Qt LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3.0 as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL included in the +## packaging of this file. Please review the following information to +## ensure the GNU General Public License version 3.0 requirements will be +## met: http://www.gnu.org/copyleft/gpl.html. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +#regenerate all test's output + +import os +import sys +import subprocess +import re + +formats = ['xml', 'txt', 'xunitxml', 'lightxml'] + +qtver = subprocess.check_output(['qmake', '-query', 'QT_VERSION']).strip().decode('utf-8') +rootPath = os.getcwd() + +isWindows = sys.platform == 'win32' + +replacements = [ + (qtver, r'@INSERT_QT_VERSION_HERE@'), + (rootPath.encode('unicode-escape').decode('utf-8'), r''), + (r'( *)<Duration msecs="[\d\.]+"/>', r'\1<Duration msecs="0"/>'), +] + +extraArgs = { + "commandlinedata": "fiveTablePasses fiveTablePasses:fiveTablePasses_data1 -v2", + "benchlibcallgrind": "-callgrind", + "benchlibeventcounter": "-eventcounter", + "benchliboptions": "-eventcounter", + "benchlibtickcounter": "-tickcounter", + "badxml": "-eventcounter", + "benchlibcounting": "-eventcounter", + "printdatatags": "-datatags", + "printdatatagswithglobaltags": "-datatags", + "silent": "-silent", + "verbose1": "-v1", + "verbose2": "-v2", +} + +# Replace all occurrences of searchExp in one file +def replaceInFile(file): + import sys + import fileinput + for line in fileinput.input(file, inplace=1): + for searchExp, replaceExp in replacements: + line = re.sub(searchExp, replaceExp, line) + sys.stdout.write(line) + +def subdirs(): + result = [] + for path in os.listdir('.'): + if os.path.isdir('./' + path): + result.append(path) + return result + +def getTestForPath(path): + if isWindows: + testpath = path + '\\' + path + '.exe' + else: + testpath = path + '/' + path + return testpath + +def generateTestData(testname): + print(" running " + testname) + for format in formats: + cmd = [getTestForPath(testname) + ' -' + format + ' ' + extraArgs.get(testname, '')] + result = 'expected_' + testname + '.' + format + data = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True).communicate()[0] + out = open(result, 'w') + out.write(data) + out.close() + replaceInFile(result) + +if isWindows: + print("This script does not work on Windows.") + exit() + +tests = sys.argv[1:] +if len(tests) == 0: + tests = subdirs() +print("Generating " + str(len(tests)) + " test results for: " + qtver + " in: " + rootPath) +for path in tests: + if os.path.isfile(getTestForPath(path)): + generateTestData(path) + else: + print("Warning: directory " + path + " contains no test executable") diff --git a/tests/auto/testlib/selftests/selftests.pri b/tests/auto/testlib/selftests/selftests.pri index c9474419eb..7b706735a9 100644 --- a/tests/auto/testlib/selftests/selftests.pri +++ b/tests/auto/testlib/selftests/selftests.pri @@ -41,5 +41,6 @@ SUBPROGRAMS = \ subtest \ verbose1 \ verbose2 \ + verifyexceptionthrown \ warnings \ xunit diff --git a/tests/auto/testlib/selftests/selftests.qrc b/tests/auto/testlib/selftests/selftests.qrc index 03de05fb89..e7ca7138b2 100644 --- a/tests/auto/testlib/selftests/selftests.qrc +++ b/tests/auto/testlib/selftests/selftests.qrc @@ -134,6 +134,10 @@ <file>expected_verbose2.txt</file> <file>expected_verbose2.xml</file> <file>expected_verbose2.xunitxml</file> + <file>expected_verifyexceptionthrown.lightxml</file> + <file>expected_verifyexceptionthrown.txt</file> + <file>expected_verifyexceptionthrown.xml</file> + <file>expected_verifyexceptionthrown.xunitxml</file> <file>expected_warnings.lightxml</file> <file>expected_warnings.txt</file> <file>expected_warnings.xml</file> diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index e332f01861..97083d8d61 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -68,6 +68,7 @@ private: QList<LoggerSet> allLoggerSets() const; QTemporaryDir tempDir; + QRegularExpression durationRegExp; }; struct BenchmarkResult @@ -99,13 +100,13 @@ inline bool qCompare // Now check the value. Some variance is allowed, and how much depends on // the measured unit. qreal variance = 0.; - if (r1.unit == "msec") { + if (r1.unit == "msecs" || r1.unit == "WalltimeMilliseconds") { variance = 0.1; } else if (r1.unit == "instruction reads") { variance = 0.001; } - else if (r1.unit == "ticks") { + else if (r1.unit == "CPU ticks" || r1.unit == "CPUTicks") { variance = 0.001; } if (variance == 0.) { @@ -301,6 +302,7 @@ QList<LoggerSet> tst_Selftests::allLoggerSets() const tst_Selftests::tst_Selftests() : tempDir(QDir::tempPath() + "/tst_selftests.XXXXXX") + , durationRegExp("<Duration msecs=\"[\\d\\.]+\"/>") {} void tst_Selftests::initTestCase() @@ -381,6 +383,10 @@ void tst_Selftests::runSubTest_data() << "subtest" << "verbose1" << "verbose2" +#ifndef QT_NO_EXCEPTIONS + // this test will test nothing if the exceptions are disabled + << "verifyexceptionthrown" +#endif //!QT_NO_EXCEPTIONS << "warnings" << "xunit" ; @@ -633,9 +639,19 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& logge .arg(loggers.at(n)))); } } else { - QVERIFY2(res.count() == exp.count(), + if (res.count() != exp.count()) { + qDebug() << "<<<<<<"; + foreach (const QByteArray &line, res) + qDebug() << line; + qDebug() << "======"; + foreach (const QByteArray &line, exp) + qDebug() << line; + qDebug() << ">>>>>>"; + + QVERIFY2(res.count() == exp.count(), qPrintable(QString::fromLatin1("Mismatch in line count: %1 != %2 (%3).") .arg(res.count()).arg(exp.count()).arg(loggers.at(n)))); + } } // By this point, we should have loaded a non-empty expected data file. @@ -700,6 +716,10 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& logge QVERIFY2(error.isEmpty(), qPrintable(QString("Expected line didn't parse as benchmark result: %1\nLine: %2").arg(error).arg(expected))); QCOMPARE(actualResult, expectedResult); + } else if (line.startsWith(" <Duration msecs=") || line.startsWith("<Duration msecs=")) { + QRegularExpressionMatch match = durationRegExp.match(line); + QVERIFY2(match.hasMatch(), qPrintable(QString::fromLatin1("Invalid Duration tag at line %1 (%2): '%3'") + .arg(i).arg(loggers.at(n), output))); } else { QVERIFY2(output == expected, qPrintable(QString::fromLatin1("Mismatch at line %1 (%2): '%3' != '%4'") diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp b/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp new file mode 100644 index 0000000000..fc57f19c4f --- /dev/null +++ b/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp @@ -0,0 +1,162 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include <QtTest/QtTest> + + +#ifndef QT_NO_EXCEPTIONS +# include <stdexcept> +#endif + + +#ifndef QT_NO_EXCEPTIONS + +class MyBaseException +{ + +}; + +class MyDerivedException: public MyBaseException, public std::domain_error +{ +public: + MyDerivedException(): std::domain_error("MyDerivedException") {} +}; + + +#endif // !QT_NO_EXCEPTIONS + + +class tst_VerifyExceptionThrown: public QObject +{ + Q_OBJECT +private: + void doSomething() const {} + +private slots: +// Remove all test cases if exceptions are not available +#ifndef QT_NO_EXCEPTIONS + void testCorrectStdTypes() const; + void testCorrectStdExceptions() const; + void testCorrectMyExceptions() const; + + void testFailInt() const; + void testFailStdString() const; + void testFailStdRuntimeError() const; + void testFailMyException() const; + void testFailMyDerivedException() const; + + void testFailNoException() const; +#endif // !QT_NO_EXCEPTIONS +}; + + + +#ifndef QT_NO_EXCEPTIONS + +void tst_VerifyExceptionThrown::testCorrectStdTypes() const +{ + QVERIFY_EXCEPTION_THROWN(throw int(5), int); + QVERIFY_EXCEPTION_THROWN(throw float(9.8), float); + QVERIFY_EXCEPTION_THROWN(throw bool(true), bool); + QVERIFY_EXCEPTION_THROWN(throw std::string("some string"), std::string); +} + +void tst_VerifyExceptionThrown::testCorrectStdExceptions() const +{ + // same type + QVERIFY_EXCEPTION_THROWN(throw std::exception(), std::exception); + QVERIFY_EXCEPTION_THROWN(throw std::runtime_error("runtime error"), std::runtime_error); + QVERIFY_EXCEPTION_THROWN(throw std::overflow_error("overflow error"), std::overflow_error); + + // inheritance + QVERIFY_EXCEPTION_THROWN(throw std::overflow_error("overflow error"), std::runtime_error); + QVERIFY_EXCEPTION_THROWN(throw std::overflow_error("overflow error"), std::exception); +} + +void tst_VerifyExceptionThrown::testCorrectMyExceptions() const +{ + // same type + QVERIFY_EXCEPTION_THROWN(throw MyBaseException(), MyBaseException); + QVERIFY_EXCEPTION_THROWN(throw MyDerivedException(), MyDerivedException); + + // inheritance + QVERIFY_EXCEPTION_THROWN(throw MyDerivedException(), MyBaseException); + QVERIFY_EXCEPTION_THROWN(throw MyDerivedException(), std::domain_error); +} + +void tst_VerifyExceptionThrown::testFailInt() const +{ + QVERIFY_EXCEPTION_THROWN(throw int(5), double); +} + +void tst_VerifyExceptionThrown::testFailStdString() const +{ + QVERIFY_EXCEPTION_THROWN(throw std::string("some string"), char*); +} + +void tst_VerifyExceptionThrown::testFailStdRuntimeError() const +{ + QVERIFY_EXCEPTION_THROWN(throw std::logic_error("logic error"), std::runtime_error); +} + +void tst_VerifyExceptionThrown::testFailMyException() const +{ + QVERIFY_EXCEPTION_THROWN(throw std::logic_error("logic error"), MyBaseException); +} + +void tst_VerifyExceptionThrown::testFailMyDerivedException() const +{ + QVERIFY_EXCEPTION_THROWN(throw MyDerivedException(), std::runtime_error); +} + +void tst_VerifyExceptionThrown::testFailNoException() const +{ + QVERIFY_EXCEPTION_THROWN(doSomething(), std::exception); +} + +#endif // !QT_NO_EXCEPTIONS + + + +QTEST_MAIN(tst_VerifyExceptionThrown) + +#include "tst_verifyexceptionthrown.moc" diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/verifyexceptionthrown.pro b/tests/auto/testlib/selftests/verifyexceptionthrown/verifyexceptionthrown.pro new file mode 100644 index 0000000000..51f108c9d7 --- /dev/null +++ b/tests/auto/testlib/selftests/verifyexceptionthrown/verifyexceptionthrown.pro @@ -0,0 +1,8 @@ +SOURCES += tst_verifyexceptionthrown.cpp +QT = core testlib + +mac:CONFIG -= app_bundle +CONFIG -= debug_and_release_target +CONFIG += exceptions + +TARGET = verifyexceptionthrown diff --git a/tests/auto/testlib/selftests/warnings/tst_warnings.cpp b/tests/auto/testlib/selftests/warnings/tst_warnings.cpp index 20f53fdc91..4e3620caab 100644 --- a/tests/auto/testlib/selftests/warnings/tst_warnings.cpp +++ b/tests/auto/testlib/selftests/warnings/tst_warnings.cpp @@ -41,6 +41,7 @@ #include <QtCore/QCoreApplication> +#include <QtCore/QRegularExpression> #include <QtTest/QtTest> class tst_Warnings: public QObject @@ -49,6 +50,7 @@ class tst_Warnings: public QObject private slots: void testWarnings(); void testMissingWarnings(); + void testMissingWarningsRegularExpression(); void testMissingWarningsWithData_data(); void testMissingWarningsWithData(); }; @@ -73,6 +75,17 @@ void tst_Warnings::testWarnings() qDebug("Baba"); qDebug("Bubu"); qDebug("Baba"); + + QTest::ignoreMessage(QtDebugMsg, QRegularExpression("^Bubu.*")); + QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Baba.*")); + qDebug("Bubublabla"); + qWarning("Babablabla"); + qDebug("Bubublabla"); + qWarning("Babablabla"); + + // accept redundant space at end to keep compatibility with Qt < 5.2 + QTest::ignoreMessage(QtDebugMsg, "Bubu "); + qDebug() << "Bubu"; } void tst_Warnings::testMissingWarnings() @@ -84,6 +97,14 @@ void tst_Warnings::testMissingWarnings() qWarning("Warning2"); } +void tst_Warnings::testMissingWarningsRegularExpression() +{ + QTest::ignoreMessage(QtWarningMsg, QRegularExpression("Warning\\d\\d")); + QTest::ignoreMessage(QtWarningMsg, QRegularExpression("Warning\\s\\d")); + + qWarning("Warning11"); +} + void tst_Warnings::testMissingWarningsWithData_data() { QTest::addColumn<int>("dummy"); |