Added C++ autotests for series

Also fixed a bug found in testing, and added tests for
optional constructors for already tested classes.

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

1 files changed, 29 insertions, 4 deletions

diff --git a/tests/auto/cpptest/q3dscatter-series/tst_series.cpp b/tests/auto/cpptest/q3dscatter-series/tst_series.cpp
index 80db0ac8..df290579 100644
--- a/tests/auto/cpptest/q3dscatter-series/tst_series.cpp
+++ b/tests/auto/cpptest/q3dscatter-series/tst_series.cpp
@@ -36,7 +36,6 @@ private slots:
 
     void initialProperties();
     void initializeProperties();
-    void invalidProperties();
 
 private:
     QScatter3DSeries *m_series;
@@ -65,20 +64,46 @@ void tst_series::construct()
     QScatter3DSeries *series = new QScatter3DSeries();
     QVERIFY(series);
     delete series;
+
+    QScatterDataProxy *proxy = new QScatterDataProxy();
+
+    series = new QScatter3DSeries(proxy);
+    QVERIFY(series);
+    QCOMPARE(series->dataProxy(), proxy);
+    delete series;
 }
 
 void tst_series::initialProperties()
 {
     QVERIFY(m_series);
+
+    QVERIFY(m_series->dataProxy());
+    QCOMPARE(m_series->itemSize(), 0.0f);
+    QCOMPARE(m_series->selectedItem(), m_series->invalidSelectionIndex());
+
+    // Common properties. The ones identical between different series are tested in QBar3DSeries tests
+    QCOMPARE(m_series->itemLabelFormat(), QString("@xLabel, @yLabel, @zLabel"));
+    QCOMPARE(m_series->mesh(), QAbstract3DSeries::MeshSphere);
+    QCOMPARE(m_series->type(), QAbstract3DSeries::SeriesTypeScatter);
 }
 
 void tst_series::initializeProperties()
 {
     QVERIFY(m_series);
-}
 
-void tst_series::invalidProperties()
-{
+    m_series->setDataProxy(new QScatterDataProxy());
+    m_series->setItemSize(0.5f);
+    m_series->setSelectedItem(0);
+
+    QCOMPARE(m_series->itemSize(), 0.5f);
+    QCOMPARE(m_series->selectedItem(), 0);
+
+    // Common properties. The ones identical between different series are tested in QBar3DSeries tests
+    m_series->setMesh(QAbstract3DSeries::MeshPoint);
+    m_series->setMeshRotation(QQuaternion(1, 1, 10, 20));
+
+    QCOMPARE(m_series->mesh(), QAbstract3DSeries::MeshPoint);
+    QCOMPARE(m_series->meshRotation(), QQuaternion(1, 1, 10, 20));
 }
 
 QTEST_MAIN(tst_series)