Added autotests for C++ axes

Task-number: QTRD-3368
Change-Id: I79f49ba839f191b64206f38763b2afff167757b7
Change-Id: I79f49ba839f191b64206f38763b2afff167757b7
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>

10 files changed, 430 insertions, 1 deletions

diff --git a/tests/auto/cpptest/cpptest.pro b/tests/auto/cpptest/cpptest.pro
index 29ba3dc3..578f5c53 100644
--- a/tests/auto/cpptest/cpptest.pro
+++ b/tests/auto/cpptest/cpptest.pro
@@ -11,4 +11,7 @@ SUBDIRS = q3dbars \
           q3dsurface-proxy \
           q3dsurface-modelproxy \
           q3dsurface-heightproxy \
-          q3dsurface-series
+          q3dsurface-series \
+          q3daxis-category \
+          q3daxis-logvalue \
+          q3daxis-value
diff --git a/tests/auto/cpptest/q3daxis-category/q3daxis-category.pro b/tests/auto/cpptest/q3daxis-category/q3daxis-category.pro
new file mode 100644
index 00000000..74415397
--- /dev/null
+++ b/tests/auto/cpptest/q3daxis-category/q3daxis-category.pro
@@ -0,0 +1,8 @@
+QT += testlib datavisualization
+
+TARGET = tst_cpptest
+CONFIG += console testcase
+
+TEMPLATE = app
+
+SOURCES += tst_axis.cpp
diff --git a/tests/auto/cpptest/q3daxis-category/tst_axis.cpp b/tests/auto/cpptest/q3daxis-category/tst_axis.cpp
new file mode 100644
index 00000000..800a0953
--- /dev/null
+++ b/tests/auto/cpptest/q3daxis-category/tst_axis.cpp
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+#include <QtDataVisualization/QCategory3DAxis>
+
+using namespace QtDataVisualization;
+
+class tst_axis: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup();
+
+    void construct();
+
+    void initialProperties();
+    void initializeProperties();
+    void invalidProperties();
+
+private:
+    QCategory3DAxis *m_axis;
+};
+
+void tst_axis::initTestCase()
+{
+}
+
+void tst_axis::cleanupTestCase()
+{
+}
+
+void tst_axis::init()
+{
+    m_axis = new QCategory3DAxis();
+}
+
+void tst_axis::cleanup()
+{
+    delete m_axis;
+}
+
+void tst_axis::construct()
+{
+    QCategory3DAxis *axis = new QCategory3DAxis();
+    QVERIFY(axis);
+    delete axis;
+}
+
+void tst_axis::initialProperties()
+{
+    QVERIFY(m_axis);
+
+    QCOMPARE(m_axis->labels().length(), 0);
+
+    // Common (from QAbstract3DAxis)
+    QCOMPARE(m_axis->isAutoAdjustRange(), true);
+    QCOMPARE(m_axis->labelAutoRotation(), 0.0f);
+    QCOMPARE(m_axis->max(), 10.0f);
+    QCOMPARE(m_axis->min(), 0.0f);
+    QCOMPARE(m_axis->orientation(), QAbstract3DAxis::AxisOrientationNone);
+    QCOMPARE(m_axis->title(), QString(""));
+    QCOMPARE(m_axis->isTitleFixed(), true);
+    QCOMPARE(m_axis->isTitleVisible(), false);
+    QCOMPARE(m_axis->type(), QAbstract3DAxis::AxisTypeCategory);
+}
+
+void tst_axis::initializeProperties()
+{
+    QVERIFY(m_axis);
+
+    m_axis->setLabels(QStringList() << "first" << "second");
+
+    QCOMPARE(m_axis->labels().length(), 2);
+    QCOMPARE(m_axis->labels().at(1), QString("second"));
+
+    // Common (from QAbstract3DAxis)
+    m_axis->setAutoAdjustRange(false);
+    m_axis->setLabelAutoRotation(15.0f);
+    m_axis->setMax(25.0f);
+    m_axis->setMin(5.0f);
+    m_axis->setTitle("title");
+    m_axis->setTitleFixed(false);
+    m_axis->setTitleVisible(true);
+
+    QCOMPARE(m_axis->isAutoAdjustRange(), false);
+    QCOMPARE(m_axis->labelAutoRotation(), 15.0f);
+    QCOMPARE(m_axis->max(), 25.0f);
+    QCOMPARE(m_axis->min(), 5.0f);
+    QCOMPARE(m_axis->title(), QString("title"));
+    QCOMPARE(m_axis->isTitleFixed(), false);
+    QCOMPARE(m_axis->isTitleVisible(), true);
+}
+
+void tst_axis::invalidProperties()
+{
+    m_axis->setLabelAutoRotation(-15.0f);
+    QCOMPARE(m_axis->labelAutoRotation(), 0.0f);
+
+    m_axis->setLabelAutoRotation(100.0f);
+    QCOMPARE(m_axis->labelAutoRotation(), 90.0f);
+
+    m_axis->setMax(-10.0f);
+    QCOMPARE(m_axis->max(), 0.0f);
+    QCOMPARE(m_axis->min(), 0.0f);
+
+    m_axis->setMin(10.0f);
+    QCOMPARE(m_axis->max(), 11.0f);
+    QCOMPARE(m_axis->min(), 10.0f);
+}
+
+QTEST_MAIN(tst_axis)
+#include "tst_axis.moc"
diff --git a/tests/auto/cpptest/q3daxis-logvalue/q3daxis-logvalue.pro b/tests/auto/cpptest/q3daxis-logvalue/q3daxis-logvalue.pro
new file mode 100644
index 00000000..74415397
--- /dev/null
+++ b/tests/auto/cpptest/q3daxis-logvalue/q3daxis-logvalue.pro
@@ -0,0 +1,8 @@
+QT += testlib datavisualization
+
+TARGET = tst_cpptest
+CONFIG += console testcase
+
+TEMPLATE = app
+
+SOURCES += tst_axis.cpp
diff --git a/tests/auto/cpptest/q3daxis-logvalue/tst_axis.cpp b/tests/auto/cpptest/q3daxis-logvalue/tst_axis.cpp
new file mode 100644
index 00000000..adbedb24
--- /dev/null
+++ b/tests/auto/cpptest/q3daxis-logvalue/tst_axis.cpp
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+#include <QtDataVisualization/QLogValue3DAxisFormatter>
+
+using namespace QtDataVisualization;
+
+class tst_axis: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup();
+
+    void construct();
+
+    void initialProperties();
+    void initializeProperties();
+    void invalidProperties();
+
+private:
+    QLogValue3DAxisFormatter *m_formatter;
+};
+
+void tst_axis::initTestCase()
+{
+}
+
+void tst_axis::cleanupTestCase()
+{
+}
+
+void tst_axis::init()
+{
+    m_formatter = new QLogValue3DAxisFormatter();
+}
+
+void tst_axis::cleanup()
+{
+    delete m_formatter;
+}
+
+void tst_axis::construct()
+{
+    QLogValue3DAxisFormatter *formatter = new QLogValue3DAxisFormatter();
+    QVERIFY(formatter);
+    delete formatter;
+}
+
+void tst_axis::initialProperties()
+{
+    QVERIFY(m_formatter);
+
+    QCOMPARE(m_formatter->autoSubGrid(), true);
+    QCOMPARE(m_formatter->base(), 10.0);
+    QCOMPARE(m_formatter->showEdgeLabels(), true);
+}
+
+void tst_axis::initializeProperties()
+{
+    QVERIFY(m_formatter);
+
+    m_formatter->setAutoSubGrid(false);
+    m_formatter->setBase(0.1);
+    m_formatter->setShowEdgeLabels(false);
+
+    QCOMPARE(m_formatter->autoSubGrid(), false);
+    QCOMPARE(m_formatter->base(), 0.1);
+    QCOMPARE(m_formatter->showEdgeLabels(), false);
+}
+
+void tst_axis::invalidProperties()
+{
+    m_formatter->setBase(-1.0);
+    QCOMPARE(m_formatter->base(), 10.0);
+
+    m_formatter->setBase(1.0);
+    QCOMPARE(m_formatter->base(), 10.0);
+}
+
+QTEST_MAIN(tst_axis)
+#include "tst_axis.moc"
diff --git a/tests/auto/cpptest/q3daxis-value/q3daxis-value.pro b/tests/auto/cpptest/q3daxis-value/q3daxis-value.pro
new file mode 100644
index 00000000..74415397
--- /dev/null
+++ b/tests/auto/cpptest/q3daxis-value/q3daxis-value.pro
@@ -0,0 +1,8 @@
+QT += testlib datavisualization
+
+TARGET = tst_cpptest
+CONFIG += console testcase
+
+TEMPLATE = app
+
+SOURCES += tst_axis.cpp
diff --git a/tests/auto/cpptest/q3daxis-value/tst_axis.cpp b/tests/auto/cpptest/q3daxis-value/tst_axis.cpp
new file mode 100644
index 00000000..92029f13
--- /dev/null
+++ b/tests/auto/cpptest/q3daxis-value/tst_axis.cpp
@@ -0,0 +1,158 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+#include <QtDataVisualization/QValue3DAxis>
+
+using namespace QtDataVisualization;
+
+class tst_axis: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup();
+
+    void construct();
+
+    void initialProperties();
+    void initializeProperties();
+    void invalidProperties();
+
+private:
+    QValue3DAxis *m_axis;
+};
+
+void tst_axis::initTestCase()
+{
+}
+
+void tst_axis::cleanupTestCase()
+{
+}
+
+void tst_axis::init()
+{
+    m_axis = new QValue3DAxis();
+}
+
+void tst_axis::cleanup()
+{
+    delete m_axis;
+}
+
+void tst_axis::construct()
+{
+    QValue3DAxis *axis = new QValue3DAxis();
+    QVERIFY(axis);
+    delete axis;
+}
+
+void tst_axis::initialProperties()
+{
+    QVERIFY(m_axis);
+
+    QCOMPARE(m_axis->labelFormat(), QString("%.2f"));
+    QCOMPARE(m_axis->reversed(), false);
+    QCOMPARE(m_axis->segmentCount(), 5);
+    QCOMPARE(m_axis->subSegmentCount(), 1);
+
+    // Common (from QAbstract3DAxis)
+    QCOMPARE(m_axis->isAutoAdjustRange(), true);
+    QCOMPARE(m_axis->labelAutoRotation(), 0.0f);
+    QCOMPARE(m_axis->labels().length(), 6);
+    QCOMPARE(m_axis->labels().at(0), QString("0.00"));
+    QCOMPARE(m_axis->labels().at(1), QString("2.00"));
+    QCOMPARE(m_axis->labels().at(2), QString("4.00"));
+    QCOMPARE(m_axis->labels().at(3), QString("6.00"));
+    QCOMPARE(m_axis->labels().at(4), QString("8.00"));
+    QCOMPARE(m_axis->labels().at(5), QString("10.00"));
+    QCOMPARE(m_axis->max(), 10.0f);
+    QCOMPARE(m_axis->min(), 0.0f);
+    QCOMPARE(m_axis->orientation(), QAbstract3DAxis::AxisOrientationNone);
+    QCOMPARE(m_axis->title(), QString(""));
+    QCOMPARE(m_axis->isTitleFixed(), true);
+    QCOMPARE(m_axis->isTitleVisible(), false);
+    QCOMPARE(m_axis->type(), QAbstract3DAxis::AxisTypeValue);
+}
+
+void tst_axis::initializeProperties()
+{
+    QVERIFY(m_axis);
+
+    m_axis->setLabelFormat("%.0fm");
+    m_axis->setReversed(true);
+    m_axis->setSegmentCount(2);
+    m_axis->setSubSegmentCount(5);
+
+    QCOMPARE(m_axis->labelFormat(), QString("%.0fm"));
+    QCOMPARE(m_axis->reversed(), true);
+    QCOMPARE(m_axis->segmentCount(), 2);
+    QCOMPARE(m_axis->subSegmentCount(), 5);
+
+    // Common (from QAbstract3DAxis)
+    m_axis->setAutoAdjustRange(false);
+    m_axis->setLabelAutoRotation(15.0f);
+    m_axis->setMax(25.0f);
+    m_axis->setMin(5.0f);
+    m_axis->setTitle("title");
+    m_axis->setTitleFixed(false);
+    m_axis->setTitleVisible(true);
+
+    QCOMPARE(m_axis->isAutoAdjustRange(), false);
+    QCOMPARE(m_axis->labelAutoRotation(), 15.0f);
+    QCOMPARE(m_axis->labels().length(), 3);
+    QCOMPARE(m_axis->labels().at(0), QString("5m"));
+    QCOMPARE(m_axis->labels().at(1), QString("15m"));
+    QCOMPARE(m_axis->labels().at(2), QString("25m"));
+    QCOMPARE(m_axis->max(), 25.0f);
+    QCOMPARE(m_axis->min(), 5.0f);
+    QCOMPARE(m_axis->title(), QString("title"));
+    QCOMPARE(m_axis->isTitleFixed(), false);
+    QCOMPARE(m_axis->isTitleVisible(), true);
+}
+
+void tst_axis::invalidProperties()
+{
+    m_axis->setSegmentCount(-1);
+    QCOMPARE(m_axis->segmentCount(), 1);
+
+    m_axis->setSubSegmentCount(-1);
+    QCOMPARE(m_axis->subSegmentCount(), 1);
+
+    m_axis->setLabelAutoRotation(-15.0f);
+    QCOMPARE(m_axis->labelAutoRotation(), 0.0f);
+
+    m_axis->setLabelAutoRotation(100.0f);
+    QCOMPARE(m_axis->labelAutoRotation(), 90.0f);
+
+    m_axis->setMax(-10.0f);
+    QCOMPARE(m_axis->max(), -10.0f);
+    QCOMPARE(m_axis->min(), -11.0f);
+
+    m_axis->setMin(10.0f);
+    QCOMPARE(m_axis->max(), 11.0f);
+    QCOMPARE(m_axis->min(), 10.0f);
+}
+
+QTEST_MAIN(tst_axis)
+#include "tst_axis.moc"
diff --git a/tests/auto/cpptest/q3dbars/tst_bars.cpp b/tests/auto/cpptest/q3dbars/tst_bars.cpp
index 4535c026..6910e4fa 100644
--- a/tests/auto/cpptest/q3dbars/tst_bars.cpp
+++ b/tests/auto/cpptest/q3dbars/tst_bars.cpp
@@ -112,6 +112,9 @@ void tst_bars::initialProperties()
     QVERIFY(!m_graph->selectedSeries());
     QVERIFY(!m_graph->primarySeries());
     QCOMPARE(m_graph->floorLevel(), 0.0);
