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

[Andrea Cimitan]

Add tests for the GenericLensView

Add tests for the GenericLensView

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:607
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/712/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/530
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/714
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/714/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/712
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/588
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/588/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1242

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

You need to remerge this with trunk UnityTestCase is "gone"

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:610
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/729/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/731
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/731/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/605
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/605/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/609
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1272

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

review: Approve (continuous-integration)

=== modified file 'Dash/GenericLensView.qml'
--- Dash/GenericLensView.qml	2013-02-15 09:49:36 +0000
+++ Dash/GenericLensView.qml	2013-04-23 09:42:25 +0000
@@ -86,6 +86,7 @@
         }
         pageHeader: PageHeader {
             id: pageHeader
+            objectName: "pageHeader"
             width: categoryView.width
             text: lensView.lens.name
             searchEntryEnabled: true

=== modified file 'plugins/Unity/categoryfilter.cpp'
--- plugins/Unity/categoryfilter.cpp	2013-04-10 08:11:52 +0000
+++ plugins/Unity/categoryfilter.cpp	2013-04-23 09:42:25 +0000
@@ -43,4 +43,3 @@
         Q_EMIT indexChanged(m_index);
     }
 }
-

=== modified file 'plugins/Unity/categoryfilter.h'
--- plugins/Unity/categoryfilter.h	2013-04-05 22:03:12 +0000
+++ plugins/Unity/categoryfilter.h	2013-04-23 09:42:25 +0000
@@ -17,6 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef CATEGORY_FILTER_H
+#define CATEGORY_FILTER_H
+
 // Utils
 #include "plugins/Utils/qsortfilterproxymodelqml.h"
 
@@ -42,3 +45,4 @@
     int m_index;
 };
 
+#endif // CATEGORY_FILTER_H

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-04-22 18:56:16 +0000
+++ tests/qmltests/CMakeLists.txt	2013-04-23 09:42:25 +0000
@@ -42,6 +42,7 @@
 add_qml_test(Components Tile)
 add_qml_test(Components PageHeader)
 add_qml_test(Dash DashPreview)
+add_qml_test(Dash GenericLensView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Dash PeoplePreview)
 add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
 add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

