diff options
author | Bea Lam <bea.lam@nokia.com> | 2012-01-31 17:15:00 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-07 11:45:38 +0100 |
commit | 5e42176970c05c015685194aecf954aaac5d9e1e (patch) | |
tree | 110385902f865b7cbe13ea393a023c3ec3d6067b /tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp | |
parent | a52c11229a0c55071a43c9352b6c2e9e8ae481fa (diff) |
Separate out some of the common test code
Moves findItem, findItems() etc. into shared/visualtestutil.h and
moves duplicate list model test classes and other common view-specific
code into shared/viewtestutil.h.
Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp')
-rw-r--r-- | tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp | 49 |
1 files changed, 5 insertions, 44 deletions
diff --git a/tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp b/tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp index a17687073c..d357877ed5 100644 --- a/tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp @@ -48,8 +48,13 @@ #include <private/qdeclarativevaluetype_p.h> #include <math.h> #include "../../shared/util.h" +#include "../shared/viewtestutil.h" +#include "../shared/visualtestutil.h" #include <QtOpenGL/QGLShaderProgram> +using namespace QQuickViewTestUtil; +using namespace QQuickVisualTestUtil; + class tst_qquickflickable : public QDeclarativeDataTest { Q_OBJECT @@ -76,10 +81,6 @@ private slots: private: QDeclarativeEngine engine; - - void flick(QQuickView *canvas, const QPoint &from, const QPoint &to, int duration); - template<typename T> - T *findItem(QQuickItem *parent, const QString &objectName); }; void tst_qquickflickable::create() @@ -657,46 +658,6 @@ void tst_qquickflickable::margins() delete root; } -void tst_qquickflickable::flick(QQuickView *canvas, const QPoint &from, const QPoint &to, int duration) -{ - const int pointCount = 5; - QPoint diff = to - from; - - // send press, five equally spaced moves, and release. - QTest::mousePress(canvas, Qt::LeftButton, 0, from); - - for (int i = 0; i < pointCount; ++i) { - QMouseEvent mv(QEvent::MouseMove, from + (i+1)*diff/pointCount, Qt::LeftButton, Qt::LeftButton,Qt::NoModifier); - QGuiApplication::sendEvent(canvas, &mv); - QTest::qWait(duration/pointCount); - QCoreApplication::processEvents(); - } - - QTest::mouseRelease(canvas, Qt::LeftButton, 0, to); - QTest::qWait(50); -} - -template<typename T> -T *tst_qquickflickable::findItem(QQuickItem *parent, const QString &objectName) -{ - const QMetaObject &mo = T::staticMetaObject; - //qDebug() << parent->childItems().count() << "children"; - for (int i = 0; i < parent->childItems().count(); ++i) { - QQuickItem *item = qobject_cast<QQuickItem*>(parent->childItems().at(i)); - if (!item) - continue; - //qDebug() << "try" << item; - if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) { - return static_cast<T*>(item); - } - item = findItem<T>(item, objectName); - if (item) - return static_cast<T*>(item); - } - - return 0; -} - QTEST_MAIN(tst_qquickflickable) #include "tst_qquickflickable.moc" |