+    QCOMPARE(m_graph->columnAxis()->orientation(), QAbstract3DAxis::AxisOrientationX);
+    QCOMPARE(m_graph->valueAxis()->orientation(), QAbstract3DAxis::AxisOrientationY);
+    QCOMPARE(m_graph->rowAxis()->orientation(), QAbstract3DAxis::AxisOrientationZ);
 
     // Common properties
     QCOMPARE(m_graph->activeTheme()->type(), Q3DTheme::ThemeQt);
diff --git a/tests/auto/cpptest/q3dscatter/tst_scatter.cpp b/tests/auto/cpptest/q3dscatter/tst_scatter.cpp
index 89057788..5a3b6550 100644
--- a/tests/auto/cpptest/q3dscatter/tst_scatter.cpp
+++ b/tests/auto/cpptest/q3dscatter/tst_scatter.cpp
@@ -91,6 +91,9 @@ void tst_scatter::initialProperties()
     QVERIFY(m_graph);
     QCOMPARE(m_graph->seriesList().length(), 0);
     QVERIFY(!m_graph->selectedSeries());
+    QCOMPARE(m_graph->axisX()->orientation(), QAbstract3DAxis::AxisOrientationX);
+    QCOMPARE(m_graph->axisY()->orientation(), QAbstract3DAxis::AxisOrientationY);
+    QCOMPARE(m_graph->axisZ()->orientation(), QAbstract3DAxis::AxisOrientationZ);
 
     // Common properties
     QCOMPARE(m_graph->activeTheme()->type(), Q3DTheme::ThemeQt);
diff --git a/tests/auto/cpptest/q3dsurface/tst_surface.cpp b/tests/auto/cpptest/q3dsurface/tst_surface.cpp
index 600261d2..0ae0a326 100644
--- a/tests/auto/cpptest/q3dsurface/tst_surface.cpp
+++ b/tests/auto/cpptest/q3dsurface/tst_surface.cpp
@@ -97,6 +97,9 @@ void tst_surface::initialProperties()
     QCOMPARE(m_graph->seriesList().length(), 0);
     QVERIFY(!m_graph->selectedSeries());
     QCOMPARE(m_graph->flipHorizontalGrid(), false);
+    QCOMPARE(m_graph->axisX()->orientation(), QAbstract3DAxis::AxisOrientationX);
+    QCOMPARE(m_graph->axisY()->orientation(), QAbstract3DAxis::AxisOrientationY);
+    QCOMPARE(m_graph->axisZ()->orientation(), QAbstract3DAxis::AxisOrientationZ);
 
     // Common properties
     QCOMPARE(m_graph->activeTheme()->type(), Q3DTheme::ThemeQt);