From d281aa6936ad01e28dacabb41bd9eb59891f85a1 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Sat, 7 Jul 2012 06:07:11 +0200 Subject: statemachine: Support parallel root state QStateMachine inherits from QState, so it should be possible to set its childMode to ParallelStates, and it should behave as expected (the machine should emit the finished() signal when all its child states are in final states). Task-number: QTBUG-22931 Change-Id: Ic436351be0be69e3b01ae9984561132cd9839fa7 Reviewed-by: Eskil Abrahamsen Blomfeldt --- .../statemachine/qstatemachine/tst_qstatemachine.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp index 64f8d3aa9b..436b386a28 100644 --- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp @@ -1912,11 +1912,16 @@ void tst_QStateMachine::parallelRootState() QSignalSpy startedSpy(&machine, SIGNAL(started())); QVERIFY(startedSpy.isValid()); - QTest::ignoreMessage(QtWarningMsg, "QStateMachine::start: No initial state set for machine. Refusing to start."); + QSignalSpy finishedSpy(&machine, SIGNAL(finished())); + QVERIFY(finishedSpy.isValid()); machine.start(); - QCoreApplication::processEvents(); - QEXPECT_FAIL("", "parallel root state is not supported (QTBUG-22931)", Continue); - QCOMPARE(startedSpy.count(), 1); + QTRY_COMPARE(startedSpy.count(), 1); + QCOMPARE(machine.configuration().size(), 4); + QVERIFY(machine.configuration().contains(s1)); + QVERIFY(machine.configuration().contains(s1_f)); + QVERIFY(machine.configuration().contains(s2)); + QVERIFY(machine.configuration().contains(s2_f)); + QTRY_COMPARE(finishedSpy.count(), 1); } void tst_QStateMachine::allSourceToTargetConfigurations() -- cgit v1.2.3