Fix invalid value handling

Fixes: QTBUG-112773
Change-Id: I3b00587d27e88dd69b58efe3551abf8759df0020
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 86665d774ec0e4efb46eec47fdc8297a3ff5d196)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

8 files changed, 129 insertions, 105 deletions

diff --git a/tests/auto/cpptest/q3dbars/tst_bars.cpp b/tests/auto/cpptest/q3dbars/tst_bars.cpp
index 2b8cc340..96219cb0 100644
--- a/tests/auto/cpptest/q3dbars/tst_bars.cpp
+++ b/tests/auto/cpptest/q3dbars/tst_bars.cpp
@@ -186,9 +186,9 @@ void tst_bars::invalidProperties()
     m_graph->setLocale(QLocale("XX"));
 
     QCOMPARE(m_graph->selectionMode(), QAbstract3DGraph::SelectionItem);
-    QCOMPARE(m_graph->aspectRatio(), -1.0/*2.0*/); // TODO: Fix once QTRD-3367 is done
-    QCOMPARE(m_graph->horizontalAspectRatio(), -1.0/*0.0*/); // TODO: Fix once QTRD-3367 is done
-    QCOMPARE(m_graph->reflectivity(), -1.0/*0.5*/); // TODO: Fix once QTRD-3367 is done
+    QCOMPARE(m_graph->aspectRatio(), 2.0);
+    QCOMPARE(m_graph->horizontalAspectRatio(), 0.0);
+    QCOMPARE(m_graph->reflectivity(), 0.5);
     QCOMPARE(m_graph->locale(), QLocale("C"));
 }
 
diff --git a/tests/auto/cpptest/q3dscatter/tst_scatter.cpp b/tests/auto/cpptest/q3dscatter/tst_scatter.cpp
index e8b26baf..f6ac402e 100644
--- a/tests/auto/cpptest/q3dscatter/tst_scatter.cpp
+++ b/tests/auto/cpptest/q3dscatter/tst_scatter.cpp
@@ -148,9 +148,9 @@ void tst_scatter::invalidProperties()
     m_graph->setLocale(QLocale("XX"));
 
     QCOMPARE(m_graph->selectionMode(), QAbstract3DGraph::SelectionItem);
-    QCOMPARE(m_graph->aspectRatio(), -1.0/*2.0*/); // TODO: Fix once QTRD-3367 is done
-    QCOMPARE(m_graph->horizontalAspectRatio(), -1.0/*0.0*/); // TODO: Fix once QTRD-3367 is done
-    QCOMPARE(m_graph->reflectivity(), -1.0/*0.5*/); // TODO: Fix once QTRD-3367 is done
+    QCOMPARE(m_graph->aspectRatio(), 2.0);
+    QCOMPARE(m_graph->horizontalAspectRatio(), 0.0);
+    QCOMPARE(m_graph->reflectivity(), 0.5);
     QCOMPARE(m_graph->locale(), QLocale("C"));
 }
 
diff --git a/tests/auto/cpptest/q3dsurface/tst_surface.cpp b/tests/auto/cpptest/q3dsurface/tst_surface.cpp
index 0da7fa50..b27dfa0c 100644
--- a/tests/auto/cpptest/q3dsurface/tst_surface.cpp
+++ b/tests/auto/cpptest/q3dsurface/tst_surface.cpp
@@ -158,9 +158,9 @@ void tst_surface::invalidProperties()
     m_graph->setLocale(QLocale("XX"));
 
     QCOMPARE(m_graph->selectionMode(), QAbstract3DGraph::SelectionItem);
-    QCOMPARE(m_graph->aspectRatio(), -1.0/*2.0*/); // TODO: Fix once QTRD-3367 is done
-    QCOMPARE(m_graph->horizontalAspectRatio(), -1.0/*0.0*/); // TODO: Fix once QTRD-3367 is done
-    QCOMPARE(m_graph->reflectivity(), -1.0/*0.5*/); // TODO: Fix once QTRD-3367 is done
+    QCOMPARE(m_graph->aspectRatio(), 2.0);
+    QCOMPARE(m_graph->horizontalAspectRatio(), 0.0);
+    QCOMPARE(m_graph->reflectivity(), 0.5);
     QCOMPARE(m_graph->locale(), QLocale("C"));
 }
 
