Added tests for QML axes

Task-number: QTRD-3368
Change-Id: Ie7be01bdbd0f63eccde39af86d1423d0af5df1b3
Change-Id: Ie7be01bdbd0f63eccde39af86d1423d0af5df1b3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

7 files changed, 260 insertions, 7 deletions

diff --git a/tests/auto/qmltest/axis3d/tst_category.qml b/tests/auto/qmltest/axis3d/tst_category.qml
index 98e1779f..7f0be845 100644
--- a/tests/auto/qmltest/axis3d/tst_category.qml
+++ b/tests/auto/qmltest/axis3d/tst_category.qml
@@ -25,5 +25,92 @@ Item {
     height: 150
     width: 150
 
-    // TODO: Add tests for CategoryAxis3D
+    CategoryAxis3D {
+        id: initial
+    }
+
+    CategoryAxis3D {
+        id: initialized
+        labels: ["first", "second"]
+
+        autoAdjustRange: false
+        labelAutoRotation: 10.0
+        max: 20
+        min: 10
+        title: "initialized"
+        titleFixed: false
+        titleVisible: true
+    }
+
+    CategoryAxis3D {
+        id: change
+    }
+
+    TestCase {
+        name: "CategoryAxis3D Initial"
+
+        function test_initial() {
+            compare(initial.labels.length, 0)
+
+            compare(initial.autoAdjustRange, true)
+            compare(initial.labelAutoRotation, 0.0)
+            compare(initial.max, 10)
+            compare(initial.min, 0)
+            compare(initial.orientation, AbstractAxis3D.AxisOrientationNone)
+            compare(initial.title, "")
+            compare(initial.titleFixed, true)
+            compare(initial.titleVisible, false)
+            compare(initial.type, AbstractAxis3D.AxisTypeCategory)
+        }
+    }
+
+    TestCase {
+        name: "CategoryAxis3D Initialized"
+
+        function test_initialized() {
+            compare(initialized.labels.length, 2)
+            compare(initialized.labels[0], "first")
+            compare(initialized.labels[1], "second")
+
+            compare(initialized.autoAdjustRange, false)
+            compare(initialized.labelAutoRotation, 10.0)
+            compare(initialized.max, 20)
+            compare(initialized.min, 10)
+            compare(initialized.title, "initialized")
+            compare(initialized.titleFixed, false)
+            compare(initialized.titleVisible, true)
+        }
+    }
+
+    TestCase {
+        name: "CategoryAxis3D Change"
+
+        function test_change() {
+            change.labels = ["first"]
+            compare(change.labels.length, 1)
+            compare(change.labels[0], "first")
+            change.labels = ["first", "second"]
+            compare(change.labels.length, 2)
+            compare(change.labels[0], "first")
+            compare(change.labels[1], "second")
+            change.labels[1] = "another"
+            compare(change.labels[1], "another")
+
+            change.autoAdjustRange = false
+            change.labelAutoRotation = 10.0
+            change.max = 20
+            change.min = 10
+            change.title = "initialized"
+            change.titleFixed = false
+            change.titleVisible = true
+
+            compare(change.autoAdjustRange, false)
+            compare(change.labelAutoRotation, 10.0)
+            compare(change.max, 20)
+            compare(change.min, 10)
+            compare(change.title, "initialized")
+            compare(change.titleFixed, false)
+            compare(change.titleVisible, true)
+        }
+    }
 }
diff --git a/tests/auto/qmltest/axis3d/tst_logvalue.qml b/tests/auto/qmltest/axis3d/tst_logvalue.qml
index 7c6dc83c..fad93611 100644
--- a/tests/auto/qmltest/axis3d/tst_logvalue.qml
+++ b/tests/auto/qmltest/axis3d/tst_logvalue.qml
@@ -25,5 +25,52 @@ Item {
     height: 150
     width: 150
 
-    // TODO: Add tests for LogValueAxis3DFormatter
+    LogValueAxis3DFormatter {
+        id: initial
+    }
+
+    LogValueAxis3DFormatter {
+        id: initialized
+        autoSubGrid: false
+        base: 0.1
+        showEdgeLabels: false
+    }
+
+    LogValueAxis3DFormatter {
+        id: change
+    }
+
+    TestCase {
+        name: "LogValueAxis3DFormatter Initial"
+
+        function test_initial() {
+            compare(initial.autoSubGrid, true)
+            compare(initial.base, 10)
+            compare(initial.showEdgeLabels, true)
+        }
+    }
+
+    TestCase {
+        name: "LogValueAxis3DFormatter Initialized"
+
+        function test_initialized() {
+            compare(initialized.autoSubGrid, false)
+            compare(initialized.base, 0.1)
+            compare(initialized.showEdgeLabels, false)
+        }
+    }
+
+    TestCase {
+        name: "LogValueAxis3DFormatter Change"
+
+        function test_change() {
+            change.autoSubGrid = false
+            change.base = 0.1
+            change.showEdgeLabels = false
+
+            compare(change.autoSubGrid, false)
+            compare(change.base, 0.1)
+            compare(change.showEdgeLabels, false)
+        }
+    }
 }
