2 files changed, 155 insertions, 3 deletions

diff --git a/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp b/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
index ac3374b6a3..c64d55671a 100644
--- a/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
+++ b/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
@@ -47,6 +47,7 @@ private slots:
     void historyInitialState();
     void transitions();
     void privateSignals();
+    void parallelStateAndInitialState();
 };
 
 class TestClass: public QObject
@@ -344,5 +345,35 @@ void tst_QState::privateSignals()
 
 }
 
+void tst_QState::parallelStateAndInitialState()
+{
+    QStateMachine machine;
+
+    { // setting an initial state on a parallel state:
+        QState a(QState::ParallelStates, &machine);
+        QState b(&a);
+        QVERIFY(!a.initialState());
+        const QString warning
+            = QString::asprintf("QState::setInitialState: ignoring attempt to set initial state of parallel state group %p", &a);
+        QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
+        a.setInitialState(&b); // should produce a warning and do nothing.
+        QVERIFY(!a.initialState());
+    }
+
+    { // setting the child-mode from ExclusiveStates to ParallelStates should remove the initial state:
+        QState a(QState::ExclusiveStates, &machine);
+        QState b(&a);
+        a.setInitialState(&b);
+        QCOMPARE(a.initialState(), &b);
+        const QString warning
+            = QString::asprintf("QState::setChildMode: setting the child-mode of state %p to "
+                                "parallel removes the initial state", &a);
+        QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
+        a.setChildMode(QState::ParallelStates); // should produce a warning and remove the initial state
+        QVERIFY(!a.initialState());
+        QCOMPARE(a.childMode(), QState::ParallelStates);
+    }
+}
+
 QTEST_MAIN(tst_QState)
 #include "tst_qstate.moc"
diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
index e60b1c983c..8c76809c48 100644
--- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
@@ -249,7 +249,9 @@ private slots:
     void qtbug_44783();
     void internalTransition();
     void conflictingTransition();
+    void conflictingTransition2();
     void qtbug_46059();
+    void qtbug_46703();
     void postEventFromBeginSelectTransitions();
 };
 
@@ -266,7 +268,7 @@ public:
     TestState(ChildMode mode, const QString &objectName = QString())
         : QState(mode)
     { setObjectName(objectName); }
-    QList<QPair<int, Event> > events;
+    QVector<QPair<int, Event> > events;
 protected:
     virtual void onEntry(QEvent *) {
         events.append(qMakePair(globalTick++, Entry));
@@ -282,7 +284,7 @@ public:
     TestTransition(QAbstractState *target, const QString &objectName = QString())
         : QAbstractTransition()
     { setTargetState(target); setObjectName(objectName); }
-    QList<int> triggers;
+    QVector<int> triggers;
 protected:
     virtual bool eventTest(QEvent *) {
         return true;
@@ -4861,7 +4863,7 @@ public:
         signalList.append(signal);
     }
 
-    QList<QMetaMethod> signalList;
+    QVector<QMetaMethod> signalList;
 };
 
 void tst_QStateMachine::testIncrementReceivers()
@@ -6448,6 +6450,71 @@ void tst_QStateMachine::conflictingTransition()
     QVERIFY(machine.isRunning());
 }
 
