Merge lp:~unity-team/unity/phablet.test_LensView into lp:unity/phablet

[Andrea Cimitan]

Adds fake Unity plugin (mostly done by dednick), and tests searchQuery for LensView

Adds fake Unity plugin (mostly done by dednick), and tests searchQuery for LensView

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:594
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/554/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/555
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/555/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/554
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/430
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/430/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/434
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1050

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/554/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:597
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/556/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/351/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/557
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/557/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/556
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/432
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/432/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1052

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/556/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

Superseeded by https://code.launchpad.net/~unity-team/unity/phablet.test_LensView_new/+merge/159643

=== modified file 'tests/qmluitests/Dash/CMakeLists.txt'
--- tests/qmluitests/Dash/CMakeLists.txt	2013-04-11 15:05:45 +0000
+++ tests/qmluitests/Dash/CMakeLists.txt	2013-04-16 12:13:28 +0000
@@ -1,2 +1,5 @@
+add_subdirectory(qml)
+
 add_qml_test(DashPreview)
+add_qml_test(LensView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/qml)
 add_qml_test(PeoplePreview)
 
=== added directory 'tests/qmluitests/Dash/qml'
=== added file 'tests/qmluitests/Dash/qml/CMakeLists.txt'
--- tests/qmluitests/Dash/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/CMakeLists.txt	2013-04-16 12:13:28 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(Unity)
 
