diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2012-04-10 14:03:43 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-11 03:24:09 +0200 |
| commit | 9981549d1550a6f19ad7353b73a33caa7db87825 (patch) | |
| tree | 2d55111856f2be26fd9342ffc9600c1a306730bd | |
| parent | bbf058cf1561eacde981a6e725348f7dcb0d354d (diff) | |
Fix failing qml3d tests.
The sphere was changed by recent fixes.
Change-Id: I01c58abb62d0206914149b7736bf415e80c04233
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
| -rw-r--r-- | tests/auto/qml3d/shaders/tst_shaders.qml | 7 | ||||
| -rw-r--r-- | tests/auto/qml3d/sphere/tst_sphere.qml | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tests/auto/qml3d/shaders/tst_shaders.qml b/tests/auto/qml3d/shaders/tst_shaders.qml index 1a50c256b..f1cc5c488 100644 --- a/tests/auto/qml3d/shaders/tst_shaders.qml +++ b/tests/auto/qml3d/shaders/tst_shaders.qml @@ -68,6 +68,13 @@ Viewport { }\ " + Material { + id: china + ambientColor: "#c09680" + specularColor: "#3c3c3c" + shininess: 128 + } + Effect { id: testEffect material: china diff --git a/tests/auto/qml3d/sphere/tst_sphere.qml b/tests/auto/qml3d/sphere/tst_sphere.qml index f513e8511..d94348de1 100644 --- a/tests/auto/qml3d/sphere/tst_sphere.qml +++ b/tests/auto/qml3d/sphere/tst_sphere.qml @@ -79,7 +79,7 @@ Viewport { name: "Sphere" function test_defaults() { - compare(sphere1.radius, 1, "radius"); + compare(sphere1.radius, 0.5, "radius"); compare(sphere1.levelOfDetail, 5, "levelOfDetail"); compare(sphere1.axis, Qt.ZAxis, "axis"); } @@ -94,7 +94,7 @@ Viewport { } function test_radiusChanged() { - compare(sphere4.radius, 1, "radius"); + compare(sphere4.radius, 0.5, "radius"); compare(sphere4.radChanged, 0, "changed 1"); sphere4.radius = 3.5 compare(sphere4.radChanged, 1, "changed 2"); |