summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Samir <a.samirh78@gmail.com>2024-02-14 22:03:38 +0200
committerAhmad Samir <a.samirh78@gmail.com>2024-02-15 22:35:00 +0200
commit026e1e3fdb8ab2116f7fae28455c7141c926bb88 (patch)
tree727ee06096d93bda08c2d9415458fe4fe0d13def
parent039d51835f4c2a3956e929f7ef7f525dccbd7fd5 (diff)
QTimer: use QTest::ingoreMessage() for negative internvals tests
Pick-to: 6.7 6.6 6.5 Change-Id: I87d095b748a7488a71b22710ab7ed72d9451c769 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
-rw-r--r--tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index c318c3a625..467fc9abd7 100644
--- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
+++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -1291,13 +1291,20 @@ void tst_QTimer::bindToTimer()
timer.stop();
QVERIFY(!active);
+ auto ignoreMsg = [] {
+ QTest::ignoreMessage(QtWarningMsg,
+ "QObject::startTimer: Timers cannot have negative intervals");
+ };
+
// also test that using negative interval updates the binding correctly
timer.start(100);
QVERIFY(active);
+ ignoreMsg();
timer.setInterval(-100);
QVERIFY(!active);
timer.start(100);
QVERIFY(active);
+ ignoreMsg();
timer.start(-100);
QVERIFY(!active);
}
@@ -1382,9 +1389,15 @@ void tst_QTimer::automatedBindingTests()
void tst_QTimer::negativeInterval()
{
+ auto ignoreMsg = [] {
+ QTest::ignoreMessage(QtWarningMsg,
+ "QObject::startTimer: Timers cannot have negative intervals");
+ };
+
QTimer timer;
// Starting with a negative interval does not change active state.
+ ignoreMsg();
timer.start(-100ms);
QVERIFY(!timer.isActive());
@@ -1392,6 +1405,7 @@ void tst_QTimer::negativeInterval()
// the active state.
timer.start(100ms);
QVERIFY(timer.isActive());
+ ignoreMsg();
timer.setInterval(-100);
QVERIFY(!timer.isActive());
@@ -1399,6 +1413,7 @@ void tst_QTimer::negativeInterval()
// and inactive state.
timer.start(100);
QVERIFY(timer.isActive());
+ ignoreMsg();
timer.start(-100ms);
QVERIFY(!timer.isActive());
}