Merge lp:~mzanetti/unity/phablet-test-filtergrids into lp:unity/phablet

[Michael Zanetti]

added tests for the various filtergrid subclasses

added tests for the various filtergrid subclasses

To do this, I had to align the API's a bit which I think in the long-run is what we should try to achieve anyways

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:595
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/524/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/525
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/525/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/524
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/400
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/400/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/404
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1003

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Some lines are very long. It makes it hard to have two code windows side-by-side. By the way, do we have a coding style guide? I would vote for a maximum of around 90 chars.

[Daniel d'Andrada (dandrader)]

217 + name: "VideosFilterGrid"

The test case should have a more general name

[Michael Zanetti (mzanetti)]

> Some lines are very long. It makes it hard to have two code windows side-by-
> side. By the way, do we have a coding style guide? I would vote for a maximum
> of around 90 chars.

In my opinion if you use a editor that can display only 90 characters it should have an option to do the word wraps for you (At least all the editors I know can do that). In my case, where I work on a 15" screen with mostly fullscreen windows, wrapping everything at 90 characters would cause the left hand side to look clumsy while leaving the right hand side empty.

Its easier for a editor to automatically add word wraps where you need them than to remove them where they are not needed.

QtCreator has this feature in Menu -> Options -> Text Editor -> Display

[Michael Zanetti (mzanetti)]

> 217 + name: "VideosFilterGrid"
>
> The test case should have a more general name

Fixed. thanks

[Albert Astals Cid (aacid)]

I'm with Michael in the line length issue, my editor setup is able to show 190 columns, why should i be deprived from half on my useful screen? If you want just 90 columns because you prefer having 2 editors side by side there's lots of ways to wrap at that width

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:596
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/545/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/546
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/546/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/545
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/421
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/421/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/425
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1036

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:597
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/547/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/340
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/548
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/548/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/423
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/423/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/427
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1038

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:599
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/550/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/343
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/551
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/551/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/550
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/426
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/426/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/430
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1042

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:601
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/551/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/552
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/552/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/427
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/427/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/431
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1047

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:602
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/555/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/350/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/556
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/556/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/431
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/431/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1051

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:602
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/557/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/558
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/558/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/557
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/433
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/433/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1054

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

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

> I'm with Michael in the line length issue, my editor setup is able to show 190
> columns, why should i be deprived from half on my useful screen? If you want
> just 90 columns because you prefer having 2 editors side by side there's lots
> of ways to wrap at that width

Automatically wrapped lines are horrible to read.

[Andrea Cimitan (cimi)]

> I'm with Michael in the line length issue, my editor setup is able to show 190
> columns, why should i be deprived from half on my useful screen? If you want
> just 90 columns because you prefer having 2 editors side by side there's lots
> of ways to wrap at that width
or you can buy a second monitor :-)

[Andrea Cimitan (cimi)]

