qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tst_qsgmousearea clickThrough() test stability. 

Change-Id: Iee87ea8e62bffd743e522f969c34fbc2f0a1443e
Reviewed-on: http://codereview.qt-project.org/5766
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
This commit is contained in:
Martin Jones 2011-09-29 13:55:36 +10:00 committed by Qt by Nokia
parent 5d62a90fe1
commit ec1e7f3b37
1 changed files with 37 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
tests/auto/declarative/qsgmousearea/tst_qsgmousearea.cpp
View File

@ -48,6 +48,7 @@
#include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativecontext.h>
#include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativeengine.h>
#include <QtOpenGL/QGLShaderProgram> #include <QtOpenGL/QGLShaderProgram>
#include "../../../shared/util.h"
#ifdef Q_OS_SYMBIAN #ifdef Q_OS_SYMBIAN
// In Symbian OS test data is located in applications private dir // In Symbian OS test data is located in applications private dir
@ -635,36 +636,28 @@ void tst_QSGMouseArea::clickThrough()
canvas->requestActivateWindow(); canvas->requestActivateWindow();
QVERIFY(canvas->rootObject() != 0); QVERIFY(canvas->rootObject() != 0);
QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0); QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(100,100));
QApplication::sendEvent(canvas, &pressEvent); QTest::mouseRelease(canvas, Qt::LeftButton, 0, QPoint(100,100));
QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0); QTRY_COMPARE(canvas->rootObject()->property("presses").toInt(), 0);
QApplication::sendEvent(canvas, &releaseEvent); QTRY_COMPARE(canvas->rootObject()->property("clicks").toInt(), 1);
QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0); QTest::qWait(800); // to avoid generating a double click.
QCOMPARE(canvas->rootObject()->property("clicks").toInt(), 1);
QApplication::sendEvent(canvas, &pressEvent); QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(100,100));
QTest::qWait(1000); QTest::qWait(1000);
QApplication::sendEvent(canvas, &releaseEvent); QTest::mouseRelease(canvas, Qt::LeftButton, 0, QPoint(100,100));
QTRY_COMPARE(canvas->rootObject()->property("presses").toInt(), 0);
QTRY_COMPARE(canvas->rootObject()->property("clicks").toInt(), 1);
QTRY_COMPARE(canvas->rootObject()->property("pressAndHolds").toInt(), 1);
QTest::mouseDClick(canvas, Qt::LeftButton, 0, QPoint(100,100));
QTest::qWait(100);
QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0); QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0);
#ifdef QT_BUILD_INTERNAL QTRY_COMPARE(canvas->rootObject()->property("clicks").toInt(), 2);
QEXPECT_FAIL("", "QTBUG-21685 - Unstable test for developer build", Abort); QTRY_COMPARE(canvas->rootObject()->property("doubleClicks").toInt(), 1);
#endif
QCOMPARE(canvas->rootObject()->property("clicks").toInt(), 1);
QCOMPARE(canvas->rootObject()->property("pressAndHolds").toInt(), 1);
QApplication::sendEvent(canvas, &pressEvent);
QApplication::sendEvent(canvas, &releaseEvent);
pressEvent = QMouseEvent(QEvent::MouseButtonDblClick, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
QApplication::sendEvent(canvas, &pressEvent);
QApplication::sendEvent(canvas, &releaseEvent);
QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0);
QCOMPARE(canvas->rootObject()->property("clicks").toInt(), 2);
QCOMPARE(canvas->rootObject()->property("doubleClicks").toInt(), 1);
QCOMPARE(canvas->rootObject()->property("pressAndHolds").toInt(), 1); QCOMPARE(canvas->rootObject()->property("pressAndHolds").toInt(), 1);
delete canvas; delete canvas;
@ -676,29 +669,25 @@ void tst_QSGMouseArea::clickThrough()
canvas->requestActivateWindow(); canvas->requestActivateWindow();
QVERIFY(canvas->rootObject() != 0); QVERIFY(canvas->rootObject() != 0);
pressEvent = QMouseEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0); QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(100,100));
QApplication::sendEvent(canvas, &pressEvent); QTest::mouseRelease(canvas, Qt::LeftButton, 0, QPoint(100,100));
releaseEvent = QMouseEvent(QEvent::MouseButtonRelease, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
QApplication::sendEvent(canvas, &releaseEvent);
QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0); QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0);
QCOMPARE(canvas->rootObject()->property("clicks").toInt(), 0); QCOMPARE(canvas->rootObject()->property("clicks").toInt(), 0);
QApplication::sendEvent(canvas, &pressEvent); QTest::qWait(800); // to avoid generating a double click.
QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(100,100));
QTest::qWait(1000); QTest::qWait(1000);
QApplication::sendEvent(canvas, &releaseEvent); QTest::mouseRelease(canvas, Qt::LeftButton, 0, QPoint(100,100));
QTest::qWait(100);
QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0); QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0);
QCOMPARE(canvas->rootObject()->property("clicks").toInt(), 0); QCOMPARE(canvas->rootObject()->property("clicks").toInt(), 0);
QCOMPARE(canvas->rootObject()->property("pressAndHolds").toInt(), 0); QCOMPARE(canvas->rootObject()->property("pressAndHolds").toInt(), 0);
QApplication::sendEvent(canvas, &pressEvent); QTest::mouseDClick(canvas, Qt::LeftButton, 0, QPoint(100,100));
QApplication::sendEvent(canvas, &releaseEvent); QTest::qWait(100);
pressEvent = QMouseEvent(QEvent::MouseButtonDblClick, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
QApplication::sendEvent(canvas, &pressEvent);
QApplication::sendEvent(canvas, &releaseEvent);
QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0); QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0);
QCOMPARE(canvas->rootObject()->property("clicks").toInt(), 0); QCOMPARE(canvas->rootObject()->property("clicks").toInt(), 0);
@ -707,32 +696,28 @@ void tst_QSGMouseArea::clickThrough()
canvas->rootObject()->setProperty("letThrough", QVariant(true)); canvas->rootObject()->setProperty("letThrough", QVariant(true));
pressEvent = QMouseEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0); QTest::qWait(800); // to avoid generating a double click.
QApplication::sendEvent(canvas, &pressEvent); QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(100,100));
QTest::mouseRelease(canvas, Qt::LeftButton, 0, QPoint(100,100));
releaseEvent = QMouseEvent(QEvent::MouseButtonRelease, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
QApplication::sendEvent(canvas, &releaseEvent);
QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0); QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0);
QCOMPARE(canvas->rootObject()->property("clicks").toInt(), 1); QTRY_COMPARE(canvas->rootObject()->property("clicks").toInt(), 1);
QApplication::sendEvent(canvas, &pressEvent); QTest::qWait(800); // to avoid generating a double click.
QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(100,100));
QTest::qWait(1000); QTest::qWait(1000);
QApplication::sendEvent(canvas, &releaseEvent); QTest::mouseRelease(canvas, Qt::LeftButton, 0, QPoint(100,100));
QTest::qWait(100);
QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0); QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0);
QCOMPARE(canvas->rootObject()->property("clicks").toInt(), 1); QCOMPARE(canvas->rootObject()->property("clicks").toInt(), 1);
QCOMPARE(canvas->rootObject()->property("pressAndHolds").toInt(), 1); QCOMPARE(canvas->rootObject()->property("pressAndHolds").toInt(), 1);
QApplication::sendEvent(canvas, &pressEvent); QTest::mouseDClick(canvas, Qt::LeftButton, 0, QPoint(100,100));
QApplication::sendEvent(canvas, &releaseEvent); QTest::qWait(100);
pressEvent = QMouseEvent(QEvent::MouseButtonDblClick, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
QApplication::sendEvent(canvas, &pressEvent);
QApplication::sendEvent(canvas, &releaseEvent);
QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0); QCOMPARE(canvas->rootObject()->property("presses").toInt(), 0);
QCOMPARE(canvas->rootObject()->property("clicks").toInt(), 2); QTRY_COMPARE(canvas->rootObject()->property("clicks").toInt(), 2);
QCOMPARE(canvas->rootObject()->property("doubleClicks").toInt(), 1); QCOMPARE(canvas->rootObject()->property("doubleClicks").toInt(), 1);
QCOMPARE(canvas->rootObject()->property("pressAndHolds").toInt(), 1); QCOMPARE(canvas->rootObject()->property("pressAndHolds").toInt(), 1);