diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-30 16:10:19 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-02 06:34:02 +0000 |
| commit | ed6d778b20d0cdf2968e8d68085d33791ac33c49 (patch) | |
| tree | d97e5a36316371b199dca3774cae50ba4348172e /tests/auto/render/material | |
| parent | 77b04a10874870b6b41e7b788636b492f3da9075 (diff) | |
Remove QbackendNode::setPeer(QNode *)
...and fix up unit tests by using the QbackendNodeTester to simulate
the initialization performed by QAbstractAspectPrivate.
Change-Id: I61207f9f1631494f926552bef8eba33cc2a45850
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render/material')
| -rw-r--r-- | tests/auto/render/material/material.pro | 1 | ||||
| -rw-r--r-- | tests/auto/render/material/tst_material.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/render/material/material.pro b/tests/auto/render/material/material.pro index 5cd5ab339..9efe88ace 100644 --- a/tests/auto/render/material/material.pro +++ b/tests/auto/render/material/material.pro @@ -8,5 +8,6 @@ CONFIG += testcase SOURCES += tst_material.cpp +include(../../core/common/common.pri) include(../commons/commons.pri) diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp index 269379b25..4a037e76f 100644 --- a/tests/auto/render/material/tst_material.cpp +++ b/tests/auto/render/material/tst_material.cpp @@ -27,6 +27,7 @@ ****************************************************************************/ #include <QtTest/QTest> +#include <qbackendnodetester.h> #include <Qt3DRender/private/material_p.h> #include <Qt3DRender/QMaterial> @@ -41,7 +42,7 @@ using namespace Qt3DCore; using namespace Qt3DRender; using namespace Qt3DRender::Render; -class tst_RenderMaterial : public QObject +class tst_RenderMaterial : public Qt3DCore::QBackendNodeTester { Q_OBJECT public: @@ -114,7 +115,7 @@ void tst_RenderMaterial::shouldHavePropertiesMirroringFromItsPeer() Material backend; // GIVEN - backend.setPeer(frontendMaterial); + simulateInitialization(frontendMaterial, &backend); // THEN QVERIFY(backend.isEnabled() == frontendMaterial->isEnabled()); |