4 files changed, 65 insertions, 0 deletions
diff --git a/tests/auto/cpptest/q3dsurface-heightproxy/customtexture.jpg b/tests/auto/cpptest/q3dsurface-heightproxy/customtexture.jpg
new file mode 100644
index 00000000..2580f5bd
--- /dev/null
+++ b/tests/auto/cpptest/q3dsurface-heightproxy/customtexture.jpg
diff --git a/tests/auto/cpptest/q3dsurface-heightproxy/q3dsurface-heightproxy.pro b/tests/auto/cpptest/q3dsurface-heightproxy/q3dsurface-heightproxy.pro
index b0b5d361..56a964d0 100644
--- a/tests/auto/cpptest/q3dsurface-heightproxy/q3dsurface-heightproxy.pro
+++ b/tests/auto/cpptest/q3dsurface-heightproxy/q3dsurface-heightproxy.pro
@@ -6,3 +6,6 @@ CONFIG += console testcase
 TEMPLATE = app
 
 SOURCES += tst_proxy.cpp
+
+RESOURCES += \
+    q3dsurface-heightproxy.qrc
diff --git a/tests/auto/cpptest/q3dsurface-heightproxy/q3dsurface-heightproxy.qrc b/tests/auto/cpptest/q3dsurface-heightproxy/q3dsurface-heightproxy.qrc
new file mode 100644
index 00000000..b83c7ef9
--- /dev/null
+++ b/tests/auto/cpptest/q3dsurface-heightproxy/q3dsurface-heightproxy.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>customtexture.jpg</file>
+    </qresource>
+</RCC>
diff --git a/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp
index cf896bbf..8e998568 100644
--- a/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp
+++ b/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp
@@ -70,15 +70,72 @@ void tst_proxy::construct()
 void tst_proxy::initialProperties()
 {
     QVERIFY(m_proxy);
+
+    QCOMPARE(m_proxy->heightMap(), QImage());
+    QCOMPARE(m_proxy->heightMapFile(), QString(""));
+    QCOMPARE(m_proxy->maxXValue(), 10.0f);
+    QCOMPARE(m_proxy->maxZValue(), 10.0f);
+    QCOMPARE(m_proxy->minXValue(), 0.0f);
+    QCOMPARE(m_proxy->minZValue(), 0.0f);
+
+    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);
+
+    m_proxy->setHeightMapFile(":/customtexture.jpg");
+    m_proxy->setMaxXValue(11.0f);
+    m_proxy->setMaxZValue(11.0f);
+    m_proxy->setMinXValue(-10.0f);
+    m_proxy->setMinZValue(-10.0f);
+
+    QCoreApplication::processEvents();
+
+    QCOMPARE(m_proxy->heightMapFile(), QString(":/customtexture.jpg"));
+    QCOMPARE(m_proxy->maxXValue(), 11.0f);
+    QCOMPARE(m_proxy->maxZValue(), 11.0f);
+    QCOMPARE(m_proxy->minXValue(), -10.0f);
+    QCOMPARE(m_proxy->minZValue(), -10.0f);
+
+    QCOMPARE(m_proxy->columnCount(), 24);
+    QCOMPARE(m_proxy->rowCount(), 24);
+
+    m_proxy->setHeightMapFile("");
+
+    QCoreApplication::processEvents();
+
+    QCOMPARE(m_proxy->columnCount(), 0);
+    QCOMPARE(m_proxy->rowCount(), 0);
+
+    m_proxy->setHeightMap(QImage(":/customtexture.jpg"));
+
+    QCoreApplication::processEvents();
+
+    QCOMPARE(m_proxy->columnCount(), 24);
+    QCOMPARE(m_proxy->rowCount(), 24);
 }
 
 void tst_proxy::invalidProperties()
 {
+    m_proxy->setMaxXValue(-10.0f);
+    m_proxy->setMaxZValue(-10.0f);
+    QCOMPARE(m_proxy->maxXValue(), -10.0f);
+    QCOMPARE(m_proxy->maxZValue(), -10.0f);
+    QCOMPARE(m_proxy->minXValue(), -11.0f);
+    QCOMPARE(m_proxy->minZValue(), -11.0f);
+
+    m_proxy->setMinXValue(10.0f);
+    m_proxy->setMinZValue(10.0f);
+    QCOMPARE(m_proxy->maxXValue(), 11.0f);
+    QCOMPARE(m_proxy->maxZValue(), 11.0f);
+    QCOMPARE(m_proxy->minXValue(), 10.0f);
+    QCOMPARE(m_proxy->minZValue(), 10.0f);
 }
 
 QTEST_MAIN(tst_proxy)