From 7af79ba09148dbfe5c1fc8b130d564dcca7ae4b3 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 16 Aug 2021 16:58:32 +0200 Subject: [PATCH] Make clear why QTestLog::addB?XFail() don't add to counters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 904617dfb83f39a6a379635b64fea6fcd00f241a and makes clear to future readers why that wouldn't be a sensible change. Update the test's data, eliminating a case of duplicate counting that was caused by the reverted commit. Task-number: QTBUG-95661 Pick-to: 5.12 5.15 6.1 6.2 Change-Id: Ice6d3ab06ca171e0d6eb0fac757f1ab774e229f0 Reviewed-by: Mårten Nordheim Reviewed-by: Tor Arne Vestbø --- src/testlib/qtestlog.cpp | 6 ++++-- tests/auto/testlib/selftests/expected_blacklisted.tap | 10 +++++----- tests/auto/testlib/selftests/expected_blacklisted.txt | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index 212dc927a44..7e311d273e7 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -337,6 +337,8 @@ void QTestLog::addXFail(const char *msg, const char *file, int line) { QTEST_ASSERT(msg); + // Will be counted in addPass() if we get there. + FOREACH_TEST_LOGGER logger->addIncident(QAbstractTestLogger::XFail, msg, file, line); } @@ -385,7 +387,7 @@ void QTestLog::addBXFail(const char *msg, const char *file, int line) { QTEST_ASSERT(msg); - ++QTest::blacklists; + // Will be counted in addBPass() if we get there. FOREACH_TEST_LOGGER logger->addIncident(QAbstractTestLogger::BlacklistedXFail, msg, file, line); diff --git a/tests/auto/testlib/selftests/expected_blacklisted.tap b/tests/auto/testlib/selftests/expected_blacklisted.tap index fee7750a12c..f75fabbdd21 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.tap +++ b/tests/auto/testlib/selftests/expected_blacklisted.tap @@ -15,16 +15,16 @@ not ok 4 - fail() # TODO 'false' returned FALSE. (This test should BFAIL) file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp line: 0 ... -not ok 6 - xfail() # TODO This test should BXFAIL then BPASS +not ok 5 - xfail() # TODO This test should BXFAIL then BPASS --- # This test should BXFAIL then BPASS at: tst_Blacklisted::xfail() (qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp:0) file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp line: 0 ... -ok 7 - xpass() # TODO 'true' returned TRUE unexpectedly. (This test should BXPASS) -ok 8 - cleanupTestCase() -1..8 -# tests 8 +ok 6 - xpass() # TODO 'true' returned TRUE unexpectedly. (This test should BXPASS) +ok 7 - cleanupTestCase() +1..7 +# tests 7 # pass 2 # fail 0 diff --git a/tests/auto/testlib/selftests/expected_blacklisted.txt b/tests/auto/testlib/selftests/expected_blacklisted.txt index 62a2d11ed2f..b6335780295 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.txt +++ b/tests/auto/testlib/selftests/expected_blacklisted.txt @@ -12,5 +12,5 @@ BPASS : tst_Blacklisted::xfail() BXPASS : tst_Blacklisted::xpass() 'true' returned TRUE unexpectedly. (This test should BXPASS) Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] PASS : tst_Blacklisted::cleanupTestCase() -Totals: 2 passed, 0 failed, 1 skipped, 5 blacklisted, 0ms +Totals: 2 passed, 0 failed, 1 skipped, 4 blacklisted, 0ms ********* Finished testing of tst_Blacklisted *********