5 files changed, 170 insertions, 0 deletions
diff --git a/tests/auto/declarative/states/data/explicit.qml b/tests/auto/declarative/states/data/explicit.qml
new file mode 100644
index 0000000..271115a
--- /dev/null
+++ b/tests/auto/declarative/states/data/explicit.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+Rectangle {
+    id: MyRectangle
+    property color sourceColor: "blue"
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges {
+            target: MyRectangle; explicit: true
+            color: sourceColor
+        }
+    }
+}
diff --git a/tests/auto/declarative/states/data/parentChange4.qml b/tests/auto/declarative/states/data/parentChange4.qml
new file mode 100644
index 0000000..ee75176
--- /dev/null
+++ b/tests/auto/declarative/states/data/parentChange4.qml
@@ -0,0 +1,30 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400; height: 400
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        x: 5; y: 5
+        width: 100; height: 100
+        color: "red"
+    }
+    MouseRegion {
+        id: Clickable
+        anchors.fill: parent
+    }
+
+    Item {
+        id: newParent
+        transform: Scale { xScale: .5; yScale: .7}
+    }
+
+    states: State {
+        name: "reparented"
+        when: Clickable.pressed
+        ParentChange {
+            target: myRect
+            parent: newParent
+        }
+    }
+}
diff --git a/tests/auto/declarative/states/data/parentChange5.qml b/tests/auto/declarative/states/data/parentChange5.qml
new file mode 100644
index 0000000..47b733b
--- /dev/null
+++ b/tests/auto/declarative/states/data/parentChange5.qml
@@ -0,0 +1,30 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400; height: 400
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        x: 5; y: 5
+        width: 100; height: 100
+        color: "red"
+    }
+    MouseRegion {
+        id: Clickable
+        anchors.fill: parent
+    }
+
+    Item {
+        id: newParent
+        transform: Rotation { angle: 30; axis { x: 0; y: 1; z: 0 } }
+    }
+
+    states: State {
+        name: "reparented"
+        when: Clickable.pressed
+        ParentChange {
+            target: myRect
+            parent: newParent
+        }
+    }
+}
diff --git a/tests/auto/declarative/states/data/restoreEntryValues.qml b/tests/auto/declarative/states/data/restoreEntryValues.qml
new file mode 100644
index 0000000..d86f033
--- /dev/null
+++ b/tests/auto/declarative/states/data/restoreEntryValues.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+Rectangle {
+    id: MyRectangle
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges {
+            target: MyRectangle
+            restoreEntryValues: false
+            color: "blue"
+        }
+    }
+}
diff --git a/tests/auto/declarative/states/tst_states.cpp b/tests/auto/declarative/states/tst_states.cpp
index 40e9aa8..3d8f303 100644
--- a/tests/auto/declarative/states/tst_states.cpp
+++ b/tests/auto/declarative/states/tst_states.cpp
@@ -56,8 +56,11 @@ private slots:
     void signalOverride();
     void signalOverrideCrash();
     void parentChange();
+    void parentChangeErrors();
     void anchorChanges();
     void script();
+    void restoreEntryValues();
+    void explicitChanges();
 };
 
 void tst_states::basicChanges()
@@ -425,6 +428,43 @@ void tst_states::parentChange()
     }
 }
 
+void tst_states::parentChangeErrors()
+{
+    QmlEngine engine;
+
+    {
+        QmlComponent rectComponent(&engine, SRCDIR "/data/parentChange4.qml");
+        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+        QVERIFY(innerRect != 0);
+
+        QTest::ignoreMessage(QtWarningMsg, "QML QmlParentChange (file://" SRCDIR "/data/parentChange4.qml:25:9) Unable to preserve appearance under non-uniform scale");
+        rect->setState("reparented");
+        QCOMPARE(innerRect->rotation(), qreal(0));
+        QCOMPARE(innerRect->scale(), qreal(1));
+        QCOMPARE(innerRect->x(), qreal(5));
+        QCOMPARE(innerRect->y(), qreal(5));
+    }
+
+    {
+        QmlComponent rectComponent(&engine, SRCDIR "/data/parentChange5.qml");
+        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+        QVERIFY(innerRect != 0);
+
+        QTest::ignoreMessage(QtWarningMsg, "QML QmlParentChange (file://" SRCDIR "/data/parentChange5.qml:25:9) Unable to preserve appearance under complex transform");
+        rect->setState("reparented");
+        QCOMPARE(innerRect->rotation(), qreal(0));
+        QCOMPARE(innerRect->scale(), qreal(1));
+        QCOMPARE(innerRect->x(), qreal(5));
+        QCOMPARE(innerRect->y(), qreal(5));
+    }
+}
+
 void tst_states::anchorChanges()
 {
     QmlEngine engine;
@@ -479,6 +519,48 @@ void tst_states::script()
     }
 }
 
+void tst_states::restoreEntryValues()
+{
+    QmlEngine engine;
+
+    QmlComponent rectComponent(&engine, SRCDIR "/data/restoreEntryValues.qml");
+    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QCOMPARE(rect->color(),QColor("red"));
+
+    rect->setState("blue");
+    QCOMPARE(rect->color(),QColor("blue"));
+
+    rect->setState("");
+    QCOMPARE(rect->color(),QColor("blue"));
+}
+
+void tst_states::explicitChanges()
+{
+    QmlEngine engine;
+
+    QmlComponent rectComponent(&engine, SRCDIR "/data/explicit.qml");
+    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QCOMPARE(rect->color(),QColor("red"));
+
+    rect->setState("blue");
+    QCOMPARE(rect->color(),QColor("blue"));
+
+    rect->setProperty("sourceColor", QColor("green"));
+    QCOMPARE(rect->color(),QColor("blue"));
+
+    rect->setState("");
+    QCOMPARE(rect->color(),QColor("red"));
+    rect->setProperty("sourceColor", QColor("yellow"));
+    QCOMPARE(rect->color(),QColor("red"));
+
+    rect->setState("blue");
+    QCOMPARE(rect->color(),QColor("yellow"));
+}
+
 QTEST_MAIN(tst_states)
 
 #include "tst_states.moc"