diff --git a/tests/auto/qmltest/axis3d/tst_value.qml b/tests/auto/qmltest/axis3d/tst_value.qml
index fa70608b..6a8f7849 100644
--- a/tests/auto/qmltest/axis3d/tst_value.qml
+++ b/tests/auto/qmltest/axis3d/tst_value.qml
@@ -25,5 +25,106 @@ Item {
     height: 150
     width: 150
 
-    // TODO: Add tests for ValueAxis3D
+    ValueAxis3D {
+        id: initial
+    }
+
+    ValueAxis3D {
+        id: initialized
+        formatter: ValueAxis3DFormatter { objectName: "formatter1" }
+        labelFormat: "%f"
+        reversed: true
+        segmentCount: 10
+        subSegmentCount: 5
+
+        autoAdjustRange: false
+        labelAutoRotation: 10.0
+        max: 20
+        min: -10
+        title: "initialized"
+        titleFixed: false
+        titleVisible: true
+    }
+
+    ValueAxis3D {
+        id: change
+    }
+
+    TestCase {
+        name: "ValueAxis3D Initial"
+
+        function test_initial() {
+            verify(initial.formatter)
+            compare(initial.labelFormat, "%.2f")
+            compare(initial.reversed, false)
+            compare(initial.segmentCount, 5)
+            compare(initial.subSegmentCount, 1)
+
+            compare(initial.autoAdjustRange, true)
+            compare(initial.labelAutoRotation, 0.0)
+            compare(initial.max, 10)
+            compare(initial.min, 0)
+            compare(initial.orientation, AbstractAxis3D.AxisOrientationNone)
+            compare(initial.title, "")
+            compare(initial.titleFixed, true)
+            compare(initial.titleVisible, false)
+            compare(initial.type, AbstractAxis3D.AxisTypeValue)
+        }
+    }
+
+    TestCase {
+        name: "ValueAxis3D Initialized"
+
+        function test_initialized() {
+            compare(initialized.formatter.objectName, "formatter1")
+            compare(initialized.labelFormat, "%f")
+            compare(initialized.reversed, true)
+            compare(initialized.segmentCount, 10)
+            compare(initialized.subSegmentCount, 5)
+
+            compare(initialized.autoAdjustRange, false)
+            compare(initialized.labelAutoRotation, 10.0)
+            compare(initialized.max, 20)
+            compare(initialized.min, -10)
+            compare(initialized.title, "initialized")
+            compare(initialized.titleFixed, false)
+            compare(initialized.titleVisible, true)
+        }
+    }
+
+    TestCase {
+        name: "ValueAxis3D Change"
+
+        ValueAxis3DFormatter { id: formatter1 }
+
+        function test_change() {
+            change.formatter = formatter1
+            change.labelFormat = "%f"
+            change.reversed = true
+            change.segmentCount = 10
+            change.subSegmentCount = 5
+
+            compare(change.formatter, formatter1)
+            compare(change.labelFormat, "%f")
+            compare(change.reversed, true)
+            compare(change.segmentCount, 10)
+            compare(change.subSegmentCount, 5)
+
+            change.autoAdjustRange = false
+            change.labelAutoRotation = 10.0
+            change.max = 20
+            change.min = -10
+            change.title = "initialized"
+            change.titleFixed = false
+            change.titleVisible = true
+
+            compare(change.autoAdjustRange, false)
+            compare(change.labelAutoRotation, 10.0)
+            compare(change.max, 20)
+            compare(change.min, -10)
+            compare(change.title, "initialized")
+            compare(change.titleFixed, false)
+            compare(change.titleVisible, true)
+        }
+    }
 }