=== added file 'tests/qmltests/Dash/tst_GenericLensView.qml'
--- tests/qmltests/Dash/tst_GenericLensView.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/tst_GenericLensView.qml	2013-04-23 09:42:25 +0000
@@ -0,0 +1,54 @@
+/*
+ * 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
+import Unity.Test 0.1 as UT
+
+Item {
+    width: units.gu(120)
+    height: units.gu(80)
+
+    Lenses {
+        id: lenses
+    }
+
+    GenericLensView {
+        id: genericLensView
+        anchors.fill: parent
+
+        UT.UnityTestCase {
+            name: "GenericLensView"
+            when: lenses.loaded
+
+            function init() {
+                genericLensView.lens = lenses.get(0)
+            }
+
+            function test_isCurrent() {
+                var pageHeader = findChild(genericLensView, "pageHeader");
+                genericLensView.isCurrent = true
+                pageHeader.searchQuery = "test"
+                genericLensView.isCurrent = false
+                tryCompare(pageHeader, "searchQuery", "")
+            }
+        }
+    }
+}

=== modified file 'tests/qmltests/plugins/Unity/CMakeLists.txt'
--- tests/qmltests/plugins/Unity/CMakeLists.txt	2013-04-19 11:04:55 +0000
+++ tests/qmltests/plugins/Unity/CMakeLists.txt	2013-04-23 09:42:25 +0000
@@ -3,19 +3,26 @@
 include(FindPkgConfig)
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Quick REQUIRED)
+pkg_search_module(DEE dee-1.0 REQUIRED)
+pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
+pkg_search_module(DEEQT libdee-qt5 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}
+  ${DEE_INCLUDE_DIRS}
+  ${DEEQT_INCLUDE_DIRS}
 )
 
 add_definitions(-DQT_NO_KEYWORDS)
 
 set(UnityQML_SOURCES
+  ../../../../../plugins/Unity/categories.cpp
+  ../../../../../plugins/Unity/categoryfilter.cpp
+  ../../../../../plugins/Utils/qsortfilterproxymodelqml.cpp
   fake_lens.cpp
   fake_lenses.cpp
   fake_unity_plugin.cpp
@@ -25,6 +32,8 @@
 target_link_libraries(FakeUnityQml
   ${Qt5Core_LIBRARIES}
   ${Qt5Quick_LIBRARIES}
+  ${DEEQT_LDFLAGS}
+  ${GOBJECT_LDFLAGS}
 )
 
 qt5_use_modules(FakeUnityQml Qml)

=== added directory 'tests/qmltests/plugins/Unity/categories'
=== added file 'tests/qmltests/plugins/Unity/categories/CategoryScene.qml'
--- tests/qmltests/plugins/Unity/categories/CategoryScene.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/plugins/Unity/categories/CategoryScene.qml	2013-04-23 09:42:25 +0000
@@ -0,0 +1,86 @@
+/*
+ * 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 Ubuntu.Components 0.1
+
+Item {
+    id: root
+    width: units.gu(30)
+    height: units.gu(6) * 10
+
+    Lenses {
+        id: lenses
+    }
+
+    Connections {
+        target: lenses
+        onLoadedChanged: categories_view.model = lenses.get(0).categories
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: "grey"
+
+        ListView {
+            id:categories_view
+            interactive: true
+
+            anchors.fill: parent
+            orientation: ListView.Horizontal
+            boundsBehavior: Flickable.DragAndOvershootBounds
+            flickDeceleration: units.gu(625)
+            maximumFlickVelocity: width * 5
+            snapMode: ListView.SnapOneItem
+            highlightMoveDuration: 250
+
+            delegate: ListView {
+                id: category
+                width: ListView.view.width
+                height: ListView.view.height
+
+                objectName: id
+                model: results
+
+                delegate: Item {
+                    id: category_item
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    width: image.width + text.width
+                    height: units.gu(6)
+
+                    Image {
+                        id: image
+                        width: units.gu(5)
+                        height: units.gu(5)
+                        anchors.verticalCenter: parent.verticalCenter
+
+                        source: column_1
+                    }
+                    Text {
+                        id: text;
+                        text: column_4
+                        anchors.left: image.right
+                        height: units.gu(5)
+                        verticalAlignment: Text.AlignVCenter
+                        anchors.leftMargin: units.gu(2)
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'tests/qmltests/plugins/Unity/categories/test_categories'
--- tests/qmltests/plugins/Unity/categories/test_categories	1970-01-01 00:00:00 +0000
+++ tests/qmltests/plugins/Unity/categories/test_categories	2013-04-23 09:42:25 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+QML2_IMPORT_PATH=../../../../../builddir/tests/qmltests/plugins/ qmlscene CategoryScene.qml

=== modified file 'tests/qmltests/plugins/Unity/fake_lens.cpp'
--- tests/qmltests/plugins/Unity/fake_lens.cpp	2013-04-19 08:23:18 +0000
+++ tests/qmltests/plugins/Unity/fake_lens.cpp	2013-04-23 09:42:25 +0000
@@ -17,12 +17,26 @@
 // Self
 #include "fake_lens.h"
 
+#include <dee.h>
+#include "paths.h"
+
+static DeeModel* create_categories_model(unsigned category_count);
+static DeeModel* create_results_model(unsigned category_count, unsigned result_count);
+
 // TODO: Implement remaining pieces
 
 Lens::Lens(QObject* parent)
 : QObject(parent),
-  m_visible(false)
-{}
+  m_visible(false),
+  m_categories(new Categories(this)),
+  m_results(new DeeListModel(this))
+{
+    m_categories->setModel(create_categories_model(4));
+    m_results->setModel(create_results_model(4, 30));
+
+    m_categories->setResultModel(m_results);
+    m_categories->setGlobalResultModel(m_results);
+}
 
 Lens::Lens(QString const& id,
            QString const& name,
@@ -31,8 +45,16 @@
 : QObject(parent),
   m_id(id),
   m_name(name),
-  m_visible(visible)
-{}
+  m_visible(visible),
+  m_categories(new Categories(this)),
+  m_results(new DeeListModel(this))
+{
+    m_categories->setModel(create_categories_model(4));
+    m_results->setModel(create_results_model(4, 30));
+
+    m_categories->setResultModel(m_results);
+    m_categories->setGlobalResultModel(m_results);
+}
 
 QString Lens::id() const {
     return m_id;
@@ -63,3 +85,83 @@
 bool Lens::visible() const {
     return m_visible;
 }
+
+Categories* Lens::categories() const {
+  return m_categories;
+}
+
+static const gchar * categories_model_schema[] = {
+  "s", // DISPLAY_NAME
+  "s", // ICON_HINT
+  "s", // RENDERER_NAME
+  "a{sv}" // HINTS
+};
+
+
+DeeModel* create_categories_model(unsigned category_count) {
+    DeeModel* category_model = dee_sequence_model_new();
+    dee_model_set_schema_full(category_model, categories_model_schema, G_N_ELEMENTS(categories_model_schema));
+
+    GVariantBuilder b;
+    g_variant_builder_init(&b, G_VARIANT_TYPE("a{sv}"));
+    GVariant *hints = g_variant_builder_end(&b);
+
+    for(unsigned i = 0; i < category_count; ++i)
+    {
+      dee_model_append(category_model,
+                       ("Category "+std::to_string(i)).c_str(),
+                       "gtk-apply",
+                       "grid",
+                       hints);
+    }
+    g_variant_unref(hints);
+    return category_model;
+}
+
+
+/* Schema that is used in the DeeModel representing
+   the results */
+static const gchar * results_model_schema[] = {
+  "s", // URI
+  "s", // ICON_HINT
+  "u", // CATEGORY
+  "s", // MIMETYPE
+  "s", // TITLE
+  "s", // COMMENT
+  "s", // DND_URI
+  "a{sv}" // METADATA
+};
+
+static const gchar * icons[] = {
+  "Applications.png",
+  "Home.png",
+  "Music.png",
+  "People.png",
+  "Videos.png",
+};
+
+DeeModel* create_results_model(unsigned category_count, unsigned result_count) {
+    DeeModel* results_model = dee_sequence_model_new();
+    dee_model_set_schema_full(results_model, results_model_schema, G_N_ELEMENTS(results_model_schema));
+
+    GVariantBuilder b;
+    g_variant_builder_init(&b, G_VARIANT_TYPE("a{sv}"));
+    GVariant *hints = g_variant_builder_end(&b);
+
+    for(unsigned i = 0; i < result_count; ++i)
+    {
+      unsigned category = i % category_count;
+
+      dee_model_append(results_model,
+                       ("uri://result."+std::to_string(i)).c_str(),
+                       (shellAppDirectory() + "Dash/graphics/lensIcons/" + (icons[i%G_N_ELEMENTS(icons)])).toLatin1().data(),
+                       category,
+                       "application/x-desktop",
+                       ("Title."+std::to_string(i)).c_str(),
+                       ("Comment."+std::to_string(i)).c_str(),
+                       ("uri://result."+std::to_string(i)).c_str(),
+                       hints);
+    }
+    g_variant_unref(hints);
+    return results_model;
+  }

