diff options
author | Antti Määttä <antti.maatta@qt.io> | 2016-10-25 13:10:23 +0300 |
---|---|---|
committer | Antti Määttä <antti.maatta@qt.io> | 2017-01-27 12:07:21 +0000 |
commit | c2da124e676c3e1b599210d1ee50a09b3fff9ffa (patch) | |
tree | c186b6d1b9481d264aba017bd4c8c0165b8cb2fc | |
parent | 61a7a44b4f2ea88ee4451dbc0faedbd5efd11558 (diff) |
Update ObjectPicker unit tests
Change-Id: I648e0b49e06c68779631870f9d31e3671eb5e691
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | tests/auto/render/objectpicker/tst_objectpicker.cpp | 17 | ||||
-rw-r--r-- | tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp | 14 |
2 files changed, 31 insertions, 0 deletions
diff --git a/tests/auto/render/objectpicker/tst_objectpicker.cpp b/tests/auto/render/objectpicker/tst_objectpicker.cpp index c42ec60c9..96ee76827 100644 --- a/tests/auto/render/objectpicker/tst_objectpicker.cpp +++ b/tests/auto/render/objectpicker/tst_objectpicker.cpp @@ -46,7 +46,9 @@ private Q_SLOTS: // GIVEN Qt3DRender::Render::ObjectPicker objectPicker; Qt3DRender::QObjectPicker picker; + Qt3DRender::QEventForward eventForward; picker.setHoverEnabled(true); + picker.setEventForward(&eventForward); // WHEN simulateInitialization(&picker, &objectPicker); @@ -55,6 +57,7 @@ private Q_SLOTS: QVERIFY(!objectPicker.peerId().isNull()); QCOMPARE(objectPicker.isHoverEnabled(), true); QCOMPARE(objectPicker.isDirty(), true); + QCOMPARE(objectPicker.eventForward(), eventForward.id()); } void checkInitialAndCleanedUpState() @@ -66,6 +69,8 @@ private Q_SLOTS: QVERIFY(objectPicker.peerId().isNull()); QCOMPARE(objectPicker.isHoverEnabled(), false); QCOMPARE(objectPicker.isDirty(), false); + QCOMPARE(objectPicker.isEventForwardingEnabled(), false); + QCOMPARE(objectPicker.eventForward(), Qt3DCore::QNodeId()); // GIVEN Qt3DRender::QObjectPicker picker; @@ -78,12 +83,15 @@ private Q_SLOTS: // THEN QCOMPARE(objectPicker.isHoverEnabled(), false); QCOMPARE(objectPicker.isDirty(), false); + QCOMPARE(objectPicker.isEventForwardingEnabled(), false); + QCOMPARE(objectPicker.eventForward(), Qt3DCore::QNodeId()); } void checkPropertyChanges() { // GIVEN Qt3DRender::Render::ObjectPicker objectPicker; + Qt3DRender::QEventForward eventForward; TestRenderer renderer; objectPicker.setRenderer(&renderer); @@ -102,6 +110,15 @@ private Q_SLOTS: objectPicker.unsetDirty(); QVERIFY(!objectPicker.isDirty()); + + // WHEN + updateChange->setValue(QVariant::fromValue(eventForward.id())); + updateChange->setPropertyName("eventForward"); + objectPicker.sceneChangeEvent(updateChange); + + // THEN + QCOMPARE(objectPicker.isEventForwardingEnabled(), true); + QCOMPARE(objectPicker.eventForward(), eventForward.id()); } void checkBackendPropertyNotifications() diff --git a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp index 4397954ec..8cc87ce14 100644 --- a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp +++ b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp @@ -105,6 +105,7 @@ private Q_SLOTS: // GIVEN TestArbiter arbiter; QScopedPointer<Qt3DRender::QObjectPicker> objectPicker(new Qt3DRender::QObjectPicker()); + QScopedPointer<Qt3DRender::QEventForward> eventForward(new Qt3DRender::QEventForward()); arbiter.setArbiterOnNode(objectPicker.data()); // WHEN @@ -119,6 +120,19 @@ private Q_SLOTS: QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); + + // WHEN + objectPicker->setEventForward(eventForward.data()); + QCoreApplication::processEvents(); + + // THEN + QCOMPARE(arbiter.events.size(), 1); + change = arbiter.events.last().staticCast<Qt3DCore::QPropertyUpdatedChange>(); + QCOMPARE(change->propertyName(), "eventForward"); + QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), eventForward->id()); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); + + arbiter.events.clear(); } void checkBackendUpdates_data() |