Added axisXTop and axisYRight properties to QML series APIs

2 files changed, 38 insertions, 11 deletions

diff --git a/tests/auto/qml-qtquicktest/tst_barseries.qml b/tests/auto/qml-qtquicktest/tst_barseries.qml
index 61156bb8..d31ea32e 100644
--- a/tests/auto/qml-qtquicktest/tst_barseries.qml
+++ b/tests/auto/qml-qtquicktest/tst_barseries.qml
@@ -36,6 +36,18 @@ Rectangle {
             compare(barSeries.labelsVisible, false);
         }
 
+        function test_axes() {
+            compare(chartView.axes.length, 2);
+            verify(chartView.axes[0] == barSeries.axisX || chartView.axes[1] == barSeries.axisX);
+            verify(chartView.axes[0] == barSeries.axisY || chartView.axes[1] == barSeries.axisY);
+
+            compare(barSeries.axisX, stackedBarSeries.axisX);
+            compare(barSeries.axisY, stackedBarSeries.axisY);
+
+            compare(barSeries.axisX, percentBarSeries.axisX);
+            compare(barSeries.axisY, percentBarSeries.axisY);
+        }
+
         function test_append() {
             var setCount = 5;
             var valueCount = 50;
@@ -105,10 +117,10 @@ Rectangle {
         anchors.fill: parent
 
         BarSeries {
-            axisX: BarCategoriesAxis {}
-            axisY: ValuesAxis { min: 0; max: 10 }
             id: barSeries
             name: "bar"
+            axisX: BarCategoryAxis {}
+            axisY: ValueAxis { min: 0; max: 10 }
 
             SignalSpy {
                 id: addedSpy
@@ -121,5 +133,15 @@ Rectangle {
                 signalName: "barsetsRemoved"
             }
         }
+
+        StackedBarSeries {
+            id: stackedBarSeries
+            name: "stackedBar"
+        }
+
+        PercentBarSeries {
+            id: percentBarSeries
+            name: "percentBar"
+        }
     }
 }
diff --git a/tests/auto/qml-qtquicktest/tst_xyseries.qml b/tests/auto/qml-qtquicktest/tst_xyseries.qml
index eba5006f..eddf788f 100644
--- a/tests/auto/qml-qtquicktest/tst_xyseries.qml
+++ b/tests/auto/qml-qtquicktest/tst_xyseries.qml
@@ -34,26 +34,17 @@ Rectangle {
         function test_properties() {
             verify(lineSeries.color != undefined);
             compare(lineSeries.pointsVisible, false);
-            // TODO: Should the properties be set or not?
-//            verify(lineSeries.axisX != null);
-//            verify(lineSeries.axisY != null);
             compare(lineSeries.capStyle, Qt.SquareCap);
             compare(lineSeries.style, Qt.SolidLine);
             compare(lineSeries.width, 2.0);
 
             verify(splineSeries.color != undefined);
             compare(splineSeries.pointsVisible, false);
-            // TODO: Should the properties be set or not?
-//            verify(splineSeries.axisX != null);
-//            verify(splineSeries.axisY != null);
             compare(splineSeries.capStyle, Qt.SquareCap);
             compare(splineSeries.style, Qt.SolidLine);
             compare(splineSeries.width, 2.0);
 
             verify(scatterSeries.color != undefined);
-            // TODO: Should the properties be set or not?
-//            verify(scatterSeries.axisX != null);
-//            verify(scatterSeries.axisY != null);
             verify(scatterSeries.borderColor != undefined);
             compare(scatterSeries.borderWidth, 2.0);
             compare(scatterSeries.markerShape, ScatterSeries.MarkerShapeCircle);
@@ -64,6 +55,20 @@ Rectangle {
             compare(areaSeries.borderWidth, 2.0);
         }
 
+        function test_axes() {
+            compare(chartView.axes.length, 2);
+            console.log("chart.axes[0] " + chartView.axes[0]);
+            console.log("chart.axes[1] " + chartView.axes[1]);
+            console.log("lineSeries.axisX " + lineSeries.axisX);
+            console.log("lineSeries.axisY " + lineSeries.axisY);
+            verify(chartView.axes[0] == lineSeries.axisX || chartView.axes[1] == lineSeries.axisX);
+            verify(chartView.axes[0] == lineSeries.axisY || chartView.axes[1] == lineSeries.axisY);
+            verify(lineSeries.axisX == splineSeries.axisX);
+            verify(lineSeries.axisY == splineSeries.axisY);
+            verify(lineSeries.axisX == areaSeries.axisX);
+            verify(lineSeries.axisY == areaSeries.axisY);
+        }
+
         function test_append() {
             lineSeriesPointAddedSpy.clear();
             splineSeriesPointAddedSpy.clear();