From e1a8f3afc834ff3a148ca330ba5338f60e64e276 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 16 Apr 2010 13:28:19 +1000 Subject: Extend testlib selftest to cover all loggers, not just plain text. --- tests/auto/selftests/README | 5 - tests/auto/selftests/expected_assert.lightxml | 18 + tests/auto/selftests/expected_assert.xml | 21 + tests/auto/selftests/expected_assert.xunitxml | 16 + tests/auto/selftests/expected_badxml.lightxml | 55 + tests/auto/selftests/expected_badxml.txt | 32 + tests/auto/selftests/expected_badxml.xml | 75 + tests/auto/selftests/expected_badxml.xunitxml | 38 + .../selftests/expected_benchlibcallgrind.lightxml | 15 + .../auto/selftests/expected_benchlibcallgrind.xml | 17 + .../selftests/expected_benchlibcallgrind.xunitxml | 12 + .../expected_benchlibeventcounter.lightxml | 21 + .../selftests/expected_benchlibeventcounter.xml | 23 + .../expected_benchlibeventcounter.xunitxml | 12 + .../selftests/expected_benchliboptions.lightxml | 15 + tests/auto/selftests/expected_benchliboptions.xml | 17 + .../selftests/expected_benchliboptions.xunitxml | 12 + .../expected_benchlibtickcounter.lightxml | 15 + .../selftests/expected_benchlibtickcounter.xml | 17 + .../expected_benchlibtickcounter.xunitxml | 12 + .../selftests/expected_benchlibwalltime.lightxml | 25 + tests/auto/selftests/expected_benchlibwalltime.xml | 25 + .../selftests/expected_benchlibwalltime.xunitxml | 16 + tests/auto/selftests/expected_cmptest.lightxml | 32 + tests/auto/selftests/expected_cmptest.txt | 8 +- tests/auto/selftests/expected_cmptest.xml | 45 + tests/auto/selftests/expected_cmptest.xunitxml | 26 + .../selftests/expected_commandlinedata.lightxml | 36 + tests/auto/selftests/expected_commandlinedata.xml | 43 + .../selftests/expected_commandlinedata.xunitxml | 27 + tests/auto/selftests/expected_crashes.lightxml | 15 + tests/auto/selftests/expected_crashes.xml | 18 + tests/auto/selftests/expected_crashes.xunitxml | 15 + tests/auto/selftests/expected_datatable.lightxml | 52 + tests/auto/selftests/expected_datatable.xml | 84 + tests/auto/selftests/expected_datatable.xunitxml | 36 + tests/auto/selftests/expected_datetime.lightxml | 27 + tests/auto/selftests/expected_datetime.xml | 32 + tests/auto/selftests/expected_datetime.xunitxml | 23 + .../selftests/expected_exceptionthrow.lightxml | 12 + tests/auto/selftests/expected_exceptionthrow.xml | 15 + .../selftests/expected_exceptionthrow.xunitxml | 12 + tests/auto/selftests/expected_expectfail.lightxml | 35 + tests/auto/selftests/expected_expectfail.xml | 43 + tests/auto/selftests/expected_expectfail.xunitxml | 31 + tests/auto/selftests/expected_failinit.lightxml | 12 + tests/auto/selftests/expected_failinit.xml | 15 + tests/auto/selftests/expected_failinit.xunitxml | 12 + .../auto/selftests/expected_failinitdata.lightxml | 9 + tests/auto/selftests/expected_failinitdata.xml | 12 + .../auto/selftests/expected_failinitdata.xunitxml | 11 + tests/auto/selftests/expected_fetchbogus.lightxml | 15 + tests/auto/selftests/expected_fetchbogus.xml | 20 + tests/auto/selftests/expected_fetchbogus.xunitxml | 15 + tests/auto/selftests/expected_globaldata.lightxml | 30 + tests/auto/selftests/expected_globaldata.xml | 35 + tests/auto/selftests/expected_globaldata.xunitxml | 24 + tests/auto/selftests/expected_longstring.lightxml | 23 + tests/auto/selftests/expected_longstring.txt | 2 +- tests/auto/selftests/expected_longstring.xml | 26 + tests/auto/selftests/expected_longstring.xunitxml | 21 + tests/auto/selftests/expected_maxwarnings.lightxml | 6020 +++++++++++++++++++ tests/auto/selftests/expected_maxwarnings.xml | 6022 ++++++++++++++++++++ tests/auto/selftests/expected_maxwarnings.xunitxml | 4017 +++++++++++++ tests/auto/selftests/expected_multiexec.lightxml | 13 + tests/auto/selftests/expected_multiexec.xml | 16 + tests/auto/selftests/expected_multiexec.xunitxml | 11 + tests/auto/selftests/expected_singleskip.lightxml | 15 + tests/auto/selftests/expected_singleskip.xml | 18 + tests/auto/selftests/expected_singleskip.xunitxml | 15 + tests/auto/selftests/expected_skip.lightxml | 30 + tests/auto/selftests/expected_skip.txt | 6 +- tests/auto/selftests/expected_skip.xml | 34 + tests/auto/selftests/expected_skip.xunitxml | 25 + tests/auto/selftests/expected_skipglobal.lightxml | 9 + tests/auto/selftests/expected_skipglobal.xml | 12 + tests/auto/selftests/expected_skipglobal.xunitxml | 13 + tests/auto/selftests/expected_skipinit.lightxml | 12 + tests/auto/selftests/expected_skipinit.xml | 15 + tests/auto/selftests/expected_skipinit.xunitxml | 14 + .../auto/selftests/expected_skipinitdata.lightxml | 9 + tests/auto/selftests/expected_skipinitdata.xml | 12 + .../auto/selftests/expected_skipinitdata.xunitxml | 13 + tests/auto/selftests/expected_sleep.lightxml | 13 + tests/auto/selftests/expected_sleep.xml | 16 + tests/auto/selftests/expected_sleep.xunitxml | 11 + tests/auto/selftests/expected_strcmp.lightxml | 51 + tests/auto/selftests/expected_strcmp.xml | 60 + tests/auto/selftests/expected_strcmp.xunitxml | 43 + tests/auto/selftests/expected_subtest.lightxml | 49 + tests/auto/selftests/expected_subtest.xml | 67 + tests/auto/selftests/expected_subtest.xunitxml | 39 + .../selftests/expected_waitwithoutgui.lightxml | 0 tests/auto/selftests/expected_waitwithoutgui.xml | 0 .../selftests/expected_waitwithoutgui.xunitxml | 0 tests/auto/selftests/expected_warnings.lightxml | 43 + tests/auto/selftests/expected_warnings.xml | 45 + tests/auto/selftests/expected_warnings.xunitxml | 32 + tests/auto/selftests/expected_xunit.lightxml | 52 + tests/auto/selftests/expected_xunit.txt | 63 +- tests/auto/selftests/expected_xunit.xml | 56 + tests/auto/selftests/expected_xunit.xunitxml | 40 + tests/auto/selftests/selftests.qrc | 153 +- tests/auto/selftests/tst_selftests.cpp | 403 +- 104 files changed, 18787 insertions(+), 263 deletions(-) delete mode 100644 tests/auto/selftests/README create mode 100644 tests/auto/selftests/expected_assert.lightxml create mode 100644 tests/auto/selftests/expected_assert.xml create mode 100644 tests/auto/selftests/expected_assert.xunitxml create mode 100644 tests/auto/selftests/expected_badxml.lightxml create mode 100644 tests/auto/selftests/expected_badxml.txt create mode 100644 tests/auto/selftests/expected_badxml.xml create mode 100644 tests/auto/selftests/expected_badxml.xunitxml create mode 100644 tests/auto/selftests/expected_benchlibcallgrind.lightxml create mode 100644 tests/auto/selftests/expected_benchlibcallgrind.xml create mode 100644 tests/auto/selftests/expected_benchlibcallgrind.xunitxml create mode 100644 tests/auto/selftests/expected_benchlibeventcounter.lightxml create mode 100644 tests/auto/selftests/expected_benchlibeventcounter.xml create mode 100644 tests/auto/selftests/expected_benchlibeventcounter.xunitxml create mode 100644 tests/auto/selftests/expected_benchliboptions.lightxml create mode 100644 tests/auto/selftests/expected_benchliboptions.xml create mode 100644 tests/auto/selftests/expected_benchliboptions.xunitxml create mode 100644 tests/auto/selftests/expected_benchlibtickcounter.lightxml create mode 100644 tests/auto/selftests/expected_benchlibtickcounter.xml create mode 100644 tests/auto/selftests/expected_benchlibtickcounter.xunitxml create mode 100644 tests/auto/selftests/expected_benchlibwalltime.lightxml create mode 100644 tests/auto/selftests/expected_benchlibwalltime.xml create mode 100644 tests/auto/selftests/expected_benchlibwalltime.xunitxml create mode 100644 tests/auto/selftests/expected_cmptest.lightxml create mode 100644 tests/auto/selftests/expected_cmptest.xml create mode 100644 tests/auto/selftests/expected_cmptest.xunitxml create mode 100644 tests/auto/selftests/expected_commandlinedata.lightxml create mode 100644 tests/auto/selftests/expected_commandlinedata.xml create mode 100644 tests/auto/selftests/expected_commandlinedata.xunitxml create mode 100644 tests/auto/selftests/expected_crashes.lightxml create mode 100644 tests/auto/selftests/expected_crashes.xml create mode 100644 tests/auto/selftests/expected_crashes.xunitxml create mode 100644 tests/auto/selftests/expected_datatable.lightxml create mode 100644 tests/auto/selftests/expected_datatable.xml create mode 100644 tests/auto/selftests/expected_datatable.xunitxml create mode 100644 tests/auto/selftests/expected_datetime.lightxml create mode 100644 tests/auto/selftests/expected_datetime.xml create mode 100644 tests/auto/selftests/expected_datetime.xunitxml create mode 100644 tests/auto/selftests/expected_exceptionthrow.lightxml create mode 100644 tests/auto/selftests/expected_exceptionthrow.xml create mode 100644 tests/auto/selftests/expected_exceptionthrow.xunitxml create mode 100644 tests/auto/selftests/expected_expectfail.lightxml create mode 100644 tests/auto/selftests/expected_expectfail.xml create mode 100644 tests/auto/selftests/expected_expectfail.xunitxml create mode 100644 tests/auto/selftests/expected_failinit.lightxml create mode 100644 tests/auto/selftests/expected_failinit.xml create mode 100644 tests/auto/selftests/expected_failinit.xunitxml create mode 100644 tests/auto/selftests/expected_failinitdata.lightxml create mode 100644 tests/auto/selftests/expected_failinitdata.xml create mode 100644 tests/auto/selftests/expected_failinitdata.xunitxml create mode 100644 tests/auto/selftests/expected_fetchbogus.lightxml create mode 100644 tests/auto/selftests/expected_fetchbogus.xml create mode 100644 tests/auto/selftests/expected_fetchbogus.xunitxml create mode 100644 tests/auto/selftests/expected_globaldata.lightxml create mode 100644 tests/auto/selftests/expected_globaldata.xml create mode 100644 tests/auto/selftests/expected_globaldata.xunitxml create mode 100644 tests/auto/selftests/expected_longstring.lightxml create mode 100644 tests/auto/selftests/expected_longstring.xml create mode 100644 tests/auto/selftests/expected_longstring.xunitxml create mode 100644 tests/auto/selftests/expected_maxwarnings.lightxml create mode 100644 tests/auto/selftests/expected_maxwarnings.xml create mode 100644 tests/auto/selftests/expected_maxwarnings.xunitxml create mode 100644 tests/auto/selftests/expected_multiexec.lightxml create mode 100644 tests/auto/selftests/expected_multiexec.xml create mode 100644 tests/auto/selftests/expected_multiexec.xunitxml create mode 100644 tests/auto/selftests/expected_singleskip.lightxml create mode 100644 tests/auto/selftests/expected_singleskip.xml create mode 100644 tests/auto/selftests/expected_singleskip.xunitxml create mode 100644 tests/auto/selftests/expected_skip.lightxml create mode 100644 tests/auto/selftests/expected_skip.xml create mode 100644 tests/auto/selftests/expected_skip.xunitxml create mode 100644 tests/auto/selftests/expected_skipglobal.lightxml create mode 100644 tests/auto/selftests/expected_skipglobal.xml create mode 100644 tests/auto/selftests/expected_skipglobal.xunitxml create mode 100644 tests/auto/selftests/expected_skipinit.lightxml create mode 100644 tests/auto/selftests/expected_skipinit.xml create mode 100644 tests/auto/selftests/expected_skipinit.xunitxml create mode 100644 tests/auto/selftests/expected_skipinitdata.lightxml create mode 100644 tests/auto/selftests/expected_skipinitdata.xml create mode 100644 tests/auto/selftests/expected_skipinitdata.xunitxml create mode 100644 tests/auto/selftests/expected_sleep.lightxml create mode 100644 tests/auto/selftests/expected_sleep.xml create mode 100644 tests/auto/selftests/expected_sleep.xunitxml create mode 100644 tests/auto/selftests/expected_strcmp.lightxml create mode 100644 tests/auto/selftests/expected_strcmp.xml create mode 100644 tests/auto/selftests/expected_strcmp.xunitxml create mode 100644 tests/auto/selftests/expected_subtest.lightxml create mode 100644 tests/auto/selftests/expected_subtest.xml create mode 100644 tests/auto/selftests/expected_subtest.xunitxml create mode 100644 tests/auto/selftests/expected_waitwithoutgui.lightxml create mode 100644 tests/auto/selftests/expected_waitwithoutgui.xml create mode 100644 tests/auto/selftests/expected_waitwithoutgui.xunitxml create mode 100644 tests/auto/selftests/expected_warnings.lightxml create mode 100644 tests/auto/selftests/expected_warnings.xml create mode 100644 tests/auto/selftests/expected_warnings.xunitxml create mode 100644 tests/auto/selftests/expected_xunit.lightxml create mode 100644 tests/auto/selftests/expected_xunit.xml create mode 100644 tests/auto/selftests/expected_xunit.xunitxml diff --git a/tests/auto/selftests/README b/tests/auto/selftests/README deleted file mode 100644 index 6b5976a..0000000 --- a/tests/auto/selftests/README +++ /dev/null @@ -1,5 +0,0 @@ - -These are the tests for QTestLib itself. - -Adding a new test for QTestlib is a complicated process. See change 282716 -for an example of what changes that has to be done. diff --git a/tests/auto/selftests/expected_assert.lightxml b/tests/auto/selftests/expected_assert.lightxml new file mode 100644 index 0000000..50b5376 --- /dev/null +++ b/tests/auto/selftests/expected_assert.lightxml @@ -0,0 +1,18 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_assert.xml b/tests/auto/selftests/expected_assert.xml new file mode 100644 index 0000000..2a77999 --- /dev/null +++ b/tests/auto/selftests/expected_assert.xml @@ -0,0 +1,21 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_assert.xunitxml b/tests/auto/selftests/expected_assert.xunitxml new file mode 100644 index 0000000..264ae93 --- /dev/null +++ b/tests/auto/selftests/expected_assert.xunitxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_badxml.lightxml b/tests/auto/selftests/expected_badxml.lightxml new file mode 100644 index 0000000..d6a76f2 --- /dev/null +++ b/tests/auto/selftests/expected_badxml.lightxml @@ -0,0 +1,55 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text ]]]> more text]]> + + + + + + open < tags < text]]> + + + " mixed ]]]> up > " in < the ]]]> hopes < of triggering "< ]]]> bugs]]> + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_badxml.txt b/tests/auto/selftests/expected_badxml.txt new file mode 100644 index 0000000..046f1b2 --- /dev/null +++ b/tests/auto/selftests/expected_badxml.txt @@ -0,0 +1,32 @@ +********* Start testing of tst_BadXml ********* +Config: Using QTest library 4.6.3, Qt 4.6.3 +PASS : tst_BadXml::initTestCase() +QDEBUG : tst_BadXml::badDataTag(end cdata ]]> text ]]> more text) a message +FAIL! : tst_BadXml::badDataTag(end cdata ]]> text ]]> more text) a failure + Loc: [/local/rmcgover_builds/qt/4.6/tests/auto/selftests/badxml/tst_badxml.cpp(109)] +RESULT : tst_BadXml::badDataTag():"end cdata ]]> text ]]> more text": + 0 events per iteration (total: 0, iterations: 1) +QDEBUG : tst_BadXml::badDataTag(quotes " text" more text) a message +FAIL! : tst_BadXml::badDataTag(quotes " text" more text) a failure + Loc: [/local/rmcgover_builds/qt/4.6/tests/auto/selftests/badxml/tst_badxml.cpp(109)] +RESULT : tst_BadXml::badDataTag():"quotes " text" more text": + 0 events per iteration (total: 0, iterations: 1) +QDEBUG : tst_BadXml::badDataTag(xml close > open < tags < text) a message +FAIL! : tst_BadXml::badDataTag(xml close > open < tags < text) a failure + Loc: [/local/rmcgover_builds/qt/4.6/tests/auto/selftests/badxml/tst_badxml.cpp(109)] +RESULT : tst_BadXml::badDataTag():"xml close > open < tags < text": + 0 events per iteration (total: 0, iterations: 1) +QDEBUG : tst_BadXml::badDataTag(all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a message +FAIL! : tst_BadXml::badDataTag(all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a failure + Loc: [/local/rmcgover_builds/qt/4.6/tests/auto/selftests/badxml/tst_badxml.cpp(109)] +RESULT : tst_BadXml::badDataTag():"all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs": + 0 events per iteration (total: 0, iterations: 1) +QDEBUG : tst_BadXml::badMessage(string 0) end cdata ]]> text ]]> more text +QDEBUG : tst_BadXml::badMessage(string 1) quotes " text" more text +QDEBUG : tst_BadXml::badMessage(string 2) xml close > open < tags < text +QDEBUG : tst_BadXml::badMessage(string 3) all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs +PASS : tst_BadXml::badMessage() +FAIL! : tst_BadXml::failWithNoFile() failure message +PASS : tst_BadXml::cleanupTestCase() +Totals: 3 passed, 5 failed, 0 skipped +********* Finished testing of tst_BadXml ********* diff --git a/tests/auto/selftests/expected_badxml.xml b/tests/auto/selftests/expected_badxml.xml new file mode 100644 index 0000000..c1962c7 --- /dev/null +++ b/tests/auto/selftests/expected_badxml.xml @@ -0,0 +1,75 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + text ]]]> more text]]> + + + + text ]]]> more text]]> + + + + + + + + + + + + + + open < tags < text]]> + + + + open < tags < text]]> + + + + + " mixed ]]]> up > " in < the ]]]> hopes < of triggering "< ]]]> bugs]]> + + + + " mixed ]]]> up > " in < the ]]]> hopes < of triggering "< ]]]> bugs]]> + + + + + + + + text ]]]> more text]]> + + + + + + + + open < tags < text]]> + + + + " mixed ]]]> up > " in < the ]]]> hopes < of triggering "< ]]]> bugs]]> + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_badxml.xunitxml b/tests/auto/selftests/expected_badxml.xunitxml new file mode 100644 index 0000000..3a410e7 --- /dev/null +++ b/tests/auto/selftests/expected_badxml.xunitxml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text ]]]> more text]]> + + open < tags < text]]> + " mixed ]]]> up > " in < the ]]]> hopes < of triggering "< ]]]> bugs]]> + + diff --git a/tests/auto/selftests/expected_benchlibcallgrind.lightxml b/tests/auto/selftests/expected_benchlibcallgrind.lightxml new file mode 100644 index 0000000..b3959ad --- /dev/null +++ b/tests/auto/selftests/expected_benchlibcallgrind.lightxml @@ -0,0 +1,15 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchlibcallgrind.xml b/tests/auto/selftests/expected_benchlibcallgrind.xml new file mode 100644 index 0000000..e27fbab --- /dev/null +++ b/tests/auto/selftests/expected_benchlibcallgrind.xml @@ -0,0 +1,17 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchlibcallgrind.xunitxml b/tests/auto/selftests/expected_benchlibcallgrind.xunitxml new file mode 100644 index 0000000..61b4b5a --- /dev/null +++ b/tests/auto/selftests/expected_benchlibcallgrind.xunitxml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchlibeventcounter.lightxml b/tests/auto/selftests/expected_benchlibeventcounter.lightxml new file mode 100644 index 0000000..3e6c444 --- /dev/null +++ b/tests/auto/selftests/expected_benchlibeventcounter.lightxml @@ -0,0 +1,21 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchlibeventcounter.xml b/tests/auto/selftests/expected_benchlibeventcounter.xml new file mode 100644 index 0000000..0e29bc4 --- /dev/null +++ b/tests/auto/selftests/expected_benchlibeventcounter.xml @@ -0,0 +1,23 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchlibeventcounter.xunitxml b/tests/auto/selftests/expected_benchlibeventcounter.xunitxml new file mode 100644 index 0000000..72a8b9e --- /dev/null +++ b/tests/auto/selftests/expected_benchlibeventcounter.xunitxml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchliboptions.lightxml b/tests/auto/selftests/expected_benchliboptions.lightxml new file mode 100644 index 0000000..1138462 --- /dev/null +++ b/tests/auto/selftests/expected_benchliboptions.lightxml @@ -0,0 +1,15 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchliboptions.xml b/tests/auto/selftests/expected_benchliboptions.xml new file mode 100644 index 0000000..bcf1ea0 --- /dev/null +++ b/tests/auto/selftests/expected_benchliboptions.xml @@ -0,0 +1,17 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchliboptions.xunitxml b/tests/auto/selftests/expected_benchliboptions.xunitxml new file mode 100644 index 0000000..f5c776d --- /dev/null +++ b/tests/auto/selftests/expected_benchliboptions.xunitxml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchlibtickcounter.lightxml b/tests/auto/selftests/expected_benchlibtickcounter.lightxml new file mode 100644 index 0000000..0071ceb --- /dev/null +++ b/tests/auto/selftests/expected_benchlibtickcounter.lightxml @@ -0,0 +1,15 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchlibtickcounter.xml b/tests/auto/selftests/expected_benchlibtickcounter.xml new file mode 100644 index 0000000..3a63d74 --- /dev/null +++ b/tests/auto/selftests/expected_benchlibtickcounter.xml @@ -0,0 +1,17 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchlibtickcounter.xunitxml b/tests/auto/selftests/expected_benchlibtickcounter.xunitxml new file mode 100644 index 0000000..15ff5ae --- /dev/null +++ b/tests/auto/selftests/expected_benchlibtickcounter.xunitxml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchlibwalltime.lightxml b/tests/auto/selftests/expected_benchlibwalltime.lightxml new file mode 100644 index 0000000..aa0cc01 --- /dev/null +++ b/tests/auto/selftests/expected_benchlibwalltime.lightxml @@ -0,0 +1,25 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchlibwalltime.xml b/tests/auto/selftests/expected_benchlibwalltime.xml new file mode 100644 index 0000000..155fca9 --- /dev/null +++ b/tests/auto/selftests/expected_benchlibwalltime.xml @@ -0,0 +1,25 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_benchlibwalltime.xunitxml b/tests/auto/selftests/expected_benchlibwalltime.xunitxml new file mode 100644 index 0000000..5b713a9 --- /dev/null +++ b/tests/auto/selftests/expected_benchlibwalltime.xunitxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_cmptest.lightxml b/tests/auto/selftests/expected_cmptest.lightxml new file mode 100644 index 0000000..9824dae --- /dev/null +++ b/tests/auto/selftests/expected_cmptest.lightxml @@ -0,0 +1,32 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + ) + Expected (expected): QVariant(PhonyClass,)]]> + + + + + diff --git a/tests/auto/selftests/expected_cmptest.txt b/tests/auto/selftests/expected_cmptest.txt index b7c5665..18d4cce 100644 --- a/tests/auto/selftests/expected_cmptest.txt +++ b/tests/auto/selftests/expected_cmptest.txt @@ -6,19 +6,19 @@ 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/rmcgover/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)] + Loc: [/home/user/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)] FAIL! : tst_Cmptest::compare_tostring(null hash, invalid) Compared values are not the same Actual (actual): QVariant(QVariantHash) Expected (expected): QVariant() - Loc: [/home/rmcgover/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)] + Loc: [/home/user/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)] 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/rmcgover/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)] + Loc: [/home/user/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)] FAIL! : tst_Cmptest::compare_tostring(both non-null user type) Compared values are not the same Actual (actual): QVariant(PhonyClass,) Expected (expected): QVariant(PhonyClass,) - Loc: [/home/rmcgover/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)] + Loc: [/home/user/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)] PASS : tst_Cmptest::cleanupTestCase() Totals: 4 passed, 4 failed, 0 skipped ********* Finished testing of tst_Cmptest ********* diff --git a/tests/auto/selftests/expected_cmptest.xml b/tests/auto/selftests/expected_cmptest.xml new file mode 100644 index 0000000..4dd1bc5 --- /dev/null +++ b/tests/auto/selftests/expected_cmptest.xml @@ -0,0 +1,45 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + ) + Expected (expected): QVariant(PhonyClass,)]]> + + + + + + diff --git a/tests/auto/selftests/expected_cmptest.xunitxml b/tests/auto/selftests/expected_cmptest.xunitxml new file mode 100644 index 0000000..dc77fd2 --- /dev/null +++ b/tests/auto/selftests/expected_cmptest.xunitxml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_commandlinedata.lightxml b/tests/auto/selftests/expected_commandlinedata.lightxml new file mode 100644 index 0000000..8763a91 --- /dev/null +++ b/tests/auto/selftests/expected_commandlinedata.lightxml @@ -0,0 +1,36 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_commandlinedata.xml b/tests/auto/selftests/expected_commandlinedata.xml new file mode 100644 index 0000000..95b7a50 --- /dev/null +++ b/tests/auto/selftests/expected_commandlinedata.xml @@ -0,0 +1,43 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_commandlinedata.xunitxml b/tests/auto/selftests/expected_commandlinedata.xunitxml new file mode 100644 index 0000000..9c4dbfd --- /dev/null +++ b/tests/auto/selftests/expected_commandlinedata.xunitxml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_crashes.lightxml b/tests/auto/selftests/expected_crashes.lightxml new file mode 100644 index 0000000..60ef540 --- /dev/null +++ b/tests/auto/selftests/expected_crashes.lightxml @@ -0,0 +1,15 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_crashes.xml b/tests/auto/selftests/expected_crashes.xml new file mode 100644 index 0000000..d20cee3 --- /dev/null +++ b/tests/auto/selftests/expected_crashes.xml @@ -0,0 +1,18 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_crashes.xunitxml b/tests/auto/selftests/expected_crashes.xunitxml new file mode 100644 index 0000000..7b5b552 --- /dev/null +++ b/tests/auto/selftests/expected_crashes.xunitxml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_datatable.lightxml b/tests/auto/selftests/expected_datatable.lightxml new file mode 100644 index 0000000..681aa10 --- /dev/null +++ b/tests/auto/selftests/expected_datatable.lightxml @@ -0,0 +1,52 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_datatable.xml b/tests/auto/selftests/expected_datatable.xml new file mode 100644 index 0000000..4472451 --- /dev/null +++ b/tests/auto/selftests/expected_datatable.xml @@ -0,0 +1,84 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_datatable.xunitxml b/tests/auto/selftests/expected_datatable.xunitxml new file mode 100644 index 0000000..8b23938 --- /dev/null +++ b/tests/auto/selftests/expected_datatable.xunitxml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_datetime.lightxml b/tests/auto/selftests/expected_datetime.lightxml new file mode 100644 index 0000000..054d306 --- /dev/null +++ b/tests/auto/selftests/expected_datetime.lightxml @@ -0,0 +1,27 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_datetime.xml b/tests/auto/selftests/expected_datetime.xml new file mode 100644 index 0000000..7ac35d8 --- /dev/null +++ b/tests/auto/selftests/expected_datetime.xml @@ -0,0 +1,32 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_datetime.xunitxml b/tests/auto/selftests/expected_datetime.xunitxml new file mode 100644 index 0000000..0c66aa6 --- /dev/null +++ b/tests/auto/selftests/expected_datetime.xunitxml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_exceptionthrow.lightxml b/tests/auto/selftests/expected_exceptionthrow.lightxml new file mode 100644 index 0000000..f092a0c --- /dev/null +++ b/tests/auto/selftests/expected_exceptionthrow.lightxml @@ -0,0 +1,12 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + diff --git a/tests/auto/selftests/expected_exceptionthrow.xml b/tests/auto/selftests/expected_exceptionthrow.xml new file mode 100644 index 0000000..69d6e2a --- /dev/null +++ b/tests/auto/selftests/expected_exceptionthrow.xml @@ -0,0 +1,15 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + diff --git a/tests/auto/selftests/expected_exceptionthrow.xunitxml b/tests/auto/selftests/expected_exceptionthrow.xunitxml new file mode 100644 index 0000000..6fcf70f --- /dev/null +++ b/tests/auto/selftests/expected_exceptionthrow.xunitxml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_expectfail.lightxml b/tests/auto/selftests/expected_expectfail.lightxml new file mode 100644 index 0000000..2424ada --- /dev/null +++ b/tests/auto/selftests/expected_expectfail.lightxml @@ -0,0 +1,35 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_expectfail.xml b/tests/auto/selftests/expected_expectfail.xml new file mode 100644 index 0000000..849b16a --- /dev/null +++ b/tests/auto/selftests/expected_expectfail.xml @@ -0,0 +1,43 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_expectfail.xunitxml b/tests/auto/selftests/expected_expectfail.xunitxml new file mode 100644 index 0000000..429093c --- /dev/null +++ b/tests/auto/selftests/expected_expectfail.xunitxml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_failinit.lightxml b/tests/auto/selftests/expected_failinit.lightxml new file mode 100644 index 0000000..13ba15d --- /dev/null +++ b/tests/auto/selftests/expected_failinit.lightxml @@ -0,0 +1,12 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + diff --git a/tests/auto/selftests/expected_failinit.xml b/tests/auto/selftests/expected_failinit.xml new file mode 100644 index 0000000..0943586 --- /dev/null +++ b/tests/auto/selftests/expected_failinit.xml @@ -0,0 +1,15 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + diff --git a/tests/auto/selftests/expected_failinit.xunitxml b/tests/auto/selftests/expected_failinit.xunitxml new file mode 100644 index 0000000..40f9134 --- /dev/null +++ b/tests/auto/selftests/expected_failinit.xunitxml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_failinitdata.lightxml b/tests/auto/selftests/expected_failinitdata.lightxml new file mode 100644 index 0000000..9fac6f9 --- /dev/null +++ b/tests/auto/selftests/expected_failinitdata.lightxml @@ -0,0 +1,9 @@ + + 4.6.3 + 4.6.3 + + + + + + diff --git a/tests/auto/selftests/expected_failinitdata.xml b/tests/auto/selftests/expected_failinitdata.xml new file mode 100644 index 0000000..7ef3e0f --- /dev/null +++ b/tests/auto/selftests/expected_failinitdata.xml @@ -0,0 +1,12 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + diff --git a/tests/auto/selftests/expected_failinitdata.xunitxml b/tests/auto/selftests/expected_failinitdata.xunitxml new file mode 100644 index 0000000..e2c11b0 --- /dev/null +++ b/tests/auto/selftests/expected_failinitdata.xunitxml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_fetchbogus.lightxml b/tests/auto/selftests/expected_fetchbogus.lightxml new file mode 100644 index 0000000..edce196 --- /dev/null +++ b/tests/auto/selftests/expected_fetchbogus.lightxml @@ -0,0 +1,15 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_fetchbogus.xml b/tests/auto/selftests/expected_fetchbogus.xml new file mode 100644 index 0000000..9df9b6d --- /dev/null +++ b/tests/auto/selftests/expected_fetchbogus.xml @@ -0,0 +1,20 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_fetchbogus.xunitxml b/tests/auto/selftests/expected_fetchbogus.xunitxml new file mode 100644 index 0000000..864e8a0 --- /dev/null +++ b/tests/auto/selftests/expected_fetchbogus.xunitxml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_globaldata.lightxml b/tests/auto/selftests/expected_globaldata.lightxml new file mode 100644 index 0000000..47ef0e9 --- /dev/null +++ b/tests/auto/selftests/expected_globaldata.lightxml @@ -0,0 +1,30 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_globaldata.xml b/tests/auto/selftests/expected_globaldata.xml new file mode 100644 index 0000000..8cafbf8 --- /dev/null +++ b/tests/auto/selftests/expected_globaldata.xml @@ -0,0 +1,35 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_globaldata.xunitxml b/tests/auto/selftests/expected_globaldata.xunitxml new file mode 100644 index 0000000..f444676 --- /dev/null +++ b/tests/auto/selftests/expected_globaldata.xunitxml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_longstring.lightxml b/tests/auto/selftests/expected_longstring.lightxml new file mode 100644 index 0000000..df615a1 --- /dev/null +++ b/tests/auto/selftests/expected_longstring.lightxml @@ -0,0 +1,23 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_longstring.txt b/tests/auto/selftests/expected_longstring.txt index 5d94e23..c451daf 100644 --- a/tests/auto/selftests/expected_longstring.txt +++ b/tests/auto/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/rmcgover/depot/qt/master/tests/auto/selftests/longstring/tst_longstring.cpp(67)] + Loc: [/home/user/depot/qt/master/tests/auto/selftests/longstring/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/selftests/expected_longstring.xml b/tests/auto/selftests/expected_longstring.xml new file mode 100644 index 0000000..ca352fc --- /dev/null +++ b/tests/auto/selftests/expected_longstring.xml @@ -0,0 +1,26 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_longstring.xunitxml b/tests/auto/selftests/expected_longstring.xunitxml new file mode 100644 index 0000000..0d05f57 --- /dev/null +++ b/tests/auto/selftests/expected_longstring.xunitxml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_maxwarnings.lightxml b/tests/auto/selftests/expected_maxwarnings.lightxml new file mode 100644 index 0000000..fc4552d --- /dev/null +++ b/tests/auto/selftests/expected_maxwarnings.lightxml @@ -0,0 +1,6020 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_maxwarnings.xml b/tests/auto/selftests/expected_maxwarnings.xml new file mode 100644 index 0000000..934607b --- /dev/null +++ b/tests/auto/selftests/expected_maxwarnings.xml @@ -0,0 +1,6022 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_maxwarnings.xunitxml b/tests/auto/selftests/expected_maxwarnings.xunitxml new file mode 100644 index 0000000..1444130 --- /dev/null +++ b/tests/auto/selftests/expected_maxwarnings.xunitxml @@ -0,0 +1,4017 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_multiexec.lightxml b/tests/auto/selftests/expected_multiexec.lightxml new file mode 100644 index 0000000..092479c --- /dev/null +++ b/tests/auto/selftests/expected_multiexec.lightxml @@ -0,0 +1,13 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + diff --git a/tests/auto/selftests/expected_multiexec.xml b/tests/auto/selftests/expected_multiexec.xml new file mode 100644 index 0000000..2a88d32 --- /dev/null +++ b/tests/auto/selftests/expected_multiexec.xml @@ -0,0 +1,16 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_multiexec.xunitxml b/tests/auto/selftests/expected_multiexec.xunitxml new file mode 100644 index 0000000..8b7f3ba --- /dev/null +++ b/tests/auto/selftests/expected_multiexec.xunitxml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_singleskip.lightxml b/tests/auto/selftests/expected_singleskip.lightxml new file mode 100644 index 0000000..1d414e8 --- /dev/null +++ b/tests/auto/selftests/expected_singleskip.lightxml @@ -0,0 +1,15 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_singleskip.xml b/tests/auto/selftests/expected_singleskip.xml new file mode 100644 index 0000000..89119e3 --- /dev/null +++ b/tests/auto/selftests/expected_singleskip.xml @@ -0,0 +1,18 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_singleskip.xunitxml b/tests/auto/selftests/expected_singleskip.xunitxml new file mode 100644 index 0000000..0ac8be0 --- /dev/null +++ b/tests/auto/selftests/expected_singleskip.xunitxml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_skip.lightxml b/tests/auto/selftests/expected_skip.lightxml new file mode 100644 index 0000000..86a2a96 --- /dev/null +++ b/tests/auto/selftests/expected_skip.lightxml @@ -0,0 +1,30 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_skip.txt b/tests/auto/selftests/expected_skip.txt index c603913..32247e6 100644 --- a/tests/auto/selftests/expected_skip.txt +++ b/tests/auto/selftests/expected_skip.txt @@ -2,11 +2,11 @@ Config: Using QTest library 4.6.3, Qt 4.6.3 PASS : tst_Skip::initTestCase() SKIP : tst_Skip::test() skipping all - Loc: [/home/rmcgover/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(68)] + Loc: [/home/user/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(68)] SKIP : tst_Skip::emptytest() skipping all - Loc: [/home/rmcgover/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(78)] + Loc: [/home/user/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(78)] SKIP : tst_Skip::singleSkip(local 1) skipping one - Loc: [/home/rmcgover/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(97)] + Loc: [/home/user/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(97)] QDEBUG : tst_Skip::singleSkip(local 2) this line should only be reached once (true) PASS : tst_Skip::singleSkip() PASS : tst_Skip::cleanupTestCase() diff --git a/tests/auto/selftests/expected_skip.xml b/tests/auto/selftests/expected_skip.xml new file mode 100644 index 0000000..5c61eb8 --- /dev/null +++ b/tests/auto/selftests/expected_skip.xml @@ -0,0 +1,34 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_skip.xunitxml b/tests/auto/selftests/expected_skip.xunitxml new file mode 100644 index 0000000..4749906 --- /dev/null +++ b/tests/auto/selftests/expected_skip.xunitxml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_skipglobal.lightxml b/tests/auto/selftests/expected_skipglobal.lightxml new file mode 100644 index 0000000..61c778f --- /dev/null +++ b/tests/auto/selftests/expected_skipglobal.lightxml @@ -0,0 +1,9 @@ + + 4.6.3 + 4.6.3 + + + + + + diff --git a/tests/auto/selftests/expected_skipglobal.xml b/tests/auto/selftests/expected_skipglobal.xml new file mode 100644 index 0000000..54a5671 --- /dev/null +++ b/tests/auto/selftests/expected_skipglobal.xml @@ -0,0 +1,12 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + diff --git a/tests/auto/selftests/expected_skipglobal.xunitxml b/tests/auto/selftests/expected_skipglobal.xunitxml new file mode 100644 index 0000000..cf6152f --- /dev/null +++ b/tests/auto/selftests/expected_skipglobal.xunitxml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_skipinit.lightxml b/tests/auto/selftests/expected_skipinit.lightxml new file mode 100644 index 0000000..0fbcdfb --- /dev/null +++ b/tests/auto/selftests/expected_skipinit.lightxml @@ -0,0 +1,12 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + diff --git a/tests/auto/selftests/expected_skipinit.xml b/tests/auto/selftests/expected_skipinit.xml new file mode 100644 index 0000000..e8f2772 --- /dev/null +++ b/tests/auto/selftests/expected_skipinit.xml @@ -0,0 +1,15 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + diff --git a/tests/auto/selftests/expected_skipinit.xunitxml b/tests/auto/selftests/expected_skipinit.xunitxml new file mode 100644 index 0000000..848b539 --- /dev/null +++ b/tests/auto/selftests/expected_skipinit.xunitxml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_skipinitdata.lightxml b/tests/auto/selftests/expected_skipinitdata.lightxml new file mode 100644 index 0000000..2caf2cc --- /dev/null +++ b/tests/auto/selftests/expected_skipinitdata.lightxml @@ -0,0 +1,9 @@ + + 4.6.3 + 4.6.3 + + + + + + diff --git a/tests/auto/selftests/expected_skipinitdata.xml b/tests/auto/selftests/expected_skipinitdata.xml new file mode 100644 index 0000000..ced753e --- /dev/null +++ b/tests/auto/selftests/expected_skipinitdata.xml @@ -0,0 +1,12 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + diff --git a/tests/auto/selftests/expected_skipinitdata.xunitxml b/tests/auto/selftests/expected_skipinitdata.xunitxml new file mode 100644 index 0000000..b761deb --- /dev/null +++ b/tests/auto/selftests/expected_skipinitdata.xunitxml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_sleep.lightxml b/tests/auto/selftests/expected_sleep.lightxml new file mode 100644 index 0000000..b235385 --- /dev/null +++ b/tests/auto/selftests/expected_sleep.lightxml @@ -0,0 +1,13 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + diff --git a/tests/auto/selftests/expected_sleep.xml b/tests/auto/selftests/expected_sleep.xml new file mode 100644 index 0000000..2733c75 --- /dev/null +++ b/tests/auto/selftests/expected_sleep.xml @@ -0,0 +1,16 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_sleep.xunitxml b/tests/auto/selftests/expected_sleep.xunitxml new file mode 100644 index 0000000..ec2dac7 --- /dev/null +++ b/tests/auto/selftests/expected_sleep.xunitxml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_strcmp.lightxml b/tests/auto/selftests/expected_strcmp.lightxml new file mode 100644 index 0000000..96e5e2d --- /dev/null +++ b/tests/auto/selftests/expected_strcmp.lightxml @@ -0,0 +1,51 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_strcmp.xml b/tests/auto/selftests/expected_strcmp.xml new file mode 100644 index 0000000..953286f --- /dev/null +++ b/tests/auto/selftests/expected_strcmp.xml @@ -0,0 +1,60 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_strcmp.xunitxml b/tests/auto/selftests/expected_strcmp.xunitxml new file mode 100644 index 0000000..6ce0c35 --- /dev/null +++ b/tests/auto/selftests/expected_strcmp.xunitxml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_subtest.lightxml b/tests/auto/selftests/expected_subtest.lightxml new file mode 100644 index 0000000..d9d311c --- /dev/null +++ b/tests/auto/selftests/expected_subtest.lightxml @@ -0,0 +1,49 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_subtest.xml b/tests/auto/selftests/expected_subtest.xml new file mode 100644 index 0000000..8ca16a4 --- /dev/null +++ b/tests/auto/selftests/expected_subtest.xml @@ -0,0 +1,67 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_subtest.xunitxml b/tests/auto/selftests/expected_subtest.xunitxml new file mode 100644 index 0000000..7d958ff --- /dev/null +++ b/tests/auto/selftests/expected_subtest.xunitxml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_waitwithoutgui.lightxml b/tests/auto/selftests/expected_waitwithoutgui.lightxml new file mode 100644 index 0000000..e69de29 diff --git a/tests/auto/selftests/expected_waitwithoutgui.xml b/tests/auto/selftests/expected_waitwithoutgui.xml new file mode 100644 index 0000000..e69de29 diff --git a/tests/auto/selftests/expected_waitwithoutgui.xunitxml b/tests/auto/selftests/expected_waitwithoutgui.xunitxml new file mode 100644 index 0000000..e69de29 diff --git a/tests/auto/selftests/expected_warnings.lightxml b/tests/auto/selftests/expected_warnings.lightxml new file mode 100644 index 0000000..9c8be34 --- /dev/null +++ b/tests/auto/selftests/expected_warnings.lightxml @@ -0,0 +1,43 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_warnings.xml b/tests/auto/selftests/expected_warnings.xml new file mode 100644 index 0000000..8d22b8c --- /dev/null +++ b/tests/auto/selftests/expected_warnings.xml @@ -0,0 +1,45 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_warnings.xunitxml b/tests/auto/selftests/expected_warnings.xunitxml new file mode 100644 index 0000000..9c377e5 --- /dev/null +++ b/tests/auto/selftests/expected_warnings.xunitxml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_xunit.lightxml b/tests/auto/selftests/expected_xunit.lightxml new file mode 100644 index 0000000..d7573f3 --- /dev/null +++ b/tests/auto/selftests/expected_xunit.lightxml @@ -0,0 +1,52 @@ + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_xunit.txt b/tests/auto/selftests/expected_xunit.txt index 3c014e3..02cfa6f 100644 --- a/tests/auto/selftests/expected_xunit.txt +++ b/tests/auto/selftests/expected_xunit.txt @@ -1,40 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - + Expected (3): 3 + Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(74)] +SKIP : tst_Xunit::testFunc3() skipping this function! + Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(79)] +FAIL! : tst_Xunit::testFunc4() a forced failure! + Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(84)] +XFAIL : tst_Xunit::testFunc5() this failure is expected + Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(98)] +PASS : tst_Xunit::testFunc5() +XFAIL : tst_Xunit::testFunc6() this failure is also expected + Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(104)] +PASS : tst_Xunit::testFunc6() +XPASS : tst_Xunit::testFunc7() 'true' returned FALSE. () + Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/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/selftests/expected_xunit.xml b/tests/auto/selftests/expected_xunit.xml new file mode 100644 index 0000000..39c132b --- /dev/null +++ b/tests/auto/selftests/expected_xunit.xml @@ -0,0 +1,56 @@ + + + + 4.6.3 + 4.6.3 + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_xunit.xunitxml b/tests/auto/selftests/expected_xunit.xunitxml new file mode 100644 index 0000000..8d5403c --- /dev/null +++ b/tests/auto/selftests/expected_xunit.xunitxml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + diff --git a/tests/auto/selftests/selftests.qrc b/tests/auto/selftests/selftests.qrc index 4b75405..f82722b 100644 --- a/tests/auto/selftests/selftests.qrc +++ b/tests/auto/selftests/selftests.qrc @@ -1,41 +1,138 @@ - expected_subtest.txt - expected_warnings.txt - expected_maxwarnings.txt - expected_cmptest.txt expected_alive.txt - expected_globaldata.txt - expected_skipglobal.txt - expected_skip.txt - expected_expectfail.txt - expected_strcmp.txt - expected_sleep.txt - expected_fetchbogus.txt + expected_assert.lightxml + expected_assert.txt + expected_assert.xml + expected_assert.xunitxml + expected_badxml.lightxml + expected_badxml.txt + expected_badxml.xml + expected_badxml.xunitxml + expected_benchlibcallgrind.lightxml + expected_benchlibcallgrind.txt + expected_benchlibcallgrind.xml + expected_benchlibcallgrind.xunitxml + expected_benchlibeventcounter.lightxml + expected_benchlibeventcounter.txt + expected_benchlibeventcounter.xml + expected_benchlibeventcounter.xunitxml + expected_benchliboptions.lightxml + expected_benchliboptions.txt + expected_benchliboptions.xml + expected_benchliboptions.xunitxml + expected_benchlibtickcounter.lightxml + expected_benchlibtickcounter.txt + expected_benchlibtickcounter.xml + expected_benchlibtickcounter.xunitxml + expected_benchlibwalltime.lightxml + expected_benchlibwalltime.txt + expected_benchlibwalltime.xml + expected_benchlibwalltime.xunitxml + expected_cmptest.lightxml + expected_cmptest.txt + expected_cmptest.xml + expected_cmptest.xunitxml + expected_commandlinedata.lightxml + expected_commandlinedata.txt + expected_commandlinedata.xml + expected_commandlinedata.xunitxml + expected_crashes.lightxml + expected_crashes.xml + expected_crashes.xunitxml expected_crashes_1.txt expected_crashes_2.txt expected_crashes_3.txt - expected_multiexec.txt - expected_failinit.txt - expected_failinitdata.txt - expected_skipinitdata.txt - expected_skipinit.txt + expected_datatable.lightxml + expected_datatable.txt + expected_datatable.xml + expected_datatable.xunitxml + expected_datetime.lightxml expected_datetime.txt - expected_singleskip.txt - expected_assert.txt - expected_fatal.txt - expected_waitwithoutgui.txt + expected_datetime.xml + expected_datetime.xunitxml expected_differentexec.txt + expected_exceptionthrow.lightxml expected_exceptionthrow.txt + expected_exceptionthrow.xml + expected_exceptionthrow.xunitxml + expected_expectfail.lightxml + expected_expectfail.txt + expected_expectfail.xml + expected_expectfail.xunitxml + expected_failinit.lightxml + expected_failinit.txt + expected_failinit.xml + expected_failinit.xunitxml + expected_failinitdata.lightxml + expected_failinitdata.txt + expected_failinitdata.xml + expected_failinitdata.xunitxml + expected_fatal.txt + expected_fetchbogus.lightxml + expected_fetchbogus.txt + expected_fetchbogus.xml + expected_fetchbogus.xunitxml + expected_globaldata.lightxml + expected_globaldata.txt + expected_globaldata.xml + expected_globaldata.xunitxml + expected_longstring.lightxml + expected_longstring.txt + expected_longstring.xml + expected_longstring.xunitxml + expected_maxwarnings.lightxml + expected_maxwarnings.txt + expected_maxwarnings.xml + expected_maxwarnings.xunitxml + expected_multiexec.lightxml + expected_multiexec.txt + expected_multiexec.xml + expected_multiexec.xunitxml expected_qexecstringlist.txt - expected_datatable.txt - expected_commandlinedata.txt - expected_benchlibcallgrind.txt - expected_benchlibwalltime.txt - expected_benchlibeventcounter.txt - expected_benchliboptions.txt - expected_benchlibtickcounter.txt + expected_singleskip.lightxml + expected_singleskip.txt + expected_singleskip.xml + expected_singleskip.xunitxml + expected_skip.lightxml + expected_skip.txt + expected_skip.xml + expected_skip.xunitxml + expected_skipglobal.lightxml + expected_skipglobal.txt + expected_skipglobal.xml + expected_skipglobal.xunitxml + expected_skipinit.lightxml + expected_skipinit.txt + expected_skipinit.xml + expected_skipinit.xunitxml + expected_skipinitdata.lightxml + expected_skipinitdata.txt + expected_skipinitdata.xml + expected_skipinitdata.xunitxml + expected_sleep.lightxml + expected_sleep.txt + expected_sleep.xml + expected_sleep.xunitxml + expected_strcmp.lightxml + expected_strcmp.txt + expected_strcmp.xml + expected_strcmp.xunitxml + expected_subtest.lightxml + expected_subtest.txt + expected_subtest.xml + expected_subtest.xunitxml + expected_waitwithoutgui.lightxml + expected_waitwithoutgui.txt + expected_waitwithoutgui.xml + expected_waitwithoutgui.xunitxml + expected_warnings.lightxml + expected_warnings.txt + expected_warnings.xml + expected_warnings.xunitxml + expected_xunit.lightxml expected_xunit.txt - expected_longstring.txt + expected_xunit.xml + expected_xunit.xunitxml diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp index 0b9cee0..f34e2fb 100644 --- a/tests/auto/selftests/tst_selftests.cpp +++ b/tests/auto/selftests/tst_selftests.cpp @@ -49,18 +49,12 @@ class tst_Selftests: public QObject { Q_OBJECT private slots: - void initTestCase(); void runSubTest_data(); void runSubTest(); - void checkXML() const; - void checkXML_data(); - void checkXunitxml() const; - void checkXunitxml_data(); + void cleanupTestCase(); private: - QStringList m_checkXMLBlacklist; - QStringList m_checkXunitBlacklist; - void doRunSubTest(QString &subdir, QStringList &arguments ); + void doRunSubTest(QString const& subdir, QString const& logger, QStringList const& arguments ); }; struct BenchmarkResult @@ -121,89 +115,221 @@ QT_END_NAMESPACE static QList splitLines(QByteArray ba) { ba.replace('\r', ""); - return ba.split('\n'); + QList out = ba.split('\n'); + + // Replace any ` file="..."' in XML with a generic location. + static const char marker[] = " file=\""; + for (int i = 0; i < out.size(); ++i) { + QByteArray& line = out[i]; + int index = line.indexOf(marker); + if (index == -1) { + continue; + } + int end = line.indexOf('"', index + sizeof(marker)); + if (end == -1) { + continue; + } + line.replace(index, end-index, " file=\"__FILE__\""); + } + + return out; } -static QList expectedResult(const QString &subdir) +static QList expectedResult(const QString &subdir, const QString &logger) { - QFile file(":/expected_" + subdir + ".txt"); + QString suffix = logger; + if (suffix.isEmpty()) { + suffix = "txt"; + } + QFile file(":/expected_" + subdir + "." + suffix); if (!file.open(QIODevice::ReadOnly)) return QList(); return splitLines(file.readAll()); } +struct Logger +{ + Logger(QString const&, QString const&, QStringList const&); + + QString name; + QString testdata_suffix; + QStringList arguments; +}; + +Logger::Logger(QString const& _name, QString const& _testdata_suffix, QStringList const& _arguments) + : name(_name) + , testdata_suffix(_testdata_suffix) + , arguments(_arguments) +{ +} + +static QList allLoggers() +{ + return QList() + << Logger("plain", "txt", QStringList()) + << Logger("xml", "xml", QStringList() << "-xml") + << Logger("xml flush", "xml", QStringList() << "-xml" << "-flush") + << Logger("xunitxml", "xunitxml", QStringList() << "-xunitxml") + << Logger("lightxml", "lightxml", QStringList() << "-lightxml") + ; +} + void tst_Selftests::runSubTest_data() { QTest::addColumn("subdir"); + QTest::addColumn("logger"); QTest::addColumn("arguments"); - QTest::newRow("subtest") << "subtest" << QStringList(); - QTest::newRow("warnings") << "warnings" << QStringList(); - QTest::newRow("maxwarnings") << "maxwarnings" << QStringList(); - QTest::newRow("cmptest") << "cmptest" << QStringList(); -// QTest::newRow("alive") << "alive" << QStringList(); // timer dependent - QTest::newRow("globaldata") << "globaldata" << QStringList(); - QTest::newRow("skipglobal") << "skipglobal" << QStringList(); - QTest::newRow("skip") << "skip" << QStringList(); - QTest::newRow("strcmp") << "strcmp" << QStringList(); - QTest::newRow("expectfail") << "expectfail" << QStringList(); - QTest::newRow("sleep") << "sleep" << QStringList(); - QTest::newRow("fetchbogus") << "fetchbogus" << QStringList(); - QTest::newRow("crashes") << "crashes" << QStringList(); - QTest::newRow("multiexec") << "multiexec" << QStringList(); - QTest::newRow("failinit") << "failinit" << QStringList(); - QTest::newRow("failinitdata") << "failinitdata" << QStringList(); - QTest::newRow("skipinit") << "skipinit" << QStringList(); - QTest::newRow("skipinitdata") << "skipinitdata" << QStringList(); - QTest::newRow("datetime") << "datetime" << QStringList(); - QTest::newRow("singleskip") << "singleskip" << QStringList(); - - //on windows assert does nothing in release mode and blocks execution with a popup window in debug mode + QStringList tests = QStringList() + << "subtest" + << "warnings" + << "maxwarnings" + << "cmptest" +// << "alive" // timer dependent + << "globaldata" + << "skipglobal" + << "skip" + << "strcmp" + << "expectfail" + << "sleep" + << "fetchbogus" + << "crashes" + << "multiexec" + << "failinit" + << "failinitdata" + << "skipinit" + << "skipinitdata" + << "datetime" + << "singleskip" + + //on windows assert does nothing in release mode and blocks execution with a popup window in debug mode #if !defined(Q_OS_WIN) - QTest::newRow("assert") << "assert" << QStringList(); + << "assert" #endif - QTest::newRow("waitwithoutgui") << "waitwithoutgui" << QStringList(); - QTest::newRow("differentexec") << "differentexec" << QStringList(); + << "waitwithoutgui" + << "differentexec" #ifndef QT_NO_EXCEPTIONS - // The machine that run the intel autotests will popup a dialog - // with a warning that an uncaught exception was thrown. - // This will time out and falsely fail, therefore we disable the test for that platform. + // The machine that run the intel autotests will popup a dialog + // with a warning that an uncaught exception was thrown. + // This will time out and falsely fail, therefore we disable the test for that platform. # if !defined(Q_CC_INTEL) || !defined(Q_OS_WIN) - QTest::newRow("exceptionthrow") << "exceptionthrow" << QStringList(); + << "exceptionthrow" # endif #endif - QTest::newRow("qexecstringlist") << "qexecstringlist" << QStringList(); - QTest::newRow("datatable") << "datatable" << QStringList(); - QTest::newRow("commandlinedata") << "commandlinedata" << QString("fiveTablePasses fiveTablePasses:fiveTablePasses_data1 -v2").split(' '); + << "qexecstringlist" + << "datatable" + << "commandlinedata" #if defined(__GNUC__) && defined(__i386) && defined(Q_OS_LINUX) - QTest::newRow("benchlibcallgrind") << "benchlibcallgrind" << QStringList("-callgrind"); + << "benchlibcallgrind" #endif - QTest::newRow("benchlibeventcounter") << "benchlibeventcounter" << QStringList("-eventcounter"); - QTest::newRow("benchliboptions") << "benchliboptions" << QStringList("-eventcounter"); + << "benchlibeventcounter" + << "benchliboptions" - //### These tests are affected by timing and whether the CPU tick counter is - //### monotonically increasing. They won't work on some machines so leave them off by default. - //### Feel free to uncomment for your own testing. + //### These tests are affected by timing and whether the CPU tick counter is + //### monotonically increasing. They won't work on some machines so leave them off by default. + //### Feel free to uncomment for your own testing. #if 0 - QTest::newRow("benchlibwalltime") << "benchlibwalltime" << QStringList(); - QTest::newRow("benchlibtickcounter") << "benchlibtickcounter" << QStringList("-tickcounter"); + << "benchlibwalltime" + << "benchlibtickcounter" #endif - QTest::newRow("xunit") << "xunit" << QStringList("-xunitxml"); - QTest::newRow("longstring") << "longstring" << QStringList(); + << "xunit" + << "longstring" + << "badxml" + ; + + foreach (Logger const& logger, allLoggers()) { + QString rowSuffix; + if (logger.name != "plain") { + rowSuffix = QString(" %1").arg(logger.name); + } + + foreach (QString const& subtest, tests) { + QStringList arguments = logger.arguments; + if (subtest == "commandlinedata") { + arguments << QString("fiveTablePasses fiveTablePasses:fiveTablePasses_data1 -v2").split(' '); + } + else if (subtest == "benchlibcallgrind") { + arguments << "-callgrind"; + } + else if (subtest == "benchlibeventcounter") { + arguments << "-eventcounter"; + } + else if (subtest == "benchliboptions") { + arguments << "-eventcounter"; + } + else if (subtest == "benchlibtickcounter") { + arguments << "-tickcounter"; + } + else if (subtest == "badxml") { + arguments << "-eventcounter"; + } + + // These tests don't work right with loggers other than plain, usually because + // they internally supply arguments to themselves. + if (logger.name != "plain") { + if (subtest == "differentexec") { + continue; + } + if (subtest == "qexecstringlist") { + continue; + } + if (subtest == "benchliboptions") { + continue; + } + if (subtest == "waitwithoutgui") { + continue; + } + // `crashes' will not output valid XML on platforms without a crash handler + if (subtest == "crashes") { + continue; + } + // this test prints out some floats in the testlog and the formatting is + // platform-specific and hard to predict. + if (subtest == "subtest") { + continue; + } + } + QTest::newRow(qPrintable(QString("%1%2").arg(subtest).arg(rowSuffix))) + << subtest + << logger.testdata_suffix + << arguments + ; + } + } } -void tst_Selftests::doRunSubTest(QString &subdir, QStringList &arguments ) +void tst_Selftests::doRunSubTest(QString const& subdir, QString const& logger, QStringList const& arguments ) { + // For the plain text logger, we'll read straight from standard output. + // For all other loggers (XML), we'll tell testlib to redirect to a file. + // The reason is that tests are allowed to print to standard output, and + // that means the test log is no longer guaranteed to be valid XML. + QStringList extraArguments; + QString logfile; + if (logger != "txt") { + logfile = "test_output"; + extraArguments << "-o" << logfile; + } + QProcess proc; proc.setEnvironment(QStringList("")); - proc.start(subdir + "/" + subdir, arguments); + proc.start(subdir + "/" + subdir, QStringList() << arguments << extraArguments); QVERIFY2(proc.waitForFinished(), qPrintable(proc.errorString())); - const QByteArray out(proc.readAllStandardOutput()); + QByteArray out; + if (logfile.isEmpty()) { + out = proc.readAllStandardOutput(); + } + else { + QFile file(logfile); + if (file.open(QIODevice::ReadOnly)) + out = file.readAll(); + } + const QByteArray err(proc.readAllStandardError()); /* Some platforms decides to output a message for uncaught exceptions. For instance, @@ -215,13 +341,13 @@ void tst_Selftests::doRunSubTest(QString &subdir, QStringList &arguments ) QVERIFY2(err.isEmpty(), err.constData()); QList res = splitLines(out); - QList exp = expectedResult(subdir); + QList exp = expectedResult(subdir, logger); if (exp.count() == 0) { QList > expArr; int i = 1; do { - exp = expectedResult(subdir + QString("_%1").arg(i++)); + exp = expectedResult(subdir + QString("_%1").arg(i++), logger); if (exp.count()) expArr += exp; } while(exp.count()); @@ -236,6 +362,28 @@ void tst_Selftests::doRunSubTest(QString &subdir, QStringList &arguments ) QCOMPARE(res.count(), exp.count()); } + if (logger == "xunitxml" || logger == "xml" || logger == "lightxml") { + QByteArray xml(out); + // lightxml intentionally skips the root element, which technically makes it + // not valid XML. + // We'll add that ourselves for the purpose of validation. + if (logger == "lightxml") { + xml.prepend(""); + xml.append(""); + } + + QXmlStreamReader reader(xml); + + while(!reader.atEnd()) + reader.readNext(); + + QVERIFY2(!reader.error(), qPrintable(QString("line %1, col %2: %3") + .arg(reader.lineNumber()) + .arg(reader.columnNumber()) + .arg(reader.errorString()) + )); + } + bool benchmark = false; for (int i = 0; i < res.count(); ++i) { QByteArray line = res.at(i); @@ -250,8 +398,13 @@ void tst_Selftests::doRunSubTest(QString &subdir, QStringList &arguments ) const QString output(QString::fromLatin1(line)); const QString expected(QString::fromLatin1(exp.at(i)).replace("", QT_VERSION_STR)); - if (line.contains("ASSERT") && output != expected) - QEXPECT_FAIL("assert", "QTestLib prints out the absolute path.", Continue); + if (line.contains("ASSERT") && output != expected) { + QEXPECT_FAIL("assert", "QTestLib prints out the absolute path.", Continue); + QEXPECT_FAIL("assert xml", "QTestLib prints out the absolute path.", Continue); + QEXPECT_FAIL("assert xml flush","QTestLib prints out the absolute path.", Continue); + QEXPECT_FAIL("assert lightxml", "QTestLib prints out the absolute path.", Continue); + QEXPECT_FAIL("assert xunitxml", "QTestLib prints out the absolute path.", Continue); + } /* On some platforms we compile without RTTI, and as a result we never throw an exception. */ if(expected.startsWith(QLatin1String("FAIL! : tst_Exception::throwException() Caught unhandled exce")) && expected != output) @@ -292,131 +445,10 @@ void tst_Selftests::doRunSubTest(QString &subdir, QStringList &arguments ) void tst_Selftests::runSubTest() { QFETCH(QString, subdir); + QFETCH(QString, logger); QFETCH(QStringList, arguments); - doRunSubTest(subdir, arguments); -} - -void tst_Selftests::initTestCase() -{ -#if !defined(Q_OS_UNIX) || defined(Q_WS_MAC) - m_checkXMLBlacklist.append("crashes"); // This test crashes (XML valid on Unix only) -#endif - m_checkXMLBlacklist.append("waitwithoutgui"); // This test is not a QTestLib test. - - /* Output from several tests is broken with the XML output method, - * and it's quite heavy in the design. See task 155001. */ - m_checkXMLBlacklist.append("multiexec"); - m_checkXMLBlacklist.append("differentexec"); - m_checkXMLBlacklist.append("qexecstringlist"); - m_checkXMLBlacklist.append("benchliboptions"); - - /* These tests use printf and therefore corrupt the testlog */ - m_checkXMLBlacklist.append("subtest"); - m_checkXMLBlacklist.append("globaldata"); - m_checkXMLBlacklist.append("warnings"); - - m_checkXunitBlacklist = m_checkXMLBlacklist; -} - -void tst_Selftests::checkXML() const -{ - QFETCH(QString, subdir); - QFETCH(QStringList, arguments); - - if(m_checkXMLBlacklist.contains(subdir)) - return; - - QStringList args; - /* Test both old (-flush) and new XML logger implementation */ - for (int i = 0; i < 2; ++i) { - bool flush = i; - args = arguments; - args.prepend("-xml"); - if (flush) args.prepend("-flush"); - - QProcess proc; - proc.setEnvironment(QStringList("")); - proc.start(subdir + "/" + subdir, args); - QVERIFY(proc.waitForFinished()); - - QByteArray out(proc.readAllStandardOutput()); - QByteArray err(proc.readAllStandardError()); - - /* Some platforms decides to output a message for uncaught exceptions. For instance, - * this is what windows platforms says: - * "This application has requested the Runtime to terminate it in an unusual way. - * Please contact the application's support team for more information." */ - if(subdir != QLatin1String("exceptionthrow") && subdir != QLatin1String("fetchbogus")) - QVERIFY2(err.isEmpty(), err.constData()); - - QXmlStreamReader reader(out); - - while(!reader.atEnd()) - reader.readNext(); - - QVERIFY2(!reader.error(), qPrintable(QString("(flush %0) line %1, col %2: %3") - .arg(flush) - .arg(reader.lineNumber()) - .arg(reader.columnNumber()) - .arg(reader.errorString()) - )); - } -} - -void tst_Selftests::checkXunitxml() const -{ - QFETCH(QString, subdir); - QFETCH(QStringList, arguments); - - if(m_checkXunitBlacklist.contains(subdir)) - return; - - arguments.prepend("-xunitxml"); - arguments.prepend("-flush"); - - QProcess proc; - proc.setEnvironment(QStringList("")); - proc.start(subdir + "/" + subdir, arguments); - QVERIFY(proc.waitForFinished()); - - QByteArray out(proc.readAllStandardOutput()); - QByteArray err(proc.readAllStandardError()); - -// qDebug()< Date: Fri, 16 Apr 2010 13:54:48 +1000 Subject: Fixed failure of tst_selftests::runSubTest(subtest xml) --- src/testlib/qtestxmlstreamer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/testlib/qtestxmlstreamer.cpp b/src/testlib/qtestxmlstreamer.cpp index b9946e5..2ae8ad8 100644 --- a/src/testlib/qtestxmlstreamer.cpp +++ b/src/testlib/qtestxmlstreamer.cpp @@ -172,7 +172,7 @@ void QTestXmlStreamer::formatBeforeAttributes(const QTestElement *element, QTest element->attributeValue(QTest::AI_Line)); if( !element->childElements() ) { - QTest::qt_asprintf(formatted, "\n", + QTest::qt_asprintf(formatted, "\n", element->attributeValue(QTest::AI_Result), buf.constData()); } else { formatted->data()[0] = '\0'; -- cgit v0.12 From d5124956d635be68d9891fd720806534f129ce76 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 16 Apr 2010 13:58:57 +1000 Subject: Reverted "qwarn" -> "qwarning" attribute change in XML test logs. XML test logger message type changed from "qwarn" to "qwarning" for warnings, apparently accidentally. --- src/testlib/qtestlogger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/testlib/qtestlogger.cpp b/src/testlib/qtestlogger.cpp index c0bc26c..fa76b9e 100644 --- a/src/testlib/qtestlogger.cpp +++ b/src/testlib/qtestlogger.cpp @@ -297,7 +297,7 @@ void QTestLogger::addMessage(MessageTypes type, const char *message, const char break; case QAbstractTestLogger::QWarning: ++qwarnCounter; - typeBuf = "qwarning"; + typeBuf = "qwarn"; break; case QAbstractTestLogger::QFatal: ++qfatalCounter; -- cgit v0.12 From 47fc8188c76cf4f2d2cec7155c8293c634f6c653 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 16 Apr 2010 14:39:35 +1000 Subject: Fixed "pass" incident missing from test xml in some cases Task-number: QTBUG-6278 --- src/testlib/qtestxmlstreamer.cpp | 48 ++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/src/testlib/qtestxmlstreamer.cpp b/src/testlib/qtestxmlstreamer.cpp index 2ae8ad8..a44ea50 100644 --- a/src/testlib/qtestxmlstreamer.cpp +++ b/src/testlib/qtestxmlstreamer.cpp @@ -149,7 +149,29 @@ void QTestXmlStreamer::formatEnd(const QTestElement *element, QTestCharBuffer *f return; if (element->elementType() == QTest::LET_TestCase) { - QTest::qt_asprintf(formatted, "\n"); + bool failed = false; + for (QTestElement* child = element->childElements(); child; child = child->nextElement()) { + if ( child->elementType() == QTest::LET_Failure + && child->attribute(QTest::AI_Result) + && ( !strcmp(child->attributeValue(QTest::AI_Result), "fail") + || !strcmp(child->attributeValue(QTest::AI_Result), "xpass")) + ) + { + failed = true; + break; + } + } + + // For passing functions, no Incident has been output yet. + // For failing functions, we already output one. + // Please note: we are outputting "pass" even if there was an xfail etc. + // This is by design (arguably bad design, but dangerous to change now!) + if (element->attribute(QTest::AI_Result) && !failed) { + QTest::qt_asprintf(formatted, "\n\n"); + } + else { + QTest::qt_asprintf(formatted, "\n"); + } } else { formatted->data()[0] = '\0'; } @@ -157,29 +179,11 @@ void QTestXmlStreamer::formatEnd(const QTestElement *element, QTestCharBuffer *f void QTestXmlStreamer::formatBeforeAttributes(const QTestElement *element, QTestCharBuffer *formatted) const { - if(!element || !formatted) + Q_UNUSED(element); + if (!formatted) return; - if (element->elementType() == QTest::LET_TestCase && element->attribute(QTest::AI_Result)){ - QTestCharBuffer buf; - QTestCharBuffer quotedFile; - QXmlTestLogger::xmlQuote("edFile, element->attributeValue(QTest::AI_File)); - - QTest::qt_asprintf(&buf, "%s=\"%s\" %s=\"%s\"", - element->attributeName(QTest::AI_File), - quotedFile.constData(), - element->attributeName(QTest::AI_Line), - element->attributeValue(QTest::AI_Line)); - - if( !element->childElements() ) { - QTest::qt_asprintf(formatted, "\n", - element->attributeValue(QTest::AI_Result), buf.constData()); - } else { - formatted->data()[0] = '\0'; - } - } else { - formatted->data()[0] = '\0'; - } + formatted->data()[0] = '\0'; } void QTestXmlStreamer::output(QTestElement *element) const -- cgit v0.12 From cf2996cceb1ee07d8969867981c8caeabf2d35c3 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 16 Apr 2010 15:29:08 +1000 Subject: Fixed DataTag missing from testlib XML in some cases. Task-number: QTBUG-6320 --- src/testlib/qtestlogger.cpp | 27 +++++++++++++++++++++++---- src/testlib/qtestlogger_p.h | 1 + src/testlib/qtestxmlstreamer.cpp | 10 +++++++++- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/testlib/qtestlogger.cpp b/src/testlib/qtestlogger.cpp index fa76b9e..4e4bc3c 100644 --- a/src/testlib/qtestlogger.cpp +++ b/src/testlib/qtestlogger.cpp @@ -211,10 +211,7 @@ void QTestLogger::addIncident(IncidentTypes type, const char *description, QTest::qt_snprintf(buf, sizeof(buf), "%i", line); failureElement->addAttribute(QTest::AI_Line, buf); failureElement->addAttribute(QTest::AI_Description, description); - const char* tag = QTestResult::currentDataTag(); - if (tag) { - failureElement->addAttribute(QTest::AI_Tag, tag); - } + addTag(failureElement); currentLogElement->addLogElement(failureElement); } @@ -277,6 +274,27 @@ void QTestLogger::addBenchmarkResult(const QBenchmarkResult &result) currentLogElement->addLogElement(benchmarkElement); } +void QTestLogger::addTag(QTestElement* element) +{ + const char *tag = QTestResult::currentDataTag(); + const char *gtag = QTestResult::currentGlobalDataTag(); + const char *filler = (tag && gtag) ? ":" : ""; + if ((!tag || !tag[0]) && (!gtag || !gtag[0])) { + return; + } + + if (!tag) { + tag = ""; + } + if (!gtag) { + gtag = ""; + } + + QTestCharBuffer buf; + QTest::qt_asprintf(&buf, "%s%s%s", gtag, filler, tag); + element->addAttribute(QTest::AI_Tag, buf.constData()); +} + void QTestLogger::addMessage(MessageTypes type, const char *message, const char *file, int line) { QTestElement *errorElement = new QTestElement(QTest::LET_Error); @@ -318,6 +336,7 @@ void QTestLogger::addMessage(MessageTypes type, const char *message, const char errorElement->addAttribute(QTest::AI_Type, typeBuf); errorElement->addAttribute(QTest::AI_Description, message); + addTag(errorElement); if(file) errorElement->addAttribute(QTest::AI_File, file); diff --git a/src/testlib/qtestlogger_p.h b/src/testlib/qtestlogger_p.h index 31f7d55..bb7a358 100644 --- a/src/testlib/qtestlogger_p.h +++ b/src/testlib/qtestlogger_p.h @@ -83,6 +83,7 @@ class QTestLogger : public QAbstractTestLogger void addIncident(IncidentTypes type, const char *description, const char *file = 0, int line = 0); void addBenchmarkResult(const QBenchmarkResult &result); + void addTag(QTestElement* element); void addMessage(MessageTypes type, const char *message, const char *file = 0, int line = 0); diff --git a/src/testlib/qtestxmlstreamer.cpp b/src/testlib/qtestxmlstreamer.cpp index a44ea50..f63c221 100644 --- a/src/testlib/qtestxmlstreamer.cpp +++ b/src/testlib/qtestxmlstreamer.cpp @@ -111,12 +111,20 @@ void QTestXmlStreamer::formatStart(const QTestElement *element, QTestCharBuffer QXmlTestLogger::xmlQuote("edFile, element->attributeValue(QTest::AI_File)); QXmlTestLogger::xmlCdata(&cdataDesc, element->attributeValue(QTest::AI_Description)); - QTest::qt_asprintf(formatted, "\n \n\n", + QTestCharBuffer tagbuf; + if (element->attribute(QTest::AI_Tag)) { + QTestCharBuffer cdataTag; + QXmlTestLogger::xmlCdata(&cdataTag, element->attributeValue(QTest::AI_Tag)); + QTest::qt_asprintf(&tagbuf, " \n", cdataTag.constData()); + } + + QTest::qt_asprintf(formatted, "\n%s \n\n", element->attributeValue(QTest::AI_Type), element->attributeName(QTest::AI_File), quotedFile.constData(), element->attributeName(QTest::AI_Line), element->attributeValue(QTest::AI_Line), + tagbuf.constData(), cdataDesc.constData()); break; } -- cgit v0.12 From 96da5f25cae2599820a526c2898b3c2e8329b88b Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Mon, 19 Apr 2010 17:07:22 +1000 Subject: Fixed failure of tst_qbytearraymatcher on 64 bit. Code had `sizeof(needle-1)' where `sizeof(needle)-1' was meant. This would pass where sizeof(char*) == 4, but not where sizeof(char*) == 8. --- tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp b/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp index abaebb0..e8a1ba3 100644 --- a/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp +++ b/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp @@ -69,7 +69,7 @@ void tst_QByteArrayMatcher::interface() matcher2.setPattern(QByteArray(needle)); QByteArrayMatcher matcher3 = QByteArrayMatcher(QByteArray(needle)); - QByteArrayMatcher matcher4(needle, sizeof(needle - 1)); + QByteArrayMatcher matcher4(needle, sizeof(needle) - 1); QByteArrayMatcher matcher5(matcher2); QByteArrayMatcher matcher6; matcher6 = matcher3; -- cgit v0.12