Clean up qdeclarativepositioner tests

dynamic.qml is now at expect-fail status, see QTBUG-14839

Task-number: QTBUG-14792

1 files changed, 35 insertions, 30 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
index 8da3602..8a522a5 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml
@@ -1,13 +1,14 @@
 import QtQuick 1.0
 
+//Expected to fail until QTBUG-14839 is resolved
 Item {
-    width: 400; height: 400;
+    width: 120; height: 60;
     property int step: 0
     function tick()
     {
         step++;
         if(step == 1){
-            row1.destroy(); //Not dynamically created, so is this valid?
+            //row1.destroy(); //Not dynamically created, so is this valid?
         }else if(step == 2){
             r2a.destroy();
         }else if(step == 3){
@@ -21,42 +22,46 @@ Item {
         }else if(step == 7){
             r3c.parent = row2;
         }else if(step == 8){
-            row3.destroy();
+            //row3.destroy();//empty now, so should have no effect//May be invalid, but was deleting the reparent items at one point
         }else{
             repeater.model++;
         }
     }
 
-    //Tests base positioner functionality, so just using row
-    Row{
-        id: row1
-        Rectangle{id: r1a; width:20; height:20; color: "red"}
-        Rectangle{id: r1b; width:20; height:20; color: "green"}
-        Rectangle{id: r1c; width:20; height:20; color: "blue"}
-    }
-    Row{
-        y:20
-        id: row2
-        move: Transition{NumberAnimation{properties:"x"}}
-        Repeater{ 
-            id: repeater 
-            model: 0; 
-            delegate: Component{ Rectangle { color: "yellow"; width:20; height:20;}}
+    //Tests base positioner functionality, so don't need them all.
+    Column{
+        move: Transition{NumberAnimation{properties:"y"}}
+        Row{
+            id: row1
+            height: childrenRect.height
+            Rectangle{id: r1a; width:20; height:20; color: "red"}
+            Rectangle{id: r1b; width:20; height:20; color: "green"}
+            Rectangle{id: r1c; width:20; height:20; color: "blue"}
+        }
+        Row{
+            id: row2
+            height: childrenRect.height
+            move: Transition{NumberAnimation{properties:"x"}}
+            Repeater{ 
+                id: repeater 
+                model: 0; 
+                delegate: Component{ Rectangle { color: "yellow"; width:20; height:20;}}
+            }
+            Rectangle{id: r2a; width:20; height:20; color: "red"}
+            Rectangle{id: r2b; width:20; height:20; color: "green"}
+            Rectangle{id: r2c; width:20; height:20; color: "blue"}
+        }
+        Row{
+            move: Transition{NumberAnimation{properties:"x"}}
+            id: row3
+            height: childrenRect.height
+            Rectangle{id: r3a; width:20; height:20; color: "red"}
+            Rectangle{id: r3b; width:20; height:20; color: "green"}
+            Rectangle{id: r3c; width:20; height:20; color: "blue"}
         }
-        Rectangle{id: r2a; width:20; height:20; color: "red"}
-        Rectangle{id: r2b; width:20; height:20; color: "green"}
-        Rectangle{id: r2c; width:20; height:20; color: "blue"}
-    }
-    Row{
-        move: Transition{NumberAnimation{properties:"x"}}
-        y:40
-        id: row3
-        Rectangle{id: r3a; width:20; height:20; color: "red"}
-        Rectangle{id: r3b; width:20; height:20; color: "green"}
-        Rectangle{id: r3c; width:20; height:20; color: "blue"}
     }
     Timer{
-        interval: 500;
+        interval: 250;
         running: true;
         repeat: true;
         onTriggered: tick();