1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QEventDispatcher: port to QTEST_THROW_ON_FAIL

Browse Source 
Dogfooding the new QtTest 6.8 feature.

Change-Id: I4ded1fabac25fb283eb26b5eef341892b4459e96
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit 7a93e815d2489b97510a1ab7aaf6a140e2e2c587)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-01-10 16:22:20 +01:00 committed by Qt Cherry-pick Bot
parent 161996d1da
commit 2ec36e7ebe
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
View File

@ -19,6 +19,9 @@ endif()
foreach(test ${test_names}) foreach(test ${test_names})
qt_internal_add_test(${test} qt_internal_add_test(${test}
NO_BATCH NO_BATCH
DEFINES
QTEST_THROW_ON_FAIL
QTEST_THROW_ON_SKIP
SOURCES SOURCES
tst_qeventdispatcher.cpp tst_qeventdispatcher.cpp
) )

12
tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
View File

@ -20,6 +20,10 @@ static bool glibDisabled = []() {
#include <chrono> #include <chrono>
#ifndef QTEST_THROW_ON_FAIL
# error This test requires QTEST_THROW_ON_FAIL being active.
#endif
using namespace std::chrono_literals; using namespace std::chrono_literals;
static constexpr auto PreciseTimerInterval = 10ms; static constexpr auto PreciseTimerInterval = 10ms;
@ -230,8 +234,6 @@ void tst_QEventDispatcher::registerTimer()
{ {
TimerManager timers(eventDispatcher, this); TimerManager timers(eventDispatcher, this);
timers.registerAll(); timers.registerAll();
if (QTest::currentTestFailed())
return;
// check that all 3 are present in the eventDispatcher's registeredTimer() list // check that all 3 are present in the eventDispatcher's registeredTimer() list
QCOMPARE(timers.registeredTimers().size(), 3); QCOMPARE(timers.registeredTimers().size(), 3);
@ -267,8 +269,6 @@ void tst_QEventDispatcher::registerTimer()
QCOMPARE(timerIdFromEvent, timers.preciseTimerId()); QCOMPARE(timerIdFromEvent, timers.preciseTimerId());
// now unregister it and make sure it's gone // now unregister it and make sure it's gone
timers.unregister(Qt::TimerId(timers.preciseTimerId())); timers.unregister(Qt::TimerId(timers.preciseTimerId()));
if (QTest::currentTestFailed())
return;
QCOMPARE(timers.registeredTimers().size(), 2); QCOMPARE(timers.registeredTimers().size(), 2);
QVERIFY(!timers.foundPrecise()); QVERIFY(!timers.foundPrecise());
QVERIFY(timers.foundCoarse()); QVERIFY(timers.foundCoarse());
@ -291,8 +291,6 @@ void tst_QEventDispatcher::registerTimer()
QCOMPARE(timerIdFromEvent, timers.coarseTimerId()); QCOMPARE(timerIdFromEvent, timers.coarseTimerId());
// now unregister it and make sure it's gone // now unregister it and make sure it's gone
timers.unregister(Qt::TimerId(timers.coarseTimerId())); timers.unregister(Qt::TimerId(timers.coarseTimerId()));
if (QTest::currentTestFailed())
return;
QCOMPARE(timers.registeredTimers().size(), 1); QCOMPARE(timers.registeredTimers().size(), 1);
QVERIFY(!timers.foundPrecise()); QVERIFY(!timers.foundPrecise());
QVERIFY(!timers.foundCoarse()); 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 // not going to wait for the VeryCoarseTimer, would take too long, just unregister it
timers.unregisterAll(); timers.unregisterAll();
if (QTest::currentTestFailed())
return;
QVERIFY(timers.registeredTimers().isEmpty()); QVERIFY(timers.registeredTimers().isEmpty());
} }

3
tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
View File

@ -21,6 +21,9 @@ foreach(test ${test_names})
NO_BATCH NO_BATCH
SOURCES SOURCES
../../../corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp ../../../corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
DEFINES
QTEST_THROW_ON_FAIL
QTEST_THROW_ON_SKIP
LIBRARIES LIBRARIES
Qt::Gui Qt::Gui
) )