From 8f86de1aa775a44c3477a318635a7ed8ff4ed064 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 8 Jun 2009 10:06:19 +0200 Subject: add a autotest for touch events start off by testing basic behavior: 1. touch events are disabled by default 2. touch events are automatically accepted when enabled --- tests/auto/qtouchevent/qtouchevent.pro | 3 + tests/auto/qtouchevent/tst_qtouchevent.cpp | 94 ++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 tests/auto/qtouchevent/qtouchevent.pro create mode 100644 tests/auto/qtouchevent/tst_qtouchevent.cpp diff --git a/tests/auto/qtouchevent/qtouchevent.pro b/tests/auto/qtouchevent/qtouchevent.pro new file mode 100644 index 0000000..8f6aa87 --- /dev/null +++ b/tests/auto/qtouchevent/qtouchevent.pro @@ -0,0 +1,3 @@ +SOURCES=tst_qtouchevent.cpp +TARGET=tst_qtouchevent +QT+=testlib diff --git a/tests/auto/qtouchevent/tst_qtouchevent.cpp b/tests/auto/qtouchevent/tst_qtouchevent.cpp new file mode 100644 index 0000000..9ec3dd7 --- /dev/null +++ b/tests/auto/qtouchevent/tst_qtouchevent.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +class tst_QTouchEvent : public QObject +{ + Q_OBJECT +public: + tst_QTouchEvent() { } + ~tst_QTouchEvent() { } + +private slots: + void touchDisabledByDefault(); + void touchEventAcceptedByDefault(); +}; + +void tst_QTouchEvent::touchDisabledByDefault() +{ + // the widget attribute is not enabled by default + QWidget widget; + QVERIFY(!widget.testAttribute(Qt::WA_AcceptTouchEvents)); + + // events should not be accepted since they are not enabled + QList touchPoints; + touchPoints.append(QTouchEvent::TouchPoint(0)); + QTouchEvent touchEvent(QEvent::TouchBegin, + Qt::NoModifier, + Qt::TouchPointPressed, + touchPoints); + bool res = QApplication::sendEvent(&widget, &touchEvent) + && touchEvent.isAccepted(); + QVERIFY(!res); +} + +void tst_QTouchEvent::touchEventAcceptedByDefault() +{ + // enabling touch events should automatically accept touch events + QWidget widget; + widget.setAttribute(Qt::WA_AcceptTouchEvents); + + QList touchPoints; + touchPoints.append(QTouchEvent::TouchPoint(0)); + QTouchEvent touchEvent(QEvent::TouchBegin, + Qt::NoModifier, + Qt::TouchPointPressed, + touchPoints); + bool res = QApplication::sendEvent(&widget, &touchEvent) + && touchEvent.isAccepted(); + QVERIFY(res); +} + +QTEST_MAIN(tst_QTouchEvent) + +#include "tst_qtouchevent.moc" -- cgit v0.12 From e982ba18f8cffaa55f7c73a3ef877932abb91db1 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 8 Jun 2009 10:10:41 +0200 Subject: make QTouchEvent autotest pass the event is accepted by default, but no handled --- tests/auto/qtouchevent/tst_qtouchevent.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/auto/qtouchevent/tst_qtouchevent.cpp b/tests/auto/qtouchevent/tst_qtouchevent.cpp index 9ec3dd7..8ed7035 100644 --- a/tests/auto/qtouchevent/tst_qtouchevent.cpp +++ b/tests/auto/qtouchevent/tst_qtouchevent.cpp @@ -67,9 +67,9 @@ void tst_QTouchEvent::touchDisabledByDefault() Qt::NoModifier, Qt::TouchPointPressed, touchPoints); - bool res = QApplication::sendEvent(&widget, &touchEvent) - && touchEvent.isAccepted(); + bool res = QApplication::sendEvent(&widget, &touchEvent); QVERIFY(!res); + QVERIFY(!touchEvent.isAccepted()); } void tst_QTouchEvent::touchEventAcceptedByDefault() @@ -84,9 +84,9 @@ void tst_QTouchEvent::touchEventAcceptedByDefault() Qt::NoModifier, Qt::TouchPointPressed, touchPoints); - bool res = QApplication::sendEvent(&widget, &touchEvent) - && touchEvent.isAccepted(); - QVERIFY(res); + bool res = QApplication::sendEvent(&widget, &touchEvent); + QVERIFY(!res); // not handled... + QVERIFY(touchEvent.isAccepted()); // but accepted } QTEST_MAIN(tst_QTouchEvent) -- cgit v0.12 From d44a1bf3af16f2d2d251d03936ba3af5e585628c Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 8 Jun 2009 10:15:54 +0200 Subject: add tst_QTouchEventWidget to handle touch events test that sending the TouchBegin to this widget both succeeds and accepts the event --- tests/auto/qtouchevent/tst_qtouchevent.cpp | 35 ++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/tests/auto/qtouchevent/tst_qtouchevent.cpp b/tests/auto/qtouchevent/tst_qtouchevent.cpp index 8ed7035..a830970 100644 --- a/tests/auto/qtouchevent/tst_qtouchevent.cpp +++ b/tests/auto/qtouchevent/tst_qtouchevent.cpp @@ -42,6 +42,25 @@ #include #include +class tst_QTouchEventWidget : public QWidget +{ +public: + bool event(QEvent *event) + { + switch (event->type()) { + case QEvent::TouchBegin: + break; + case QEvent::TouchUpdate: + break; + case QEvent::TouchEnd: + break; + default: + return QWidget::event(event); + } + return true; + } +}; + class tst_QTouchEvent : public QObject { Q_OBJECT @@ -78,6 +97,8 @@ void tst_QTouchEvent::touchEventAcceptedByDefault() QWidget widget; widget.setAttribute(Qt::WA_AcceptTouchEvents); + // QWidget doesn't handle touch event by default, so sending it fails + // (but the event is accepted) QList touchPoints; touchPoints.append(QTouchEvent::TouchPoint(0)); QTouchEvent touchEvent(QEvent::TouchBegin, @@ -85,10 +106,20 @@ void tst_QTouchEvent::touchEventAcceptedByDefault() Qt::TouchPointPressed, touchPoints); bool res = QApplication::sendEvent(&widget, &touchEvent); - QVERIFY(!res); // not handled... - QVERIFY(touchEvent.isAccepted()); // but accepted + QVERIFY(!res); + QVERIFY(touchEvent.isAccepted()); + + // tst_QTouchEventWidget does handle, sending succeeds + tst_QTouchEventWidget touchWidget; + touchWidget.setAttribute(Qt::WA_AcceptTouchEvents); + touchEvent.ignore(); + res = QApplication::sendEvent(&touchWidget, &touchEvent); + QVERIFY(res); + QVERIFY(touchEvent.isAccepted()); } + + QTEST_MAIN(tst_QTouchEvent) #include "tst_qtouchevent.moc" -- cgit v0.12