Fix test textures for modelview autotest

Change-Id: I2b8fe0a7ec59d44d89e233d48c2410c22ce92fea
Reviewed-on: http://codereview.qt.nokia.com/1224
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>

7 files changed, 23 insertions, 22 deletions

diff --git a/tests/auto/qml3d/modelview/textures/amethyst.jpg b/tests/auto/qml3d/modelview/textures/amethyst.jpg
new file mode 100644
index 000000000..43a2c4409
--- /dev/null
+++ b/tests/auto/qml3d/modelview/textures/amethyst.jpg
diff --git a/tests/auto/qml3d/modelview/textures/bigblue.jpg b/tests/auto/qml3d/modelview/textures/bigblue.jpg
new file mode 100644
index 000000000..8a0bb6533
--- /dev/null
+++ b/tests/auto/qml3d/modelview/textures/bigblue.jpg
diff --git a/tests/auto/qml3d/modelview/textures/blueweb.jpg b/tests/auto/qml3d/modelview/textures/blueweb.jpg
new file mode 100644
index 000000000..68f3d3507
--- /dev/null
+++ b/tests/auto/qml3d/modelview/textures/blueweb.jpg
diff --git a/tests/auto/qml3d/modelview/textures/pastelstuff.jpg b/tests/auto/qml3d/modelview/textures/pastelstuff.jpg
new file mode 100644
index 000000000..82da86e09
--- /dev/null
+++ b/tests/auto/qml3d/modelview/textures/pastelstuff.jpg
diff --git a/tests/auto/qml3d/modelview/textures/qtlogo.png b/tests/auto/qml3d/modelview/textures/qtlogo.png
new file mode 100644
index 000000000..7d3e97eb3
--- /dev/null
+++ b/tests/auto/qml3d/modelview/textures/qtlogo.png
diff --git a/tests/auto/qml3d/modelview/textures/threedgreen.jpg b/tests/auto/qml3d/modelview/textures/threedgreen.jpg
new file mode 100644
index 000000000..7624527ff
--- /dev/null
+++ b/tests/auto/qml3d/modelview/textures/threedgreen.jpg
diff --git a/tests/auto/qml3d/modelview/tst_modelview.qml b/tests/auto/qml3d/modelview/tst_modelview.qml
index c56c13658..f49d7456b 100644
--- a/tests/auto/qml3d/modelview/tst_modelview.qml
+++ b/tests/auto/qml3d/modelview/tst_modelview.qml
@@ -63,43 +63,43 @@ Rectangle
         property variant emptyStringListModel:[]
 
         property variant stringListModelForViewport:[
-            "textures/woman.jpg",
-            "textures/niagara_falls.jpg",
-            "textures/place.jpg",
-            "textures/background.jpg",
-            "textures/basket.jpg",
+            "textures/threedgreen.jpg",
+            "textures/amethyst.jpg",
+            "textures/bigblue.jpg",
+            "textures/pastelstuff.jpg",
+            "textures/blueweb.jpg",
             "textures/qtlogo.png"
         ]
 
         property variant stringListModelEmptyForItem: []
 
         property variant stringListModelForItem:[
-            "textures/niagara_falls.jpg",
-            "textures/background.jpg",
-            "textures/place.jpg",
+            "textures/amethyst.jpg",
+            "textures/pastelstuff.jpg",
+            "textures/bigblue.jpg",
             "textures/qtlogo.png",
-            "textures/basket.jpg",
-            "textures/woman.jpg"
+            "textures/blueweb.jpg",
+            "textures/threedgreen.jpg"
         ]
 
         ListModel {
             id: listModelForViewport
-            ListElement { image:"textures/woman.jpg"}
-            ListElement { image:"textures/niagara_falls.jpg"}
-            ListElement { image:"textures/place.jpg"}
-            ListElement { image:"textures/background.jpg"}
-            ListElement { image:"textures/basket.jpg"}
+            ListElement { image:"textures/threedgreen.jpg"}
+            ListElement { image:"textures/amethyst.jpg"}
+            ListElement { image:"textures/bigblue.jpg"}
+            ListElement { image:"textures/pastelstuff.jpg"}
+            ListElement { image:"textures/blueweb.jpg"}
             ListElement { image:"textures/qtlogo.png"}
         }
 
         ListModel {
             id: listModelForItem
-            ListElement { image:"textures/niagara_falls.jpg"}
-            ListElement { image:"textures/background.jpg"}
-            ListElement { image:"textures/place.jpg"}
+            ListElement { image:"textures/amethyst.jpg"}
+            ListElement { image:"textures/pastelstuff.jpg"}
+            ListElement { image:"textures/bigblue.jpg"}
             ListElement { image:"textures/qtlogo.png"}
-            ListElement { image:"textures/basket.jpg"}
-            ListElement { image:"textures/woman.jpg"}
+            ListElement { image:"textures/blueweb.jpg"}
+            ListElement { image:"textures/threedgreen.jpg"}
         }
 
         Component {
@@ -161,6 +161,7 @@ Rectangle
 
         TestCase {
             id: modelViewTestAddingCase
+//            when: false
             name: "Quick3d ModelView Adding Data Test"
 
             function test_changing_stringList_model() {
@@ -196,8 +197,8 @@ Rectangle
                 var viewportChildCount = viewport.children.length;
                 var itemChildCount = listModelParentItem.children.length;
 
-                listModelForViewport.append({"image":"textures/background.jpg"});
-                listModelForItem.append({"image":"textures/background.jpg"});
+                listModelForViewport.append({"image":"textures/pastelstuff.jpg"});
+                listModelForItem.append({"image":"textures/pastelstuff.jpg"});
                 viewport.update3d();
                 compare(viewport.children.length, viewportChildCount + 1,
                         "Viewport missing child after listModel.append()");