summaryrefslogtreecommitdiffstats
path: root/tests/auto/testlib/selftests/failcleanup
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2022-07-11 14:27:28 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2022-07-25 19:29:07 +0200
commit21e9c223b753ade33c994c1efabbd67978eda3bf (patch)
treedeb3f79829a12f43b4f52111fd37139aa5f0479d /tests/auto/testlib/selftests/failcleanup
parentafbae9c2acf8d5c0846a87f03edfb9407672e9ee (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')
-rw-r--r--tests/auto/testlib/selftests/failcleanup/CMakeLists.txt8
-rw-r--r--tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp6
2 files changed, 5 insertions, 9 deletions
diff --git a/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt b/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
index e45d1b528b..81997dff89 100644
--- a/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
@@ -1,12 +1,10 @@
-# Generated from failcleanup.pro.
-
#####################################################################
## failcleanup Binary:
#####################################################################
qt_internal_add_executable(failcleanup
- NO_INSTALL # special case
- OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+ NO_INSTALL
+ OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
SOURCES
tst_failcleanup.cpp
PUBLIC_LIBRARIES
@@ -16,6 +14,4 @@ qt_internal_add_executable(failcleanup
## Scopes:
#####################################################################
-# special case begin
qt_internal_apply_testlib_coverage_options(failcleanup)
-# special case end
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)