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/qquickvisualdatamodel/tst_qquickvisualdatamodel.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/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp')
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp index 114123f8e0..1b6a7629d9 100644 --- a/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp +++ b/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp @@ -39,6 +39,8 @@ ** ****************************************************************************/ #include "../../shared/util.h" +#include "../shared/visualtestutil.h" + #include <qtest.h> #include <QtTest/QSignalSpy> #include <QStandardItemModel> @@ -55,6 +57,8 @@ #include <private/qdeclarativeengine_p.h> #include <math.h> +using namespace QQuickVisualTestUtil; + template <typename T, int N> int lengthOf(const T (&)[N]) { return N; } static void initStandardTreeModel(QStandardItemModel *model) @@ -249,8 +253,6 @@ private: bool failed; QDeclarativeEngine engine; - template<typename T> - T *findItem(QQuickItem *parent, const QString &objectName, int index = -1); }; Q_DECLARE_METATYPE(QDeclarativeChangeSet) @@ -3438,32 +3440,6 @@ void tst_qquickvisualdatamodel::warnings() QCOMPARE(evaluate<int>(listView, "count"), count); } -template<typename T> -T *tst_qquickvisualdatamodel::findItem(QQuickItem *parent, const QString &objectName, int index) -{ - 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)) { - if (index != -1) { - QDeclarativeExpression e(qmlContext(item), item, "index"); - if (e.evaluate().toInt() == index) - return static_cast<T*>(item); - } else { - return static_cast<T*>(item); - } - } - item = findItem<T>(item, objectName, index); - if (item) - return static_cast<T*>(item); - } - - return 0; -} QTEST_MAIN(tst_qquickvisualdatamodel) |