diff options
Diffstat (limited to 'tests/auto/render/picking/tst_picking.cpp')
| -rw-r--r-- | tests/auto/render/picking/tst_picking.cpp | 50 |
1 files changed, 22 insertions, 28 deletions
diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp index 4f4201e07..d0e6512d5 100644 --- a/tests/auto/render/picking/tst_picking.cpp +++ b/tests/auto/render/picking/tst_picking.cpp @@ -153,14 +153,13 @@ private Q_SLOTS: QCoreApplication::processEvents(); + auto dpicker = [](QObjectPicker *node) { + return static_cast<QObjectPickerPrivate *>(QObjectPickerPrivate::get(node)); + }; + // WHEN Qt3DRender::QPickEventPtr event(new Qt3DRender::QPickEvent()); - QVariant v; - v.setValue<Qt3DRender::QObjectPickerEvent>({event, Qt3DCore::QNodeId()}); - Qt3DCore::QPropertyUpdatedChangePtr e(new Qt3DCore::QPropertyUpdatedChange(child11.id())); - e->setPropertyName("pressed"); - e->setValue(v); - child11.picker->sceneChangeEvent(e); + dpicker(child11.picker)->pressedEvent(event.data()); // THEN QCOMPARE(root.pressedCalled, 0); @@ -171,7 +170,7 @@ private Q_SLOTS: // WHEN child11.pressedCalled = 0; child11.acceptsEvents = false; - child11.picker->sceneChangeEvent(e); + dpicker(child11.picker)->pressedEvent(event.data()); // THEN QCOMPARE(root.pressedCalled, 0); @@ -184,7 +183,7 @@ private Q_SLOTS: child1.pressedCalled = 0; child11.acceptsEvents = false; child11.pressedCalled = 0; - child11.picker->sceneChangeEvent(e); + dpicker(child11.picker)->pressedEvent(event.data()); // THEN QCOMPARE(root.pressedCalled, 1); @@ -208,16 +207,14 @@ private Q_SLOTS: QCoreApplication::processEvents(); + auto dpicker = [](QObjectPicker *node) { + return static_cast<QObjectPickerPrivate *>(QObjectPickerPrivate::get(node)); + }; + // WHEN Qt3DRender::QPickEventPtr event(new Qt3DRender::QPickEvent()); - QVariant v; - v.setValue<Qt3DRender::QObjectPickerEvent>({event, Qt3DCore::QNodeId()}); - Qt3DCore::QPropertyUpdatedChangePtr e(new Qt3DCore::QPropertyUpdatedChange(child11.id())); - e->setPropertyName("pressed"); - e->setValue(v); - child11.picker->sceneChangeEvent(e); - e->setPropertyName("released"); - child11.picker->sceneChangeEvent(e); + dpicker(child11.picker)->pressedEvent(event.data()); + dpicker(child11.picker)->releasedEvent(event.data()); // THEN QCOMPARE(root.releasedCalled, 0); @@ -229,10 +226,8 @@ private Q_SLOTS: child11.releasedCalled = 0; child11.pressedCalled = 0; child11.acceptsEvents = false; - e->setPropertyName("pressed"); - child11.picker->sceneChangeEvent(e); - e->setPropertyName("released"); - child11.picker->sceneChangeEvent(e); + dpicker(child11.picker)->pressedEvent(event.data()); + dpicker(child11.picker)->releasedEvent(event.data()); // THEN QCOMPARE(child1.pressedCalled, 1); @@ -259,14 +254,13 @@ private Q_SLOTS: QCoreApplication::processEvents(); + auto dpicker = [](QObjectPicker *node) { + return static_cast<QObjectPickerPrivate *>(QObjectPickerPrivate::get(node)); + }; + // WHEN Qt3DRender::QPickEventPtr event(new Qt3DRender::QPickEvent()); - QVariant v; - v.setValue<Qt3DRender::QObjectPickerEvent>({event, Qt3DCore::QNodeId()}); - Qt3DCore::QPropertyUpdatedChangePtr e(new Qt3DCore::QPropertyUpdatedChange(child11.id())); - e->setPropertyName("clicked"); - e->setValue(v); - child11.picker->sceneChangeEvent(e); + dpicker(child11.picker)->clickedEvent(event.data()); // THEN QCOMPARE(root.clickedCalled, 0); @@ -277,7 +271,7 @@ private Q_SLOTS: // WHEN child11.clickedCalled = 0; child11.acceptsEvents = false; - child11.picker->sceneChangeEvent(e); + dpicker(child11.picker)->clickedEvent(event.data()); // THEN QCOMPARE(root.clickedCalled, 0); @@ -290,7 +284,7 @@ private Q_SLOTS: child1.clickedCalled = 0; child11.acceptsEvents = false; child11.clickedCalled = 0; - child11.picker->sceneChangeEvent(e); + dpicker(child11.picker)->clickedEvent(event.data()); // THEN QCOMPARE(root.clickedCalled, 1); |