Code seems fine to me, however considering the complexity of the test (we're not testing a single component but mixing them), I'd wait for other reviews...

Only picky thing is removing id: shell from the test qml since it's not used

review: Approve

[Michael Zanetti (mzanetti)]

> Only picky thing is removing id: shell from the test qml since it's not used

It's used inside the used components... removing it from the test causes a warning to be printed. Actually when you removed some of those lately you introduced a lot of warnings... I did the review and approved... so my fault too.

[Andrea Cimitan (cimi)]

> > Only picky thing is removing id: shell from the test qml since it's not used
>
> It's used inside the used components... removing it from the test causes a
> warning to be printed. Actually when you removed some of those lately you
> introduced a lot of warnings... I did the review and approved... so my fault
> too.

ops, thanks for clarifying!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:602
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/613/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/413
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/615/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/613/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/489/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/493/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Looks good

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:603
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/616/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/618
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/618/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/616
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/492
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/492/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/496
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1128

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Components/ResponsiveGridView.qml'
--- Components/ResponsiveGridView.qml	2013-03-20 09:37:41 +0000
+++ Components/ResponsiveGridView.qml	2013-04-18 11:37:25 +0000
@@ -37,6 +37,7 @@
 
     GridView {
         id: gridView
+        objectName: "responsiveGridViewGrid"
         anchors {
             fill: parent
             leftMargin: margin/2

=== modified file 'Dash/Apps/ApplicationsFilterGrid.qml'
--- Dash/Apps/ApplicationsFilterGrid.qml	2013-04-02 15:29:04 +0000
+++ Dash/Apps/ApplicationsFilterGrid.qml	2013-04-18 11:37:25 +0000
@@ -29,7 +29,10 @@
     delegateHeight: units.gu(9.5)
     verticalSpacing: units.gu(2)
 
+    signal clicked(int index, variant data)
+
     delegate: Tile {
+        objectName: "delegate" + index
         Application {
             id: application
             desktopFile: model.column_6 ? stripProtocol(model.column_6) : model.desktopFile // FIXME: this is temporary
@@ -48,6 +51,6 @@
         imageWidth: units.gu(8)
         imageHeight: units.gu(7.5)
         source: icon.indexOf("/") == -1 ? "image://gicon/" + icon : icon
-        onClicked: shell.activateApplication(application.desktopFile)
+        onClicked: filterGrid.clicked(index, application.desktopFile);
     }
 }

=== modified file 'Dash/DashApps.qml'
--- Dash/DashApps.qml	2013-04-05 11:42:20 +0000
+++ Dash/DashApps.qml	2013-04-18 11:37:25 +0000
@@ -85,7 +85,13 @@
        a bug where it can position the delegate content to overlap the section header
        of the ListView - a workaround is to use sourceComponent of Loader instead */
     Component { id: runningApplicationsGrid; RunningApplicationsGrid {} }
-    Component { id: applicationsFilterGrid; ApplicationsFilterGrid {} }
+    Component {
+        id: applicationsFilterGrid;
+        ApplicationsFilterGrid {
+            onClicked: shell.activateApplication(data)
+        }
+    }
+
     property var componentModels: {
         "RunningApplicationsGrid": runningApplicationsGrid,
         "ApplicationsFilterGrid": applicationsFilterGrid,

=== modified file 'Dash/DashHome.qml'
--- Dash/DashHome.qml	2013-03-18 15:21:23 +0000
+++ Dash/DashHome.qml	2013-04-18 11:37:25 +0000
@@ -114,7 +114,14 @@
        When using Loader to load external QML file in the list deelgate, the ListView has
        a bug where it can position the delegate content to overlap the section header
        of the ListView - a workaround is to use sourceComponent of Loader instead */
-    Component { id: applicationsFilterGrid; ApplicationsFilterGrid { objectName: "dashHomeApplicationsGrid" } }
+    Component {
+        id: applicationsFilterGrid
+        ApplicationsFilterGrid {
+            objectName: "dashHomeApplicationsGrid"
+            onClicked: shell.activateApplication(data);
+        }
+    }
+
     Component { id: peopleCarousel; PeopleCarousel {}   }
     Component { id: peopleGrid;     PeopleFilterGrid {} }
     Component { id: musicGrid;      MusicFilterGrid {}  }

=== modified file 'Dash/Music/MusicFilterGrid.qml'
--- Dash/Music/MusicFilterGrid.qml	2013-02-15 23:08:44 +0000
+++ Dash/Music/MusicFilterGrid.qml	2013-04-18 11:37:25 +0000
@@ -30,7 +30,10 @@
     readonly property int iconWidth: (width / columns) * 0.8
     readonly property int iconHeight: iconWidth
 
+    signal clicked(int index)
+
     delegate: AlbumTile {
+        objectName: "delegate" + index
         width: filterGrid.cellWidth
         height: filterGrid.cellHeight
         iconWidth: filterGrid.iconWidth
@@ -38,5 +41,8 @@
         artist: model.column_4
         album: model.column_5
         source: model.column_1
+        onClicked: {
+            filterGrid.clicked(index);
+        }
     }
 }

=== modified file 'Dash/People/PeopleFilterGrid.qml'
--- Dash/People/PeopleFilterGrid.qml	2013-02-15 12:48:00 +0000
+++ Dash/People/PeopleFilterGrid.qml	2013-04-18 11:37:25 +0000
@@ -35,6 +35,7 @@
     signal clicked(int index, variant data)
 
     delegate: ListItems.Base {
+        objectName: "delegate" + index
         width: filterGrid.cellWidth
         showDivider: index < Math.floor((filterGrid.model.count-1) / filterGrid.columnCount) * filterGrid.columnCount
 

=== modified file 'Dash/Video/VideosFilterGrid.qml'
--- Dash/Video/VideosFilterGrid.qml	2013-02-15 23:08:44 +0000
+++ Dash/Video/VideosFilterGrid.qml	2013-04-18 11:37:25 +0000
@@ -33,6 +33,7 @@
     signal clicked(int index)
 
     delegate: Tile {
+        objectName: "delegate" + index
         width: filtergrid.cellWidth
         height: filtergrid.cellHeight
         text: model.column_4

=== modified file 'tests/autopilot/qml_phone_shell/emulators/main_window.py'
--- tests/autopilot/qml_phone_shell/emulators/main_window.py	2013-03-13 19:37:27 +0000
+++ tests/autopilot/qml_phone_shell/emulators/main_window.py	2013-04-18 11:37:25 +0000
@@ -40,7 +40,7 @@
         return self.app.select_single("Dash")
 
     def get_dash_home_applications_grid(self):
-        return self.app.select_single("FilterGrid", objectName="dashHomeApplicationsGrid")
+        return self.app.select_single("ApplicationsFilterGrid", objectName="dashHomeApplicationsGrid")
 
     def get_bottombar(self):
         return self.app.select_single("Bottombar")

=== modified file 'tests/autopilot/qml_phone_shell/tests/__init__.py'
--- tests/autopilot/qml_phone_shell/tests/__init__.py	2013-03-13 15:59:48 +0000
+++ tests/autopilot/qml_phone_shell/tests/__init__.py	2013-04-18 11:37:25 +0000
@@ -35,7 +35,7 @@
 
     def launch_test_local(self, geometry):
         self.app = self.launch_test_application(
-            "../../qml-phone-shell", "-geometry", geometry, "-frameless")
+            "../../builddir/qml-phone-shell", "-geometry", geometry, "-frameless")
 
     def launch_test_installed(self, geometry):
         if self.running_on_device():

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-04-17 10:14:28 +0000
+++ tests/qmltests/CMakeLists.txt	2013-04-18 11:37:25 +0000
@@ -37,6 +37,7 @@
 add_qml_test(Components PageHeader)
 add_qml_test(Dash DashPreview)
 add_qml_test(Dash PeoplePreview)
+add_qml_test(Dash FilterGrids IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
 add_qml_test(Greeter Greeter)
 add_qml_test(Hud Hud IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins)
 add_qml_test(Launcher Launcher)

=== added file 'tests/qmltests/Dash/tst_FilterGrids.qml'
--- tests/qmltests/Dash/tst_FilterGrids.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/tst_FilterGrids.qml	2013-04-18 11:37:25 +0000
@@ -0,0 +1,147 @@
+/*
+ * 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 "../../../Dash/Video"
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 0.1
+import "../"
+
+Rectangle {
+    id: shell
+    width: gridRect.width + controls.width
+    height: units.gu(50)
+    color: "white"
+
+    Column {
+        id: controls
+        width: units.gu(30)
+        height: parent.height
+        anchors.top: parent.top
+        anchors.right: parent.right
+        spacing: units.gu(1)
+        Label {
+            id: spyLabel
+            color: "blue"
+            text: "Clicked item: [none]"
+            anchors {left: parent.left; right: parent.right; margins: units.gu(1) }
+        }
+        Repeater {
+            model: testCase.test_clicked_signal_data()
+            Button {
+                anchors {left: parent.left; right: parent.right; margins: units.gu(1) }
+                text: testCase.test_clicked_signal_data()[index].tag
+                onClicked: gridLoader.source = "../../../Dash/" + testCase.test_clicked_signal_data()[index].component
+            }
+        }
+    }
+
+    ListModel {
+        id: fakeModel
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item0"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item1"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item2"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item3"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item4"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item5"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item6"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item7"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item8"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item9"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item10"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item11"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item12"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item13"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item14"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item15"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item16"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item17"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item18"; column_5: ""; column_6: "dummy.desktop" }
+        ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item19"; column_5: ""; column_6: "dummy.desktop" }
+    }
+
+    Rectangle {
+        id: gridRect
+        width: units.gu(50)
+        height: parent.height
+        color: "grey"
+        anchors.top: parent.top
+        anchors.left: parent.left
+
+        Loader {
+            id: gridLoader
+            anchors.fill: parent
+
+            onProgressChanged: {
+                if (progress == 1) {
+                    item.model = fakeModel
+                }
+            }
+        }
+
+        Connections {
+            target: gridLoader.item
+            onClicked: spyLabel.text = "Clicked index: " + index
+        }
+    }
+
+    UnityTestCase {
+        id: testCase
+        name: "FilterGrids"
+        when: windowShown
+
+        function test_clicked_signal_data() {
+            return [
+                {tag: "VideosFilterGrid", component: "Video/VideosFilterGrid.qml"},
+                {tag: "PeopleFilterGrid", component: "People/PeopleFilterGrid.qml"},
+                {tag: "MusicFilterGrid", component: "Music/MusicFilterGrid.qml"},
+                {tag: "ApplicationsFilterGrid", component: "Apps/ApplicationsFilterGrid.qml"}
+            ]
+        }
+
+        function test_clicked_signal(data) {
+            gridLoader.source = "";
+            gridLoader.source = "../../../Dash/" + data.component;
+
+            // Wait until the FilterGrid is loaded by the loader
+            tryCompare(gridLoader, "status", Loader.Ready, "Loader couldn't load " + data.component);
+
+            // Wait until the GridView inside the model has the according amout of items set
+            var gridView = findChild(gridLoader, "responsiveGridViewGrid");
+            var itemCount = gridLoader.item.filter ? gridLoader.item.collapsedRowCount * gridLoader.item.columns : fakeModel.count;
+            tryCompare(gridView, "count", itemCount)
+
+            // Wait until the expandinganimation is finished
+            tryCompare(gridLoader.item.__expansionAnimation, "running", false)
+
+            // Click item 1
+            var tile1 = findChild(gridLoader.item, "delegate1");
+            clickedSpy.clear()
+            mouseClick(tile1, tile1.width/2, tile1.height/2);
+
+            // Check emission of clicked() signal with the according index as argument
+            compare(clickedSpy.signalArguments[0][0], 1, "Clicked index is not the same as the one actually clicked")
+        }
+    }
+
+    SignalSpy {
+        id: clickedSpy
+        signalName: "clicked"
+        target: gridLoader.item
+    }
+}
+

=== modified file 'tests/qmltests/plugins/CMakeLists.txt'
--- tests/qmltests/plugins/CMakeLists.txt	2013-04-16 14:22:23 +0000
+++ tests/qmltests/plugins/CMakeLists.txt	2013-04-18 11:37:25 +0000
@@ -1,2 +1,3 @@
 add_subdirectory(HudClient)
 add_subdirectory(Ubuntu)
+add_subdirectory(Dee)

=== added directory 'tests/qmltests/plugins/Dee'
=== added file 'tests/qmltests/plugins/Dee/CMakeLists.txt'
--- tests/qmltests/plugins/Dee/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmltests/plugins/Dee/CMakeLists.txt	2013-04-18 11:37:25 +0000
@@ -0,0 +1,4 @@
+# copy qmldir file into build directory for shadow builds
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+    )

=== added file 'tests/qmltests/plugins/Dee/DeeVariantText.qml'
--- tests/qmltests/plugins/Dee/DeeVariantText.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/plugins/Dee/DeeVariantText.qml	2013-04-18 11:37:25 +0000
@@ -0,0 +1,22 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.0
+
+Item {
+    property variant value
+    property string text
+}

=== added file 'tests/qmltests/plugins/Dee/qmldir'
--- tests/qmltests/plugins/Dee/qmldir	1970-01-01 00:00:00 +0000
+++ tests/qmltests/plugins/Dee/qmldir	2013-04-18 11:37:25 +0000
@@ -0,0 +1,3 @@
+module Dee
+
+DeeVariantText 3.0 DeeVariantText.qml