From 6c05fbad5fd71ba91997662c3e827233b5a5beb1 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Thu, 14 Feb 2013 16:53:58 +0100
Subject: Some minor cleanups in testbench

Change-Id: I6afa30c19ce293c658b694db49ec5fcb87104517
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
 tests/manual/testbench/content/Components.qml | 34 ++++-----------------------
 tests/manual/testbench/main.qml               |  2 +-
 2 files changed, 5 insertions(+), 31 deletions(-)

(limited to 'tests')

diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml
index 32af62a7..209bce60 100644
--- a/tests/manual/testbench/content/Components.qml
+++ b/tests/manual/testbench/content/Components.qml
@@ -80,36 +80,10 @@ Item {
     }
     property var model: ListModel{
         id: testDataModel
-        ListElement { text: "1) Apple" }
-        ListElement { text: "2) Banana" }
-        ListElement { text: "3) Coconut" }
-        ListElement { text: "4) Orange" }
-        ListElement { text: "5) Kiwi" }
-        ListElement { text: "6) Apple" }
-        ListElement { text: "7) Banana" }
-        ListElement { text: "8) Coconut" }
-        ListElement { text: "9) Orange" }
-        ListElement { text: "10) Kiwi" }
-        ListElement { text: "11) Apple" }
-        ListElement { text: "12) Banana" }
-        ListElement { text: "13) Coconut" }
-        ListElement { text: "14) Orange" }
-        ListElement { text: "15) Kiwi" }
-        ListElement { text: "16) Apple" }
-        ListElement { text: "17) Banana" }
-        ListElement { text: "18) Coconut" }
-        ListElement { text: "19) Orange" }
-        ListElement { text: "20) Kiwi" }
-        ListElement { text: "21) Apple" }
-        ListElement { text: "22) Banana" }
-        ListElement { text: "23) Coconut" }
-        ListElement { text: "24) Orange" }
-        ListElement { text: "25) Kiwi" }
-        ListElement { text: "26) Apple" }
-        ListElement { text: "27) Banana" }
-        ListElement { text: "28) Coconut" }
-        ListElement { text: "29) Orange" }
-        ListElement { text: "30) Kiwi" }
+        Component.onCompleted: {
+            for (var i = 0 ; i < 10 ; ++i)
+                testDataModel.append({text: "Value " + i});
+        }
     }
     property string loremIpsum:
             "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor "+
diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml
index ff7506b8..1a9e7d13 100644
--- a/tests/manual/testbench/main.qml
+++ b/tests/manual/testbench/main.qml
@@ -375,7 +375,7 @@ ApplicationWindow {
                             Text {
                                 height: 20
                                 anchors.right: parent.right
-                                text: loader.item[name]
+                                text: loader.item[name] ? loader.item[name] : ""
                             }
                         }
                     }
-- 
cgit v1.2.1