Merge branch 'develop'

Conflicts:
	.qmake.conf
	README
	src/datavisualization/global/qdatavisualizationglobal.h

Change-Id: Ia6941dcf3e6aa17e2e9ebc6f60fac16ef5049f11

1 files changed, 91 insertions, 0 deletions

diff --git a/tests/auto/cpptest/q3dscatter-proxy/tst_proxy.cpp b/tests/auto/cpptest/q3dscatter-proxy/tst_proxy.cpp
new file mode 100644
index 00000000..436350dc
--- /dev/null
+++ b/tests/auto/cpptest/q3dscatter-proxy/tst_proxy.cpp
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** 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/QScatterDataProxy>
+
+using namespace QtDataVisualization;
+
+class tst_proxy: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup();
+
+    void construct();
+
+    void initialProperties();
+    void initializeProperties();
+
+private:
+    QScatterDataProxy *m_proxy;
+};
+
+void tst_proxy::initTestCase()
+{
+}
+
+void tst_proxy::cleanupTestCase()
+{
+}
+
+void tst_proxy::init()
+{
+    m_proxy = new QScatterDataProxy();
+}
+
+void tst_proxy::cleanup()
+{
+    delete m_proxy;
+}
+
+void tst_proxy::construct()
+{
+    QScatterDataProxy *proxy = new QScatterDataProxy();
+    QVERIFY(proxy);
+    delete proxy;
+}
+
+void tst_proxy::initialProperties()
+{
+    QVERIFY(m_proxy);
+
+    QCOMPARE(m_proxy->itemCount(), 0);
+    QVERIFY(!m_proxy->series());
+
+    QCOMPARE(m_proxy->type(), QAbstractDataProxy::DataTypeScatter);
+}
+
+void tst_proxy::initializeProperties()
+{
+    QVERIFY(m_proxy);
+
+    QScatterDataArray data;
+    data << QVector3D(0.5f, 0.5f, 0.5f) << QVector3D(-0.3f, -0.5f, -0.4f);
+    m_proxy->addItems(data);
+
+    QCOMPARE(m_proxy->itemCount(), 2);
+}
+
+QTEST_MAIN(tst_proxy)
+#include "tst_proxy.moc"