=== added file 'tests/qmluitests/Dash/qml/FakeLensView.qml'
--- tests/qmluitests/Dash/qml/FakeLensView.qml	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/FakeLensView.qml	2013-04-16 12:13:28 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Unity 0.1
+import Ubuntu.Components 0.1
+
+FocusScope {
+    property Lens lens
+    property bool isCurrent : false
+
+    property var ball_color
+
+    Text {
+        id: label
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+        height: units.gu(5)
+        text: lens.id
+
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+    }
+
+    Rectangle {
+        id: bounce_area
+        anchors {
+            top: label.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        clip: true
+
+        Rectangle {
+            id: ball
+            width: units.gu(5)
+            height: units.gu(5)
+            radius: width*0.5
+
+            border.width: 1
+            border.color: "black"
+            color: ball_color
+
+            Component.onCompleted: { x = 100; y = 100; }
+
+            Behavior on x {
+                NumberAnimation {
+                    id: x_animate; duration: 500
+
+                    onRunningChanged: {
+                        if (!running) {
+                            ball.x = ball.radius + Math.random() * (bounce_area.width - ball.width);
+                        }
+                    }
+                }
+            }
+            Behavior on y {
+                NumberAnimation {
+                    id: y_animate; duration: 500
+
+                    onRunningChanged: {
+                        if (!running) {
+                            ball.y = ball.radius + Math.random() * (bounce_area.height - ball.height);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
 
=== added directory 'tests/qmluitests/Dash/qml/Unity'
=== added file 'tests/qmluitests/Dash/qml/Unity/CMakeLists.txt'
--- tests/qmluitests/Dash/qml/Unity/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/Unity/CMakeLists.txt	2013-04-16 12:13:28 +0000
@@ -0,0 +1,36 @@
+set(CMAKE_AUTOMOC ON)
+
+include(FindPkgConfig)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Quick REQUIRED)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wextra -std=c++11")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5Quick_INCLUDE_DIRS}
+)
+
+add_definitions(-DQT_NO_KEYWORDS)
+
+set(UnityQML_SOURCES
+  fake_lens.cpp
+  fake_lenses.cpp
+  fake_unity_plugin.cpp
+  test_unity_object.cpp
+)
+
+add_library(FakeUnityQml MODULE ${UnityQML_SOURCES})
+target_link_libraries(FakeUnityQml
+  ${Qt5Core_LIBRARIES}
+  ${Qt5Quick_LIBRARIES}
+)
+
+qt5_use_modules(FakeUnityQml Qml)
+
+# copy qmldir file into build directory for shadow builds
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+    )
 
=== added file 'tests/qmluitests/Dash/qml/Unity/fake_lens.cpp'
--- tests/qmluitests/Dash/qml/Unity/fake_lens.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/Unity/fake_lens.cpp	2013-04-16 12:13:28 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Self
+#include "fake_lens.h"
+
+// TODO: Implement remaining pieces
+
+Lens::Lens()
+: m_visible(false)
+{}
+
+Lens::Lens(QString const& id,
+           QString const& name,
+           bool visible)
+: m_id(id),
+  m_name(name),
+  m_visible(visible)
+{}
+
+QString Lens::id() const {
+    return m_id;
+}
+
+QString Lens::name() const {
+    return m_name;
+}
+
+QString Lens::searchQuery() const {
+    return m_searchQuery;
+}
+
+void Lens::setName(const QString &str) {
+    if (str != m_name) {
+        m_name = str;
+        Q_EMIT nameChanged(m_name);
+    }
+}
+
+void Lens::setSearchQuery(const QString &str) {
+    if (str != m_searchQuery) {
+        m_searchQuery = str;
+        Q_EMIT searchQueryChanged(m_searchQuery);
+    }
+}
+
+bool Lens::visible() const {
+    return m_visible;
+}
 
=== added file 'tests/qmluitests/Dash/qml/Unity/fake_lens.h'
--- tests/qmluitests/Dash/qml/Unity/fake_lens.h	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/Unity/fake_lens.h	2013-04-16 12:13:28 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef FAKE_LENS_H
+#define FAKE_LENS_H
+
+// Qt
+#include <QObject>
+
+class Lens : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString id READ id NOTIFY idChanged)
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
+    Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
+
+public:
+    Lens();
+    Lens(QString const& id, QString const& name, bool visible);
+
+    QString id() const;
+    QString name() const;
+    QString searchQuery() const;
+    bool visible() const;
+
+    void setName(const QString &str);
+    void setSearchQuery(const QString &str);
+
+Q_SIGNALS:
+    void idChanged(QString);
+    void nameChanged(QString);
+    void searchQueryChanged(QString);
+    void visibleChanged(bool);
+
+private:
+    QString m_id;
+    QString m_name;
+    QString m_searchQuery;
+    bool m_visible;
+};
+
+#endif // FAKE_LENS_H
 
=== added file 'tests/qmluitests/Dash/qml/Unity/fake_lenses.cpp'
--- tests/qmluitests/Dash/qml/Unity/fake_lenses.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/Unity/fake_lenses.cpp	2013-04-16 12:13:28 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Nick Dedekind <[e-mail]>
+ */
+
+// Self
+#include "fake_lenses.h"
+
+// TODO: Implement remaining pieces, like Categories (i.e. LensView now gives warnings)
+
+Lenses::Lenses(QObject *parent)
+: QAbstractListModel(parent)
+{
+    m_roles[Lenses::RoleLens] = "lens";
+    m_roles[Lenses::RoleId] = "id";
+    m_roles[Lenses::RoleVisible] = "visible";
+
+    m_lenses << (new Lens("MockLens1", "People", true))
+             << (new Lens("MockLens2", "Music", true))
+             << (new Lens("MockLens3", "Home", false))
+             << (new Lens("MockLens4", "Apps", true))
+             << (new Lens("MockLens5", "Video", true));
+}
+
+Lenses::~Lenses()
+{
+    qDeleteAll(m_lenses);
+    m_lenses.clear();
+}
+
+QHash<int, QByteArray> Lenses::roleNames() const
+{
+    return m_roles;
+}
+
+int Lenses::rowCount(const QModelIndex&) const
+{
+    return m_lenses.count();
+}
+
+QVariant Lenses::data(const QModelIndex& index, int role) const
+{
+    Q_UNUSED(role)
+
+    if (!index.isValid() || index.row() >= m_lenses.size()) {
+        return QVariant();
+    }
+
+    Lens* lens = m_lenses.at(index.row());
+
+    if (role == Lenses::RoleLens) {
+        return QVariant::fromValue(lens);
+    } else if (role == Lenses::RoleId) {
+        return QVariant::fromValue(lens->id());
+    } else if (role == Lenses::RoleVisible) {
+        return QVariant::fromValue(lens->visible());
+    } else {
+        return QVariant();
+    }
+}
+
+QVariant Lenses::get(int row) const
+{
+    return data(QAbstractListModel::index(row), 0);
+}
+
+QVariant Lenses::get(QString const&) const
+{
+    return QVariant();
+}
+
+QModelIndex Lenses::parent(const QModelIndex&) const
+{
+    return QModelIndex();
+}
+
+bool Lenses::loaded() const
+{
+    return true;
+}
+
+void Lenses::addLens(Lens* lens)
+{
+    int index = rowCount();
+    beginInsertRows(QModelIndex(), index, index);
+    m_lenses.append(lens);
+    endInsertRows();
+}
 
=== added file 'tests/qmluitests/Dash/qml/Unity/fake_lenses.h'
--- tests/qmluitests/Dash/qml/Unity/fake_lenses.h	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/Unity/fake_lenses.h	2013-04-16 12:13:28 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Nick Dedekind <[e-mail]>
+ */
+
+#ifndef FAKE_LENSES_H
+#define FAKE_LENSES_H
+
+// Local
+#include "fake_lens.h"
+
+// Qt
+#include <QAbstractListModel>
+#include <QList>
+
+class Lenses : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_ENUMS(Roles)
+    Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
+
+public:
+    explicit Lenses(QObject *parent = 0);
+    ~Lenses();
+
+    enum Roles {
+        RoleLens,
+        RoleId,
+        RoleVisible
+    };
+
+    Q_INVOKABLE int rowCount(const QModelIndex& parent = QModelIndex()) const;
+
+    Q_INVOKABLE QVariant get(int row) const;
+    Q_INVOKABLE QVariant get(const QString& lens_id) const;
+
+    Q_INVOKABLE void addLens(Lens* lens);
+
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+    QHash<int, QByteArray> roleNames() const;
+    QModelIndex parent ( const QModelIndex & index ) const;
+
+    bool loaded() const;
+
+Q_SIGNALS:
+    void activateLensRequested(const QString& lens_id);
+    void loadedChanged(bool);
+
+private:
+    QList<Lens*> m_lenses;
+    QHash<int, QByteArray> m_roles;
+    bool m_loaded;
+};
+
+#endif // LENSES_H
 
=== added file 'tests/qmluitests/Dash/qml/Unity/fake_unity_plugin.cpp'
--- tests/qmluitests/Dash/qml/Unity/fake_unity_plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/Unity/fake_unity_plugin.cpp	2013-04-16 12:13:28 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Nick Dedekind <[e-mail]>
+ */
+
+// Self
+#include "fake_unity_plugin.h"
+#include "fake_lenses.h"
+#include "test_unity_object.h"
+
+// Qt
+#include <QtQml>
+
+void FakeUnityPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Unity"));
+
+    qmlRegisterType<UnityTestObject>(uri, 0, 1, "UnityTestObject");
+    qmlRegisterType<Lenses>(uri, 0, 1, "Lenses");
+    qmlRegisterType<Lens>(uri, 0, 1, "Lens");
+}
 
=== added file 'tests/qmluitests/Dash/qml/Unity/fake_unity_plugin.h'
--- tests/qmluitests/Dash/qml/Unity/fake_unity_plugin.h	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/Unity/fake_unity_plugin.h	2013-04-16 12:13:28 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Nick Dedekind <[e-mail]>
+ */
+
+#ifndef FAKE_UNITY_PLUGIN_H
+#define FAKE_UNITY_PLUGIN_H
+
+// Qt
+#include <QtQml/QQmlExtensionPlugin>
+
+class FakeUnityPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif
 
=== added file 'tests/qmluitests/Dash/qml/Unity/qmldir'
--- tests/qmluitests/Dash/qml/Unity/qmldir	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/Unity/qmldir	2013-04-16 12:13:28 +0000
@@ -0,0 +1,2 @@
+module Unity
+plugin FakeUnityQml
 
=== added file 'tests/qmluitests/Dash/qml/Unity/test_unity_object.cpp'
--- tests/qmluitests/Dash/qml/Unity/test_unity_object.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/Unity/test_unity_object.cpp	2013-04-16 12:13:28 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Nick Dedekind <[e-mail]>
+ */
+
+// Self
+#include "test_unity_object.h"
+
+QString UnityTestObject::testParameter() const
+{
+    return "test_result";
+}
 
=== added file 'tests/qmluitests/Dash/qml/Unity/test_unity_object.h'
--- tests/qmluitests/Dash/qml/Unity/test_unity_object.h	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/Unity/test_unity_object.h	2013-04-16 12:13:28 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Nick Dedekind <[e-mail]>
+ */
+
+#ifndef PLUGIN_H
+#define PLUGIN_H
+
+// Qt
+#include <QObject>
+
+class UnityTestObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString testParameter READ testParameter)
+
+public:
+    QString testParameter() const;
+};
+
+#endif // PLUGIN_H
 
