1 files changed, 126 insertions, 2 deletions
diff --git a/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp
index 9c54df53..b3661b91 100644
--- a/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp
+++ b/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp
@@ -19,6 +19,8 @@
 #include <QtTest/QtTest>
 
 #include <QtDataVisualization/QItemModelBarDataProxy>
+#include <QtDataVisualization/Q3DBars>
+#include <QtWidgets/QTableWidget>
 
 using namespace QtDataVisualization;
 
@@ -36,7 +38,8 @@ private slots:
 
     void initialProperties();
     void initializeProperties();
-    void invalidProperties();
+
+    void multiMatch();
 
 private:
     QItemModelBarDataProxy *m_proxy;
@@ -70,15 +73,136 @@ void tst_proxy::construct()
 void tst_proxy::initialProperties()
 {
     QVERIFY(m_proxy);
+
+    QCOMPARE(m_proxy->autoColumnCategories(), true);
+    QCOMPARE(m_proxy->autoRowCategories(), true);
+    QCOMPARE(m_proxy->columnCategories(), QStringList());
+    QCOMPARE(m_proxy->columnRole(), QString());
+    QCOMPARE(m_proxy->columnRolePattern(), QRegExp());
+    QCOMPARE(m_proxy->columnRoleReplace(), QString());
+    QVERIFY(!m_proxy->itemModel());
+    QCOMPARE(m_proxy->multiMatchBehavior(), QItemModelBarDataProxy::MMBLast);
+    QCOMPARE(m_proxy->rotationRole(), QString());
+    QCOMPARE(m_proxy->rotationRolePattern(), QRegExp());
+    QCOMPARE(m_proxy->rotationRoleReplace(), QString());
+    QCOMPARE(m_proxy->rowCategories(), QStringList());
+    QCOMPARE(m_proxy->rowRole(), QString());
+    QCOMPARE(m_proxy->rowRolePattern(), QRegExp());
+    QCOMPARE(m_proxy->rowRoleReplace(), QString());
+    QCOMPARE(m_proxy->useModelCategories(), false);
+    QCOMPARE(m_proxy->valueRole(), QString());
+    QCOMPARE(m_proxy->valueRolePattern(), QRegExp());
+    QCOMPARE(m_proxy->valueRoleReplace(), QString());
+
+    QCOMPARE(m_proxy->columnLabels().count(), 0);
+    QCOMPARE(m_proxy->rowCount(), 0);
+    QCOMPARE(m_proxy->rowLabels().count(), 0);
+    QVERIFY(!m_proxy->series());
+
+    QCOMPARE(m_proxy->type(), QAbstractDataProxy::DataTypeBar);
 }
 
 void tst_proxy::initializeProperties()
 {
     QVERIFY(m_proxy);
+
+    QTableWidget *table = new QTableWidget();
+
+    m_proxy->setAutoColumnCategories(false);
+    m_proxy->setAutoRowCategories(false);
+    m_proxy->setColumnCategories(QStringList() << "col1" << "col2");
+    m_proxy->setColumnRole("column");
+    m_proxy->setColumnRolePattern(QRegExp("/^.*-(\\d\\d)$/"));
+    m_proxy->setColumnRoleReplace("\\\\1");
+    m_proxy->setItemModel(table->model());
+    m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBAverage);
+    m_proxy->setRotationRole("rotation");
+    m_proxy->setRotationRolePattern(QRegExp("/-/"));
+    m_proxy->setRotationRoleReplace("\\\\1");
+    m_proxy->setRowCategories(QStringList() << "row1" << "row2");
+    m_proxy->setRowRole("row");
+    m_proxy->setRowRolePattern(QRegExp("/^(\\d\\d\\d\\d).*$/"));
+    m_proxy->setRowRoleReplace("\\\\1");
+    m_proxy->setUseModelCategories(true);
+    m_proxy->setValueRole("value");
+    m_proxy->setValueRolePattern(QRegExp("/-/"));
+    m_proxy->setValueRoleReplace("\\\\1");
+
+    QCOMPARE(m_proxy->autoColumnCategories(), false);
+    QCOMPARE(m_proxy->autoRowCategories(), false);
+    QCOMPARE(m_proxy->columnCategories().count(), 2);
+    QCOMPARE(m_proxy->columnRole(), QString("column"));
+    QCOMPARE(m_proxy->columnRolePattern(), QRegExp("/^.*-(\\d\\d)$/"));
+    QCOMPARE(m_proxy->columnRoleReplace(), QString("\\\\1"));
+    QVERIFY(m_proxy->itemModel());
+    QCOMPARE(m_proxy->multiMatchBehavior(), QItemModelBarDataProxy::MMBAverage);
+    QCOMPARE(m_proxy->rotationRole(), QString("rotation"));
+    QCOMPARE(m_proxy->rotationRolePattern(), QRegExp("/-/"));
+    QCOMPARE(m_proxy->rotationRoleReplace(), QString("\\\\1"));
+    QCOMPARE(m_proxy->rowCategories().count(), 2);
+    QCOMPARE(m_proxy->rowRole(), QString("row"));
+    QCOMPARE(m_proxy->rowRolePattern(), QRegExp("/^(\\d\\d\\d\\d).*$/"));
+    QCOMPARE(m_proxy->rowRoleReplace(), QString("\\\\1"));
+    QCOMPARE(m_proxy->useModelCategories(), true);
+    QCOMPARE(m_proxy->valueRole(), QString("value"));
+    QCOMPARE(m_proxy->valueRolePattern(), QRegExp("/-/"));
+    QCOMPARE(m_proxy->valueRoleReplace(), QString("\\\\1"));
 }
 
