diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-01 18:07:28 +1000 |
---|---|---|
committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-02 00:08:31 +0100 |
commit | 2a538e1c5f18b63dc81c6b660f7782fc25de54f3 (patch) | |
tree | d74fce009e4e4ba8f4673a95e0a04ff12095e553 /tests/auto/declarative | |
parent | a236006b703a4e24b33cdd85abe1fb8c387d6eed (diff) | |
download | qtquick1-2a538e1c5f18b63dc81c6b660f7782fc25de54f3.tar.gz |
Fix QDeclarativeMouseArea test failure.
Increase the drag distances to accomadate a larger drag threshold.
Change-Id: If2354e27433bfa31a9110922aa19d00f5d617873
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r-- | tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp index 1da7c21c..185921c8 100644 --- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp +++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp @@ -230,19 +230,19 @@ void tst_QDeclarativeMouseArea::dragging() // First move event triggers drag, second is acted upon. // This is due to possibility of higher stacked area taking precedence. QGraphicsSceneMouseEvent moveEvent(QEvent::GraphicsSceneMouseMove); - moveEvent.setScenePos(QPointF(106, 106)); + moveEvent.setScenePos(QPointF(111, 111)); moveEvent.setButton(Qt::LeftButton); moveEvent.setButtons(Qt::LeftButton); QApplication::sendEvent(scene, &moveEvent); - moveEvent.setScenePos(QPointF(110, 110)); + moveEvent.setScenePos(QPointF(122, 122)); moveEvent.setButton(Qt::LeftButton); moveEvent.setButtons(Qt::LeftButton); QApplication::sendEvent(scene, &moveEvent); QVERIFY(drag->active()); - QCOMPARE(blackRect->x(), 60.0); - QCOMPARE(blackRect->y(), 60.0); + QCOMPARE(blackRect->x(), 72.0); + QCOMPARE(blackRect->y(), 72.0); QGraphicsSceneMouseEvent releaseEvent(QEvent::GraphicsSceneMouseRelease); releaseEvent.setScenePos(QPointF(110, 110)); @@ -251,8 +251,8 @@ void tst_QDeclarativeMouseArea::dragging() QApplication::sendEvent(scene, &releaseEvent); QVERIFY(!drag->active()); - QCOMPARE(blackRect->x(), 60.0); - QCOMPARE(blackRect->y(), 60.0); + QCOMPARE(blackRect->x(), 72.0); + QCOMPARE(blackRect->y(), 72.0); delete canvas; } @@ -546,18 +546,18 @@ void tst_QDeclarativeMouseArea::preventStealing() QSignalSpy mousePositionSpy(mouseArea, SIGNAL(positionChanged(QDeclarativeMouseEvent*))); - QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(80, 80))); + QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(95, 95))); // Without preventStealing, mouse movement over MouseArea would // cause the Flickable to steal mouse and trigger content movement. QGraphicsScene *scene = canvas->scene(); QGraphicsSceneMouseEvent moveEvent(QEvent::GraphicsSceneMouseMove); - moveEvent.setScenePos(QPointF(70, 70)); + moveEvent.setScenePos(QPointF(80, 80)); moveEvent.setButton(Qt::LeftButton); moveEvent.setButtons(Qt::LeftButton); QApplication::sendEvent(scene, &moveEvent); - moveEvent.setScenePos(QPointF(60, 60)); + moveEvent.setScenePos(QPointF(65, 65)); moveEvent.setButton(Qt::LeftButton); moveEvent.setButtons(Qt::LeftButton); QApplication::sendEvent(scene, &moveEvent); @@ -580,14 +580,14 @@ void tst_QDeclarativeMouseArea::preventStealing() // Now allow stealing and confirm Flickable does its thing. canvas->rootObject()->setProperty("stealing", false); - QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(80, 80))); + QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(95, 95))); // Without preventStealing, mouse movement over MouseArea would // cause the Flickable to steal mouse and trigger content movement. - moveEvent.setScenePos(QPointF(70, 70)); + moveEvent.setScenePos(QPointF(80, 80)); QApplication::sendEvent(scene, &moveEvent); - moveEvent.setScenePos(QPointF(60, 60)); + moveEvent.setScenePos(QPointF(65, 65)); QApplication::sendEvent(scene, &moveEvent); moveEvent.setScenePos(QPointF(50, 50)); @@ -599,8 +599,8 @@ void tst_QDeclarativeMouseArea::preventStealing() QVERIFY(!mouseArea->pressed()); // Flickable content should have moved. - QCOMPARE(flickable->contentX(), 10.); - QCOMPARE(flickable->contentY(), 10.); + QCOMPARE(flickable->contentX(), 15.); + QCOMPARE(flickable->contentY(), 15.); QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(50, 50))); |