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>

2 files changed, 4 insertions, 25 deletions

diff --git a/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro b/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro
index 75bd663405..d83f6ca7a3 100644
--- a/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro
+++ b/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro
@@ -3,6 +3,7 @@ TARGET = tst_qquickfocusscope
 SOURCES += tst_qquickfocusscope.cpp
 
 include (../../shared/util.pri)
+include (../shared/util.pri)
 
 macx:CONFIG -= app_bundle
 
diff --git a/tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp b/tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp
index c52cfaec2c..4264c68d92 100644
--- a/tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp
+++ b/tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp
@@ -48,6 +48,9 @@
 #include <QtQuick/private/qquicktext_p.h>
 #include <QtQuick/private/qquickfocusscope_p.h>
 #include "../../shared/util.h"
+#include "../shared/visualtestutil.h"
+
+using namespace QQuickVisualTestUtil;
 
 class tst_qquickfocusscope : public QDeclarativeDataTest
 {
@@ -55,9 +58,6 @@ class tst_qquickfocusscope : public QDeclarativeDataTest
 public:
     tst_qquickfocusscope() {}
 
-    template<typename T>
-    T *findItem(QQuickItem *parent, const QString &id);
-
 private slots:
     void basic();
     void nested();
@@ -71,28 +71,6 @@ private slots:
     void canvasFocus();
 };
 
-/*
-   Find an item with the specified id.
-*/
-template<typename T>
-T *tst_qquickfocusscope::findItem(QQuickItem *parent, const QString &objectName)
-{
-    const QMetaObject &mo = T::staticMetaObject;
-    QList<QQuickItem *> children = parent->childItems();
-    for (int i = 0; i < children.count(); ++i) {
-        QQuickItem *item = children.at(i);
-        if (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;
-}
-
 void tst_qquickfocusscope::basic()
 {
     QQuickView *view = new QQuickView;