9b2971cbb4
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>
51 lines
2.5 KiB
Plaintext
51 lines
2.5 KiB
Plaintext
********* Start testing of tst_Subtest *********
|
|
Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
|
|
QDEBUG : tst_Subtest::initTestCase() initTestCase initTestCase (null)
|
|
PASS : tst_Subtest::initTestCase()
|
|
QDEBUG : tst_Subtest::test1() init test1 (null)
|
|
QDEBUG : tst_Subtest::test1() test1 test1 (null)
|
|
QDEBUG : tst_Subtest::test1() cleanup test1 (null)
|
|
PASS : tst_Subtest::test1()
|
|
QDEBUG : tst_Subtest::test2() test2_data test2 (null)
|
|
QDEBUG : tst_Subtest::test2() test2_data end
|
|
QDEBUG : tst_Subtest::test2(data0) init test2 data0
|
|
QDEBUG : tst_Subtest::test2(data0) test2 test2 data0
|
|
QDEBUG : tst_Subtest::test2(data0) test2 end
|
|
QDEBUG : tst_Subtest::test2(data0) cleanup test2 data0
|
|
PASS : tst_Subtest::test2(data0)
|
|
QDEBUG : tst_Subtest::test2(data1) init test2 data1
|
|
QDEBUG : tst_Subtest::test2(data1) test2 test2 data1
|
|
QDEBUG : tst_Subtest::test2(data1) test2 end
|
|
QDEBUG : tst_Subtest::test2(data1) cleanup test2 data1
|
|
PASS : tst_Subtest::test2(data1)
|
|
QDEBUG : tst_Subtest::test2(data2) init test2 data2
|
|
QDEBUG : tst_Subtest::test2(data2) test2 test2 data2
|
|
QDEBUG : tst_Subtest::test2(data2) test2 end
|
|
QDEBUG : tst_Subtest::test2(data2) cleanup test2 data2
|
|
PASS : tst_Subtest::test2(data2)
|
|
QDEBUG : tst_Subtest::test3() test3_data test3 (null)
|
|
QDEBUG : tst_Subtest::test3() test3_data end
|
|
QDEBUG : tst_Subtest::test3(data0) init test3 data0
|
|
QDEBUG : tst_Subtest::test3(data0) test2 test3 data0
|
|
QDEBUG : tst_Subtest::test3(data0) test2 end
|
|
QDEBUG : tst_Subtest::test3(data0) cleanup test3 data0
|
|
PASS : tst_Subtest::test3(data0)
|
|
QDEBUG : tst_Subtest::test3(data1) init test3 data1
|
|
QDEBUG : tst_Subtest::test3(data1) test2 test3 data1
|
|
FAIL! : tst_Subtest::test3(data1) Compared values are not the same
|
|
Actual (str): hello1
|
|
Expected (QString("hello0")): hello0
|
|
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp(154)]
|
|
QDEBUG : tst_Subtest::test3(data1) cleanup test3 data1
|
|
QDEBUG : tst_Subtest::test3(data2) init test3 data2
|
|
QDEBUG : tst_Subtest::test3(data2) test2 test3 data2
|
|
FAIL! : tst_Subtest::test3(data2) Compared values are not the same
|
|
Actual (str): hello2
|
|
Expected (QString("hello0")): hello0
|
|
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp(154)]
|
|
QDEBUG : tst_Subtest::test3(data2) cleanup test3 data2
|
|
QDEBUG : tst_Subtest::cleanupTestCase() cleanupTestCase cleanupTestCase (null)
|
|
PASS : tst_Subtest::cleanupTestCase()
|
|
Totals: 7 passed, 2 failed, 0 skipped
|
|
********* Finished testing of tst_Subtest *********
|