1 files changed, 80 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
index 40e4fff..f01e9d4 100644
--- a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
+++ b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
@@ -46,6 +46,8 @@ private slots:
     void extensionObjects();
     void enums();
     void valueTypeFunctions();
+    void constantsOverrideBindings();
+    void outerBindingOverridesInnerBinding();
 
 private:
     QmlEngine engine;
@@ -401,6 +403,84 @@ void tst_qmlecmascript::valueTypeFunctions()
     QCOMPARE(obj->rectFProperty(), QRectF(0,0.5,100,99.5));
 }
 
+/* 
+Tests that writing a constant to a property with a binding on it disables the
+binding.
+*/
+void tst_qmlecmascript::constantsOverrideBindings()
+{
+    // From ECMAScript
+    {
+        QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.1.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("c2").toInt(), 0);
+        object->setProperty("c1", QVariant(9));
+        QCOMPARE(object->property("c2").toInt(), 9);
+
+        emit object->basicSignal();
+
+        QCOMPARE(object->property("c2").toInt(), 13);
+        object->setProperty("c1", QVariant(8));
+        QCOMPARE(object->property("c2").toInt(), 13);
+    }
+
+    // During construction
+    {
+        QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.2.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("c1").toInt(), 0);
+        QCOMPARE(object->property("c2").toInt(), 10);
+        object->setProperty("c1", QVariant(9));
+        QCOMPARE(object->property("c1").toInt(), 9);
+        QCOMPARE(object->property("c2").toInt(), 10);
+    }
+
+    // From C++
+    {
+        QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.3.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("c2").toInt(), 0);
+        object->setProperty("c1", QVariant(9));
+        QCOMPARE(object->property("c2").toInt(), 9);
+
+        object->setProperty("c2", QVariant(13));
+        QCOMPARE(object->property("c2").toInt(), 13);
+        object->setProperty("c1", QVariant(7));
+        QCOMPARE(object->property("c1").toInt(), 7);
+        QCOMPARE(object->property("c2").toInt(), 13);
+    }
+}
+
+/*
+Tests that assigning a binding to a property that already has a binding causes
+the original binding to be disabled.
+*/
+void tst_qmlecmascript::outerBindingOverridesInnerBinding()
+{
+    QmlComponent component(&engine, TEST_FILE("outerBindingOverridesInnerBinding.qml"));
+    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("c1").toInt(), 0);
+    QCOMPARE(object->property("c2").toInt(), 0);
+    QCOMPARE(object->property("c3").toInt(), 0);
+
+    object->setProperty("c1", QVariant(9));
+    QCOMPARE(object->property("c1").toInt(), 9);
+    QCOMPARE(object->property("c2").toInt(), 0);
+    QCOMPARE(object->property("c3").toInt(), 0);
+
+    object->setProperty("c3", QVariant(8));
+    QCOMPARE(object->property("c1").toInt(), 9);
+    QCOMPARE(object->property("c2").toInt(), 8);
+    QCOMPARE(object->property("c3").toInt(), 8);
+}
 
 QTEST_MAIN(tst_qmlecmascript)