From: Damian Jansen <damian.jansen@nokia.com>
Date: Mon, 30 Apr 2012 00:44:47 +0000 (+1000)
Subject: Update system tests
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=bd9962711efffcf5c1929e9ba0a85a731f2705b6;p=konrad%2Fqtdeclarative.git

Update system tests

A few items have changed, namely:
SpriteImage property names
XmlListModel is separated from QtQuick
A fixed bug in ParticleSystem

Change-Id: Iec8fb1c6ad0a76deb6b0733caf3b893e0da0627e
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
---

diff --git a/tests/testapplications/elements/content/ParticleSystemElement.qml b/tests/testapplications/elements/content/ParticleSystemElement.qml
index cd64980..ba3892f 100644
--- a/tests/testapplications/elements/content/ParticleSystemElement.qml
+++ b/tests/testapplications/elements/content/ParticleSystemElement.qml
@@ -87,7 +87,7 @@ Item {
                 "Advance to resume simulation." }
         },
         State { name: "resumed"; when: statenum == 3
-            PropertyChanges { target: bugpanel; bugnumber: "21539" }
+            // PropertyChanges { target: bugpanel; bugnumber: "21539" } FIXED
             PropertyChanges { target: particlesystemelement; paused: false }
             PropertyChanges { target: particlesystemelementtest
                 testtext: "The simulation should now be active.\n"+
diff --git a/tests/testapplications/elements/content/SpriteSequenceElement.qml b/tests/testapplications/elements/content/SpriteSequenceElement.qml
index 8b0a93b..acfa2cc 100644
--- a/tests/testapplications/elements/content/SpriteSequenceElement.qml
+++ b/tests/testapplications/elements/content/SpriteSequenceElement.qml
@@ -50,55 +50,55 @@ Item {
         sprites: [Sprite {
             name: "happy"
             source: "pics/squarefacesprite2.png"
-            frames: 6
+            frameCount: 6
             frameDuration: 120
             to: {"silly": 1, "sad":0}
         }, Sprite {
             name: "silly"
             source: "pics/squarefacesprite.png"
-            frames: 6
+            frameCount: 6
             frameDuration: 120
             to: {"happy": 1, "sad": 0}
         }, Sprite {
             name: "sad"
             source: "pics/squarefacesprite3.png"
-            frames: 6
+            frameCount: 6
             frameDuration: 120
             to: {"evil": 0.5, "sad": 1, "cyclops" : 0}
         }, Sprite {
             name: "cyclops"
             source: "pics/squarefacesprite4.png"
-            frames: 6
+            frameCount: 6
             frameDuration: 120
             to: {"love": 0.1, "boggled": 0.1, "cyclops" : 0.1}
         }, Sprite {
             name: "evil"
             source: "pics/squarefacesprite5.png"
-            frames: 6
+            frameCount: 6
             frameDuration: 120
             to: {"sad": 1.0, "cyclops" : 0}
         }, Sprite {
             name: "love"
             source: "pics/squarefacesprite6.png"
-            frames: 6
+            frameCount: 6
             frameDuration: 120
             to: {"love": 0.1, "boggled": 0.1, "cyclops" : 0.1}
         }, Sprite {
             name: "boggled"
             source: "pics/squarefacesprite7.png"
-            frames: 6
+            frameCount: 6
             frameDuration: 120
             to: {"love": 0.1, "boggled": 0.1, "cyclops" : 0.1, "dying":0}
         }, Sprite {
             name: "dying"
             source: "pics/squarefacespriteX.png"
-            frames: 4
+            frameCount: 4
             frameDuration: 120
             to: {"dead":1.0}
         }, Sprite {
             name: "dead"
             source: "pics/squarefacespriteXX.png"
-            frames: 1
+            frameCount: 1
             frameDuration: 10000
         }]
 
diff --git a/tests/testapplications/elements/content/XmlListModelElement.qml b/tests/testapplications/elements/content/XmlListModelElement.qml
index 9e4fc52..255fa15 100644
--- a/tests/testapplications/elements/content/XmlListModelElement.qml
+++ b/tests/testapplications/elements/content/XmlListModelElement.qml
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import QtQuick.XmlListModel 2.0
 
 Item {
     id: xmllistmodelelementtest
@@ -110,7 +111,7 @@ Item {
                     width: parent.width; wrapMode: Text.WordWrap; visible: opacity != 0; text: methodtext
                     anchors.horizontalCenter: parent.horizontalCenter; anchors.top: ingredientlist.bottom
                     Behavior on opacity { NumberAnimation { duration: 250 } }
-                    Component.onCompleted: { console.log(model.method); methodtext = model.method; console.log(recipemethod.textFormat); }
+                    Component.onCompleted: { methodtext = model.method; }
                 }
                 MouseArea { anchors.fill: parent; onClicked: delbox.state = delbox.state == "open" ? "closed" : "open" }
                 Behavior on height { NumberAnimation { duration: 250 } }