summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtouchevent
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-06-08 14:08:43 +0200
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-06-08 14:08:43 +0200
commit65df0d15038a89810567662644089a197bb8016b (patch)
treeae4cf796b6ffdfe39faf8c4a4bb5a9386552d496 /tests/auto/qtouchevent
parent6e565768dd30bd3a489cea0dfd7715c93df62522 (diff)
don't reset the touch widget in the basicRawEventTranslation() test
Diffstat (limited to 'tests/auto/qtouchevent')
-rw-r--r--tests/auto/qtouchevent/tst_qtouchevent.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/qtouchevent/tst_qtouchevent.cpp b/tests/auto/qtouchevent/tst_qtouchevent.cpp
index 0a96edad6a..ae6e2179c2 100644
--- a/tests/auto/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/qtouchevent/tst_qtouchevent.cpp
@@ -278,12 +278,11 @@ void tst_QTouchEvent::basicRawEventTranslation()
QCOMPARE(touchBeginPoint.pressure(), qreal(-1.));
// moving the point should translate to TouchUpdate
- touchWidget.reset();
rawTouchPoint.setState(Qt::TouchPointMoved);
rawTouchPoint.setGlobalPos(globalPos + delta);
res = qt_translateRawTouchEvent(QList<QTouchEvent::TouchPoint>() << rawTouchPoint, &touchWidget);
QVERIFY(res);
- QVERIFY(!touchWidget.seenTouchBegin);
+ QVERIFY(touchWidget.seenTouchBegin);
QVERIFY(touchWidget.seenTouchUpdate);
QVERIFY(!touchWidget.seenTouchEnd);
QCOMPARE(touchWidget.touchUpdatePoints.count(), 1);
@@ -300,13 +299,12 @@ void tst_QTouchEvent::basicRawEventTranslation()
QCOMPARE(touchUpdatePoint.pressure(), qreal(-1.));
// releasing the point translates to TouchEnd
- touchWidget.reset();
rawTouchPoint.setState(Qt::TouchPointReleased);
rawTouchPoint.setGlobalPos(globalPos + delta + delta);
res = qt_translateRawTouchEvent(QList<QTouchEvent::TouchPoint>() << rawTouchPoint, &touchWidget);
QVERIFY(res);
- QVERIFY(!touchWidget.seenTouchBegin);
- QVERIFY(!touchWidget.seenTouchUpdate);
+ QVERIFY(touchWidget.seenTouchBegin);
+ QVERIFY(touchWidget.seenTouchUpdate);
QVERIFY(touchWidget.seenTouchEnd);
QCOMPARE(touchWidget.touchEndPoints.count(), 1);
QTouchEvent::TouchPoint touchEndPoint = touchWidget.touchEndPoints.first();