diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2022-07-11 14:27:28 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2022-07-25 19:29:07 +0200 |
commit | 21e9c223b753ade33c994c1efabbd67978eda3bf (patch) | |
tree | deb3f79829a12f43b4f52111fd37139aa5f0479d /tests/auto/testlib/selftests/skipcleanuptestcase | |
parent | afbae9c2acf8d5c0846a87f03edfb9407672e9ee (diff) |
Test skip and fail in cleanup() as well as in cleanupTestCase()
The skipcleanup and failcleanup tests were actually testing skip and
fail in cleanupTestCase(), not in cleanup(). Add almost-duplicate
tests and clean up so that we now have {fail,skip}cleanup(,testcase}
tests to cover all four cases. Generated expected output. The new
tests (with old names) get their fail or skip - during cleanup() -
reported against the test instead of the cleanupTestCase function.
(Results for {init,cleanup}TestCase() are always reported, even when
these slots are not defined, as no-op passes.)
Pick-to: 6.4
Change-Id: I0988d1696b50c0e2f30c45ddc25e1bd0bfd2151a
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/testlib/selftests/skipcleanuptestcase')
-rw-r--r-- | tests/auto/testlib/selftests/skipcleanuptestcase/CMakeLists.txt | 17 | ||||
-rw-r--r-- | tests/auto/testlib/selftests/skipcleanuptestcase/tst_skipcleanuptestcase.cpp | 25 |
2 files changed, 42 insertions, 0 deletions
diff --git a/tests/auto/testlib/selftests/skipcleanuptestcase/CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanuptestcase/CMakeLists.txt new file mode 100644 index 0000000000..1d175144ff --- /dev/null +++ b/tests/auto/testlib/selftests/skipcleanuptestcase/CMakeLists.txt @@ -0,0 +1,17 @@ +##################################################################### +## skipcleanuptestcase Binary: +##################################################################### + +qt_internal_add_executable(skipcleanuptestcase + NO_INSTALL + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + SOURCES + tst_skipcleanuptestcase.cpp + PUBLIC_LIBRARIES + Qt::Test +) + +## Scopes: +##################################################################### + +qt_internal_apply_testlib_coverage_options(skipcleanuptestcase) diff --git a/tests/auto/testlib/selftests/skipcleanuptestcase/tst_skipcleanuptestcase.cpp b/tests/auto/testlib/selftests/skipcleanuptestcase/tst_skipcleanuptestcase.cpp new file mode 100644 index 0000000000..89be7ac8bf --- /dev/null +++ b/tests/auto/testlib/selftests/skipcleanuptestcase/tst_skipcleanuptestcase.cpp @@ -0,0 +1,25 @@ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + +#include <QTest> + +class tst_SkipCleanupTestCase: public QObject +{ +Q_OBJECT +private slots: + void aTestFunction() const; + void cleanupTestCase() const; +}; + +void tst_SkipCleanupTestCase::aTestFunction() const +{ + QVERIFY(true); +} + +void tst_SkipCleanupTestCase::cleanupTestCase() const +{ + QSKIP("Skip inside cleanupTestCase."); +} + +QTEST_APPLESS_MAIN(tst_SkipCleanupTestCase) +#include "tst_skipcleanuptestcase.moc" |