Add test for PropertyChanges with attached properties.

Task-number: QTBUG-11283

2 files changed, 63 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml b/tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml
new file mode 100644
index 0000000..e17823b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml
@@ -0,0 +1,20 @@
+import Qt.test 1.0
+import Qt 4.7
+
+Item {
+    id: item
+    width: 100; height: 100
+    MyRectangle.foo: 0
+
+    states: State {
+        name: "foo1"
+        PropertyChanges {
+            target: item
+            MyRectangle.foo: 1
+            width: 50
+        }
+    }
+
+    Component.onCompleted: item.state = "foo1"
+}
+
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index 055a34c..1ddbe4d 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -50,6 +50,20 @@
 #include <private/qdeclarativeitem_p.h>
 
 
+class MyAttached : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int foo READ foo WRITE setFoo)
+public:
+    MyAttached(QObject *parent) : QObject(parent), m_foo(13) {}
+
+    int foo() const { return m_foo; }
+    void setFoo(int f) { m_foo = f; }
+
+private:
+    int m_foo;
+};
+
 class MyRect : public QDeclarativeRectangle
 {
    Q_OBJECT
@@ -61,6 +75,10 @@ public:
     
     int propertyWithNotify() const { return m_prop; }
     void setPropertyWithNotify(int i) { m_prop = i; emit oddlyNamedNotifySignal(); }
+
+    static MyAttached *qmlAttachedProperties(QObject *o) {
+        return new MyAttached(o);
+    }
 Q_SIGNALS:
     void didSomething();
     void oddlyNamedNotifySignal();
@@ -69,6 +87,8 @@ private:
     int m_prop;
 };
 
+QML_DECLARE_TYPE(MyRect)
+QML_DECLARE_TYPEINFO(MyRect, QML_HAS_ATTACHED_PROPERTIES)
 
 class tst_qdeclarativestates : public QObject
 {
@@ -83,6 +103,7 @@ private slots:
     void initTestCase();
 
     void basicChanges();
+    void attachedPropertyChanges();
     void basicExtension();
     void basicBinding();
     void signalOverride();
@@ -220,6 +241,28 @@ void tst_qdeclarativestates::basicChanges()
     }
 }
 
+void tst_qdeclarativestates::attachedPropertyChanges()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent component(&engine, SRCDIR "/data/attachedPropertyChanges.qml");
+    QVERIFY(component.isReady());
+
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
+    QVERIFY(item != 0);
+    QCOMPARE(item->width(), 50.0);
+
+    // Ensure attached property has been changed
+    QObject *attObj = qmlAttachedPropertiesObject<MyRect>(item, false);
+    QVERIFY(attObj);
+
+    MyAttached *att = qobject_cast<MyAttached*>(attObj);
+    QVERIFY(att);
+
+    QEXPECT_FAIL("", "QTBUG-11283", Abort);
+    QCOMPARE(att->foo(), 1);
+}
+
 void tst_qdeclarativestates::basicExtension()
 {
     QDeclarativeEngine engine;