From 828e14b5f98a77f219bdcf119e463443121cf939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 31 Jan 2020 18:25:50 +0100 Subject: Fix unused argument warning in test Change-Id: I9f55efee82f8d855d89977b3e4db32855e110c87 Reviewed-by: Simon Hausmann --- tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp | 2 +- tests/auto/testlib/selftests/silent/tst_silent.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/testlib') diff --git a/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp b/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp index 49c08982ad..cb3ac4fc2d 100644 --- a/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp +++ b/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp @@ -80,7 +80,7 @@ void tst_Blacklisted::xpass() #include static jmp_buf state; -static void abort_handler(int signal) +static void abort_handler(int) { longjmp(state, 1); } diff --git a/tests/auto/testlib/selftests/silent/tst_silent.cpp b/tests/auto/testlib/selftests/silent/tst_silent.cpp index cf3c35dec4..999d9acf07 100644 --- a/tests/auto/testlib/selftests/silent/tst_silent.cpp +++ b/tests/auto/testlib/selftests/silent/tst_silent.cpp @@ -77,7 +77,7 @@ void tst_Silent::xpass() #include static jmp_buf state; -static void abort_handler(int signal) +static void abort_handler(int) { longjmp(state, 1); } -- cgit v1.2.3 From 27db9e458cef512fca3a6b5c9ebbcda7a8172428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 22 Jan 2020 16:43:40 +0100 Subject: testlib: Clarify that our XUnit reporter is actually a JUnit reporter The reporter was probably named 'xunit' based on the historical use of xUnit to refer to testing frameworks derived from Smalltalk's SUnit. These frameworks typically added their own prefix, e.g. JUnit for Java, RUnit for R, etc. The most popular of these was the JUnit framework, and the corresponding XML output produced by the Ant built tool became somewhat of a de facto standard, which is probably why we chose to model our reporter after it. Nowadays however, naming it 'xunit' is problematic as there is actually a testing famework named xUnit.net, typically shortened to, you guessed it: xunit. Test report consumers will typically have a junit mode, and an xunit mode, and the latter could easily be mistaken for what testlib outputs, unless we clarify this. The clarification also allows us to safely extend our support for the JUnit XML format to incorporate some elements that are nowadays common, but where we are lagging behind the standard. [ChangeLog][QTestLib] The formerly named 'xunitxml' test reporter has been renamed to what it actually is: a JUnit test reporter, and is now triggered by passing -o junitxml to the test binary. Change-Id: Ieb20d3d2b5905c74e55b98174948cc70870c0ef9 Reviewed-by: Friedemann Kleint Reviewed-by: Simon Hausmann --- .../testlib/selftests/expected_assert.junitxml | 17 + .../testlib/selftests/expected_assert.xunitxml | 17 - .../testlib/selftests/expected_badxml.junitxml | 51 + .../testlib/selftests/expected_badxml.xunitxml | 51 - .../selftests/expected_benchlibcallgrind.junitxml | 25 + .../selftests/expected_benchlibcallgrind.xunitxml | 25 - .../selftests/expected_benchlibcounting.junitxml | 21 + .../selftests/expected_benchlibcounting.xunitxml | 21 - .../expected_benchlibeventcounter.junitxml | 13 + .../expected_benchlibeventcounter.xunitxml | 13 - .../selftests/expected_benchliboptions.junitxml | 39 + .../selftests/expected_benchliboptions.xunitxml | 39 - .../expected_benchlibtickcounter.junitxml | 13 + .../expected_benchlibtickcounter.xunitxml | 13 - .../selftests/expected_benchlibwalltime.junitxml | 17 + .../selftests/expected_benchlibwalltime.xunitxml | 17 - .../selftests/expected_blacklisted.junitxml | 35 + .../selftests/expected_blacklisted.xunitxml | 35 - .../testlib/selftests/expected_cmptest.junitxml | 161 + .../testlib/selftests/expected_cmptest.xunitxml | 161 - .../selftests/expected_commandlinedata.junitxml | 28 + .../selftests/expected_commandlinedata.xunitxml | 28 - .../testlib/selftests/expected_counting.junitxml | 65 + .../testlib/selftests/expected_counting.xunitxml | 65 - .../testlib/selftests/expected_datatable.junitxml | 37 + .../testlib/selftests/expected_datatable.xunitxml | 37 - .../testlib/selftests/expected_datetime.junitxml | 24 + .../testlib/selftests/expected_datetime.xunitxml | 24 - .../selftests/expected_differentexec.junitxml | 21 + .../selftests/expected_differentexec.xunitxml | 21 - .../selftests/expected_exceptionthrow.junitxml | 13 + .../selftests/expected_exceptionthrow.xunitxml | 13 - .../testlib/selftests/expected_expectfail.junitxml | 67 + .../testlib/selftests/expected_expectfail.xunitxml | 67 - .../selftests/expected_failcleanup.junitxml | 14 + .../selftests/expected_failcleanup.xunitxml | 14 - .../selftests/expected_faildatatype.junitxml | 18 + .../selftests/expected_faildatatype.xunitxml | 18 - .../selftests/expected_failfetchtype.junitxml | 16 + .../selftests/expected_failfetchtype.xunitxml | 16 - .../testlib/selftests/expected_failinit.junitxml | 13 + .../testlib/selftests/expected_failinit.xunitxml | 13 - .../selftests/expected_failinitdata.junitxml | 12 + .../selftests/expected_failinitdata.xunitxml | 12 - .../testlib/selftests/expected_fetchbogus.junitxml | 16 + .../testlib/selftests/expected_fetchbogus.xunitxml | 16 - .../selftests/expected_findtestdata.junitxml | 16 + .../selftests/expected_findtestdata.xunitxml | 16 - .../auto/testlib/selftests/expected_float.junitxml | 307 ++ .../auto/testlib/selftests/expected_float.xunitxml | 307 -- .../testlib/selftests/expected_globaldata.junitxml | 108 + .../testlib/selftests/expected_globaldata.xunitxml | 108 - .../testlib/selftests/expected_keyboard.junitxml | 12 + .../testlib/selftests/expected_keyboard.xunitxml | 12 - .../testlib/selftests/expected_longstring.junitxml | 22 + .../testlib/selftests/expected_longstring.xunitxml | 22 - .../selftests/expected_maxwarnings.junitxml | 4018 ++++++++++++++++++++ .../selftests/expected_maxwarnings.xunitxml | 4018 -------------------- .../testlib/selftests/expected_multiexec.junitxml | 60 + .../testlib/selftests/expected_multiexec.xunitxml | 60 - .../selftests/expected_pairdiagnostics.junitxml | 21 + .../selftests/expected_pairdiagnostics.xunitxml | 21 - .../selftests/expected_qexecstringlist.junitxml | 55 + .../selftests/expected_qexecstringlist.xunitxml | 55 - .../selftests/expected_signaldumper.junitxml | 288 ++ .../selftests/expected_signaldumper.xunitxml | 288 -- .../testlib/selftests/expected_silent.junitxml | 43 + .../testlib/selftests/expected_silent.xunitxml | 43 - .../testlib/selftests/expected_singleskip.junitxml | 16 + .../testlib/selftests/expected_singleskip.xunitxml | 16 - .../auto/testlib/selftests/expected_skip.junitxml | 26 + .../auto/testlib/selftests/expected_skip.xunitxml | 26 - .../selftests/expected_skipcleanup.junitxml | 16 + .../selftests/expected_skipcleanup.xunitxml | 16 - .../testlib/selftests/expected_skipinit.junitxml | 15 + .../testlib/selftests/expected_skipinit.xunitxml | 15 - .../selftests/expected_skipinitdata.junitxml | 14 + .../selftests/expected_skipinitdata.xunitxml | 14 - .../auto/testlib/selftests/expected_sleep.junitxml | 13 + .../auto/testlib/selftests/expected_sleep.xunitxml | 13 - .../testlib/selftests/expected_strcmp.junitxml | 44 + .../testlib/selftests/expected_strcmp.xunitxml | 44 - .../testlib/selftests/expected_subtest.junitxml | 88 + .../testlib/selftests/expected_subtest.xunitxml | 88 - .../testlib/selftests/expected_testlib.junitxml | 16 + .../testlib/selftests/expected_testlib.xunitxml | 16 - .../selftests/expected_tuplediagnostics.junitxml | 22 + .../selftests/expected_tuplediagnostics.xunitxml | 22 - .../testlib/selftests/expected_verbose1.junitxml | 65 + .../testlib/selftests/expected_verbose1.xunitxml | 65 - .../testlib/selftests/expected_verbose2.junitxml | 102 + .../testlib/selftests/expected_verbose2.xunitxml | 102 - .../expected_verifyexceptionthrown.junitxml | 32 + .../expected_verifyexceptionthrown.xunitxml | 32 - .../testlib/selftests/expected_warnings.junitxml | 58 + .../testlib/selftests/expected_warnings.xunitxml | 58 - .../testlib/selftests/expected_watchdog.junitxml | 16 + .../testlib/selftests/expected_watchdog.xunitxml | 16 - .../auto/testlib/selftests/expected_xunit.junitxml | 41 + .../auto/testlib/selftests/expected_xunit.xunitxml | 41 - .../testlib/selftests/generate_expected_output.py | 4 +- tests/auto/testlib/selftests/tst_selftests.cpp | 46 +- 102 files changed, 6299 insertions(+), 6291 deletions(-) create mode 100644 tests/auto/testlib/selftests/expected_assert.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_assert.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_badxml.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_badxml.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_benchlibcounting.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_benchlibcounting.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_benchlibeventcounter.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_benchliboptions.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_benchliboptions.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_benchlibtickcounter.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_benchlibwalltime.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_blacklisted.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_blacklisted.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_cmptest.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_cmptest.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_commandlinedata.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_commandlinedata.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_counting.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_counting.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_datatable.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_datatable.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_datetime.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_datetime.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_differentexec.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_differentexec.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_exceptionthrow.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_exceptionthrow.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_expectfail.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_expectfail.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_failcleanup.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_failcleanup.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_faildatatype.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_faildatatype.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_failfetchtype.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_failfetchtype.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_failinit.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_failinit.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_failinitdata.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_failinitdata.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_fetchbogus.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_fetchbogus.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_findtestdata.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_findtestdata.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_float.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_float.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_globaldata.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_globaldata.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_keyboard.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_keyboard.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_longstring.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_longstring.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_maxwarnings.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_maxwarnings.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_multiexec.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_multiexec.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_pairdiagnostics.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_qexecstringlist.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_qexecstringlist.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_signaldumper.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_signaldumper.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_silent.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_silent.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_singleskip.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_singleskip.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_skip.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_skip.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_skipcleanup.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_skipcleanup.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_skipinit.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_skipinit.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_skipinitdata.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_skipinitdata.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_sleep.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_sleep.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_strcmp.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_strcmp.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_subtest.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_subtest.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_testlib.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_testlib.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_tuplediagnostics.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_verbose1.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_verbose1.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_verbose2.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_verbose2.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_verifyexceptionthrown.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_warnings.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_warnings.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_watchdog.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_watchdog.xunitxml create mode 100644 tests/auto/testlib/selftests/expected_xunit.junitxml delete mode 100644 tests/auto/testlib/selftests/expected_xunit.xunitxml (limited to 'tests/auto/testlib') diff --git a/tests/auto/testlib/selftests/expected_assert.junitxml b/tests/auto/testlib/selftests/expected_assert.junitxml new file mode 100644 index 0000000000..ca12a45e20 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_assert.junitxml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_assert.xunitxml b/tests/auto/testlib/selftests/expected_assert.xunitxml deleted file mode 100644 index ca12a45e20..0000000000 --- a/tests/auto/testlib/selftests/expected_assert.xunitxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_badxml.junitxml b/tests/auto/testlib/selftests/expected_badxml.junitxml new file mode 100644 index 0000000000..49048fdad6 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_badxml.junitxml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text ]]]> more text]]> + + open < tags < text]]> + " mixed ]]]> up > " in < the ]]]> hopes < of triggering "< ]]]> bugs]]> + + + diff --git a/tests/auto/testlib/selftests/expected_badxml.xunitxml b/tests/auto/testlib/selftests/expected_badxml.xunitxml deleted file mode 100644 index 49048fdad6..0000000000 --- a/tests/auto/testlib/selftests/expected_badxml.xunitxml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text ]]]> more text]]> - - open < tags < text]]> - " mixed ]]]> up > " in < the ]]]> hopes < of triggering "< ]]]> bugs]]> - - - diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml new file mode 100644 index 0000000000..95d90e6ee7 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml deleted file mode 100644 index 95d90e6ee7..0000000000 --- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml new file mode 100644 index 0000000000..05d1da9874 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.xunitxml b/tests/auto/testlib/selftests/expected_benchlibcounting.xunitxml deleted file mode 100644 index 05d1da9874..0000000000 --- a/tests/auto/testlib/selftests/expected_benchlibcounting.xunitxml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml new file mode 100644 index 0000000000..ce0a81110d --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.xunitxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xunitxml deleted file mode 100644 index ce0a81110d..0000000000 --- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.xunitxml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.junitxml b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml new file mode 100644 index 0000000000..370d1c7c5c --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.xunitxml b/tests/auto/testlib/selftests/expected_benchliboptions.xunitxml deleted file mode 100644 index 370d1c7c5c..0000000000 --- a/tests/auto/testlib/selftests/expected_benchliboptions.xunitxml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml new file mode 100644 index 0000000000..779d3bdcbc --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.xunitxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xunitxml deleted file mode 100644 index 779d3bdcbc..0000000000 --- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.xunitxml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml new file mode 100644 index 0000000000..6a0510c4c9 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.xunitxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.xunitxml deleted file mode 100644 index 6a0510c4c9..0000000000 --- a/tests/auto/testlib/selftests/expected_benchlibwalltime.xunitxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_blacklisted.junitxml b/tests/auto/testlib/selftests/expected_blacklisted.junitxml new file mode 100644 index 0000000000..6e192687fb --- /dev/null +++ b/tests/auto/testlib/selftests/expected_blacklisted.junitxml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_blacklisted.xunitxml b/tests/auto/testlib/selftests/expected_blacklisted.xunitxml deleted file mode 100644 index 6e192687fb..0000000000 --- a/tests/auto/testlib/selftests/expected_blacklisted.xunitxml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_cmptest.junitxml b/tests/auto/testlib/selftests/expected_cmptest.junitxml new file mode 100644 index 0000000000..397db4c3e4 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_cmptest.junitxml @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_cmptest.xunitxml b/tests/auto/testlib/selftests/expected_cmptest.xunitxml deleted file mode 100644 index 397db4c3e4..0000000000 --- a/tests/auto/testlib/selftests/expected_cmptest.xunitxml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.junitxml b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml new file mode 100644 index 0000000000..5072a7e6f4 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.xunitxml b/tests/auto/testlib/selftests/expected_commandlinedata.xunitxml deleted file mode 100644 index 5072a7e6f4..0000000000 --- a/tests/auto/testlib/selftests/expected_commandlinedata.xunitxml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_counting.junitxml b/tests/auto/testlib/selftests/expected_counting.junitxml new file mode 100644 index 0000000000..cb3a7815af --- /dev/null +++ b/tests/auto/testlib/selftests/expected_counting.junitxml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_counting.xunitxml b/tests/auto/testlib/selftests/expected_counting.xunitxml deleted file mode 100644 index cb3a7815af..0000000000 --- a/tests/auto/testlib/selftests/expected_counting.xunitxml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_datatable.junitxml b/tests/auto/testlib/selftests/expected_datatable.junitxml new file mode 100644 index 0000000000..89fc7ee819 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_datatable.junitxml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_datatable.xunitxml b/tests/auto/testlib/selftests/expected_datatable.xunitxml deleted file mode 100644 index 89fc7ee819..0000000000 --- a/tests/auto/testlib/selftests/expected_datatable.xunitxml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_datetime.junitxml b/tests/auto/testlib/selftests/expected_datetime.junitxml new file mode 100644 index 0000000000..6fc95719f3 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_datetime.junitxml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_datetime.xunitxml b/tests/auto/testlib/selftests/expected_datetime.xunitxml deleted file mode 100644 index 6fc95719f3..0000000000 --- a/tests/auto/testlib/selftests/expected_datetime.xunitxml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_differentexec.junitxml b/tests/auto/testlib/selftests/expected_differentexec.junitxml new file mode 100644 index 0000000000..30ee50bc08 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_differentexec.junitxml @@ -0,0 +1,21 @@ +********* Start testing of tst_TestA ********* +Config: Using QtTest library +PASS : tst_TestA::initTestCase() +PASS : tst_TestA::slotName() +PASS : tst_TestA::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestA ********* +********* Start testing of tst_TestA ********* +Config: Using QtTest library +PASS : tst_TestA::initTestCase() +PASS : tst_TestA::slotName() +PASS : tst_TestA::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestA ********* +********* Start testing of tst_TestB ********* +Config: Using QtTest library +PASS : tst_TestB::initTestCase() +PASS : tst_TestB::slotName() +PASS : tst_TestB::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestB ********* diff --git a/tests/auto/testlib/selftests/expected_differentexec.xunitxml b/tests/auto/testlib/selftests/expected_differentexec.xunitxml deleted file mode 100644 index 30ee50bc08..0000000000 --- a/tests/auto/testlib/selftests/expected_differentexec.xunitxml +++ /dev/null @@ -1,21 +0,0 @@ -********* Start testing of tst_TestA ********* -Config: Using QtTest library -PASS : tst_TestA::initTestCase() -PASS : tst_TestA::slotName() -PASS : tst_TestA::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms -********* Finished testing of tst_TestA ********* -********* Start testing of tst_TestA ********* -Config: Using QtTest library -PASS : tst_TestA::initTestCase() -PASS : tst_TestA::slotName() -PASS : tst_TestA::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms -********* Finished testing of tst_TestA ********* -********* Start testing of tst_TestB ********* -Config: Using QtTest library -PASS : tst_TestB::initTestCase() -PASS : tst_TestB::slotName() -PASS : tst_TestB::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms -********* Finished testing of tst_TestB ********* diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml new file mode 100644 index 0000000000..7d10bf6f04 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.xunitxml b/tests/auto/testlib/selftests/expected_exceptionthrow.xunitxml deleted file mode 100644 index 7d10bf6f04..0000000000 --- a/tests/auto/testlib/selftests/expected_exceptionthrow.xunitxml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_expectfail.junitxml b/tests/auto/testlib/selftests/expected_expectfail.junitxml new file mode 100644 index 0000000000..47483d71bf --- /dev/null +++ b/tests/auto/testlib/selftests/expected_expectfail.junitxml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_expectfail.xunitxml b/tests/auto/testlib/selftests/expected_expectfail.xunitxml deleted file mode 100644 index 47483d71bf..0000000000 --- a/tests/auto/testlib/selftests/expected_expectfail.xunitxml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_failcleanup.junitxml b/tests/auto/testlib/selftests/expected_failcleanup.junitxml new file mode 100644 index 0000000000..813e284ee0 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_failcleanup.junitxml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_failcleanup.xunitxml b/tests/auto/testlib/selftests/expected_failcleanup.xunitxml deleted file mode 100644 index 813e284ee0..0000000000 --- a/tests/auto/testlib/selftests/expected_failcleanup.xunitxml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_faildatatype.junitxml b/tests/auto/testlib/selftests/expected_faildatatype.junitxml new file mode 100644 index 0000000000..fcc0db3892 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_faildatatype.junitxml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_faildatatype.xunitxml b/tests/auto/testlib/selftests/expected_faildatatype.xunitxml deleted file mode 100644 index fcc0db3892..0000000000 --- a/tests/auto/testlib/selftests/expected_faildatatype.xunitxml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_failfetchtype.junitxml b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml new file mode 100644 index 0000000000..a54a37a913 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_failfetchtype.xunitxml b/tests/auto/testlib/selftests/expected_failfetchtype.xunitxml deleted file mode 100644 index a54a37a913..0000000000 --- a/tests/auto/testlib/selftests/expected_failfetchtype.xunitxml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_failinit.junitxml b/tests/auto/testlib/selftests/expected_failinit.junitxml new file mode 100644 index 0000000000..3715725ea5 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_failinit.junitxml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_failinit.xunitxml b/tests/auto/testlib/selftests/expected_failinit.xunitxml deleted file mode 100644 index 3715725ea5..0000000000 --- a/tests/auto/testlib/selftests/expected_failinit.xunitxml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_failinitdata.junitxml b/tests/auto/testlib/selftests/expected_failinitdata.junitxml new file mode 100644 index 0000000000..d245bc0dff --- /dev/null +++ b/tests/auto/testlib/selftests/expected_failinitdata.junitxml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_failinitdata.xunitxml b/tests/auto/testlib/selftests/expected_failinitdata.xunitxml deleted file mode 100644 index d245bc0dff..0000000000 --- a/tests/auto/testlib/selftests/expected_failinitdata.xunitxml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.junitxml b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml new file mode 100644 index 0000000000..77ccbd896a --- /dev/null +++ b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.xunitxml b/tests/auto/testlib/selftests/expected_fetchbogus.xunitxml deleted file mode 100644 index 77ccbd896a..0000000000 --- a/tests/auto/testlib/selftests/expected_fetchbogus.xunitxml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_findtestdata.junitxml b/tests/auto/testlib/selftests/expected_findtestdata.junitxml new file mode 100644 index 0000000000..c1138da6cb --- /dev/null +++ b/tests/auto/testlib/selftests/expected_findtestdata.junitxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_findtestdata.xunitxml b/tests/auto/testlib/selftests/expected_findtestdata.xunitxml deleted file mode 100644 index c1138da6cb..0000000000 --- a/tests/auto/testlib/selftests/expected_findtestdata.xunitxml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_float.junitxml b/tests/auto/testlib/selftests/expected_float.junitxml new file mode 100644 index 0000000000..602f9252a4 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_float.junitxml @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_float.xunitxml b/tests/auto/testlib/selftests/expected_float.xunitxml deleted file mode 100644 index 602f9252a4..0000000000 --- a/tests/auto/testlib/selftests/expected_float.xunitxml +++ /dev/null @@ -1,307 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_globaldata.junitxml b/tests/auto/testlib/selftests/expected_globaldata.junitxml new file mode 100644 index 0000000000..de184c2fdd --- /dev/null +++ b/tests/auto/testlib/selftests/expected_globaldata.junitxml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_globaldata.xunitxml b/tests/auto/testlib/selftests/expected_globaldata.xunitxml deleted file mode 100644 index de184c2fdd..0000000000 --- a/tests/auto/testlib/selftests/expected_globaldata.xunitxml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_keyboard.junitxml b/tests/auto/testlib/selftests/expected_keyboard.junitxml new file mode 100644 index 0000000000..93b5f7bfff --- /dev/null +++ b/tests/auto/testlib/selftests/expected_keyboard.junitxml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_keyboard.xunitxml b/tests/auto/testlib/selftests/expected_keyboard.xunitxml deleted file mode 100644 index 93b5f7bfff..0000000000 --- a/tests/auto/testlib/selftests/expected_keyboard.xunitxml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_longstring.junitxml b/tests/auto/testlib/selftests/expected_longstring.junitxml new file mode 100644 index 0000000000..269c06fe08 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_longstring.junitxml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_longstring.xunitxml b/tests/auto/testlib/selftests/expected_longstring.xunitxml deleted file mode 100644 index 269c06fe08..0000000000 --- a/tests/auto/testlib/selftests/expected_longstring.xunitxml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.junitxml b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml new file mode 100644 index 0000000000..329fae5f1d --- /dev/null +++ b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml @@ -0,0 +1,4018 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.xunitxml b/tests/auto/testlib/selftests/expected_maxwarnings.xunitxml deleted file mode 100644 index 329fae5f1d..0000000000 --- a/tests/auto/testlib/selftests/expected_maxwarnings.xunitxml +++ /dev/null @@ -1,4018 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_multiexec.junitxml b/tests/auto/testlib/selftests/expected_multiexec.junitxml new file mode 100644 index 0000000000..8ab914842b --- /dev/null +++ b/tests/auto/testlib/selftests/expected_multiexec.junitxml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_multiexec.xunitxml b/tests/auto/testlib/selftests/expected_multiexec.xunitxml deleted file mode 100644 index 8ab914842b..0000000000 --- a/tests/auto/testlib/selftests/expected_multiexec.xunitxml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml new file mode 100644 index 0000000000..cf2a30b84a --- /dev/null +++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.xunitxml b/tests/auto/testlib/selftests/expected_pairdiagnostics.xunitxml deleted file mode 100644 index cf2a30b84a..0000000000 --- a/tests/auto/testlib/selftests/expected_pairdiagnostics.xunitxml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml new file mode 100644 index 0000000000..b352b8e6b9 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testA() +PASS : tst_QExecStringList::testB(Data1) +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::testB(Data3) +PASS : tst_QExecStringList::testC() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testA() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testB(Data1) +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::testB(Data3) +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testC() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.xunitxml b/tests/auto/testlib/selftests/expected_qexecstringlist.xunitxml deleted file mode 100644 index b352b8e6b9..0000000000 --- a/tests/auto/testlib/selftests/expected_qexecstringlist.xunitxml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - -********* Start testing of tst_QExecStringList ********* -Config: Using QtTest library -PASS : tst_QExecStringList::initTestCase() -PASS : tst_QExecStringList::testA() -PASS : tst_QExecStringList::testB(Data1) -PASS : tst_QExecStringList::testB(Data2) -PASS : tst_QExecStringList::testB(Data3) -PASS : tst_QExecStringList::testC() -PASS : tst_QExecStringList::cleanupTestCase() -Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms -********* Finished testing of tst_QExecStringList ********* -********* Start testing of tst_QExecStringList ********* -Config: Using QtTest library -PASS : tst_QExecStringList::initTestCase() -PASS : tst_QExecStringList::testA() -PASS : tst_QExecStringList::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms -********* Finished testing of tst_QExecStringList ********* -********* Start testing of tst_QExecStringList ********* -Config: Using QtTest library -PASS : tst_QExecStringList::initTestCase() -PASS : tst_QExecStringList::testB(Data1) -PASS : tst_QExecStringList::testB(Data2) -PASS : tst_QExecStringList::testB(Data3) -PASS : tst_QExecStringList::cleanupTestCase() -Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms -********* Finished testing of tst_QExecStringList ********* -********* Start testing of tst_QExecStringList ********* -Config: Using QtTest library -PASS : tst_QExecStringList::initTestCase() -PASS : tst_QExecStringList::testB(Data2) -PASS : tst_QExecStringList::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms -********* Finished testing of tst_QExecStringList ********* -********* Start testing of tst_QExecStringList ********* -Config: Using QtTest library -PASS : tst_QExecStringList::initTestCase() -PASS : tst_QExecStringList::testC() -PASS : tst_QExecStringList::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms -********* Finished testing of tst_QExecStringList ********* diff --git a/tests/auto/testlib/selftests/expected_signaldumper.junitxml b/tests/auto/testlib/selftests/expected_signaldumper.junitxml new file mode 100644 index 0000000000..cbf7075ba1 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_signaldumper.junitxml @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +())]]> +())]]> +&)@_POINTER_)]]> +())]]> +*)_POINTER_)]]> + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_signaldumper.xunitxml b/tests/auto/testlib/selftests/expected_signaldumper.xunitxml deleted file mode 100644 index cbf7075ba1..0000000000 --- a/tests/auto/testlib/selftests/expected_signaldumper.xunitxml +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -())]]> -())]]> -&)@_POINTER_)]]> -())]]> -*)_POINTER_)]]> - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_silent.junitxml b/tests/auto/testlib/selftests/expected_silent.junitxml new file mode 100644 index 0000000000..ea229d1dc7 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_silent.junitxml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_silent.xunitxml b/tests/auto/testlib/selftests/expected_silent.xunitxml deleted file mode 100644 index ea229d1dc7..0000000000 --- a/tests/auto/testlib/selftests/expected_silent.xunitxml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_singleskip.junitxml b/tests/auto/testlib/selftests/expected_singleskip.junitxml new file mode 100644 index 0000000000..2b2da2f504 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_singleskip.junitxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_singleskip.xunitxml b/tests/auto/testlib/selftests/expected_singleskip.xunitxml deleted file mode 100644 index 2b2da2f504..0000000000 --- a/tests/auto/testlib/selftests/expected_singleskip.xunitxml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_skip.junitxml b/tests/auto/testlib/selftests/expected_skip.junitxml new file mode 100644 index 0000000000..63e582f96a --- /dev/null +++ b/tests/auto/testlib/selftests/expected_skip.junitxml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_skip.xunitxml b/tests/auto/testlib/selftests/expected_skip.xunitxml deleted file mode 100644 index 63e582f96a..0000000000 --- a/tests/auto/testlib/selftests/expected_skip.xunitxml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.junitxml b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml new file mode 100644 index 0000000000..9934584ec5 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.xunitxml b/tests/auto/testlib/selftests/expected_skipcleanup.xunitxml deleted file mode 100644 index 9934584ec5..0000000000 --- a/tests/auto/testlib/selftests/expected_skipcleanup.xunitxml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_skipinit.junitxml b/tests/auto/testlib/selftests/expected_skipinit.junitxml new file mode 100644 index 0000000000..bab08c375c --- /dev/null +++ b/tests/auto/testlib/selftests/expected_skipinit.junitxml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_skipinit.xunitxml b/tests/auto/testlib/selftests/expected_skipinit.xunitxml deleted file mode 100644 index bab08c375c..0000000000 --- a/tests/auto/testlib/selftests/expected_skipinit.xunitxml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.junitxml b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml new file mode 100644 index 0000000000..e61d50b06b --- /dev/null +++ b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml b/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml deleted file mode 100644 index e61d50b06b..0000000000 --- a/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_sleep.junitxml b/tests/auto/testlib/selftests/expected_sleep.junitxml new file mode 100644 index 0000000000..e4ed66bcb8 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_sleep.junitxml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_sleep.xunitxml b/tests/auto/testlib/selftests/expected_sleep.xunitxml deleted file mode 100644 index e4ed66bcb8..0000000000 --- a/tests/auto/testlib/selftests/expected_sleep.xunitxml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_strcmp.junitxml b/tests/auto/testlib/selftests/expected_strcmp.junitxml new file mode 100644 index 0000000000..66dce857c9 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_strcmp.junitxml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_strcmp.xunitxml b/tests/auto/testlib/selftests/expected_strcmp.xunitxml deleted file mode 100644 index 66dce857c9..0000000000 --- a/tests/auto/testlib/selftests/expected_strcmp.xunitxml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_subtest.junitxml b/tests/auto/testlib/selftests/expected_subtest.junitxml new file mode 100644 index 0000000000..b49c006940 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_subtest.junitxml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_subtest.xunitxml b/tests/auto/testlib/selftests/expected_subtest.xunitxml deleted file mode 100644 index b49c006940..0000000000 --- a/tests/auto/testlib/selftests/expected_subtest.xunitxml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_testlib.junitxml b/tests/auto/testlib/selftests/expected_testlib.junitxml new file mode 100644 index 0000000000..c9c67c7c9a --- /dev/null +++ b/tests/auto/testlib/selftests/expected_testlib.junitxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_testlib.xunitxml b/tests/auto/testlib/selftests/expected_testlib.xunitxml deleted file mode 100644 index c9c67c7c9a..0000000000 --- a/tests/auto/testlib/selftests/expected_testlib.xunitxml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml new file mode 100644 index 0000000000..0a276a17f5 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_tuplediagnostics.xunitxml b/tests/auto/testlib/selftests/expected_tuplediagnostics.xunitxml deleted file mode 100644 index 0a276a17f5..0000000000 --- a/tests/auto/testlib/selftests/expected_tuplediagnostics.xunitxml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_verbose1.junitxml b/tests/auto/testlib/selftests/expected_verbose1.junitxml new file mode 100644 index 0000000000..cb3a7815af --- /dev/null +++ b/tests/auto/testlib/selftests/expected_verbose1.junitxml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_verbose1.xunitxml b/tests/auto/testlib/selftests/expected_verbose1.xunitxml deleted file mode 100644 index cb3a7815af..0000000000 --- a/tests/auto/testlib/selftests/expected_verbose1.xunitxml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_verbose2.junitxml b/tests/auto/testlib/selftests/expected_verbose2.junitxml new file mode 100644 index 0000000000..6764a5564f --- /dev/null +++ b/tests/auto/testlib/selftests/expected_verbose2.junitxml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_verbose2.xunitxml b/tests/auto/testlib/selftests/expected_verbose2.xunitxml deleted file mode 100644 index 6764a5564f..0000000000 --- a/tests/auto/testlib/selftests/expected_verbose2.xunitxml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml new file mode 100644 index 0000000000..003a31a1cc --- /dev/null +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xunitxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xunitxml deleted file mode 100644 index 003a31a1cc..0000000000 --- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xunitxml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_warnings.junitxml b/tests/auto/testlib/selftests/expected_warnings.junitxml new file mode 100644 index 0000000000..5cca215f12 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_warnings.junitxml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_warnings.xunitxml b/tests/auto/testlib/selftests/expected_warnings.xunitxml deleted file mode 100644 index 5cca215f12..0000000000 --- a/tests/auto/testlib/selftests/expected_warnings.xunitxml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_watchdog.junitxml b/tests/auto/testlib/selftests/expected_watchdog.junitxml new file mode 100644 index 0000000000..7e16ab2c34 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_watchdog.junitxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/tests/auto/testlib/selftests/expected_watchdog.xunitxml b/tests/auto/testlib/selftests/expected_watchdog.xunitxml deleted file mode 100644 index 7e16ab2c34..0000000000 --- a/tests/auto/testlib/selftests/expected_watchdog.xunitxml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_xunit.junitxml b/tests/auto/testlib/selftests/expected_xunit.junitxml new file mode 100644 index 0000000000..395b6efdd9 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_xunit.junitxml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + diff --git a/tests/auto/testlib/selftests/expected_xunit.xunitxml b/tests/auto/testlib/selftests/expected_xunit.xunitxml deleted file mode 100644 index 395b6efdd9..0000000000 --- a/tests/auto/testlib/selftests/expected_xunit.xunitxml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py index 48ecbf0289..1c0beff7fb 100755 --- a/tests/auto/testlib/selftests/generate_expected_output.py +++ b/tests/auto/testlib/selftests/generate_expected_output.py @@ -86,7 +86,7 @@ class Cleaner (object): # Build details: (r'(Config: Using QtTest library).*', r'\1'), # txt (r'( *[^<]+', r'\1/>'), # xml, lightxml - (r'()', r'\1\2'), # xunitxml + (r'()', r'\1\2'), # junitxml # Line numbers in source files: (r'(ASSERT: ".*" in file .*, line) \d+', r'\1 0'), # lightxml (r'(Loc: \[[^[\]()]+)\(\d+\)', r'\1(0)'), # txt @@ -295,7 +295,7 @@ def testEnv(testname, return data def generateTestData(testname, clean, - formats = ('xml', 'txt', 'xunitxml', 'lightxml', 'teamcity', 'tap'), + formats = ('xml', 'txt', 'junitxml', 'lightxml', 'teamcity', 'tap'), # Make sure this matches tst_Selftests::runSubTest_data(): extraArgs = { "commandlinedata": "fiveTablePasses fiveTablePasses:fiveTablePasses_data1 -v2", diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 331ae48135..6e4a7896f6 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -280,13 +280,17 @@ QList tst_Selftests::allLoggerSets() const QStringList() << "xml", QStringList() << "-xml" << "-o" << logName("xml") ) - << LoggerSet("old stdout xunitxml", - QStringList() << "stdout xunitxml", - QStringList() << "-xunitxml" + << LoggerSet("old stdout junitxml", + QStringList() << "stdout junitxml", + QStringList() << "-junitxml" ) - << LoggerSet("old xunitxml", - QStringList() << "xunitxml", - QStringList() << "-xunitxml" << "-o" << logName("xunitxml") + << LoggerSet("old junitxml", + QStringList() << "junitxml", + QStringList() << "-junitxml" << "-o" << logName("junitxml") + ) + << LoggerSet("old xunitxml compatibility", + QStringList() << "junitxml", + QStringList() << "-xunitxml" << "-o" << logName("junitxml") ) << LoggerSet("old stdout lightxml", QStringList() << "stdout lightxml", @@ -335,13 +339,17 @@ QList tst_Selftests::allLoggerSets() const QStringList() << "xml", QStringList() << "-o" << logName("xml")+",xml" ) - << LoggerSet("new stdout xunitxml", - QStringList() << "stdout xunitxml", + << LoggerSet("new stdout junitxml", + QStringList() << "stdout junitxml", + QStringList() << "-o" << "-,junitxml" + ) + << LoggerSet("new stdout xunitxml compatibility", + QStringList() << "stdout junitxml", QStringList() << "-o" << "-,xunitxml" ) - << LoggerSet("new xunitxml", - QStringList() << "xunitxml", - QStringList() << "-o" << logName("xunitxml")+",xunitxml" + << LoggerSet("new junitxml", + QStringList() << "junitxml", + QStringList() << "-o" << logName("junitxml")+",junitxml" ) << LoggerSet("new stdout lightxml", QStringList() << "stdout lightxml", @@ -384,24 +392,24 @@ QList tst_Selftests::allLoggerSets() const QStringList() << "-o" << logName("xml")+",xml" << "-o" << "-,txt" ) - << LoggerSet("txt + xunitxml", - QStringList() << "txt" << "xunitxml", + << LoggerSet("txt + junitxml", + QStringList() << "txt" << "junitxml", QStringList() << "-o" << logName("txt")+",txt" - << "-o" << logName("xunitxml")+",xunitxml" + << "-o" << logName("junitxml")+",junitxml" ) - << LoggerSet("lightxml + stdout xunitxml", - QStringList() << "lightxml" << "stdout xunitxml", + << LoggerSet("lightxml + stdout junitxml", + QStringList() << "lightxml" << "stdout junitxml", QStringList() << "-o" << logName("lightxml")+",lightxml" - << "-o" << "-,xunitxml" + << "-o" << "-,junitxml" ) // All loggers at the same time (except csv) << LoggerSet("all loggers", - QStringList() << "txt" << "xml" << "lightxml" << "stdout txt" << "xunitxml" << "tap", + QStringList() << "txt" << "xml" << "lightxml" << "stdout txt" << "junitxml" << "tap", QStringList() << "-o" << logName("txt")+",txt" << "-o" << logName("xml")+",xml" << "-o" << logName("lightxml")+",lightxml" << "-o" << "-,txt" - << "-o" << logName("xunitxml")+",xunitxml" + << "-o" << logName("junitxml")+",junitxml" << "-o" << logName("teamcity")+",teamcity" << "-o" << logName("tap")+",tap" ) -- cgit v1.2.3 From 8c6c4df3e83776d821f357582a717dbfbeb1c3ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= Date: Tue, 4 Feb 2020 11:32:00 +0100 Subject: Maintain at least 500ms timestamp distance between each test function If we had one test function that just did tst_Mouse::f1() { QTest::mouseMove(w, QPoint(0,0)); } and another test function that did tst_Mouse::f2() { QTest::mouseMove(w, QPoint(500,500)); } their corresponding event timestamps were only 1 apart from each other. This meant that any code that tried to estimate the velocity of a mouse cursor would get a really high velocity estimate inside f2(). This would come as a surprise to most people. So to avoid this, we add a 500 ms timestamp delay between each test function call. In theory this could also prevent generating a mouseDoubleClickEvent when a pair of test functions containing a press-release sequence was run, but there is a separate pre-existing mechanism to handle that case. Change-Id: Icd4fc35853c09f080466d22411208c7b5c4174b5 Reviewed-by: Shawn Rutledge --- tests/auto/testlib/selftests/mouse/tst_mouse.cpp | 67 +++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) (limited to 'tests/auto/testlib') diff --git a/tests/auto/testlib/selftests/mouse/tst_mouse.cpp b/tests/auto/testlib/selftests/mouse/tst_mouse.cpp index d097027e7e..43dda31daf 100644 --- a/tests/auto/testlib/selftests/mouse/tst_mouse.cpp +++ b/tests/auto/testlib/selftests/mouse/tst_mouse.cpp @@ -42,6 +42,8 @@ class tst_Mouse : public QObject Q_OBJECT private slots: + void timestampBetweenTestFunction_data(); + void timestampBetweenTestFunction(); void stateHandlingPart1_data(); void stateHandlingPart1(); void stateHandlingPart2(); @@ -55,20 +57,83 @@ public: Qt::MouseButtons stateInMouseMove = Qt::NoButton; int moveCount = 0; int pressCount = 0; + int doubleClickCount = 0; + ulong lastTimeStamp = 0; protected: - void mousePressEvent(QMouseEvent *) + void mousePressEvent(QMouseEvent *e) { pressCount++; + processEvent(e); } void mouseMoveEvent(QMouseEvent *e) { moveCount++; stateInMouseMove = e->buttons(); + processEvent(e); } + + void mouseReleaseEvent(QMouseEvent *e) + { + processEvent(e); + } + + void mouseDoubleClickEvent(QMouseEvent *e) + { + doubleClickCount++; + processEvent(e); + } + + void processEvent(QMouseEvent *e) + { + lastTimeStamp = e->timestamp(); + } + }; +static ulong lastTimeStampInPreviousTestFunction = 0; + +void tst_Mouse::timestampBetweenTestFunction_data() +{ + QTest::addColumn("hoverLast"); + QTest::addColumn("pressAndRelease"); + QTest::newRow("press, release") << true << false; + QTest::newRow("press, release, hover") << true << true; + QTest::newRow("hover") << false << true; + QTest::newRow("hover #2") << false << true; + QTest::newRow("press, release #2") << true << false; + QTest::newRow("press, release, hover #2") << true << true; +} + +void tst_Mouse::timestampBetweenTestFunction() +{ + QFETCH(bool, hoverLast); + QFETCH(bool, pressAndRelease); + + MouseWindow w; + w.show(); + w.setGeometry(100, 100, 200, 200); + QVERIFY(QTest::qWaitForWindowActive(&w)); + + QPoint point(10, 10); + QCOMPARE(w.pressCount, 0); + if (pressAndRelease) { + QTest::mousePress(&w, Qt::LeftButton, { }, point); + QVERIFY(w.lastTimeStamp - lastTimeStampInPreviousTestFunction > 500); // Should be at least 500 ms timestamp between each test case + QCOMPARE(w.pressCount, 1); + QTest::mouseRelease(&w, Qt::LeftButton, { }, point); + } + QCOMPARE(w.doubleClickCount, 0); + if (hoverLast) { + static int xMove = 0; + xMove += 5; // Just make sure we generate different hover coordinates + point.rx() += xMove; + QTest::mouseMove(&w, point); // a hover move. This doesn't generate a timestamp delay of 500 ms + } + lastTimeStampInPreviousTestFunction = w.lastTimeStamp; +} + void tst_Mouse::stateHandlingPart1_data() { QTest::addColumn("dummy"); -- cgit v1.2.3 From a2832c577f950a1673c5dea362b4c2e8087a64ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 5 Feb 2020 14:59:26 +0100 Subject: Remove tst prefix for testlib selftests These tests are apparently not run at the moment, otherwise they would have failed to even start, but they should definitely not have the tst prefix. Change-Id: Iafcec2764ebb3570e6bc6ebfba27d92a94639893 Reviewed-by: Simon Hausmann --- tests/auto/testlib/selftests/deleteLater/deleteLater.pro | 2 +- tests/auto/testlib/selftests/deleteLater_noApp/deleteLater_noApp.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/testlib') diff --git a/tests/auto/testlib/selftests/deleteLater/deleteLater.pro b/tests/auto/testlib/selftests/deleteLater/deleteLater.pro index 9a10096461..1b057eccde 100644 --- a/tests/auto/testlib/selftests/deleteLater/deleteLater.pro +++ b/tests/auto/testlib/selftests/deleteLater/deleteLater.pro @@ -4,6 +4,6 @@ QT = core testlib CONFIG -= app_bundle CONFIG -= debug_and_release_target -TARGET = tst_deleteLater +TARGET = deleteLater include($$QT_SOURCE_TREE/src/testlib/selfcover.pri) diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/deleteLater_noApp.pro b/tests/auto/testlib/selftests/deleteLater_noApp/deleteLater_noApp.pro index 6f2b253c14..90440109e7 100644 --- a/tests/auto/testlib/selftests/deleteLater_noApp/deleteLater_noApp.pro +++ b/tests/auto/testlib/selftests/deleteLater_noApp/deleteLater_noApp.pro @@ -4,6 +4,6 @@ QT = core testlib CONFIG -= app_bundle CONFIG -= debug_and_release_target -TARGET = tst_deleteLater_noApp +TARGET = deleteLater_noApp include($$QT_SOURCE_TREE/src/testlib/selfcover.pri) -- cgit v1.2.3 From dbdb3cbc907fed4055adaa848dd5e36fb67b2263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 5 Feb 2020 15:01:22 +0100 Subject: Reduce scope of testlib selftest regular expressions Change-Id: I2fd7a39684bde44d82c4d877086f606413d68520 Reviewed-by: Edward Welbourne Reviewed-by: Simon Hausmann --- tests/auto/testlib/selftests/tst_selftests.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/auto/testlib') diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 6e4a7896f6..5c50fc6548 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -76,8 +76,6 @@ private: QList allLoggerSets() const; QTemporaryDir tempDir; - QRegularExpression durationRegExp; - QRegularExpression teamcityLocRegExp; }; struct BenchmarkResult @@ -418,8 +416,6 @@ QList tst_Selftests::allLoggerSets() const tst_Selftests::tst_Selftests() : tempDir(QDir::tempPath() + "/tst_selftests.XXXXXX") - , durationRegExp("") - , teamcityLocRegExp("\\|\\[Loc: .*\\(\\d*\\)\\|\\]") {} void tst_Selftests::initTestCase() @@ -881,6 +877,7 @@ bool tst_Selftests::compareOutput(const QString &logger, const QString &subdir, // Special handling for ignoring _FILE_ and _LINE_ if logger is teamcity if (logger.endsWith(QLatin1String("teamcity"))) { + static QRegularExpression teamcityLocRegExp("\\|\\[Loc: .*\\(\\d*\\)\\|\\]"); actualLine.replace(teamcityLocRegExp, teamCityLocation()); expectedLine.replace(teamcityLocRegExp, teamCityLocation()); } @@ -951,6 +948,7 @@ bool tst_Selftests::compareLine(const QString &logger, const QString &subdir, if (actualLine.startsWith(QLatin1String(" "); QRegularExpressionMatch match = durationRegExp.match(actualLine); if (match.hasMatch()) return true; -- cgit v1.2.3 From 8237e39f5dfa5e6e43aca7d7b9107c666d40de7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 6 Feb 2020 12:07:04 +0100 Subject: testlib: Move subtest argument handling to individual tests The test orchestrator shouldn't have to deal with the individual options needed for each test. Change-Id: I78bbf4850cc649e625bd08a7aedf02267ba1314d Reviewed-by: Edward Welbourne --- tests/auto/testlib/selftests/badxml/tst_badxml.cpp | 3 ++ .../benchlibcallgrind/tst_benchlibcallgrind.cpp | 10 ++++- .../benchlibcounting/tst_benchlibcounting.cpp | 11 ++++- .../tst_benchlibeventcounter.cpp | 5 +++ .../benchliboptions/tst_benchliboptions.cpp | 23 ++++++----- .../tst_benchlibtickcounter.cpp | 10 ++++- .../commandlinedata/tst_commandlinedata.cpp | 12 +++++- .../testlib/selftests/counting/tst_counting.cpp | 12 +++++- .../testlib/selftests/generate_expected_output.py | 21 +--------- .../selftests/printdatatags/tst_printdatatags.cpp | 10 ++++- .../tst_printdatatagswithglobaltags.cpp | 10 ++++- .../selftests/signaldumper/tst_signaldumper.cpp | 11 ++++- tests/auto/testlib/selftests/silent/tst_silent.cpp | 11 ++++- tests/auto/testlib/selftests/tst_selftests.cpp | 47 +--------------------- tests/auto/testlib/selftests/verbose1/verbose1.pro | 2 + tests/auto/testlib/selftests/verbose2/verbose2.pro | 2 + 16 files changed, 115 insertions(+), 85 deletions(-) (limited to 'tests/auto/testlib') diff --git a/tests/auto/testlib/selftests/badxml/tst_badxml.cpp b/tests/auto/testlib/selftests/badxml/tst_badxml.cpp index 164dc7eaa9..d82765311b 100644 --- a/tests/auto/testlib/selftests/badxml/tst_badxml.cpp +++ b/tests/auto/testlib/selftests/badxml/tst_badxml.cpp @@ -194,6 +194,9 @@ int main(int argc, char** argv) args << argv[i]; } } + + args << "-eventcounter"; + /* We just want testlib to output a benchmark result, we don't actually care about the value, so just do one iteration to save time. diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp b/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp index fe83ee6608..f2176612ad 100644 --- a/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp +++ b/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp @@ -79,6 +79,14 @@ void tst_BenchlibCallgrind::twoHundredMillionInstructions() #endif } -QTEST_MAIN(tst_BenchlibCallgrind) +int main(int argc, char *argv[]) +{ + std::vector args(argv, argv + argc); + args.push_back("-callgrind"); + argc = args.size(); + argv = const_cast(&args[0]); + + QTEST_MAIN_IMPL(tst_BenchlibCallgrind) +} #include "tst_benchlibcallgrind.moc" diff --git a/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp b/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp index 58df127f3a..56b6d92f67 100644 --- a/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp +++ b/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp @@ -59,5 +59,14 @@ void tst_BenchlibCounting::failingBenchmark() }; } -QTEST_MAIN(tst_BenchlibCounting) +int main(int argc, char *argv[]) +{ + std::vector args(argv, argv + argc); + args.push_back("-eventcounter"); + argc = args.size(); + argv = const_cast(&args[0]); + + QTEST_MAIN_IMPL(tst_BenchlibCounting) +} + #include "tst_benchlibcounting.moc" diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp b/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp index e8015acb95..e3f4720a5e 100644 --- a/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp +++ b/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp @@ -94,6 +94,11 @@ void tst_BenchlibEventCounter::events_data() int main(int argc, char** argv) { + std::vector args(argv, argv + argc); + args.push_back("-eventcounter"); + argc = args.size(); + argv = const_cast(&args[0]); + TestEventDispatcher dispatcher; QCoreApplication app(argc, argv); tst_BenchlibEventCounter test; diff --git a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp index c1acf5a6e8..b89ca28ff2 100644 --- a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp +++ b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp @@ -83,6 +83,9 @@ void tst_BenchlibOptions::threeEvents() int main(int argc, char** argv) { + std::vector args(argv, argv + argc); + args.push_back("-eventcounter"); + int ret = 0; TestEventDispatcher dispatcher; @@ -91,29 +94,27 @@ int main(int argc, char** argv) /* Run with no special arguments. */ { tst_BenchlibOptions test; - ret += QTest::qExec(&test, argc, argv); + ret += QTest::qExec(&test, args.size(), const_cast(&args[0])); } /* Run with an exact number of iterations. */ { - QVector args; - for (int i = 0; i < argc; ++i) args << argv[i]; - args << "-iterations"; - args << "15"; + auto extraArgs = args; + extraArgs.push_back("-iterations"); + extraArgs.push_back("15"); tst_BenchlibFifteenIterations test; - ret += QTest::qExec(&test, args.count(), const_cast(args.data())); + ret += QTest::qExec(&test, extraArgs.size(), const_cast(&extraArgs[0])); } /* Run until getting a value of at least 100. */ { - QVector args; - for (int i = 0; i < argc; ++i) args << argv[i]; - args << "-minimumvalue"; - args << "100"; + auto extraArgs = args; + extraArgs.push_back("-minimumvalue"); + extraArgs.push_back("100"); tst_BenchlibOneHundredMinimum test; - ret += QTest::qExec(&test, args.count(), const_cast(args.data())); + ret += QTest::qExec(&test, extraArgs.size(), const_cast(&extraArgs[0])); } return ret; diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp b/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp index b37f63f20a..2cb7dfd77f 100644 --- a/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp +++ b/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp @@ -62,6 +62,14 @@ void tst_BenchlibTickCounter::threeBillionTicks() #endif } -QTEST_MAIN(tst_BenchlibTickCounter) +int main(int argc, char *argv[]) +{ + std::vector args(argv, argv + argc); + args.push_back("-tickcounter"); + argc = args.size(); + argv = const_cast(&args[0]); + + QTEST_MAIN_IMPL(tst_BenchlibTickCounter) +} #include "tst_benchlibtickcounter.moc" diff --git a/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp b/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp index 8cb1192ea2..a916fd7f1e 100644 --- a/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp +++ b/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp @@ -63,6 +63,16 @@ void tst_DataTable::fiveTablePasses_data() const QTest::newRow("fiveTablePasses_data5") << true; } -QTEST_MAIN(tst_DataTable) +int main(int argc, char *argv[]) +{ + std::vector args(argv, argv + argc); + args.push_back("fiveTablePasses"); + args.push_back("fiveTablePasses:fiveTablePasses_data1"); + args.push_back("-v2"); + argc = args.size(); + argv = const_cast(&args[0]); + + QTEST_MAIN_IMPL(tst_DataTable) +} #include "tst_commandlinedata.moc" diff --git a/tests/auto/testlib/selftests/counting/tst_counting.cpp b/tests/auto/testlib/selftests/counting/tst_counting.cpp index da5595b04f..56933c78b7 100644 --- a/tests/auto/testlib/selftests/counting/tst_counting.cpp +++ b/tests/auto/testlib/selftests/counting/tst_counting.cpp @@ -287,5 +287,15 @@ void tst_Counting::testSkipInCleanup() qDebug() << "This test function should execute and then QSKIP in cleanup()"; } -QTEST_MAIN(tst_Counting) +int main(int argc, char *argv[]) +{ +#ifdef TESTLIB_VERBOSITY_ARG + std::vector args(argv, argv + argc); + args.push_back(QT_STRINGIFY(TESTLIB_VERBOSITY_ARG)); + argc = args.size(); + argv = const_cast(&args[0]); +#endif + + QTEST_MAIN_IMPL(tst_Counting) +} #include "tst_counting.moc" diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py index 1c0beff7fb..96fab44408 100755 --- a/tests/auto/testlib/selftests/generate_expected_output.py +++ b/tests/auto/testlib/selftests/generate_expected_output.py @@ -295,23 +295,7 @@ def testEnv(testname, return data def generateTestData(testname, clean, - formats = ('xml', 'txt', 'junitxml', 'lightxml', 'teamcity', 'tap'), - # Make sure this matches tst_Selftests::runSubTest_data(): - extraArgs = { - "commandlinedata": "fiveTablePasses fiveTablePasses:fiveTablePasses_data1 -v2", - "benchlibcallgrind": "-callgrind", - "benchlibeventcounter": "-eventcounter", - "benchliboptions": "-eventcounter", - "benchlibtickcounter": "-tickcounter", - "badxml": "-eventcounter", - "benchlibcounting": "-eventcounter", - "printdatatags": "-datatags", - "printdatatagswithglobaltags": "-datatags", - "signaldumper": "-vs", - "silent": "-silent", - "verbose1": "-v1", - "verbose2": "-v2", - }): + formats = ('xml', 'txt', 'junitxml', 'lightxml', 'teamcity', 'tap')): """Run one test and save its cleaned results. Required arguments are the name of the test directory (the binary @@ -330,9 +314,6 @@ def generateTestData(testname, clean, print(" running", testname) for format in formats: cmd = [path, '-' + format] - if testname in extraArgs: - cmd += extraArgs[testname].split() - data = subprocess.Popen(cmd, stdout=subprocess.PIPE, env=env, universal_newlines=True).communicate()[0] with open('expected_' + testname + '.' + format, 'w') as out: diff --git a/tests/auto/testlib/selftests/printdatatags/tst_printdatatags.cpp b/tests/auto/testlib/selftests/printdatatags/tst_printdatatags.cpp index 5c9f5c5898..60a295c0f7 100644 --- a/tests/auto/testlib/selftests/printdatatags/tst_printdatatags.cpp +++ b/tests/auto/testlib/selftests/printdatatags/tst_printdatatags.cpp @@ -72,6 +72,14 @@ void tst_PrintDataTags::c() const { } -QTEST_MAIN(tst_PrintDataTags) +int main(int argc, char *argv[]) +{ + std::vector args(argv, argv + argc); + args.push_back("-datatags"); + argc = args.size(); + argv = const_cast(&args[0]); + + QTEST_MAIN_IMPL(tst_PrintDataTags) +} #include "tst_printdatatags.moc" diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/tst_printdatatagswithglobaltags.cpp b/tests/auto/testlib/selftests/printdatatagswithglobaltags/tst_printdatatagswithglobaltags.cpp index b68daae538..6fea34467a 100644 --- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/tst_printdatatagswithglobaltags.cpp +++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/tst_printdatatagswithglobaltags.cpp @@ -88,6 +88,14 @@ void tst_PrintDataTagsWithGlobalTags::c() const { } -QTEST_MAIN(tst_PrintDataTagsWithGlobalTags) +int main(int argc, char *argv[]) +{ + std::vector args(argv, argv + argc); + args.push_back("-datatags"); + argc = args.size(); + argv = const_cast(&args[0]); + + QTEST_MAIN_IMPL(tst_PrintDataTagsWithGlobalTags) +} #include "tst_printdatatagswithglobaltags.moc" diff --git a/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp b/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp index 08592e222d..c60260f109 100644 --- a/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp +++ b/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp @@ -424,5 +424,14 @@ void tst_Signaldumper::deletingSender() emit signalSlotOwner->signalWithoutParameters(); } -QTEST_MAIN(tst_Signaldumper) +int main(int argc, char *argv[]) +{ + std::vector args(argv, argv + argc); + args.push_back("-vs"); + argc = args.size(); + argv = const_cast(&args[0]); + + QTEST_MAIN_IMPL(tst_Signaldumper) +} + #include "tst_signaldumper.moc" diff --git a/tests/auto/testlib/selftests/silent/tst_silent.cpp b/tests/auto/testlib/selftests/silent/tst_silent.cpp index 999d9acf07..7d64efffa2 100644 --- a/tests/auto/testlib/selftests/silent/tst_silent.cpp +++ b/tests/auto/testlib/selftests/silent/tst_silent.cpp @@ -102,5 +102,14 @@ void tst_Silent::messages() qFatal("This is a fatal error message that should still appear in silent test output"); } -QTEST_MAIN(tst_Silent) +int main(int argc, char *argv[]) +{ + std::vector args(argv, argv + argc); + args.push_back("-silent"); + argc = args.size(); + argv = const_cast(&args[0]); + + QTEST_MAIN_IMPL(tst_Silent) +} + #include "tst_silent.moc" diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 5c50fc6548..e2abf6869b 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -528,49 +528,6 @@ void tst_Selftests::runSubTest_data() QStringList loggers = loggerSet.loggers; foreach (QString const& subtest, tests) { - QStringList arguments = loggerSet.arguments; - // Keep in sync with generateTestData()'s extraArgs in generate_expected_output.py: - 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"; - } - else if (subtest == "benchlibcounting") { - arguments << "-eventcounter"; - } - else if (subtest == "printdatatags") { - arguments << "-datatags"; - } - else if (subtest == "printdatatagswithglobaltags") { - arguments << "-datatags"; - } - else if (subtest == "signaldumper") { - arguments << "-vs"; - } - else if (subtest == "silent") { - arguments << "-silent"; - } - else if (subtest == "verbose1") { - arguments << "-v1"; - } - else if (subtest == "verbose2") { - arguments << "-v2"; - } - - // These tests don't work right unless logging plain text to // standard output, either because they execute multiple test // objects or because they internally supply arguments to @@ -634,7 +591,7 @@ void tst_Selftests::runSubTest_data() QTest::newRow(qPrintable(QString("%1 %2").arg(subtest).arg(loggerSet.name))) << subtest << loggers - << arguments + << loggerSet.arguments << crashes ; } @@ -690,7 +647,7 @@ static inline QByteArray msgProcessError(const QString &binary, const QStringLis void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& loggers, QStringList const& arguments, bool crashes) { #if defined(__GNUC__) && defined(__i386) && defined(Q_OS_LINUX) - if (arguments.contains("-callgrind")) { + if (subdir == "benchlibcallgrind") { QProcess checkProcess; QStringList args; args << QLatin1String("--version"); diff --git a/tests/auto/testlib/selftests/verbose1/verbose1.pro b/tests/auto/testlib/selftests/verbose1/verbose1.pro index 1f16d70d66..f50ce83ea6 100644 --- a/tests/auto/testlib/selftests/verbose1/verbose1.pro +++ b/tests/auto/testlib/selftests/verbose1/verbose1.pro @@ -4,6 +4,8 @@ SOURCES += ../counting/tst_counting.cpp QT = core testlib +DEFINES += TESTLIB_VERBOSITY_ARG="-v1" + mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/verbose2/verbose2.pro b/tests/auto/testlib/selftests/verbose2/verbose2.pro index bf54904488..d4765f01b5 100644 --- a/tests/auto/testlib/selftests/verbose2/verbose2.pro +++ b/tests/auto/testlib/selftests/verbose2/verbose2.pro @@ -4,6 +4,8 @@ SOURCES += ../counting/tst_counting.cpp QT = core testlib +DEFINES += TESTLIB_VERBOSITY_ARG="-v2" + mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target -- cgit v1.2.3 From 4777c6d76bbcee4a45d35e3f66ef099b162698f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 7 Feb 2020 12:42:58 +0100 Subject: testlib: Improve error message when detecting line count mismatch Change-Id: I0e19b4c0dd7aa77063e02e6aac7e345dd7c8a5f5 Reviewed-by: Simon Hausmann --- tests/auto/testlib/selftests/tst_selftests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/testlib') diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index e2abf6869b..be64752ceb 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -800,8 +800,8 @@ bool tst_Selftests::compareOutput(const QString &logger, const QString &subdir, { if (actual.size() != expected.size()) { - *errorMessage = QString::fromLatin1("Mismatch in line count: %1 != %2.") - .arg(actual.size()).arg(expected.size()); + *errorMessage = QString::fromLatin1("Mismatch in line count. Expected %1 but got %2.") + .arg(expected.size()).arg(actual.size()); return false; } -- cgit v1.2.3