summaryrefslogtreecommitdiffstats
path: root/tests/auto/cpptest/q3dsurface-proxy/tst_proxy.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/cpptest/q3dsurface-proxy/tst_proxy.cpp')
-rw-r--r--tests/auto/cpptest/q3dsurface-proxy/tst_proxy.cpp21
1 files changed, 17 insertions, 4 deletions
diff --git a/tests/auto/cpptest/q3dsurface-proxy/tst_proxy.cpp b/tests/auto/cpptest/q3dsurface-proxy/tst_proxy.cpp
index f4935f96..4274899d 100644
--- a/tests/auto/cpptest/q3dsurface-proxy/tst_proxy.cpp
+++ b/tests/auto/cpptest/q3dsurface-proxy/tst_proxy.cpp
@@ -36,7 +36,6 @@ private slots:
void initialProperties();
void initializeProperties();
- void invalidProperties();
private:
QSurfaceDataProxy *m_proxy;
@@ -70,15 +69,29 @@ void tst_proxy::construct()
void tst_proxy::initialProperties()
{
QVERIFY(m_proxy);
+
+ QCOMPARE(m_proxy->columnCount(), 0);
+ QCOMPARE(m_proxy->rowCount(), 0);
+ QVERIFY(!m_proxy->series());
+
+ QCOMPARE(m_proxy->type(), QAbstractDataProxy::DataTypeSurface);
}
void tst_proxy::initializeProperties()
{
QVERIFY(m_proxy);
-}
-void tst_proxy::invalidProperties()
-{
+ QSurfaceDataArray *data = new QSurfaceDataArray;
+ QSurfaceDataRow *dataRow1 = new QSurfaceDataRow;
+ QSurfaceDataRow *dataRow2 = new QSurfaceDataRow;
+ *dataRow1 << QVector3D(0.0f, 0.1f, 0.5f) << QVector3D(1.0f, 0.5f, 0.5f);
+ *dataRow2 << QVector3D(0.0f, 1.8f, 1.0f) << QVector3D(1.0f, 1.2f, 1.0f);
+ *data << dataRow1 << dataRow2;
+
+ m_proxy->resetArray(data);
+
+ QCOMPARE(m_proxy->columnCount(), 2);
+ QCOMPARE(m_proxy->rowCount(), 2);
}
QTEST_MAIN(tst_proxy)