From 2ec36e7ebeb6213e808f1ebbd8c6d4713ad45e52 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 10 Jan 2024 16:22:20 +0100 Subject: [PATCH] tst_QEventDispatcher: port to QTEST_THROW_ON_FAIL Dogfooding the new QtTest 6.8 feature. Change-Id: I4ded1fabac25fb283eb26b5eef341892b4459e96 Reviewed-by: Ahmad Samir (cherry picked from commit 7a93e815d2489b97510a1ab7aaf6a140e2e2c587) Reviewed-by: Qt Cherry-pick Bot --- .../corelib/kernel/qeventdispatcher/CMakeLists.txt | 3 +++ .../kernel/qeventdispatcher/tst_qeventdispatcher.cpp | 12 ++++-------- .../gui/kernel/qguieventdispatcher/CMakeLists.txt | 3 +++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt index 1f9cfb9449a..a18bdab4295 100644 --- a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt @@ -19,6 +19,9 @@ endif() foreach(test ${test_names}) qt_internal_add_test(${test} NO_BATCH + DEFINES + QTEST_THROW_ON_FAIL + QTEST_THROW_ON_SKIP SOURCES tst_qeventdispatcher.cpp ) diff --git a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp index 285d0809601..a61f3983662 100644 --- a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp +++ b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp @@ -20,6 +20,10 @@ static bool glibDisabled = []() { #include +#ifndef QTEST_THROW_ON_FAIL +# error This test requires QTEST_THROW_ON_FAIL being active. +#endif + using namespace std::chrono_literals; static constexpr auto PreciseTimerInterval = 10ms; @@ -230,8 +234,6 @@ void tst_QEventDispatcher::registerTimer() { TimerManager timers(eventDispatcher, this); timers.registerAll(); - if (QTest::currentTestFailed()) - return; // check that all 3 are present in the eventDispatcher's registeredTimer() list QCOMPARE(timers.registeredTimers().size(), 3); @@ -267,8 +269,6 @@ void tst_QEventDispatcher::registerTimer() QCOMPARE(timerIdFromEvent, timers.preciseTimerId()); // now unregister it and make sure it's gone timers.unregister(Qt::TimerId(timers.preciseTimerId())); - if (QTest::currentTestFailed()) - return; QCOMPARE(timers.registeredTimers().size(), 2); QVERIFY(!timers.foundPrecise()); QVERIFY(timers.foundCoarse()); @@ -291,8 +291,6 @@ void tst_QEventDispatcher::registerTimer() QCOMPARE(timerIdFromEvent, timers.coarseTimerId()); // now unregister it and make sure it's gone timers.unregister(Qt::TimerId(timers.coarseTimerId())); - if (QTest::currentTestFailed()) - return; QCOMPARE(timers.registeredTimers().size(), 1); QVERIFY(!timers.foundPrecise()); QVERIFY(!timers.foundCoarse()); @@ -300,8 +298,6 @@ void tst_QEventDispatcher::registerTimer() // not going to wait for the VeryCoarseTimer, would take too long, just unregister it timers.unregisterAll(); - if (QTest::currentTestFailed()) - return; QVERIFY(timers.registeredTimers().isEmpty()); } diff --git a/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt index 62299f77df3..33135754032 100644 --- a/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt @@ -21,6 +21,9 @@ foreach(test ${test_names}) NO_BATCH SOURCES ../../../corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp + DEFINES + QTEST_THROW_ON_FAIL + QTEST_THROW_ON_SKIP LIBRARIES Qt::Gui )