1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make clear why QTestLog::addB?XFail() don't add to counters

Browse Source 
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 <marten.nordheim@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Edward Welbourne 2021-08-16 16:58:32 +02:00
parent a56b915f71
commit 7af79ba091
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/testlib/qtestlog.cpp
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the QtTest module of the Qt Toolkit. ** 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); QTEST_ASSERT(msg);
// Will be counted in addPass() if we get there.
FOREACH_TEST_LOGGER FOREACH_TEST_LOGGER
logger->addIncident(QAbstractTestLogger::XFail, msg, file, line); 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_ASSERT(msg);
++QTest::blacklists; // Will be counted in addBPass() if we get there.
FOREACH_TEST_LOGGER FOREACH_TEST_LOGGER
logger->addIncident(QAbstractTestLogger::BlacklistedXFail, msg, file, line); logger->addIncident(QAbstractTestLogger::BlacklistedXFail, msg, file, line);

10
tests/auto/testlib/selftests/expected_blacklisted.tap
View File

@ -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 file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
line: 0 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 # This test should BXFAIL then BPASS
at: tst_Blacklisted::xfail() (qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp:0) at: tst_Blacklisted::xfail() (qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp:0)
file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
line: 0 line: 0
... ...
ok 7 - xpass() # TODO 'true' returned TRUE unexpectedly. (This test should BXPASS) ok 6 - xpass() # TODO 'true' returned TRUE unexpectedly. (This test should BXPASS)
ok 8 - cleanupTestCase() ok 7 - cleanupTestCase()
1..8 1..7
# tests 8 # tests 7
# pass 2 # pass 2
# fail 0 # fail 0

2
tests/auto/testlib/selftests/expected_blacklisted.txt
View File

@ -12,5 +12,5 @@ BPASS : tst_Blacklisted::xfail()
BXPASS : tst_Blacklisted::xpass() 'true' returned TRUE unexpectedly. (This test should BXPASS) BXPASS : tst_Blacklisted::xpass() 'true' returned TRUE unexpectedly. (This test should BXPASS)
Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)]
PASS : tst_Blacklisted::cleanupTestCase() 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 ********* ********* Finished testing of tst_Blacklisted *********