=== modified file 'tests/qmltests/plugins/Unity/fake_lens.h'
--- tests/qmltests/plugins/Unity/fake_lens.h	2013-04-19 08:23:18 +0000
+++ tests/qmltests/plugins/Unity/fake_lens.h	2013-04-23 09:42:25 +0000
@@ -19,6 +19,7 @@
 
 // Qt
 #include <QObject>
+#include "../../../../../plugins/Unity/categories.h"
 
 class Lens : public QObject
 {
@@ -27,6 +28,7 @@
     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)
+    Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)
 
 public:
     Lens(QObject* parent = 0);
@@ -40,17 +42,22 @@
     void setName(const QString &str);
     void setSearchQuery(const QString &str);
 
+    Categories* categories() const;
+
 Q_SIGNALS:
     void idChanged(QString);
     void nameChanged(QString);
     void searchQueryChanged(QString);
     void visibleChanged(bool);
+    void categoriesChanged();
 
 private:
     QString m_id;
     QString m_name;
     QString m_searchQuery;
     bool m_visible;
+    Categories* m_categories;
+    DeeListModel* m_results;
 };
 
 #endif // FAKE_LENS_H

=== modified file 'tests/qmltests/plugins/Unity/fake_lenses.cpp'
--- tests/qmltests/plugins/Unity/fake_lenses.cpp	2013-04-19 16:06:36 +0000
+++ tests/qmltests/plugins/Unity/fake_lenses.cpp	2013-04-23 09:42:25 +0000
@@ -45,18 +45,16 @@
 
 Lenses::~Lenses()
 {
-    qDeleteAll(m_lenses);
-    m_lenses.clear();
 }
 
 void Lenses::updateLenses()
 {
     clear();
     addLens(new Lens("MockLens1", "People", true, this));
-    addLens(new Lens("MockLens2", "Music", true, this));
-    addLens(new Lens("MockLens3", "Home", false, this));
-    addLens(new Lens("MockLens4", "Apps", true, this));
-    addLens(new Lens("MockLens5", "Video", true, this));
+    addLens(new Lens("MockLens2", "Music", false, this));
+    addLens(new Lens("MockLens3", "Home", true, this));
+    addLens(new Lens("MockLens4", "Applications", true, this));
+    addLens(new Lens("MockLens5", "Videos", true, this));
 
     if (!m_loaded) {
         m_loaded = true;
@@ -97,8 +95,6 @@
 
 QVariant Lenses::data(const QModelIndex& index, int role) const
 {
-    Q_UNUSED(role)
-
     if (!index.isValid() || index.row() >= m_lenses.size()) {
         return QVariant();
     }

=== modified file 'tests/qmltests/plugins/Unity/fake_unity_plugin.cpp'
--- tests/qmltests/plugins/Unity/fake_unity_plugin.cpp	2013-04-19 11:04:55 +0000
+++ tests/qmltests/plugins/Unity/fake_unity_plugin.cpp	2013-04-23 09:42:25 +0000
@@ -18,15 +18,26 @@
 
 // Self
 #include "fake_unity_plugin.h"
+
+// local
 #include "fake_lenses.h"
+#include "../../../../../plugins/Unity/categories.h"
+#include "../../../../../plugins/Unity/categoryfilter.h"
 
-// Qt
+// External
+#include <glib-object.h>
 #include <QtQml>
 
 void FakeUnityPlugin::registerTypes(const char *uri)
 {
+#ifndef GLIB_VERSION_2_36
+  g_type_init();
+#endif
+
     Q_ASSERT(uri == QLatin1String("Unity"));
 
     qmlRegisterType<Lenses>(uri, 0, 1, "Lenses");
     qmlRegisterType<Lens>(uri, 0, 1, "Lens");
+    qmlRegisterType<Categories>(uri, 0, 1, "Categories");
+    qmlRegisterType<CategoryFilter>(uri, 0, 1, "CategoryFilter");
 }