-void tst_proxy::invalidProperties()
+void tst_proxy::multiMatch()
 {
+    Q3DBars *graph = new Q3DBars();
+
+    QTableWidget *table = new QTableWidget();
+    QStringList rows;
+    rows << "row 1" << "row 2" << "row 3";
+    QStringList columns;
+    columns << "col 1";
+    const char *values[1][3] = {{"0/0/3.5/30", "0/0/5.0/30", "0/0/6.5/30"}};
+
+    table->setRowCount(1);
+    table->setColumnCount(3);
+
+    for (int col = 0; col < columns.size(); col++) {
+        for (int row = 0; row < rows.size(); row++) {
+            QModelIndex index = table->model()->index(col, row);
+            table->model()->setData(index, values[col][row]);
+        }
+    }
+
+    m_proxy->setItemModel(table->model());
+    m_proxy->setRowRole(table->model()->roleNames().value(Qt::DisplayRole));
+    m_proxy->setColumnRole(table->model()->roleNames().value(Qt::DisplayRole));
+    m_proxy->setRowRolePattern(QRegExp(QStringLiteral("^(\\d*)\\/(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
+    m_proxy->setRowRoleReplace(QStringLiteral("\\2"));
+    m_proxy->setValueRolePattern(QRegExp(QStringLiteral("^\\d*(\\/)(\\d*)\\/(\\d*[\\.\\,]?\\d*)\\/\\d*[\\.\\,]?\\d*$")));
+    m_proxy->setValueRoleReplace(QStringLiteral("\\3"));
+    m_proxy->setColumnRolePattern(QRegExp(QStringLiteral("^(\\d*)(\\/)(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
+    m_proxy->setColumnRoleReplace(QStringLiteral("\\1"));
+
+    QBar3DSeries *series = new QBar3DSeries(m_proxy);
+
+    graph->addSeries(series);
+
+    QCoreApplication::processEvents();
+    QCOMPARE(graph->valueAxis()->max(), 6.5f);
+    m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBFirst);
+    QCoreApplication::processEvents();
+    QCOMPARE(graph->valueAxis()->max(), 3.5f);
+    m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBLast);
+    QCoreApplication::processEvents();
+    QCOMPARE(graph->valueAxis()->max(), 6.5f);
+    m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBAverage);
+    QCoreApplication::processEvents();
+    QCOMPARE(graph->valueAxis()->max(), 5.0f);
+    m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBCumulative);
+    QCoreApplication::processEvents();
+    QCOMPARE(graph->valueAxis()->max(), 15.0f);
+
+    QCOMPARE(m_proxy->columnLabels().count(), 1);
+    QCOMPARE(m_proxy->rowCount(), 1);
+    QCOMPARE(m_proxy->rowLabels().count(), 1);
+    QVERIFY(m_proxy->series());
 }
 
 QTEST_MAIN(tst_proxy)