summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2018-03-26 16:30:25 +0300
committerKari Oikarinen <kari.oikarinen@qt.io>2018-04-04 07:07:40 +0000
commit3e1ecdd74cfb85d1c73f96289fc2114708881c6b (patch)
tree02765b142a88ebc640c31b63f010144779f8673a
parent051228c9ba048188a5c596d3ced3210f130a28dd (diff)
tst_QStateMachine: Don't use unconditional waitsv5.11.0-beta3
Instead use QSignalSpy to wait directly for the expected events. Change-Id: I319302ea7177fe690b5d885347c505454904518e Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
-rw-r--r--tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
index 17763f31f9..810698fb4e 100644
--- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
@@ -4667,11 +4667,14 @@ void tst_QStateMachine::clonedSignals()
s1->addTransition(t1);
machine.setInitialState(s1);
+ QSignalSpy startedSpy(&machine, &QStateMachine::started);
machine.start();
- QTest::qWait(1);
+ QVERIFY(startedSpy.wait());
+ QSignalSpy transitionSpy(t1, &CloneSignalTransition::triggered);
emitter.emitSignalWithDefaultArg();
- QTest::qWait(1);
+ QTRY_COMPARE(transitionSpy.count(), 1);
+
QCOMPARE(t1->eventSignalIndex, emitter.metaObject()->indexOfSignal("signalWithDefaultArg()"));
TEST_ACTIVE_CHANGED(s1, 2);
TEST_ACTIVE_CHANGED(s2, 1);