From 0d4096ab9d7785d05da7f3174070f0b5e91306d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Mon, 14 Nov 2016 11:31:53 +0200 Subject: Fixed inability to set subviewports Change-Id: I7966292cca04fe990a2fa6a5b4233bf89e77c553 Task-number: QTRD-1807 Reviewed-by: Miikka Heikkinen --- tests/auto/cpptest/q3dscene/tst_scene.cpp | 16 ++++++++++------ tests/auto/qmltest/bars3d/tst_basic.qml | 4 ++-- tests/auto/qmltest/scene3d/tst_scene.qml | 24 ++++++++++++++++++------ 3 files changed, 30 insertions(+), 14 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/cpptest/q3dscene/tst_scene.cpp b/tests/auto/cpptest/q3dscene/tst_scene.cpp index 9e46feb0..1336f400 100644 --- a/tests/auto/cpptest/q3dscene/tst_scene.cpp +++ b/tests/auto/cpptest/q3dscene/tst_scene.cpp @@ -111,21 +111,25 @@ void tst_scene::initializeProperties() m_scene->setPrimarySubViewport(QRect(0, 0, 50, 50)); m_scene->setSecondarySubViewport(QRect(50, 50, 100, 100)); m_scene->setSecondarySubviewOnTop(false); - m_scene->setSelectionQueryPosition(QPoint(0, 0)); m_scene->setSlicingActive(true); + m_scene->setSelectionQueryPosition(QPoint(0, 0)); QCOMPARE(m_scene->activeCamera(), camera1); QCOMPARE(m_scene->activeLight(), light1); QCOMPARE(m_scene->devicePixelRatio(), 2.0f); QCOMPARE(m_scene->graphPositionQuery(), QPoint(0, 0)); // TODO: When doing signal checks, add tests to check that queries return something (asynchronously) - // TODO: subviewports are not set (QTRD-2435) - //QCOMPARE(m_scene->primarySubViewport(), QRect(0, 0, 50, 50)); - //QCOMPARE(m_scene->secondarySubViewport(), QRect(50, 50, 100, 100)); + QCOMPARE(m_scene->primarySubViewport(), QRect(0, 0, 50, 50)); + QCOMPARE(m_scene->secondarySubViewport(), QRect(50, 50, 100, 100)); QCOMPARE(m_scene->isSecondarySubviewOnTop(), false); QCOMPARE(m_scene->selectionQueryPosition(), QPoint(0, 0)); // TODO: When doing signal checks, add tests to check that queries return something (asynchronously) QCOMPARE(m_scene->isSlicingActive(), true); - // TODO: viewport is not set by subviewports (QTRD-2435) - //QCOMPARE(m_scene->viewport(), QRect(0, 0, 100, 100)); + QCOMPARE(m_scene->viewport(), QRect(0, 0, 150, 150)); + + m_scene->setPrimarySubViewport(QRect()); + m_scene->setSecondarySubViewport(QRect()); + + QCOMPARE(m_scene->primarySubViewport(), QRect(0, 0, 30, 30)); + QCOMPARE(m_scene->secondarySubViewport(), QRect(0, 0, 150, 150)); } void tst_scene::invalidProperties() diff --git a/tests/auto/qmltest/bars3d/tst_basic.qml b/tests/auto/qmltest/bars3d/tst_basic.qml index 5d5046d4..3ef7101d 100644 --- a/tests/auto/qmltest/bars3d/tst_basic.qml +++ b/tests/auto/qmltest/bars3d/tst_basic.qml @@ -111,7 +111,7 @@ Item { compare(empty.height, 0, "height") compare(empty.multiSeriesUniform, false, "multiSeriesUniform") compare(empty.barThickness, 1.0, "barThickness") - compare(empty.barSpacing, Qt.size(0.2, 0.2), "barSpacing") + compare(empty.barSpacing, Qt.size(1.0, 1.0), "barSpacing") compare(empty.barSpacingRelative, true, "barSpacingRelative") compare(empty.seriesList.length, 0, "seriesList") compare(empty.selectedSeries, null, "selectedSeries") @@ -163,7 +163,7 @@ Item { basic.barThickness = -1 basic.barSpacing = Qt.size(-1.0, -1.0) compare(basic.barThickness, -1/*0.5*/, "barThickness") // TODO: Fix once QTRD-3367 is done - compare(basic.barSpacing, Qt.size(1.0, 0.0), "barSpacing") + compare(basic.barSpacing, Qt.size(-1.0, -1.0), "barSpacing") waitForRendering(top) basic.destroy() waitForRendering(top) diff --git a/tests/auto/qmltest/scene3d/tst_scene.qml b/tests/auto/qmltest/scene3d/tst_scene.qml index 10c68582..bd67a56f 100644 --- a/tests/auto/qmltest/scene3d/tst_scene.qml +++ b/tests/auto/qmltest/scene3d/tst_scene.qml @@ -70,12 +70,21 @@ Item { compare(initial.scene.devicePixelRatio, 1.0) compare(initial.scene.graphPositionQuery, Qt.point(-1, -1)) compare(initial.scene.invalidSelectionPoint, Qt.point(-1, -1)) - compare(initial.scene.primarySubViewport, Qt.rect(0, 0, 0, 0)) - compare(initial.scene.secondarySubViewport, Qt.rect(0, 0, 0, 0)) + compare(initial.scene.primarySubViewport.x, 0) + compare(initial.scene.primarySubViewport.y, 0) + compare(initial.scene.primarySubViewport.width, 0) + compare(initial.scene.primarySubViewport.height, 0) + compare(initial.scene.secondarySubViewport.x, 0) + compare(initial.scene.secondarySubViewport.y, 0) + compare(initial.scene.secondarySubViewport.width, 0) + compare(initial.scene.secondarySubViewport.height, 0) compare(initial.scene.secondarySubviewOnTop, true) compare(initial.scene.selectionQueryPosition, Qt.point(-1, -1)) compare(initial.scene.slicingActive, false) - compare(initial.scene.viewport, Qt.rect(0, 0, 0, 0)) + compare(initial.scene.viewport.x, 0) + compare(initial.scene.viewport.y, 0) + compare(initial.scene.viewport.width, 0) + compare(initial.scene.viewport.height, 0) } } @@ -91,7 +100,7 @@ Item { compare(initialized.scene.secondarySubviewOnTop, false) compare(initialized.scene.selectionQueryPosition, Qt.point(0, 0)) compare(initialized.scene.slicingActive, true) - compare(initialized.scene.viewport, Qt.rect(0, 0, 100, 100)) + compare(initialized.scene.viewport, Qt.rect(0, 0, 150, 150)) } } @@ -121,7 +130,7 @@ Item { compare(change.scene.secondarySubviewOnTop, false) compare(change.scene.selectionQueryPosition, Qt.point(0, 0)) compare(change.scene.slicingActive, true) - compare(change.scene.viewport, Qt.rect(0, 0, 100, 100)) + compare(change.scene.viewport, Qt.rect(0, 0, 150, 150)) } } @@ -130,7 +139,10 @@ Item { function test_invalid() { invalid.scene.primarySubViewport = Qt.rect(0, 0, -50, -50) - compare(invalid.scene.primarySubViewport, Qt.rect(0, 0, 0, 0)) + compare(invalid.scene.primarySubViewport.x, 0) + compare(invalid.scene.primarySubViewport.y, 0) + compare(invalid.scene.primarySubViewport.width, 0) + compare(invalid.scene.primarySubViewport.height, 0) } } } -- cgit v1.2.3