diff --git a/tests/auto/qmltest/bars3d/tst_basic.qml b/tests/auto/qmltest/bars3d/tst_basic.qml
index 6c908623..cfba9b4a 100644
--- a/tests/auto/qmltest/bars3d/tst_basic.qml
+++ b/tests/auto/qmltest/bars3d/tst_basic.qml
@@ -80,6 +80,12 @@ Item {
             compare(empty.selectedSeries, null, "selectedSeries")
             compare(empty.primarySeries, null, "primarySeries")
             compare(empty.floorLevel, 0.0, "floorLevel")
+            compare(empty.columnAxis.orientation, AbstractAxis3D.AxisOrientationX)
+            compare(empty.rowAxis.orientation, AbstractAxis3D.AxisOrientationZ)
+            compare(empty.valueAxis.orientation, AbstractAxis3D.AxisOrientationY)
+            compare(empty.columnAxis.type, AbstractAxis3D.AxisTypeCategory)
+            compare(empty.rowAxis.type, AbstractAxis3D.AxisTypeCategory)
+            compare(empty.valueAxis.type, AbstractAxis3D.AxisTypeValue)
         }
     }
 
diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
index ac52caaf..d70d7c88 100644
--- a/tests/auto/qmltest/qmltest.pro
+++ b/tests/auto/qmltest/qmltest.pro
@@ -25,10 +25,10 @@ OTHER_FILES += bars3d\tst_basic.qml \
                scene3d\tst_camera.qml \
                scene3d\tst_light.qml \
                input3d\tst_input.qml \
-               input3d\tst_touch.qml #\
-#               axis3d\tst_category.qml \
-#               axis3d\tst_value.qml \
-#               axis3d\tst_logvalue.qml \
+               input3d\tst_touch.qml \
+               axis3d\tst_category.qml \
+               axis3d\tst_value.qml \
+               axis3d\tst_logvalue.qml \
 
 RESOURCES += \
     qmltest.qrc
diff --git a/tests/auto/qmltest/scatter3d/tst_basic.qml b/tests/auto/qmltest/scatter3d/tst_basic.qml
index b9d9c93c..985236be 100644
--- a/tests/auto/qmltest/scatter3d/tst_basic.qml
+++ b/tests/auto/qmltest/scatter3d/tst_basic.qml
@@ -68,6 +68,12 @@ Item {
             compare(empty.height, 0, "height")
             compare(empty.seriesList.length, 0, "seriesList")
             compare(empty.selectedSeries, null, "selectedSeries")
+            compare(empty.axisX.orientation, AbstractAxis3D.AxisOrientationX)
+            compare(empty.axisZ.orientation, AbstractAxis3D.AxisOrientationZ)
+            compare(empty.axisY.orientation, AbstractAxis3D.AxisOrientationY)
+            compare(empty.axisX.type, AbstractAxis3D.AxisTypeValue)
+            compare(empty.axisZ.type, AbstractAxis3D.AxisTypeValue)
+            compare(empty.axisY.type, AbstractAxis3D.AxisTypeValue)
         }
     }
 
diff --git a/tests/auto/qmltest/surface3d/tst_basic.qml b/tests/auto/qmltest/surface3d/tst_basic.qml
index 17d3d614..ba82a524 100644
--- a/tests/auto/qmltest/surface3d/tst_basic.qml
+++ b/tests/auto/qmltest/surface3d/tst_basic.qml
@@ -70,6 +70,12 @@ Item {
             compare(empty.seriesList.length, 0, "seriesList")
             compare(empty.selectedSeries, null, "selectedSeries")
             compare(empty.flipHorizontalGrid, false, "flipHorizontalGrid")
+            compare(empty.axisX.orientation, AbstractAxis3D.AxisOrientationX)
+            compare(empty.axisZ.orientation, AbstractAxis3D.AxisOrientationZ)
+            compare(empty.axisY.orientation, AbstractAxis3D.AxisOrientationY)
+            compare(empty.axisX.type, AbstractAxis3D.AxisTypeValue)
+            compare(empty.axisZ.type, AbstractAxis3D.AxisTypeValue)
+            compare(empty.axisY.type, AbstractAxis3D.AxisTypeValue)
         }
     }