=== added file 'tests/qmluitests/Dash/qml/fake_generic_lensView.qml'
--- tests/qmluitests/Dash/qml/fake_generic_lensView.qml	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/fake_generic_lensView.qml	2013-04-16 12:13:28 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+FakeLensView {
+    id: fake_generic_lensView
+    objectName: "fake_generic_lensView"
+
+    ball_color: "orange"
+}
 
=== added file 'tests/qmluitests/Dash/qml/fake_lensView1.qml'
--- tests/qmluitests/Dash/qml/fake_lensView1.qml	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/fake_lensView1.qml	2013-04-16 12:13:28 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+FakeLensView {
+    id: fake_lensView1
+    objectName: "fake_lensView1"
+
+    ball_color: "red"
+}
 
=== added file 'tests/qmluitests/Dash/qml/fake_lensView2.qml'
--- tests/qmluitests/Dash/qml/fake_lensView2.qml	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/fake_lensView2.qml	2013-04-16 12:13:28 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+FakeLensView {
+    id: fake_lensView2
+    objectName: "fake_lensView2"
+
+    ball_color: "blue"
+}
 
=== added file 'tests/qmluitests/Dash/qml/fake_lensView3.qml'
--- tests/qmluitests/Dash/qml/fake_lensView3.qml	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/fake_lensView3.qml	2013-04-16 12:13:28 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+FakeLensView {
+    id: fake_lensView3
+    objectName: "fake_lensView3"
+
+    ball_color: "green"
+}
 
