testlib: Count passes, fails and skips consistently.
authorJason McDonald <jason.mcdonald@nokia.com>
Thu, 2 Feb 2012 07:08:44 +0000 (17:08 +1000)
committerQt by Nokia <qt-info@nokia.com>
Mon, 13 Feb 2012 00:46:09 +0000 (01:46 +0100)
commit9b2971cbb4ebf102198c2320a575e2fd718c182e
tree05e227d3607eda50b7e39255407c157f68b83e6f
parenta6d3983ef6b7affef1d2aa48ed8bf8000a6e4267
testlib: Count passes, fails and skips consistently.

For data-driven tests, testlib previously counted one fail or skip for
each data row that failed or skipped, while it counted only one pass
for a test function where all rows passed and counted no passes for a
test function where some rows passed and some rows failed. A similar
problem also existed for benchmark tests, which could run multiple
iterations of the same test, with each fail and skip being counted but
only a single pass being counted for the entire series of iterations.

This commit makes testlib count one pass, fail or skip for each data
row.  Test functions that are not data-driven count one result for the
test function, as before.  Benchmark tests count one pass, fail or skip
per iteration.

A side-effect of this change is that the test output in plain text, xml
and light xml formats now shows a result for every data row and
benchmark iteration executed, allowing post-processors to correctly
calculate the total number of tests executed.  Previously, individual
rows were not shown in the test output if they passed, making such
calculations impossible.

The only change to the xunitxml output format is to correct a bug where
no test result was recorded for a test function if the last data row
was skipped and all other rows passed -- in which case the overall
result should be a pass.  Note that there is also a pre-existing bug
in the xunit logger, where no result is reported if all rows are
skipped; that bug is unaffected by this commit.

Task-number: QTBUG-21848
Task-number: QTBUG-22124
Change-Id: I7e17177e10d6e89e55b9684c159bd506f21d002b
Reviewed-by: Ed Baak <ed.baak@nokia.com>
42 files changed:
dist/changes-5.0.0
src/testlib/qtestcase.cpp
src/testlib/qtestresult.cpp
src/testlib/qtestresult_p.h
tests/auto/testlib/selftests/expected_badxml.lightxml
tests/auto/testlib/selftests/expected_badxml.txt
tests/auto/testlib/selftests/expected_badxml.xml
tests/auto/testlib/selftests/expected_benchlibcallgrind.txt
tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml
tests/auto/testlib/selftests/expected_benchlibeventcounter.txt
tests/auto/testlib/selftests/expected_benchlibeventcounter.xml
tests/auto/testlib/selftests/expected_benchliboptions.txt
tests/auto/testlib/selftests/expected_cmptest.lightxml
tests/auto/testlib/selftests/expected_cmptest.txt
tests/auto/testlib/selftests/expected_cmptest.xml
tests/auto/testlib/selftests/expected_commandlinedata.lightxml
tests/auto/testlib/selftests/expected_commandlinedata.txt
tests/auto/testlib/selftests/expected_commandlinedata.xml
tests/auto/testlib/selftests/expected_counting.lightxml
tests/auto/testlib/selftests/expected_counting.txt
tests/auto/testlib/selftests/expected_counting.xml
tests/auto/testlib/selftests/expected_counting.xunitxml
tests/auto/testlib/selftests/expected_datatable.lightxml
tests/auto/testlib/selftests/expected_datatable.txt
tests/auto/testlib/selftests/expected_datatable.xml
tests/auto/testlib/selftests/expected_datetime.lightxml
tests/auto/testlib/selftests/expected_datetime.txt
tests/auto/testlib/selftests/expected_datetime.xml
tests/auto/testlib/selftests/expected_expectfail.lightxml
tests/auto/testlib/selftests/expected_expectfail.txt
tests/auto/testlib/selftests/expected_expectfail.xml
tests/auto/testlib/selftests/expected_float.txt
tests/auto/testlib/selftests/expected_globaldata.lightxml
tests/auto/testlib/selftests/expected_globaldata.txt
tests/auto/testlib/selftests/expected_globaldata.xml
tests/auto/testlib/selftests/expected_qexecstringlist.txt
tests/auto/testlib/selftests/expected_skip.lightxml
tests/auto/testlib/selftests/expected_skip.txt
tests/auto/testlib/selftests/expected_skip.xml
tests/auto/testlib/selftests/expected_subtest.lightxml
tests/auto/testlib/selftests/expected_subtest.txt
tests/auto/testlib/selftests/expected_subtest.xml