+void tst_QStateMachine::conflictingTransition2()
+{
+    SignalEmitter emitter;
+
+    QStateMachine machine;
+    QState s0(&machine);
+        QState p0(QState::ParallelStates, &s0);
+            QState p0s1(&p0);
+            QState p0s2(&p0);
+            QState p0s3(&p0);
+    QState s1(&machine);
+
+    machine.setInitialState(&s0);
+    s0.setInitialState(&p0);
+
+    QSignalTransition *t1 = new QSignalTransition(&emitter, SIGNAL(signalWithNoArg()));
+    p0s1.addTransition(t1);
+    QSignalTransition *t2 = p0s2.addTransition(&emitter, SIGNAL(signalWithNoArg()), &p0s1);
+    QSignalTransition *t3 = p0s3.addTransition(&emitter, SIGNAL(signalWithNoArg()), &s1);
+    QSignalSpy t1Spy(t1, &QAbstractTransition::triggered);
+    QSignalSpy t2Spy(t2, &QAbstractTransition::triggered);
+    QSignalSpy t3Spy(t3, &QAbstractTransition::triggered);
+    QVERIFY(t1Spy.isValid());
+    QVERIFY(t2Spy.isValid());
+    QVERIFY(t3Spy.isValid());
+
+    s0.setObjectName("s0");
+    p0.setObjectName("p0");
+    p0s1.setObjectName("p0s1");
+    p0s2.setObjectName("p0s2");
+    p0s3.setObjectName("p0s3");
+    s1.setObjectName("s1");
+    t1->setObjectName("p0s1->p0s1");
+    t2->setObjectName("p0s2->p0s1");
+    t3->setObjectName("p0s3->s1");
+
+    machine.start();
+
+    QTRY_COMPARE(machine.configuration().contains(&s0), true);
+    QTRY_COMPARE(machine.configuration().contains(&p0), true);
+    QTRY_COMPARE(machine.configuration().contains(&p0s1), true);
+    QTRY_COMPARE(machine.configuration().contains(&p0s2), true);
+    QTRY_COMPARE(machine.configuration().contains(&p0s3), true);
+    QTRY_COMPARE(machine.configuration().contains(&s1), false);
+
+    QCOMPARE(t1Spy.count(), 0);
+    QCOMPARE(t2Spy.count(), 0);
+    QCOMPARE(t3Spy.count(), 0);
+
+    emitter.emitSignalWithNoArg();
+
+    QTRY_COMPARE(machine.configuration().contains(&s0), true);
+    QTRY_COMPARE(machine.configuration().contains(&p0), true);
+    QTRY_COMPARE(machine.configuration().contains(&p0s1), true);
+    QTRY_COMPARE(machine.configuration().contains(&p0s2), true);
+    QTRY_COMPARE(machine.configuration().contains(&p0s3), true);
+    QTRY_COMPARE(machine.configuration().contains(&s1), false);
+
+    QCOMPARE(t1Spy.count(), 1);
+    QCOMPARE(t2Spy.count(), 1);
+    QCOMPARE(t3Spy.count(), 0); // t3 got preempted by t2
+
+    QVERIFY(machine.isRunning());
+}
+
 void tst_QStateMachine::qtbug_46059()
 {
     QStateMachine machine;
@@ -6486,6 +6553,60 @@ void tst_QStateMachine::qtbug_46059()
     QVERIFY(machine.isRunning());
 }
 
+void tst_QStateMachine::qtbug_46703()
+{
+    QStateMachine machine;
+    QState root(&machine);
+        QHistoryState h(&root);
+        QState p(QState::ParallelStates, &root);
+            QState a(&p);
+                QState a1(&a);
+                QState a2(&a);
+                QState a3(&a);
+            QState b(&p);
+                QState b1(&b);
+                QState b2(&b);
+
+    machine.setObjectName("machine");
+    root.setObjectName("root");
+    h.setObjectName("h");
+    p.setObjectName("p");
+    a.setObjectName("a");
+    a1.setObjectName("a1");
+    a2.setObjectName("a2");
+    a3.setObjectName("a3");
+    b.setObjectName("b");
+    b1.setObjectName("b1");
+    b2.setObjectName("b2");
+
+    machine.setInitialState(&root);
+    root.setInitialState(&h);
+    a.setInitialState(&a3);
+    b.setInitialState(&b1);
+    struct : public QAbstractTransition {
+        virtual bool eventTest(QEvent *) { return false; }
+        virtual void onTransition(QEvent *) {}
+    } defaultTransition;
+    defaultTransition.setTargetStates(QList<QAbstractState*>() << &a2 << &b2);
+    h.setDefaultTransition(&defaultTransition);
+
+    machine.start();
+    QCoreApplication::processEvents();
+
+    QTRY_COMPARE(machine.configuration().contains(&root), true);
+    QTRY_COMPARE(machine.configuration().contains(&h), false);
+    QTRY_COMPARE(machine.configuration().contains(&p), true);
+    QTRY_COMPARE(machine.configuration().contains(&a), true);
+    QTRY_COMPARE(machine.configuration().contains(&a1), false);
+    QTRY_COMPARE(machine.configuration().contains(&a2), true);
+    QTRY_COMPARE(machine.configuration().contains(&a3), false);
+    QTRY_COMPARE(machine.configuration().contains(&b), true);
+    QTRY_COMPARE(machine.configuration().contains(&b1), false);
+    QTRY_COMPARE(machine.configuration().contains(&b2), true);
+
+    QVERIFY(machine.isRunning());
+}
+
 void tst_QStateMachine::postEventFromBeginSelectTransitions()
 {
     class StateMachine : public QStateMachine {