Add hasSeries method to Abstract3D graph

Added a hasSeries method to Abstract3Dgraph.
The method can be used to check whether a series
has already been added to the graph. In addition,
modified cpp and qml autotests to test
the added method.

Fixes: QTBUG-96683
Change-Id: I91f70ca15b6c5fbaa7691cd17bbfc2ef460c3d37
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

6 files changed, 52 insertions, 2 deletions

diff --git a/tests/auto/cpptest/q3dbars/tst_bars.cpp b/tests/auto/cpptest/q3dbars/tst_bars.cpp
index 47529285..9c92cc84 100644
--- a/tests/auto/cpptest/q3dbars/tst_bars.cpp
+++ b/tests/auto/cpptest/q3dbars/tst_bars.cpp
@@ -57,6 +57,7 @@ private slots:
     void selectSeries();
     void removeSeries();
     void removeMultipleSeries();
+    void hasSeries();
 
     // The following tests are not required for scatter or surface, as they are handled identically
     void addInputHandler();
@@ -300,6 +301,15 @@ void tst_bars::removeMultipleSeries()
     delete series3;
 }
 
+void tst_bars::hasSeries()
+{
+    QBar3DSeries *series1 = newSeries();
+    m_graph->addSeries(series1);
+    QCOMPARE(m_graph->hasSeries(series1), true);
+    QBar3DSeries *series2 = newSeries();
+    QCOMPARE(m_graph->hasSeries(series2), false);
+}
+
 // The following tests are not required for scatter or surface, as they are handled identically
 void tst_bars::addInputHandler()
 {
diff --git a/tests/auto/cpptest/q3dscatter/tst_scatter.cpp b/tests/auto/cpptest/q3dscatter/tst_scatter.cpp
index 502c2923..cd39ab8d 100644
--- a/tests/auto/cpptest/q3dscatter/tst_scatter.cpp
+++ b/tests/auto/cpptest/q3dscatter/tst_scatter.cpp
@@ -54,6 +54,7 @@ private slots:
     void selectSeries();
     void removeSeries();
     void removeMultipleSeries();
+    void hasSeries();
 
 private:
     Q3DScatter *m_graph;
@@ -253,5 +254,14 @@ void tst_scatter::removeMultipleSeries()
     delete series3;
 }
 
+void tst_scatter::hasSeries()
+{
+    QScatter3DSeries *series1 = newSeries();
+    m_graph->addSeries(series1);
+    QCOMPARE(m_graph->hasSeries(series1), true);
+    QScatter3DSeries *series2 = newSeries();
+    QCOMPARE(m_graph->hasSeries(series2), false);
+}
+
 QTEST_MAIN(tst_scatter)
 #include "tst_scatter.moc"
diff --git a/tests/auto/cpptest/q3dsurface/tst_surface.cpp b/tests/auto/cpptest/q3dsurface/tst_surface.cpp
index e0add57c..fc1068e3 100644
--- a/tests/auto/cpptest/q3dsurface/tst_surface.cpp
+++ b/tests/auto/cpptest/q3dsurface/tst_surface.cpp
@@ -54,6 +54,7 @@ private slots:
     void selectSeries();
     void removeSeries();
     void removeMultipleSeries();
+    void hasSeries();
 
 private:
     Q3DSurface *m_graph;
@@ -263,5 +264,14 @@ void tst_surface::removeMultipleSeries()
     delete series3;
 }
 
+void tst_surface::hasSeries()
+{
+    QSurface3DSeries *series1 = newSeries();
+    m_graph->addSeries(series1);
+    QCOMPARE(m_graph->hasSeries(series1), true);
+    QSurface3DSeries *series2 = newSeries();
+    QCOMPARE(m_graph->hasSeries(series2), false);
+}
+
 QTEST_MAIN(tst_surface)
 #include "tst_surface.moc"
diff --git a/tests/auto/qmltest/bars3d/tst_bars.qml b/tests/auto/qmltest/bars3d/tst_bars.qml
index 349e28b2..80c1d9e4 100644
--- a/tests/auto/qmltest/bars3d/tst_bars.qml
+++ b/tests/auto/qmltest/bars3d/tst_bars.qml
@@ -89,6 +89,14 @@ Item {
             compare(bars3d.selectedSeries, series1)
 
             waitForRendering(top)
+        }
+
+        function test_6_has_series() {
+            bars3d.seriesList = [series1]
+            compare(bars3d.hasSeries(series1), true)
+            compare(bars3d.hasSeries(series2), false)
+
+            waitForRendering(top)
             bars3d.destroy()
             waitForRendering(top)
         }
diff --git a/tests/auto/qmltest/scatter3d/tst_scatter.qml b/tests/auto/qmltest/scatter3d/tst_scatter.qml
index 9805b2e9..d871f891 100644
--- a/tests/auto/qmltest/scatter3d/tst_scatter.qml
+++ b/tests/auto/qmltest/scatter3d/tst_scatter.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDataVisualization 1.2
+import QtDataVisualization
 import QtTest 1.0
 
 Item {
@@ -67,5 +67,11 @@ Item {
             series.seriesList[0].selectedItem = 0
             compare(series.selectedSeries, series1)
         }
+
+        function test_5_has_series() {
+            series.seriesList = [series1]
+            compare(series.hasSeries(series1), true)
+            compare(series.hasSeries(series2), false)
+        }
     }
 }
diff --git a/tests/auto/qmltest/surface3d/tst_surface.qml b/tests/auto/qmltest/surface3d/tst_surface.qml
index 2ec96007..e112295f 100644
--- a/tests/auto/qmltest/surface3d/tst_surface.qml
+++ b/tests/auto/qmltest/surface3d/tst_surface.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDataVisualization 1.2
+import QtDataVisualization
 import QtTest 1.0
 
 Item {
@@ -67,5 +67,11 @@ Item {
             series.seriesList[0].selectedPoint = Qt.point(0, 0)
             compare(series.selectedSeries, series1)
         }
+
+        function test_5_has_series() {
+            series.seriesList = [series1]
+            compare(series.hasSeries(series1), true)
+            compare(series.hasSeries(series2), false)
+        }
     }
 }