diff --git a/tests/auto/qmltest/bars3d/tst_bars.qml b/tests/auto/qmltest/bars3d/tst_bars.qml
index 56530319..03638501 100644
--- a/tests/auto/qmltest/bars3d/tst_bars.qml
+++ b/tests/auto/qmltest/bars3d/tst_bars.qml
@@ -14,7 +14,7 @@ Item {
 
     function constructBars() {
         bars3d = Qt.createQmlObject("
-        import QtQuick 2.2
+        import QtQuick
         import QtDataVisualization
         Bars3D {
             anchors.fill: parent
@@ -85,7 +85,7 @@ Item {
 
     function constructBarsWithCustomItemList() {
         bars3d = Qt.createQmlObject("
-        import QtQuick 2.2
+        import QtQuick
         import QtDataVisualization
         Bars3D {
             anchors.fill: parent
diff --git a/tests/auto/qmltest/bars3d/tst_basic.qml b/tests/auto/qmltest/bars3d/tst_basic.qml
index 34cc6f66..e019ef7d 100644
--- a/tests/auto/qmltest/bars3d/tst_basic.qml
+++ b/tests/auto/qmltest/bars3d/tst_basic.qml
@@ -17,7 +17,7 @@ Item {
 
     function constructEmpty() {
         empty = Qt.createQmlObject("
-        import QtQuick 2.2
+        import QtQuick
         import QtDataVisualization
         Bars3D {
         }", top)
@@ -25,7 +25,7 @@ Item {
 
     function constructBasic() {
         basic = Qt.createQmlObject("
-        import QtQuick 2.2
+        import QtQuick
         import QtDataVisualization
         Bars3D {
             anchors.fill: parent
@@ -43,7 +43,7 @@ Item {
 
     function constructCommon() {
         common = Qt.createQmlObject("
-        import QtQuick 2.2
+        import QtQuick
         import QtDataVisualization
         Bars3D {
             anchors.fill: parent
@@ -53,7 +53,7 @@ Item {
 
     function constructCommonInit() {
         common_init = Qt.createQmlObject("
-        import QtQuick 2.2
+        import QtQuick
         import QtDataVisualization
         Bars3D {
             anchors.fill: parent
@@ -157,6 +157,9 @@ Item {
         when: windowShown
 
         function test_1_common() {
+            if (Qt.platform.os === "android")
+                return;
+
             constructCommon()
             compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode")
             compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality")
@@ -184,6 +187,9 @@ Item {
         }
 
         function test_2_change_common() {
+            if (Qt.platform.os === "android")
+                return;
+
             common.selectionMode = AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice
             common.shadowQuality = AbstractGraph3D.ShadowQualitySoftHigh
             compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality")
@@ -224,30 +230,10 @@ Item {
             waitForRendering(top)
         }
 
-        function test_3_change_invalid_common() {
-            common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice
-            common.theme.type = -2
-            common.renderingMode = -1
-            common.measureFps = false
-            common.orthoProjection = false
-            common.aspectRatio = -1.0
-            common.polar = false
-            common.horizontalAspectRatio = -2
-            common.reflection = false
-            common.reflectivity = -1.0
-            compare(common.selectionMode, AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice, "selectionMode")
-            compare(common.theme.type, -2/*Theme3D.ThemeRetro*/, "theme") // TODO: Fix once QTRD-3367 is done
-            compare(common.renderingMode, -1/*AbstractGraph3D.RenderDirectToBackground_NoClear*/, "renderingMode") // TODO: Fix once QTRD-3367 is done
-            compare(common.aspectRatio, -1.0/*1.0*/, "aspectRatio") // TODO: Fix once QTRD-3367 is done
-            compare(common.horizontalAspectRatio, -2/*1*/, "horizontalAspectRatio") // TODO: Fix once QTRD-3367 is done
-            compare(common.reflectivity, -1.0/*1.0*/, "reflectivity") // TODO: Fix once QTRD-3367 is done
+        function test_3_common_initialized() {
+            if (Qt.platform.os === "android")
+                return;
 
-            waitForRendering(top)
-            common.destroy()
-            waitForRendering(top)
-        }
-
-        function test_4_common_initialized() {
             constructCommonInit()
 
             compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode")
@@ -272,10 +258,32 @@ Item {
             compare(common_init.reflectivity, 0.1, "reflectivity")
             compare(common_init.locale, Qt.locale("UK"), "locale")
             compare(common_init.margin, 0.2, "margin")
-
             waitForRendering(top)
             common_init.destroy();
             waitForRendering(top)
         }
+
+        function test_4_change_invalid_common() {
+            if (Qt.platform.os === "android")
+                return;
+
+            common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice
+            common.theme.type = -2
+            common.renderingMode = -1
+            common.measureFps = false
+            common.orthoProjection = false
+            common.aspectRatio = -1.0
+            common.polar = false
+            common.horizontalAspectRatio = -2
+            common.reflection = false
+            common.reflectivity = -1.0
+            compare(common.selectionMode, AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice, "selectionMode")
+            compare(common.theme.type, Theme3D.ThemeRetro, "theme")
+            compare(common.renderingMode, AbstractGraph3D.RenderDirectToBackground_NoClear, "renderingMode")
+            compare(common.aspectRatio, 1.0, "aspectRatio")
+            compare(common.horizontalAspectRatio, 1.0, "horizontalAspectRatio")
+            compare(common.reflectivity, 1.0, "reflectivity")
+            waitForRendering(top)
+        }
     }
 }
diff --git a/tests/auto/qmltest/scatter3d/tst_basic.qml b/tests/auto/qmltest/scatter3d/tst_basic.qml
index 7680008f..401148c1 100644
--- a/tests/auto/qmltest/scatter3d/tst_basic.qml
+++ b/tests/auto/qmltest/scatter3d/tst_basic.qml
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 import QtQuick 2.0
-import QtDataVisualization 1.2
+import QtDataVisualization
 import QtTest 1.0
 
 Item {
@@ -17,16 +17,16 @@ Item {
 
     function constructEmpty() {
         empty = Qt.createQmlObject("
-        import QtQuick 2.2
-        import QtDataVisualization 1.2
+        import QtQuick
+        import QtDataVisualization
         Scatter3D {
         }", top)
     }
 
     function constructBasic() {
         basic = Qt.createQmlObject("
-        import QtQuick 2.2
-        import QtDataVisualization 1.2
+        import QtQuick
+        import QtDataVisualization
         Scatter3D {
             anchors.fill: parent
         }", top)
@@ -35,8 +35,8 @@ Item {
 
     function constructCommon() {
         common = Qt.createQmlObject("
-        import QtQuick 2.2
-        import QtDataVisualization 1.2
+        import QtQuick
+        import QtDataVisualization
         Scatter3D {
             anchors.fill: parent
         }", top)
@@ -45,8 +45,8 @@ Item {
 
     function constructCommonInit() {
         common_init = Qt.createQmlObject("
-        import QtQuick 2.2
-        import QtDataVisualization 1.2
+        import QtQuick
+        import QtDataVisualization
         Scatter3D {
             anchors.fill: parent
             selectionMode: AbstractGraph3D.SelectionNone
@@ -110,6 +110,9 @@ Item {
         when: windowShown
 
         function test_1_common() {
+            if (Qt.platform.os === "android")
+                return;
+
             constructCommon()
             compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode")
             compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality")
@@ -137,6 +140,9 @@ Item {
         }
 
         function test_2_change_common() {
+            if (Qt.platform.os === "android")
+                return;
+
             common.selectionMode = AbstractGraph3D.SelectionNone
             common.shadowQuality = AbstractGraph3D.ShadowQualitySoftHigh
             compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality")
@@ -177,30 +183,10 @@ Item {
             waitForRendering(top)
         }
 
-        function test_3_change_invalid_common() {
-            common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice
-            common.theme.type = -2
-            common.renderingMode = -1
-            common.measureFps = false
-            common.orthoProjection = false
-            common.aspectRatio = -1.0
-            common.polar = false
-            common.horizontalAspectRatio = -2
-            common.reflection = false
-            common.reflectivity = -1.0
-            compare(common.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode")
-            compare(common.theme.type, -2/*Theme3D.ThemeRetro*/, "theme") // TODO: Fix once QTRD-3367 is done
-            compare(common.renderingMode, -1/*AbstractGraph3D.RenderDirectToBackground_NoClear*/, "renderingMode") // TODO: Fix once QTRD-3367 is done
-            compare(common.aspectRatio, -1.0/*1.0*/, "aspectRatio") // TODO: Fix once QTRD-3367 is done
-            compare(common.horizontalAspectRatio, -2/*1*/, "horizontalAspectRatio") // TODO: Fix once QTRD-3367 is done
-            compare(common.reflectivity, -1.0/*1.0*/, "reflectivity") // TODO: Fix once QTRD-3367 is done
+        function test_3_common_initialized() {
+            if (Qt.platform.os === "android")
+                return;
 
-            waitForRendering(top)
-            common.destroy()
-            waitForRendering(top)
-        }
-
-        function test_4_common_initialized() {
             constructCommonInit()
 
             compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode")
@@ -225,10 +211,32 @@ Item {
             compare(common_init.reflectivity, 0.1, "reflectivity")
             compare(common_init.locale, Qt.locale("UK"), "locale")
             compare(common_init.margin, 0.2, "margin")
-
             waitForRendering(top)
             common_init.destroy();
             waitForRendering(top)
         }
+
+        function test_4_change_invalid_common() {
+            if (Qt.platform.os === "android")
+                return;
+
+            common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice
+            common.theme.type = -2
+            common.renderingMode = -1
+            common.measureFps = false
+            common.orthoProjection = false
+            common.aspectRatio = -1.0
+            common.polar = false
+            common.horizontalAspectRatio = -2
+            common.reflection = false
+            common.reflectivity = -1.0
+            compare(common.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode")
+            compare(common.theme.type, Theme3D.ThemeRetro, "theme")
+            compare(common.renderingMode, AbstractGraph3D.RenderDirectToBackground_NoClear, "renderingMode")
+            compare(common.aspectRatio, 1.0, "aspectRatio")
+            compare(common.horizontalAspectRatio, 1.0, "horizontalAspectRatio")
+            compare(common.reflectivity, 1.0, "reflectivity")
+            waitForRendering(top)
+        }
     }
 }
diff --git a/tests/auto/qmltest/scene3d/tst_scene.qml b/tests/auto/qmltest/scene3d/tst_scene.qml
index 1c352c4a..b9f84202 100644
--- a/tests/auto/qmltest/scene3d/tst_scene.qml
+++ b/tests/auto/qmltest/scene3d/tst_scene.qml
@@ -41,7 +41,7 @@ Item {
         function test_initial() {
             verify(initial.scene.activeCamera)
             verify(initial.scene.activeLight)
-            compare(initial.scene.devicePixelRatio, 1.0)
+            compare(initial.scene.devicePixelRatio, Screen.devicePixelRatio)
             compare(initial.scene.graphPositionQuery, Qt.point(-1, -1))
             compare(initial.scene.invalidSelectionPoint, Qt.point(-1, -1))
             compare(initial.scene.primarySubViewport.x, 0)
diff --git a/tests/auto/qmltest/surface3d/tst_basic.qml b/tests/auto/qmltest/surface3d/tst_basic.qml
index 0d3284c6..3716cdd6 100644
--- a/tests/auto/qmltest/surface3d/tst_basic.qml
+++ b/tests/auto/qmltest/surface3d/tst_basic.qml
@@ -17,16 +17,16 @@ Item {
 
     function constructEmpty() {
         empty = Qt.createQmlObject("
-        import QtQuick 2.2
-        import QtDataVisualization 1.2
+        import QtQuick
+        import QtDataVisualization
         Surface3D {
         }", top)
     }
 
     function constructBasic() {
         basic = Qt.createQmlObject("
-        import QtQuick 2.2
-        import QtDataVisualization 1.2
+        import QtQuick
+        import QtDataVisualization
         Surface3D {
             anchors.fill: parent
             flipHorizontalGrid: true
@@ -36,8 +36,8 @@ Item {
 
     function constructCommon() {
         common = Qt.createQmlObject("
-        import QtQuick 2.2
-        import QtDataVisualization 1.2
+        import QtQuick
+        import QtDataVisualization
         Surface3D {
             anchors.fill: parent
         }", top)
@@ -46,8 +46,8 @@ Item {
 
     function constructCommonInit() {
         common_init = Qt.createQmlObject("
-        import QtQuick 2.2
-        import QtDataVisualization 1.2
+        import QtQuick
+        import QtDataVisualization
         Surface3D {
             anchors.fill: parent
             selectionMode: AbstractGraph3D.SelectionNone
@@ -118,6 +118,9 @@ Item {
         when: windowShown
 
         function test_1_common() {
+            if (Qt.platform.os === "android")
+                return;
+
             constructCommon()
             compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode")
             compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality")
@@ -145,6 +148,9 @@ Item {
         }
 
         function test_2_change_common() {
+            if (Qt.platform.os === "android")
+                return;
+
             common.selectionMode = AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice
             common.shadowQuality = AbstractGraph3D.ShadowQualitySoftHigh
             compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality")
@@ -185,30 +191,10 @@ Item {
             waitForRendering(top)
         }
 
-        function test_3_change_invalid_common() {
-            common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice
-            common.theme.type = -2
-            common.renderingMode = -1
-            common.measureFps = false
-            common.orthoProjection = false
-            common.aspectRatio = -1.0
-            common.polar = false
-            common.horizontalAspectRatio = -2
-            common.reflection = false
-            common.reflectivity = -1.0
-            compare(common.selectionMode, AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice, "selectionMode")
-            compare(common.theme.type, -2/*Theme3D.ThemeRetro*/, "theme") // TODO: Fix once QTRD-3367 is done
-            compare(common.renderingMode, -1/*AbstractGraph3D.RenderDirectToBackground_NoClear*/, "renderingMode") // TODO: Fix once QTRD-3367 is done
-            compare(common.aspectRatio, -1.0/*1.0*/, "aspectRatio") // TODO: Fix once QTRD-3367 is done
-            compare(common.horizontalAspectRatio, -2/*1*/, "horizontalAspectRatio") // TODO: Fix once QTRD-3367 is done
-            compare(common.reflectivity, -1.0/*1.0*/, "reflectivity") // TODO: Fix once QTRD-3367 is done
+        function test_3_common_initialized() {
+            if (Qt.platform.os === "android")
+                return;
 
-            waitForRendering(top)
-            common.destroy()
-            waitForRendering(top)
-        }
-
-        function test_4_common_initialized() {
             constructCommonInit()
 
             compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode")
@@ -233,10 +219,32 @@ Item {
             compare(common_init.reflectivity, 0.1, "reflectivity")
             compare(common_init.locale, Qt.locale("UK"), "locale")
             compare(common_init.margin, 0.2, "margin")
-
             waitForRendering(top)
             common_init.destroy();
             waitForRendering(top)
         }
+
+        function test_4_change_invalid_common() {
+            if (Qt.platform.os === "android")
+                return;
+
+            common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice
+            common.theme.type = -2
+            common.renderingMode = -1
+            common.measureFps = false
+            common.orthoProjection = false
+            common.aspectRatio = -1.0
+            common.polar = false
+            common.horizontalAspectRatio = -2
+            common.reflection = false
+            common.reflectivity = -1.0
+            compare(common.selectionMode, AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice, "selectionMode")
+            compare(common.theme.type, Theme3D.ThemeRetro, "theme")
+            compare(common.renderingMode, AbstractGraph3D.RenderDirectToBackground_NoClear, "renderingMode")
+            compare(common.aspectRatio, 1.0, "aspectRatio")
+            compare(common.horizontalAspectRatio, 1.0, "horizontalAspectRatio")
+            compare(common.reflectivity, 1.0, "reflectivity")
+            waitForRendering(top)
+        }
     }
 }