summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
index 8dd191e621..7c3ef3613b 100644
--- a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
+++ b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
@@ -285,17 +285,16 @@ void tst_QStatusBar::QTBUG25492_msgtimeout()
QCOMPARE(testWidget->currentMessage(), QString("Ready"));
QCOMPARE(testWidget->currentMessage(), currentMessage);
- QTest::qWait(1000);
-
- // Set display message for 2 seconds again
- testWidget->showMessage("Ready", 2000);
- QCOMPARE(testWidget->currentMessage(), QString("Ready"));
+ // Set display message for 2 seconds
+ QElapsedTimer t;
+ t.start();
+ testWidget->showMessage("Ready 2000", 2000);
+ QCOMPARE(testWidget->currentMessage(), QString("Ready 2000"));
QCOMPARE(testWidget->currentMessage(), currentMessage);
- QTest::qWait(1500);
-
// Message disappears after 2 seconds
QTRY_VERIFY(testWidget->currentMessage().isNull());
+ QVERIFY2(t.elapsed() >= 2000, qPrintable("Timer was " + QString::number(t.elapsed())));
QVERIFY(currentMessage.isNull());
// Set display message for 2 seconds first
@@ -303,8 +302,6 @@ void tst_QStatusBar::QTBUG25492_msgtimeout()
QCOMPARE(testWidget->currentMessage(), QString("Ready 25492"));
QCOMPARE(testWidget->currentMessage(), currentMessage);
- QTest::qWait(1000);
-
// Set display message forever again
testWidget->showMessage("Ready 25492", 0);
QCOMPARE(testWidget->currentMessage(), QString("Ready 25492"));