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/failcleanup/tst_failcleanup.cpp | |
| 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/failcleanup/tst_failcleanup.cpp')
| -rw-r--r-- | tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp b/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp index f0c0af7549..a93c57ccda 100644 --- a/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp +++ b/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp @@ -8,7 +8,7 @@ class tst_FailCleanup: public QObject Q_OBJECT private slots: void aTestFunction() const; - void cleanupTestCase() const; + void cleanup() const; }; void tst_FailCleanup::aTestFunction() const @@ -16,9 +16,9 @@ void tst_FailCleanup::aTestFunction() const QVERIFY(true); } -void tst_FailCleanup::cleanupTestCase() const +void tst_FailCleanup::cleanup() const { - QVERIFY2(false, "Fail inside cleanupTestCase"); + QVERIFY2(false, "Fail inside cleanup"); } QTEST_APPLESS_MAIN(tst_FailCleanup) |