=== added file 'tests/qmluitests/Dash/qml/fake_lensView4.qml'
--- tests/qmluitests/Dash/qml/fake_lensView4.qml	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/qml/fake_lensView4.qml	2013-04-16 12:13:28 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+FakeLensView {
+    id: fake_lensView4
+    objectName: "fake_lensView4"
+
+    ball_color: "grey"
+}
 
=== added file 'tests/qmluitests/Dash/tst_DashContent.qml'
--- tests/qmluitests/Dash/tst_DashContent.qml	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/tst_DashContent.qml	2013-04-16 12:13:28 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import ".."
+import "../../../Dash"
+
+import Unity 0.1
+
+Item {
+    id: shell
+    width: units.gu(40)
+    height: units.gu(80)
+
+    property ListModel searchHistory: ListModel {}
+
+    Lenses {
+        id: lensesModel
+    }
+
+    DashContent {
+        id: dash_content
+        anchors.fill: parent
+
+        model: lensesModel
+        lenses : lensesModel
+
+
+        lensDelegateMapping: { "MockLens1" : "../tests/qmluitests/Dash/qml/fake_lensView1.qml",
+                               "MockLens2" : "../tests/qmluitests/Dash/qml/fake_lensView2.qml",
+                               "MockLens3" : "../tests/qmluitests/Dash/qml/fake_lensView3.qml",
+                               "MockLens4" : "../tests/qmluitests/Dash/qml/fake_lensView4.qml"
+                             }
+
+        genericLens: "../tests/qmluitests/Dash/qml/fake_generic_lensView.qml"
+    }
+
+    UnityTestCase {
+        name: "DashContentTest"
+        when: windowShown
+
+        function test_() {
+
+        }
+    }
+}
 
=== added file 'tests/qmluitests/Dash/tst_LensView.qml'
--- tests/qmluitests/Dash/tst_LensView.qml	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/tst_LensView.qml	2013-04-16 12:13:28 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Unity 0.1
+import ".."
+import "../../../Dash"
+import Ubuntu.Components 0.1
+
+Item {
+    width: units.gu(120)
+    height: units.gu(80)
+
+    Lenses {
+        id: lenses
+    }
+
+    LensView {
+        id: lensView
+        anchors.fill: parent
+
+        Component.onCompleted: lens = lenses.get(0)
+
+        TestCase {
+            name: "LensView"
+
+            function init() {
+                lensView.lens = lenses.get(0)
+            }
+
+            function test_changeLens() {
+                lensView.lens.searchQuery = "test"
+                lensView.lens = lenses.get(1)
+                compare(lensView.lens.searchQuery, "", "searchQuery should be empty")
+            }
+        }
+    }
+}