diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-06-11 14:33:41 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-06-15 18:55:16 +0200 |
| commit | a93a9ea915332196821db9c197856955bedbfd26 (patch) | |
| tree | 5f24f501522716fd26b79658669894b998be5175 /tests/auto/testlib | |
| parent | b62fcccb1560698dddbf5167813ae1dc044fc35b (diff) | |
Fix QFAIL() to interract correctly with QEXPECT_FAIL()
Previously, it went direct to QTestResults::addFailure() without going
via the checking for expected failure. Add QTestResults::fail() to
take care of this checking, as for verify() and compare().
Tidied up the code implementing expected failure and QFAIL(), while I
was about it. Adjusted an existing test to verify that expecting a
QFAIL() works, by using QFAIL() instead of QVERIFY(false).
Remove the QVERIFY(false) whose comment brought this to my attention.
[ChangeLog][QtTestLib][QFAIL] QEXPECT_FAIL() now correctly anticipates
a subsequent QFAIL(). Previously QFAIL() counted as a fail regardless.
Change-Id: Icc28cf70e5ff3006363791ea03aa01f2f591eb71
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'tests/auto/testlib')
| -rw-r--r-- | tests/auto/testlib/selftests/xunit/tst_xunit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/testlib/selftests/xunit/tst_xunit.cpp b/tests/auto/testlib/selftests/xunit/tst_xunit.cpp index 508f8cd024..d620784e41 100644 --- a/tests/auto/testlib/selftests/xunit/tst_xunit.cpp +++ b/tests/auto/testlib/selftests/xunit/tst_xunit.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -88,7 +88,7 @@ void tst_Xunit::testFunc5() void tst_Xunit::testFunc6() { QEXPECT_FAIL("", "this failure is also expected", Abort); - QVERIFY(false); + QFAIL("This is a deliberate failure"); } void tst_Xunit::testFunc7() |