Merge lp:~unity-team/unity/phablet.test_Panel-searchIndicator into lp:unity/phablet

[Andrea Cimitan]

Add test for SearchIndicator under qmluitests/Panel

Add test for SearchIndicator under qmluitests/Panel

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:554
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/328/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/329/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/328/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/204/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/204/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'Panel/SearchIndicator.qml'
--- Panel/SearchIndicator.qml	2013-03-26 15:45:37 +0000
+++ Panel/SearchIndicator.qml	2013-04-09 10:00:31 +0000
@@ -43,6 +43,7 @@
 
     Item {
         id: container
+        objectName: "container"
 
         width: parent.width
         height: parent.height

=== modified file 'tests/qmluitests/CMakeLists.txt'
--- tests/qmluitests/CMakeLists.txt	2013-04-08 11:52:36 +0000
+++ tests/qmluitests/CMakeLists.txt	2013-04-09 10:00:31 +0000
@@ -1,19 +1,10 @@
-add_subdirectory(qml)
-
 add_custom_target(qmluitests)
 
 set(qmltest_DEFAULT_TARGETS qmluitests alltests)
 set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
 
-add_qml_test(DashPreview)
-add_qml_test(DraggingArea)
-add_qml_test(FilterGrid IMPORT_PATH ${CMAKE_BINARY_DIR}/plugins)
-add_qml_test(Greeter)
-add_qml_test(Hud IMPORT_PATH ${CMAKE_CURRENT_BINARY_DIR}/qml)
-add_qml_test(IndicatorRow IMPORT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/qml)
-add_qml_test(Launcher)
-add_qml_test(ResponsiveGridView)
-add_qml_test(Revealer)
-add_qml_test(Showable)
-add_qml_test(Stage)
-add_qml_test(Tile)
+add_subdirectory(Components)
+add_subdirectory(Dash)
+add_subdirectory(Greeter)
+add_subdirectory(Hud)
+add_subdirectory(Panel)

=== added directory 'tests/qmluitests/Components'
=== added file 'tests/qmluitests/Components/CMakeLists.txt'
--- tests/qmluitests/Components/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Components/CMakeLists.txt	2013-04-09 10:00:31 +0000
@@ -0,0 +1,7 @@
+add_qml_test(DraggingArea)
+add_qml_test(FilterGrid IMPORT_PATH ${CMAKE_BINARY_DIR}/plugins)
+add_qml_test(ResponsiveGridView)
+add_qml_test(Revealer)
+add_qml_test(Showable)
+add_qml_test(Stage)
+add_qml_test(Tile)

=== renamed file 'tests/qmluitests/RevealingRectangle.qml' => 'tests/qmluitests/Components/RevealingRectangle.qml'
--- tests/qmluitests/RevealingRectangle.qml	2013-03-19 12:06:15 +0000
+++ tests/qmluitests/Components/RevealingRectangle.qml	2013-04-09 10:00:31 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import "../../Components"
+import "../../../Components"
 
 Item {
     id: revealingRectangle

=== renamed file 'tests/qmluitests/tst_DraggingArea.qml' => 'tests/qmluitests/Components/tst_DraggingArea.qml'
--- tests/qmluitests/tst_DraggingArea.qml	2013-03-15 15:34:06 +0000
+++ tests/qmluitests/Components/tst_DraggingArea.qml	2013-04-09 10:00:31 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Components"
+import "../../../Components"
 
 /*
  There will be a green rectangle in the center of the
@@ -35,6 +35,85 @@
     property int dragStartCount: 0
     property int dragEndCount: 0
 
+    TestCase {
+        name: "DraggingAreaTest"
+        when: windowShown
+
+        function test_horizontalDrag() {
+            draggingArea.orientation = Qt.Horizontal;
+
+            dragStartCount = 0
+            dragEndCount = 0
+
+            compare(draggingArea.dragging, false);
+
+            // (item, x, y, button, modifiers, delay)
+            mousePress(draggingArea,
+                       25, 25,
+                       Qt.LeftButton, Qt.NoModifier, 0);
+
+            compare(draggingArea.dragging, false);
+            compare(dragStartCount, 0);
+            compare(dragEndCount, 0);
+
+            // (item, x, y, delay, button)
+            mouseMove(draggingArea,
+                      -100, 25,
+                      0, Qt.LeftButton);
+
+            compare(draggingArea.dragging, true);
+            compare(draggingArea.dragValue, -125);
+            compare(dragStartCount, 1);
+            compare(dragEndCount, 0);
+
+            // (item, x, y, button, modifiers, delay)
+            mouseRelease(draggingArea,
+                         -100, 25,
+                         Qt.LeftButton, Qt.NoModifier, 0);
+
+            compare(draggingArea.dragging, false);
+            compare(dragStartCount, 1);
+            compare(dragEndCount, 1);
+        }
+
+        function test_verticalDrag() {
+            draggingArea.orientation = Qt.Vertical;
+
+            dragStartCount = 0
+            dragEndCount = 0
+
+            compare(draggingArea.dragging, false);
+
+            // (item, x, y, button, modifiers, delay)
+            mousePress(draggingArea,
+                       25, 25,
+                       Qt.LeftButton, Qt.NoModifier, 0);
+
+            compare(draggingArea.dragging, false);
+            compare(dragStartCount, 0);
+            compare(dragEndCount, 0);
+
+            // (item, x, y, delay, button)
+            mouseMove(draggingArea,
+                      25, 125,
+                      0, Qt.LeftButton);
+
+            compare(draggingArea.dragging, true);
+            compare(draggingArea.dragValue, 100);
+            compare(dragStartCount, 1);
+            compare(dragEndCount, 0);
+
+            // (item, x, y, button, modifiers, delay)
+            mouseRelease(draggingArea,
+                         25, 125,
+                         Qt.LeftButton, Qt.NoModifier, 0);
+
+            compare(draggingArea.dragging, false);
+            compare(dragStartCount, 1);
+            compare(dragEndCount, 1);
+        }
+    }
+
     Column {
         anchors.left: parent.left
         anchors.top: parent.top
@@ -102,83 +181,4 @@
             onDragEnd : { ++root.dragEndCount }
         }
     }
-
-    TestCase {
-        name: "DraggingArea"
-        when: windowShown
-
-        function test_horizontalDrag() {
-            draggingArea.orientation = Qt.Horizontal;
-
-            dragStartCount = 0
-            dragEndCount = 0
-
-            compare(draggingArea.dragging, false);
-
-            // (item, x, y, button, modifiers, delay)
-            mousePress(draggingArea,
-                       25, 25,
-                       Qt.LeftButton, Qt.NoModifier, 0);
-
-            compare(draggingArea.dragging, false);
-            compare(dragStartCount, 0);
-            compare(dragEndCount, 0);
-
-            // (item, x, y, delay, button)
-            mouseMove(draggingArea,
-                      -100, 25,
-                      0, Qt.LeftButton);
-
-            compare(draggingArea.dragging, true);
-            compare(draggingArea.dragValue, -125);
-            compare(dragStartCount, 1);
-            compare(dragEndCount, 0);
-
-            // (item, x, y, button, modifiers, delay)
-            mouseRelease(draggingArea,
-                         -100, 25,
-                         Qt.LeftButton, Qt.NoModifier, 0);
-
-            compare(draggingArea.dragging, false);
-            compare(dragStartCount, 1);
-            compare(dragEndCount, 1);
-        }
-
-        function test_verticalDrag() {
-            draggingArea.orientation = Qt.Vertical;
-
-            dragStartCount = 0
-            dragEndCount = 0
-
-            compare(draggingArea.dragging, false);
-
-            // (item, x, y, button, modifiers, delay)
-            mousePress(draggingArea,
-                       25, 25,
-                       Qt.LeftButton, Qt.NoModifier, 0);
-
-            compare(draggingArea.dragging, false);
-            compare(dragStartCount, 0);
-            compare(dragEndCount, 0);
-
-            // (item, x, y, delay, button)
-            mouseMove(draggingArea,
-                      25, 125,
-                      0, Qt.LeftButton);
-
-            compare(draggingArea.dragging, true);
-            compare(draggingArea.dragValue, 100);
-            compare(dragStartCount, 1);
-            compare(dragEndCount, 0);
-
-            // (item, x, y, button, modifiers, delay)
-            mouseRelease(draggingArea,
-                         25, 125,
-                         Qt.LeftButton, Qt.NoModifier, 0);
-
-            compare(draggingArea.dragging, false);
-            compare(dragStartCount, 1);
-            compare(dragEndCount, 1);
-        }
-    }
 }

=== renamed file 'tests/qmluitests/tst_FilterGrid.qml' => 'tests/qmluitests/Components/tst_FilterGrid.qml'
--- tests/qmluitests/tst_FilterGrid.qml	2013-03-18 15:49:03 +0000
+++ tests/qmluitests/Components/tst_FilterGrid.qml	2013-04-09 10:00:31 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Components"
+import "../../../Components"
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components 0.1
 
@@ -30,6 +30,87 @@
     height: units.gu(50)
     color: "white"
 
+    TestCase {
+        name: "FilterGridTest"
+        when: windowShown
+
+        function test_turningFilterOffShowsAllElements() {
+            compare(countVisibleDelegates(), 6)
+
+            filterCheckBox.checked = false
+
+            // wait for animations to complete
+            tryCompare(filterGrid.__expansionAnimation, "running", false)
+            compare(countVisibleDelegates(), 12)
+
+            // back to initial state
+            filterCheckBox.checked = true
+            // wait for animations to complete
+            tryCompare(filterGrid.__expansionAnimation, "running", false)
+        }
+
+        function test_collapsedRowCount() {
+            for (var i = 0; i < 4; ++i) {
+                collapsedRowCountSelector.selectedIndex = i
+                // wait for animations to complete
+                tryCompare(filterGrid.__expansionAnimation, "running", false)
+                // We have 3 elements per row.
+                // row count == index + 1
+                compare(countVisibleDelegates(), 3*(i+1))
+            }
+
+            // back to initial state
+            collapsedRowCountSelector.selectedIndex = 1
+            // wait for animations to complete
+            tryCompare(filterGrid.__expansionAnimation, "running", false)
+        }
+
+        // Checks that the filter toggle button, the one that says "View All (xy)",
+        // shows up only when it's possible for the grid to be expanded.
+        function test_filterToggleButton() {
+            var filterToggleButton = filterGrid.__filterToggleButton
+
+            for (var i = 0; i < 4; ++i) {
+                collapsedRowCountSelector.selectedIndex = i
+                // wait for animations to complete
+                tryCompare(filterGrid.__expansionAnimation, "running", false)
+                // row count == index + 1
+                // The total number of rows is 4.
+
+                expandableCheckBox.checked = false
+                compare(filterToggleButton.visible, false)
+                expandableCheckBox.checked = true
+
+                if ((i+1) < 4)
+                    compare(filterToggleButton.visible, true)
+                else
+                    compare(filterToggleButton.visible, false)
+            }
+
+            // back to initial state
+            collapsedRowCountSelector.selectedIndex = 1
+            expandableCheckBox.checked = true
+            // wait for animations to complete
+            tryCompare(filterGrid.__expansionAnimation, "running", false)
+        }
+
+        function countVisibleDelegates() {
+            return __countVisibleDelegates(filterGrid.visibleChildren, 0)
+        }
+
+        function __countVisibleDelegates(objList, total) {
+            for (var i = 0; i < objList.length; ++i) {
+                var child = objList[i];
+                if (child.isGridDelegate !== undefined) {
+                    ++total;
+                } else {
+                    total = __countVisibleDelegates(child.visibleChildren, total)
+                }
+            }
+            return total
+        }
+    }
+
     Column {
         id: controls
         width: units.gu(30)
@@ -114,89 +195,5 @@
             }
         }
     }
-
-    TestCase {
-        name: "FilterGrid"
-        when: windowShown
-
-        function test_turningFilterOffShowsAllElements() {
-            compare(countVisibleDelegates(), 6)
-
-            filterCheckBox.checked = false
-
-            // wait for animations to complete
-            tryCompare(filterGrid.__expansionAnimation, "running", false)
-            compare(countVisibleDelegates(), 12)
-
-            // back to initial state
-            filterCheckBox.checked = true
-            // wait for animations to complete
-            tryCompare(filterGrid.__expansionAnimation, "running", false)
-        }
-
-        function test_collapsedRowCount() {
-
-            for (var i = 0; i < 4; ++i) {
-                collapsedRowCountSelector.selectedIndex = i
-                // wait for animations to complete
-                tryCompare(filterGrid.__expansionAnimation, "running", false)
-                // We have 3 elements per row.
-                // row count == index + 1
-                compare(countVisibleDelegates(), 3*(i+1))
-            }
-
-            // back to initial state
-            collapsedRowCountSelector.selectedIndex = 1
-            // wait for animations to complete
-            tryCompare(filterGrid.__expansionAnimation, "running", false)
-        }
-
-        // Checks that the filter toggle button, the one that says "View All (xy)",
-        // shows up only when it's possible for the grid to be expanded.
-        function test_filterToggleButton() {
-
-            var filterToggleButton = filterGrid.__filterToggleButton
-
-            for (var i = 0; i < 4; ++i) {
-                collapsedRowCountSelector.selectedIndex = i
-                // wait for animations to complete
-                tryCompare(filterGrid.__expansionAnimation, "running", false)
-                // row count == index + 1
-                // The total number of rows is 4.
-
-                expandableCheckBox.checked = false
-                compare(filterToggleButton.visible, false)
-                expandableCheckBox.checked = true
-
-                if ((i+1) < 4)
-                    compare(filterToggleButton.visible, true)
-                else
-                    compare(filterToggleButton.visible, false)
-            }
-
-            // back to initial state
-            collapsedRowCountSelector.selectedIndex = 1
-            expandableCheckBox.checked = true
-            // wait for animations to complete
-            tryCompare(filterGrid.__expansionAnimation, "running", false)
-        }
-
-        function countVisibleDelegates() {
-            return __countVisibleDelegates(filterGrid.visibleChildren, 0)
-        }
-
-        function __countVisibleDelegates(objList, total) {
-            for (var i = 0; i < objList.length; ++i) {
-                var child = objList[i];
-                if (child.isGridDelegate !== undefined) {
-                    ++total;
-                } else {
-                    total = __countVisibleDelegates(child.visibleChildren, total)
-                }
-            }
-            return total
-        }
-
-    }
 }
 

=== renamed file 'tests/qmluitests/tst_ResponsiveGridView.qml' => 'tests/qmluitests/Components/tst_ResponsiveGridView.qml'
--- tests/qmluitests/tst_ResponsiveGridView.qml	2013-03-20 10:59:28 +0000
+++ tests/qmluitests/Components/tst_ResponsiveGridView.qml	2013-04-09 10:00:31 +0000
@@ -16,7 +16,8 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Components"
+import ".."
+import "../../../Components"
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components 0.1
 
@@ -24,6 +25,78 @@
     width: gridRect.width + controls.width
     height: units.gu(80)
 
+    UnityTestCase {
+        name: "ResponsiveGridViewTest"
+        when: windowShown
+
+        function test_maximumNumberOfColumns_data() {
+            var data = new Array()
+
+            data.push({selectedIndex: 0, maxColumnCount:2, columnCount: 2})
+            data.push({selectedIndex: 1, maxColumnCount:4, columnCount: 4})
+            data.push({selectedIndex: 2, maxColumnCount:8, columnCount: 8})
+            data.push({selectedIndex: 4, maxColumnCount:1000, columnCount: 13})
+
+            return data
+        }
+
+        /* Change ResponsiveGridView's maximumNumberOfColumns property and check
+           that the resulting number of columns matches expectations */
+        function test_maximumNumberOfColumns(data) {
+            minHSpacingSelector.selectedIndex = 0
+
+            // sanity checks
+            compare(maxColumnsSelector.values[data.selectedIndex], data.maxColumnCount)
+            compare(minHSpacingSelector.values[0], 0)
+
+            maxColumnsSelector.selectedIndex = data.selectedIndex
+            tryCompareFunction(countGridDelegatesOnFirstRow, data.columnCount);
+            compare(grid.columns, data.columnCount)
+        }
+
+        function test_minimumHorizontalSpacing_data() {
+            var data = new Array()
+
+            data.push({selectedIndex: 0, minHSpacing:0, columnCount: 13})
+            data.push({selectedIndex: 1, minHSpacing:units.gu(2), columnCount: 9})
+            data.push({selectedIndex: 2, minHSpacing:units.gu(8), columnCount: 5})
+            data.push({selectedIndex: 3, minHSpacing:units.gu(25), columnCount: 2})
+
+            return data
+        }
+
+        /* Change ResponsiveGridView's minimumHorizontalSpacing property and check
+           that the resulting number of columns matches expectations */
+        function test_minimumHorizontalSpacing(data) {
+            maxColumnsSelector.selectedIndex = 4
+
+            // sanity checks
+            compare(maxColumnsSelector.values[4], 1000)
+            compare(minHSpacingSelector.values[data.selectedIndex], data.minHSpacing)
+
+            minHSpacingSelector.selectedIndex = data.selectedIndex
+            tryCompareFunction(countGridDelegatesOnFirstRow, data.columnCount);
+            compare(grid.columns, data.columnCount)
+        }
+
+
+        function countGridDelegatesOnFirstRow() {
+            return __countGridDelegatesOnFirstRow(grid.visibleChildren, 0)
+        }
+
+        function __countGridDelegatesOnFirstRow(objList, total) {
+            for (var i = 0; i < objList.length; ++i) {
+                var child = objList[i];
+                if (child.isGridDelegate !== undefined && child.y === 0) {
+                    ++total;
+                } else {
+                    total = __countGridDelegatesOnFirstRow(child.visibleChildren, total)
+                }
+            }
+            return total
+        }
+    }
+
     Column {
         id: controls
         width: units.gu(40)
@@ -116,76 +189,4 @@
             }
         }
     }
-
-    UnityTestCase {
-        name: "ResponsiveGridView"
-        when: windowShown
-
-        function test_maximumNumberOfColumns_data() {
-            var data = new Array()
-
-            data.push({selectedIndex: 0, maxColumnCount:2, columnCount: 2})
-            data.push({selectedIndex: 1, maxColumnCount:4, columnCount: 4})
-            data.push({selectedIndex: 2, maxColumnCount:8, columnCount: 8})
-            data.push({selectedIndex: 4, maxColumnCount:1000, columnCount: 13})
-
-            return data
-        }
-
-        /* Change ResponsiveGridView's maximumNumberOfColumns property and check
-           that the resulting number of columns matches expectations */
-        function test_maximumNumberOfColumns(data) {
-            minHSpacingSelector.selectedIndex = 0
-
-            // sanity checks
-            compare(maxColumnsSelector.values[data.selectedIndex], data.maxColumnCount)
-            compare(minHSpacingSelector.values[0], 0)
-
-            maxColumnsSelector.selectedIndex = data.selectedIndex
-            tryCompareFunction(countGridDelegatesOnFirstRow, data.columnCount);
-            compare(grid.columns, data.columnCount)
-        }
-
-        function test_minimumHorizontalSpacing_data() {
-            var data = new Array()
-
-            data.push({selectedIndex: 0, minHSpacing:0, columnCount: 13})
-            data.push({selectedIndex: 1, minHSpacing:units.gu(2), columnCount: 9})
-            data.push({selectedIndex: 2, minHSpacing:units.gu(8), columnCount: 5})
-            data.push({selectedIndex: 3, minHSpacing:units.gu(25), columnCount: 2})
-
-            return data
-        }
-
-        /* Change ResponsiveGridView's minimumHorizontalSpacing property and check
-           that the resulting number of columns matches expectations */
-        function test_minimumHorizontalSpacing(data) {
-            maxColumnsSelector.selectedIndex = 4
-
-            // sanity checks
-            compare(maxColumnsSelector.values[4], 1000)
-            compare(minHSpacingSelector.values[data.selectedIndex], data.minHSpacing)
-
-            minHSpacingSelector.selectedIndex = data.selectedIndex
-            tryCompareFunction(countGridDelegatesOnFirstRow, data.columnCount);
-            compare(grid.columns, data.columnCount)
-        }
-
-
-        function countGridDelegatesOnFirstRow() {
-            return __countGridDelegatesOnFirstRow(grid.visibleChildren, 0)
-        }
-
-        function __countGridDelegatesOnFirstRow(objList, total) {
-            for (var i = 0; i < objList.length; ++i) {
-                var child = objList[i];
-                if (child.isGridDelegate !== undefined && child.y === 0) {
-                    ++total;
-                } else {
-                    total = __countGridDelegatesOnFirstRow(child.visibleChildren, total)
-                }
-            }
-            return total
-        }
-    }
 }

=== renamed file 'tests/qmluitests/tst_Revealer.qml' => 'tests/qmluitests/Components/tst_Revealer.qml'
--- tests/qmluitests/tst_Revealer.qml	2013-03-19 12:19:11 +0000
+++ tests/qmluitests/Components/tst_Revealer.qml	2013-04-09 10:00:31 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
+import ".."
 
 /*
   There's a revealer on each window edge. If you press and hold any edge you
@@ -31,36 +32,8 @@
     width: units.gu(75)
     height: units.gu(50)
 
-    RevealingRectangle {
-        id: topRevealingRectangle
-        anchors.fill: parent
-        orientation: Qt.Vertical
-        direction: Qt.LeftToRight
-    }
-
-    RevealingRectangle {
-        id: bottomRevealingRectangle
-        anchors.fill: parent
-        orientation: Qt.Vertical
-        direction: Qt.RightToLeft
-    }
-
-    RevealingRectangle {
-        id: leftRevealingRectangle
-        anchors.fill: parent
-        orientation: Qt.Horizontal
-        direction: Qt.LeftToRight
-    }
-
-    RevealingRectangle {
-        id: rightRevealingRectangle
-        anchors.fill: parent
-        orientation: Qt.Horizontal
-        direction: Qt.RightToLeft
-    }
-
     UnityTestCase {
-        name: "Revealer"
+        name: "RevealerTest"
         when: windowShown
 
         /*
@@ -258,5 +231,33 @@
             tryCompare(showable, "y", -showable.height)
         }
     }
+
+    RevealingRectangle {
+        id: topRevealingRectangle
+        anchors.fill: parent
+        orientation: Qt.Vertical
+        direction: Qt.LeftToRight
+    }
+
+    RevealingRectangle {
+        id: bottomRevealingRectangle
+        anchors.fill: parent
+        orientation: Qt.Vertical
+        direction: Qt.RightToLeft
+    }
+
+    RevealingRectangle {
+        id: leftRevealingRectangle
+        anchors.fill: parent
+        orientation: Qt.Horizontal
+        direction: Qt.LeftToRight
+    }
+
+    RevealingRectangle {
+        id: rightRevealingRectangle
+        anchors.fill: parent
+        orientation: Qt.Horizontal
+        direction: Qt.RightToLeft
+    }
 }
 

=== renamed file 'tests/qmluitests/tst_Showable.qml' => 'tests/qmluitests/Components/tst_Showable.qml'
--- tests/qmluitests/tst_Showable.qml	2013-04-02 10:45:33 +0000
+++ tests/qmluitests/Components/tst_Showable.qml	2013-04-09 10:00:31 +0000
@@ -17,7 +17,8 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Components 0.1
-import "../../Components"
+import ".."
+import "../../../Components"
 
 /*
   There will be 3 stacked rectangles, red, green & blue. Initially they
@@ -31,77 +32,8 @@
     width: units.gu(40)
     height: units.gu(60)
 
-    Showable {
-        id: show1
-        anchors.left: parent.left
-        anchors.top: parent.top
-        anchors.right: parent.right
-        height: units.gu(20)
-
-        opacity: 0.2
-        shown: false
-        hides: [show2, show3]
-        showAnimation: StandardAnimation { property: "opacity"; duration: 350; to: 1.0; easing.type: Easing.OutCubic }
-        hideAnimation: StandardAnimation { property: "opacity"; duration: 350; to: 0.2; easing.type: Easing.OutCubic }
-
-        Rectangle {
-            anchors.fill: parent
-            color: "red"
-        }
-        MouseArea {
-            anchors.fill: parent
-            onClicked: { parent.show() }
-        }
-    }
-
-    Showable {
-        id: show2
-        anchors.left: parent.left
-        anchors.top: show1.bottom
-        anchors.right: parent.right
-        height: units.gu(20)
-
-        opacity: 0.2
-        shown: false
-        hides: [show1, show3]
-        showAnimation: StandardAnimation { property: "opacity"; duration: 350; to: 1.0; easing.type: Easing.OutCubic }
-        hideAnimation: StandardAnimation { property: "opacity"; duration: 350; to: 0.2; easing.type: Easing.OutCubic }
-
-        Rectangle {
-            anchors.fill: parent
-            color: "green"
-        }
-        MouseArea {
-            anchors.fill: parent
-            onClicked: { parent.show() }
-        }
-    }
-
-    Showable {
-        id: show3
-        anchors.left: parent.left
-        anchors.top: show2.bottom
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-
-        opacity: 0.1
-        shown: false
-        hides: [show1, show2]
-        showAnimation: StandardAnimation { property: "opacity"; duration: 350; to: 1.0; easing.type: Easing.OutCubic }
-        hideAnimation: StandardAnimation { property: "opacity"; duration: 350; to: 0.2; easing.type: Easing.OutCubic }
-
-        Rectangle {
-            anchors.fill: parent
-            color: "blue"
-        }
-        MouseArea {
-            anchors.fill: parent
-            onClicked: { parent.show() }
-        }
-    }
-
     UnityTestCase {
-        name: "Showable"
+        name: "ShowableTest"
         when: windowShown
 
         function init_test() {
@@ -155,4 +87,73 @@
             compare(show1.shown, true, "Showable should automatically show when created changes to true if attempted to show before.");
         }
     }
+
+    Showable {
+        id: show1
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.right: parent.right
+        height: units.gu(20)
+
+        opacity: 0.2
+        shown: false
+        hides: [show2, show3]
+        showAnimation: StandardAnimation { property: "opacity"; duration: 350; to: 1.0; easing.type: Easing.OutCubic }
+        hideAnimation: StandardAnimation { property: "opacity"; duration: 350; to: 0.2; easing.type: Easing.OutCubic }
+
+        Rectangle {
+            anchors.fill: parent
+            color: "red"
+        }
+        MouseArea {
+            anchors.fill: parent
+            onClicked: { parent.show() }
+        }
+    }
+
+    Showable {
+        id: show2
+        anchors.left: parent.left
+        anchors.top: show1.bottom
+        anchors.right: parent.right
+        height: units.gu(20)
+
+        opacity: 0.2
+        shown: false
+        hides: [show1, show3]
+        showAnimation: StandardAnimation { property: "opacity"; duration: 350; to: 1.0; easing.type: Easing.OutCubic }
+        hideAnimation: StandardAnimation { property: "opacity"; duration: 350; to: 0.2; easing.type: Easing.OutCubic }
+
+        Rectangle {
+            anchors.fill: parent
+            color: "green"
+        }
+        MouseArea {
+            anchors.fill: parent
+            onClicked: { parent.show() }
+        }
+    }
+
+    Showable {
+        id: show3
+        anchors.left: parent.left
+        anchors.top: show2.bottom
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+
+        opacity: 0.1
+        shown: false
+        hides: [show1, show2]
+        showAnimation: StandardAnimation { property: "opacity"; duration: 350; to: 1.0; easing.type: Easing.OutCubic }
+        hideAnimation: StandardAnimation { property: "opacity"; duration: 350; to: 0.2; easing.type: Easing.OutCubic }
+
+        Rectangle {
+            anchors.fill: parent
+            color: "blue"
+        }
+        MouseArea {
+            anchors.fill: parent
+            onClicked: { parent.show() }
+        }
+    }
 }

=== renamed directory 'tests/qmluitests/tst_Stage' => 'tests/qmluitests/Components/tst_Stage'
=== renamed file 'tests/qmluitests/tst_Stage.qml' => 'tests/qmluitests/Components/tst_Stage.qml'
--- tests/qmluitests/tst_Stage.qml	2013-04-02 21:33:33 +0000
+++ tests/qmluitests/Components/tst_Stage.qml	2013-04-09 10:00:31 +0000
@@ -16,9 +16,10 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Components"
+import ".."
+import "../../../Components"
 import Ubuntu.Components 0.1
-import "../../Applications/applications.js" as ApplicationsModel
+import "../../../Applications/applications.js" as ApplicationsModel
 import "tst_Stage"
 
 Rectangle {
@@ -27,6 +28,146 @@
     width: units.gu(70)
     height: stageRect.height
 
+    UnityTestCase {
+        name: "StageTest"
+        when: windowShown
+
+        /* If you press Stage's right edge it should show the hint that it's possible to
+           switch to the next running application. This means (graphically) sliding the
+           next application window from Stage's right edge for a small part of its width */
+        function test_pressingRightEdgeShowsHint() {
+
+            // it shoulnd't be showing anything at first
+            compare(stage.usingScreenshots, false)
+
+            redControl.checked = true
+
+            tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
+            wait(600)
+            tryCompare(stage, "usingScreenshots", false) // and then for it to end
+            compare(fakeAppManager.mainStageFocusedApplication.desktopFile, "red")
+            compare(fakeAppManager.mainStageApplications.get(0).desktopFile, "red")
+
+            greenControl.checked = true
+
+            tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
+            wait(600)
+            tryCompare(stage, "usingScreenshots", false) // and then for it to end
+            compare(fakeAppManager.mainStageFocusedApplication.desktopFile, "green")
+            compare(fakeAppManager.mainStageApplications.get(0).desktopFile, "green")
+
+            var draggingAreaCenterX = stage.width - (stage.rightEdgeDraggingAreaWidth / 2)
+            var draggingAreaCenterY = stage.height / 2
+            mousePress(stage, draggingAreaCenterX, draggingAreaCenterY)
+
+            // wait for the animation to start
+            tryCompare(stage, "usingScreenshots", true)
+
+            // "red" should be the new/next application being shown
+            compare(newAppScreenshot.application.desktopFile, "red")
+            tryCompareFunction(isShowingABitOfNewApp, true);
+
+            // "green" should be the current application being shown
+            compare(oldAppScreenshot.application.desktopFile, "green")
+            tryCompareFunction(isCurrentAppFadingOut, true);
+
+            mouseRelease(stage, draggingAreaCenterX, draggingAreaCenterY)
+        }
+
+        function isShowingABitOfNewApp() {
+            // it should come from the right and take less than half of the screen
+            // but at least 15% of it
+            return newAppScreenshot.x > stage.width/2
+                && newAppScreenshot.x < stage.width*(85/100)
+                && newAppScreenshot.y === 0
+                && newAppScreenshot.visible
+        }
+
+        function isCurrentAppFadingOut() {
+            // it should get a bit translucent and smaller
+            return oldAppScreenshot.opacity < 0.98
+                && oldAppScreenshot.opacity >= 0.1
+                && oldAppScreenshot.scale < 0.98
+                && oldAppScreenshot.scale >= 0.1
+                && oldAppScreenshot.visible
+        }
+
+        function init() {
+            redControl.checked = false;
+            greenControl.checked = false;
+            blueControl.checked = false;
+            // give some room for animations to start
+            wait(50)
+            // wait until animations end, if any
+            tryCompare(stage, "usingScreenshots", false)
+        }
+
+        /* If you flick from the right edge of the stage leftwards it should cause an
+           application switch.  */
+        function test_dragFromRightEdgeToSwitchApplication() {
+            // it shoulnd't be showing anything at first
+            compare(stage.usingScreenshots, false)
+
+            redControl.checked = true
+
+            tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
+            tryCompare(stage, "usingScreenshots", false) // and then for it to end
+            compare(fakeAppManager.mainStageFocusedApplication.desktopFile, "red")
+            compare(fakeAppManager.mainStageApplications.get(0).desktopFile, "red")
+
+            greenControl.checked = true
+
+            tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
+            tryCompare(stage, "usingScreenshots", false) // and then for it to end
+            compare(fakeAppManager.mainStageFocusedApplication.desktopFile, "green")
+            compare(fakeAppManager.mainStageApplications.get(0).desktopFile, "green")
+
+            var mouseX = stage.width - (stage.rightEdgeDraggingAreaWidth / 2)
+            var mouseY = stage.height / 2
+            mouseFlick(stage, mouseX, mouseY,
+                       mouseX - units.gu(5), mouseY)
+
+            // wait until animations end, if any
+            tryCompare(stage, "usingScreenshots", false)
+
+            // "red" should be the new topmost, focused, application
+            compare(fakeAppManager.mainStageFocusedApplication.desktopFile, "red")
+            compare(fakeAppManager.mainStageApplications.get(0).desktopFile, "red")
+        }
+
+        /* When an application is launched, it needs a background before it's drawn on screen
+           so that the user does not see the previous running app while the new one is launching.
+           When switching between applications, backgrounds are unnecessary, 'cause the
+           applications are in front of them. */
+        function test_background() {
+            // it shoulnd't be showing anything at first
+            compare(stage.usingScreenshots, false)
+
+            redControl.checked = true
+            tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
+
+            compare(newAppScreenshot.withBackground, true, "starting app screenshot does not have background enabled")
+
+            tryCompare(stage, "usingScreenshots", false) // wait for the animation to finish
+
+            greenControl.checked = true
+            tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
+            tryCompare(stage, "usingScreenshots", false) // and finish
+
+            var draggingAreaCenterX = stage.width - (stage.rightEdgeDraggingAreaWidth / 2)
+            var draggingAreaCenterY = stage.height / 2
+            mousePress(stage, draggingAreaCenterX, draggingAreaCenterY)
+
+            // wait for the animation to start
+            tryCompare(stage, "usingScreenshots", true)
+
+            compare(newAppScreenshot.withBackground, false, "switched app does have background enabled")
+
+            tryCompareFunction(isShowingABitOfNewApp, true); // wait for the hint animation to finish
+            mouseRelease(stage, draggingAreaCenterX, draggingAreaCenterY)
+        }
+    }
+
     // Even though we replace the ApplicationScreenshot instances in Stage
     // with our own fake ones, ApplicationScreenshot.qml still gives out a warning
     // if shell.importUbuntuApplicationAvailable is missing.
@@ -190,144 +331,4 @@
             AppControl {id: blueControl; desktopFile:"blue"}
         }
     }
-
-    UnityTestCase {
-        name: "Stage"
-        when: windowShown
-
-        /* If you press Stage's right edge it should show the hint that it's possible to
-           switch to the next running application. This means (graphically) sliding the
-           next application window from Stage's right edge for a small part of its width */
-        function test_pressingRightEdgeShowsHint() {
-
-            // it shoulnd't be showing anything at first
-            compare(stage.usingScreenshots, false)
-
-            redControl.checked = true
-
-            tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
-            wait(600)
-            tryCompare(stage, "usingScreenshots", false) // and then for it to end
-            compare(fakeAppManager.mainStageFocusedApplication.desktopFile, "red")
-            compare(fakeAppManager.mainStageApplications.get(0).desktopFile, "red")
-
-            greenControl.checked = true
-
-            tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
-            wait(600)
-            tryCompare(stage, "usingScreenshots", false) // and then for it to end
-            compare(fakeAppManager.mainStageFocusedApplication.desktopFile, "green")
-            compare(fakeAppManager.mainStageApplications.get(0).desktopFile, "green")
-
-            var draggingAreaCenterX = stage.width - (stage.rightEdgeDraggingAreaWidth / 2)
-            var draggingAreaCenterY = stage.height / 2
-            mousePress(stage, draggingAreaCenterX, draggingAreaCenterY)
-
-            // wait for the animation to start
-            tryCompare(stage, "usingScreenshots", true)
-
-            // "red" should be the new/next application being shown
-            compare(newAppScreenshot.application.desktopFile, "red")
-            tryCompareFunction(isShowingABitOfNewApp, true);
-
-            // "green" should be the current application being shown
-            compare(oldAppScreenshot.application.desktopFile, "green")
-            tryCompareFunction(isCurrentAppFadingOut, true);
-
-            mouseRelease(stage, draggingAreaCenterX, draggingAreaCenterY)
-        }
-
-        function isShowingABitOfNewApp() {
-            // it should come from the right and take less than half of the screen
-            // but at least 15% of it
-            return newAppScreenshot.x > stage.width/2
-                && newAppScreenshot.x < stage.width*(85/100)
-                && newAppScreenshot.y === 0
-                && newAppScreenshot.visible
-        }
-
-        function isCurrentAppFadingOut() {
-            // it should get a bit translucent and smaller
-            return oldAppScreenshot.opacity < 0.98
-                && oldAppScreenshot.opacity >= 0.1
-                && oldAppScreenshot.scale < 0.98
-                && oldAppScreenshot.scale >= 0.1
-                && oldAppScreenshot.visible
-        }
-
-        function init() {
-            redControl.checked = false;
-            greenControl.checked = false;
-            blueControl.checked = false;
-            // give some room for animations to start
-            wait(50)
-            // wait until animations end, if any
-            tryCompare(stage, "usingScreenshots", false)
-        }
-
-        /* If you flick from the right edge of the stage leftwards it should cause an
-           application switch.  */
-        function test_dragFromRightEdgeToSwitchApplication() {
-            // it shoulnd't be showing anything at first
-            compare(stage.usingScreenshots, false)
-
-            redControl.checked = true
-
-            tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
-            tryCompare(stage, "usingScreenshots", false) // and then for it to end
-            compare(fakeAppManager.mainStageFocusedApplication.desktopFile, "red")
-            compare(fakeAppManager.mainStageApplications.get(0).desktopFile, "red")
-
-            greenControl.checked = true
-
-            tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
-            tryCompare(stage, "usingScreenshots", false) // and then for it to end
-            compare(fakeAppManager.mainStageFocusedApplication.desktopFile, "green")
-            compare(fakeAppManager.mainStageApplications.get(0).desktopFile, "green")
-
-            var mouseX = stage.width - (stage.rightEdgeDraggingAreaWidth / 2)
-            var mouseY = stage.height / 2
-            mouseFlick(stage, mouseX, mouseY,
-                       mouseX - units.gu(5), mouseY)
-
-            // wait until animations end, if any
-            tryCompare(stage, "usingScreenshots", false)
-
-            // "red" should be the new topmost, focused, application
-            compare(fakeAppManager.mainStageFocusedApplication.desktopFile, "red")
-            compare(fakeAppManager.mainStageApplications.get(0).desktopFile, "red")
-        }
-
-        /* When an application is launched, it needs a background before it's drawn on screen
-           so that the user does not see the previous running app while the new one is launching.
-           When switching between applications, backgrounds are unnecessary, 'cause the
-           applications are in front of them. */
-        function test_background() {
-            // it shoulnd't be showing anything at first
-            compare(stage.usingScreenshots, false)
-
-            redControl.checked = true
-            tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
-
-            compare(newAppScreenshot.withBackground, true, "starting app screenshot does not have background enabled")
-
-            tryCompare(stage, "usingScreenshots", false) // wait for the animation to finish
-
-            greenControl.checked = true
-            tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
-            tryCompare(stage, "usingScreenshots", false) // and finish
-
-            var draggingAreaCenterX = stage.width - (stage.rightEdgeDraggingAreaWidth / 2)
-            var draggingAreaCenterY = stage.height / 2
-            mousePress(stage, draggingAreaCenterX, draggingAreaCenterY)
-
-            // wait for the animation to start
-            tryCompare(stage, "usingScreenshots", true)
-
-            compare(newAppScreenshot.withBackground, false, "switched app does have background enabled")
-
-            tryCompareFunction(isShowingABitOfNewApp, true); // wait for the hint animation to finish
-            mouseRelease(stage, draggingAreaCenterX, draggingAreaCenterY)
-        }
-    }
 }

=== renamed file 'tests/qmluitests/tst_Tile.qml' => 'tests/qmluitests/Components/tst_Tile.qml'
--- tests/qmluitests/tst_Tile.qml	2013-04-08 11:52:36 +0000
+++ tests/qmluitests/Components/tst_Tile.qml	2013-04-09 10:00:31 +0000
@@ -16,7 +16,8 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Components"
+import ".."
+import "../../../Components"
 import Ubuntu.Components 0.1
 
 Item {
@@ -57,11 +58,11 @@
             mouseRelease(label, 1, 1)
         }
     }
-    
+
     Tile {
         id: tile
         anchors.fill: parent
-        source: "../../graphics/[e-mail]"
+        source: "../../../graphics/[e-mail]"
         text: "Testing rocks, debugging sucks!"
         imageWidth: width
         imageHeight: width

=== added directory 'tests/qmluitests/Dash'
=== added file 'tests/qmluitests/Dash/CMakeLists.txt'
--- tests/qmluitests/Dash/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Dash/CMakeLists.txt	2013-04-09 10:00:31 +0000
@@ -0,0 +1,1 @@
+add_qml_test(DashPreview)

=== renamed file 'tests/qmluitests/tst_DashPreview.qml' => 'tests/qmluitests/Dash/tst_DashPreview.qml'
--- tests/qmluitests/tst_DashPreview.qml	2013-03-26 14:25:34 +0000
+++ tests/qmluitests/Dash/tst_DashPreview.qml	2013-04-09 10:00:31 +0000
@@ -16,7 +16,8 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Dash"
+import ".."
+import "../../../Dash"
 import Ubuntu.Components 0.1
 
 Item {
@@ -109,7 +110,7 @@
         }
 
     }
-    
+
     DashPreview {
         id: preview
         anchors.fill: parent

=== added directory 'tests/qmluitests/Greeter'
=== added file 'tests/qmluitests/Greeter/CMakeLists.txt'
--- tests/qmluitests/Greeter/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Greeter/CMakeLists.txt	2013-04-09 10:00:31 +0000
@@ -0,0 +1,1 @@
+add_qml_test(Greeter)

=== renamed file 'tests/qmluitests/tst_Greeter.qml' => 'tests/qmluitests/Greeter/tst_Greeter.qml'
--- tests/qmluitests/tst_Greeter.qml	2013-04-05 17:07:17 +0000
+++ tests/qmluitests/Greeter/tst_Greeter.qml	2013-04-09 10:00:31 +0000
@@ -16,16 +16,18 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Greeter"
+import ".."
+import "../../../Greeter"
 import Ubuntu.Components 0.1
 
 Item {
     width: units.gu(120)
     height: units.gu(80)
+
     UnityTestCase {
         name: "GreeterTest"
         when: windowShown
-        
+
         function test_cycle_data() {
             tryCompare(findChild(greeter, "userList"), "count", 5)
             var data = new Array()
@@ -35,7 +37,7 @@
             data[greeter.model.count] = {tag: greeter.model.get(0).name, username: "username0", uid: 0 }
             return data
         }
-        
+
         function test_cycle(data) {
             tryCompare(findChild(greeter, "userList"), "count", 5)
             selectionSpy.clear();
@@ -46,7 +48,7 @@
             tryCompare(greeter, "locked", greeter.model.get(data.uid).password !== undefined)
             tryCompare(selectionSpy, "count", 1)
         }
-        
+
         function test_unlock_password() {
             unlockSpy.clear()
             // First one is Lolas account right now. Replace with password protected user from lightdm
@@ -93,7 +95,7 @@
             compare(unlockSpy.count, 1)
         }
     }
-    
+
     Greeter {
         id: greeter
         anchors.fill: parent

=== added directory 'tests/qmluitests/Hud'
=== added file 'tests/qmluitests/Hud/CMakeLists.txt'
--- tests/qmluitests/Hud/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Hud/CMakeLists.txt	2013-04-09 10:00:31 +0000
@@ -0,0 +1,3 @@
+add_subdirectory(qml)
+
+add_qml_test(Hud IMPORT_PATH ${CMAKE_CURRENT_BINARY_DIR}/qml)

=== added directory 'tests/qmluitests/Hud/qml'
=== renamed file 'tests/qmluitests/qml/CMakeLists.txt' => 'tests/qmluitests/Hud/qml/CMakeLists.txt'
=== renamed directory 'tests/qmluitests/qml/HudClient' => 'tests/qmluitests/Hud/qml/HudClient'
=== modified file 'tests/qmluitests/Hud/qml/HudClient/CMakeLists.txt'
--- tests/qmluitests/qml/HudClient/CMakeLists.txt	2013-03-15 16:49:45 +0000
+++ tests/qmluitests/Hud/qml/HudClient/CMakeLists.txt	2013-04-09 10:00:31 +0000
@@ -25,8 +25,8 @@
 add_definitions(-DQT_NO_KEYWORDS)
 
 set(HudQML_SOURCES
-  ../../../../plugins/HudClient/hudclient.cpp
-  ../../../../plugins/HudClient/volumepeakdetector.cpp
+  ../../../../../plugins/HudClient/hudclient.cpp
+  ../../../../../plugins/HudClient/volumepeakdetector.cpp
   fake_hud_plugin.cpp
   fake_libhud_client.cpp
   libhud_client_stub.cpp

=== modified file 'tests/qmluitests/Hud/qml/HudClient/fake_hud_plugin.cpp'
--- tests/qmluitests/qml/HudClient/fake_hud_plugin.cpp	2013-03-15 16:57:11 +0000
+++ tests/qmluitests/Hud/qml/HudClient/fake_hud_plugin.cpp	2013-04-09 10:00:31 +0000
@@ -16,8 +16,8 @@
 
 #include "fake_hud_plugin.h"
 
-#include "../../../../plugins/HudClient/hudclient.h"
-#include "../../../../plugins/HudClient/volumepeakdetector.h"
+#include "../../../../../plugins/HudClient/hudclient.h"
+#include "../../../../../plugins/HudClient/volumepeakdetector.h"
 #include "libhud_client_stub.h"
 
 #include <deelistmodel.h>

=== renamed file 'tests/qmluitests/tst_Hud.qml' => 'tests/qmluitests/Hud/tst_Hud.qml'
--- tests/qmluitests/tst_Hud.qml	2013-04-02 08:20:21 +0000
+++ tests/qmluitests/Hud/tst_Hud.qml	2013-04-09 10:00:31 +0000
@@ -16,10 +16,10 @@
 
 import QtQuick 2.0
 import QtTest 1.0
+import ".."
+import "../../../Hud"
 import HudClient 0.1
 
-import "../../Hud"
-
 Hud {
     id: hud
     height: units.gu(80)
@@ -33,10 +33,6 @@
         }
     }
 
-    HudClientStub {
-        id: hudClientStub
-    }
-
     UnityTestCase {
         name: "HudTest"
         when: windowShown
@@ -281,4 +277,8 @@
             compare(hudClientStub.lastParametrizedCommandCommited, true, "Confirming does commit")
         }
     }
+
+    HudClientStub {
+        id: hudClientStub
+    }
 }

=== added directory 'tests/qmluitests/Launcher'
=== added file 'tests/qmluitests/Launcher/CMakeLists.txt'
--- tests/qmluitests/Launcher/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Launcher/CMakeLists.txt	2013-04-09 10:00:31 +0000
@@ -0,0 +1,1 @@
+add_qml_test(Launcher)

=== renamed file 'tests/qmluitests/tst_Launcher.qml' => 'tests/qmluitests/Launcher/tst_Launcher.qml'
--- tests/qmluitests/tst_Launcher.qml	2013-03-28 11:03:01 +0000
+++ tests/qmluitests/Launcher/tst_Launcher.qml	2013-04-09 10:00:31 +0000
@@ -16,8 +16,9 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Launcher"
-import "../../Applications/applications.js" as ApplicationsModel
+import ".."
+import "../../../Launcher"
+import "../../../Applications/applications.js" as ApplicationsModel
 
 /* Nothing is shown at first. If you drag from left edge you will bring up the
    launcher. */
@@ -26,38 +27,9 @@
     width: units.gu(50)
     height: units.gu(81)
 
-    Launcher {
-        id: launcher
-        x: 0
-        y: 0
-        width: units.gu(40)
-        height: units.gu(71)
-
-        favourites: ["/usr/share/applications/phone-app.desktop",
-                     "/usr/share/applications/camera-app.desktop",
-                     "/usr/share/applications/gallery-app.desktop"]
-
-        shortcutsWidth: units.gu(9)
-        shortcutsThreshold: units.gu(2)
-        iconPath: "graphics/applicationIcons"
-        __dateTime: testCase.fakeDateTime
-
-        property string latestApplicationSelected
-
-        onLauncherApplicationSelected: {
-            latestApplicationSelected = name
-        }
-
-        property int dashItemSelected_count: 0
-        onDashItemSelected: {
-            dashItemSelected_count++;
-        }
-
-    }
-
     UnityTestCase {
         id: testCase
-        name: "Launcher"
+        name: "LauncherTest"
         when: windowShown
 
         // Drag from the left edge of the screen rightwards and check that the launcher
@@ -197,7 +169,6 @@
                        false, /* but do not release yet */
                        launcher.maxFlickSpeedToLaunchApp*2 /* speed */ )
 
-
             // wait until it gets fully extended
             tryCompare(shortcuts, "x", 0)
 
@@ -243,6 +214,33 @@
             var shortcuts = findChild(launcher, "shortcuts")
             tryCompare(shortcuts, "x", -shortcuts.width, 1000)
         }
-
+    }
+
+    Launcher {
+        id: launcher
+        x: 0
+        y: 0
+        width: units.gu(40)
+        height: units.gu(71)
+
+        favourites: ["/usr/share/applications/phone-app.desktop",
+                     "/usr/share/applications/camera-app.desktop",
+                     "/usr/share/applications/gallery-app.desktop"]
+
+        shortcutsWidth: units.gu(9)
+        shortcutsThreshold: units.gu(2)
+        iconPath: "graphics/applicationIcons"
+        __dateTime: testCase.fakeDateTime
+
+        property string latestApplicationSelected
+
+        onLauncherApplicationSelected: {
+            latestApplicationSelected = name
+        }
+
+        property int dashItemSelected_count: 0
+        onDashItemSelected: {
+            dashItemSelected_count++;
+        }
     }
 }

=== added directory 'tests/qmluitests/Panel'
=== added file 'tests/qmluitests/Panel/CMakeLists.txt'
--- tests/qmluitests/Panel/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Panel/CMakeLists.txt	2013-04-09 10:00:31 +0000
@@ -0,0 +1,2 @@
+add_qml_test(IndicatorRow IMPORT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/qml)
+add_qml_test(SearchIndicator)

=== renamed directory 'tests/qmluitests/qml' => 'tests/qmluitests/Panel/qml'
=== renamed file 'tests/qmluitests/tst_IndicatorRow.qml' => 'tests/qmluitests/Panel/tst_IndicatorRow.qml'
--- tests/qmluitests/tst_IndicatorRow.qml	2013-04-05 12:44:49 +0000
+++ tests/qmluitests/Panel/tst_IndicatorRow.qml	2013-04-09 10:00:31 +0000
@@ -16,7 +16,8 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Panel"
+import ".."
+import "../../../Panel"
 import Ubuntu.ChewieUI 0.1 as ChewieUI
 
 /*
@@ -28,24 +29,6 @@
     width: units.gu(40)
     height: units.gu(60)
 
-    PanelBackground {
-        anchors.fill: indicatorRow
-    }
-
-    IndicatorRow {
-        id: indicatorRow
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-
-        indicatorsModel: indicatorModel
-    }
-
-    ChewieUI.PluginModel {
-        id: indicatorModel
-    }
-
     function init_test()
     {
         indicatorRow.overviewActive = false;
@@ -54,7 +37,7 @@
     }
 
     UnityTestCase {
-        name: "IndicatorRow"
+        name: "IndicatorRowTest"
         when: windowShown
 
         function test_set_current_item() {
@@ -71,7 +54,7 @@
     }
 
     UnityTestCase {
-        name: "IndicatorRow_IconPosition"
+        name: "IndicatorRow_IconPositionTest"
         when: windowShown
 
         function get_indicator_item_at(index) {
@@ -93,7 +76,7 @@
     }
 
     UnityTestCase {
-        name: "IndicatorRow_Highlight"
+        name: "IndicatorRow_HighlightTest"
         when: windowShown
 
         function get_indicator_item_at(index) {
@@ -167,7 +150,7 @@
     }
 
     UnityTestCase {
-        name: "IndicatorRow_Dimmed"
+        name: "IndicatorRow_DimmedTest"
         when: windowShown
 
         function get_indicator_item_at(index) {
@@ -253,4 +236,21 @@
         }
     }
 
+    PanelBackground {
+        anchors.fill: indicatorRow
+    }
+
+    IndicatorRow {
+        id: indicatorRow
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        indicatorsModel: indicatorModel
+    }
+
+    ChewieUI.PluginModel {
+        id: indicatorModel
+    }
 }

=== added file 'tests/qmluitests/Panel/tst_SearchIndicator.qml'
--- tests/qmluitests/Panel/tst_SearchIndicator.qml	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Panel/tst_SearchIndicator.qml	2013-04-09 10:00:31 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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 "../../../Panel"
+import Ubuntu.Components 0.1
+
+Item {
+    width: units.gu(9)
+    height: units.gu(3)
+
+    UnityTestCase {
+        name: "SearchIndicatorTest"
+        when: windowShown
+
+        function test_clickedSignal() {
+            clickedSpy.clear()
+            mouseClick(searchIndicator,
+                       searchIndicator.width / 2, searchIndicator.height / 2);
+            compare(clickedSpy.count, 1)
+        }
+
+        function test_hideUp() {
+            var container = findChild(searchIndicator, "container")
+            searchIndicator.hideUp()
+            tryCompare(container, "opacity", 0)
+            tryCompare(container, "y", -container.height)
+        }
+
+        function test_show() {
+            var container = findChild(searchIndicator, "container")
+            searchIndicator.show()
+            tryCompare(container, "opacity", 1)
+            tryCompare(container, "y", 0)
+        }
+    }
+
+    SignalSpy {
+        id: clickedSpy
+        target: searchIndicator
+        signalName: "clicked"
+    }
+
+    SearchIndicator {
+        id: searchIndicator
+        anchors.fill: parent
+    }
+}

=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2013-03-27 15:48:19 +0000
+++ tests/unittests/CMakeLists.txt	2013-04-09 10:00:31 +0000
@@ -3,9 +3,4 @@
 set(qmltest_DEFAULT_TARGETS unittests alltests)
 set(qmltest_DEFAULT_PROPERTIES PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
 
-add_qml_test(AnimationControllerWithSignals)
-add_qml_test(Carousel)
-add_qml_test(CrossFadeImage)
-add_qml_test(MathLocal)
-add_qml_test(RatingStars)
-add_qml_test(TimeLocal)
+add_subdirectory(Components)

=== added directory 'tests/unittests/Components'
=== added file 'tests/unittests/Components/CMakeLists.txt'
--- tests/unittests/Components/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/Components/CMakeLists.txt	2013-04-09 10:00:31 +0000
@@ -0,0 +1,6 @@
+add_qml_test(AnimationControllerWithSignals)
+add_qml_test(Carousel)
+add_qml_test(CrossFadeImage)
+add_qml_test(MathLocal)
+add_qml_test(RatingStars)
+add_qml_test(TimeLocal)

=== renamed file 'tests/unittests/tst_AnimationControllerWithSignals.qml' => 'tests/unittests/Components/tst_AnimationControllerWithSignals.qml'
--- tests/unittests/tst_AnimationControllerWithSignals.qml	2013-03-14 12:32:50 +0000
+++ tests/unittests/Components/tst_AnimationControllerWithSignals.qml	2013-04-09 10:00:31 +0000
@@ -16,14 +16,108 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Components"
+import "../../../Components"
 
 TestCase {
     id: testCase
-    name: "AnimationControllerWithSignals"
+    name: "AnimationControllerWithSignalsTest"
 
     property real someNumber: 0.0
 
+    function test_completeToEndWithSignal() {
+        loader.sourceComponent = testSubjectComponent;
+        var testSubject = loader.item;
+
+        testSubject.animation = someNumberAnimation;
+        testSubject.progress = 0;
+
+        signalSpy.signalName = "animationCompletedAtEnd";
+        signalSpy.target = testSubject;
+        signalSpy.clear();
+
+        compare(testSubject.completing, false)
+        compare(testSubject.completed, true)
+
+        testSubject.completeToEndWithSignal();
+        compare(testSubject.completing, true)
+        compare(testSubject.completed, true)
+        compare(signalSpy.count, 0);
+
+        testSubject.progress = 0.5;
+        compare(testSubject.completing, true)
+        compare(testSubject.completed, false)
+        compare(signalSpy.count, 0);
+
+        testSubject.progress = 1.0;
+        compare(testSubject.completing, false)
+        compare(testSubject.completed, true)
+        compare(signalSpy.count, 1);
+
+        testSubject.animation = null
+        loader.sourceComponent = undefined;
+    }
+
+    function test_completeToBeginningWithSignal() {
+        loader.sourceComponent = testSubjectComponent;
+        var testSubject = loader.item;
+
+        testSubject.animation = someNumberAnimation;
+        testSubject.progress = 1;
+
+        signalSpy.signalName = "animationCompletedAtBeginning";
+        signalSpy.target = testSubject;
+        signalSpy.clear();
+
+        compare(testSubject.completing, false)
+        compare(testSubject.completed, true)
+
+        testSubject.completeToBeginningWithSignal();
+        compare(testSubject.completing, true)
+        compare(testSubject.completed, true)
+        compare(signalSpy.count, 0);
+
+        testSubject.progress = 0.5;
+        compare(testSubject.completing, true)
+        compare(testSubject.completed, false)
+        compare(signalSpy.count, 0);
+
+        testSubject.progress = 0;
+        compare(testSubject.completing, false)
+        compare(testSubject.completed, true)
+        compare(signalSpy.count, 1);
+
+        testSubject.animation = null
+        loader.sourceComponent = undefined;
+    }
+
+    function test_settingProgressWithoutCallingCompleteWithSignal() {
+        loader.sourceComponent = testSubjectComponent;
+        var testSubject = loader.item;
+
+        testSubject.animation = someNumberAnimation;
+        testSubject.progress = 0;
+
+        signalSpy.signalName = "animationCompletedAtEnd";
+        signalSpy.target = testSubject;
+        signalSpy.clear();
+
+        compare(testSubject.completing, false)
+        compare(testSubject.completed, true)
+
+        testSubject.progress = 0.5;
+        compare(testSubject.completing, false)
+        compare(testSubject.completed, false)
+        compare(signalSpy.count, 0);
+
+        testSubject.progress = 1;
+        compare(testSubject.completing, false)
+        compare(testSubject.completed, true)
+        compare(signalSpy.count, 0);
+
+        testSubject.animation = null
+        loader.sourceComponent = undefined;
+    }
+
     NumberAnimation {
         id: someNumberAnimation
         target: testCase
@@ -45,99 +139,4 @@
     SignalSpy {
         id: signalSpy
     }
-
-    function test_completeToEndWithSignal() {
-        loader.sourceComponent = testSubjectComponent;
-        var testSubject = loader.item;
-
-        testSubject.animation = someNumberAnimation;
-        testSubject.progress = 0;
-
-        signalSpy.signalName = "animationCompletedAtEnd";
-        signalSpy.target = testSubject;
-        signalSpy.clear();
-
-        compare(testSubject.completing, false)
-        compare(testSubject.completed, true)
-
-        testSubject.completeToEndWithSignal();
-        compare(testSubject.completing, true)
-        compare(testSubject.completed, true)
-        compare(signalSpy.count, 0);
-
-        testSubject.progress = 0.5;
-        compare(testSubject.completing, true)
-        compare(testSubject.completed, false)
-        compare(signalSpy.count, 0);
-
-        testSubject.progress = 1.0;
-        compare(testSubject.completing, false)
-        compare(testSubject.completed, true)
-        compare(signalSpy.count, 1);
-
-        testSubject.animation = null
-        loader.sourceComponent = undefined;
-    }
-
-    function test_completeToBeginningWithSignal() {
-        loader.sourceComponent = testSubjectComponent;
-        var testSubject = loader.item;
-
-        testSubject.animation = someNumberAnimation;
-        testSubject.progress = 1;
-
-        signalSpy.signalName = "animationCompletedAtBeginning";
-        signalSpy.target = testSubject;
-        signalSpy.clear();
-
-        compare(testSubject.completing, false)
-        compare(testSubject.completed, true)
-
-        testSubject.completeToBeginningWithSignal();
-        compare(testSubject.completing, true)
-        compare(testSubject.completed, true)
-        compare(signalSpy.count, 0);
-
-        testSubject.progress = 0.5;
-        compare(testSubject.completing, true)
-        compare(testSubject.completed, false)
-        compare(signalSpy.count, 0);
-
-        testSubject.progress = 0;
-        compare(testSubject.completing, false)
-        compare(testSubject.completed, true)
-        compare(signalSpy.count, 1);
-
-        testSubject.animation = null
-        loader.sourceComponent = undefined;
-    }
-
-    function test_settingProgressWithoutCallingCompleteWithSignal() {
-        loader.sourceComponent = testSubjectComponent;
-        var testSubject = loader.item;
-
-        testSubject.animation = someNumberAnimation;
-        testSubject.progress = 0;
-
-        signalSpy.signalName = "animationCompletedAtEnd";
-        signalSpy.target = testSubject;
-        signalSpy.clear();
-
-        compare(testSubject.completing, false)
-        compare(testSubject.completed, true)
-
-        testSubject.progress = 0.5;
-        compare(testSubject.completing, false)
-        compare(testSubject.completed, false)
-        compare(signalSpy.count, 0);
-
-        testSubject.progress = 1;
-        compare(testSubject.completing, false)
-        compare(testSubject.completed, true)
-        compare(signalSpy.count, 0);
-
-        testSubject.animation = null
-        loader.sourceComponent = undefined;
-    }
 }
-

=== renamed file 'tests/unittests/tst_Carousel.qml' => 'tests/unittests/Components/tst_Carousel.qml'
--- tests/unittests/tst_Carousel.qml	2013-03-28 09:50:26 +0000
+++ tests/unittests/Components/tst_Carousel.qml	2013-04-09 10:00:31 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Components/carousel.js" as Carousel
+import "../../../Components/carousel.js" as Carousel
 
 TestCase {
     name: "CarouselTest"

=== renamed file 'tests/unittests/tst_CrossFadeImage.qml' => 'tests/unittests/Components/tst_CrossFadeImage.qml'
--- tests/unittests/tst_CrossFadeImage.qml	2013-03-13 22:58:26 +0000
+++ tests/unittests/Components/tst_CrossFadeImage.qml	2013-04-09 10:00:31 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Components"
+import "../../../Components"
 
 TestCase {
     name: "CrossFadeImageTest"
@@ -33,11 +33,11 @@
         fadeInFirst = argFadeInFirst
         compare(status, Image.Null, "Could not reset CrossFadeImage")
     }
-    
+
     function loadImage(url) {
         console.log("Loading image...")
         source = url
-        
+
         signalSpy.signalName = "statusChanged"
         signalSpy.wait()
 
@@ -45,7 +45,7 @@
             signalSpy.clear()
             signalSpy.wait()
         }
-        
+
         if (status == Image.Loading) {
             signalSpy.clear()
             signalSpy.wait()
@@ -54,7 +54,7 @@
         compare(status, Image.Ready, "Image not ready")
         console.log("Image loaded.")
     }
-    
+
     function waitForAnimation() {
         signalSpy.signalName = "runningChanged"
 
@@ -63,7 +63,7 @@
             signalSpy.wait()
             compare(running, true, "Animation did not start")
         }
-        
+
         signalSpy.clear()
         console.log("Waiting for animation to finish...")
         signalSpy.wait()
@@ -74,31 +74,31 @@
         compare(running, false, "Animation is running after testcase")
         compare(crossFadeImage.__nextImage.source, "", "nextimage source is not reset")
     }
-    
+
     function test_fadeFirst() {
         initTestFunction(true, true)
 
-        loadImage("../../graphics/phone_background.jpg")
+        loadImage("../../../graphics/phone_background.jpg")
 
         waitForAnimation()
-        
+
         cleanupTest()
     }
 
     function test_no_fadeFirst() {
         initTestFunction(true, false)
-        
-        loadImage("../../graphics/phone_background.jpg")
-        
+
+        loadImage("../../../graphics/phone_background.jpg")
+
         cleanupTest()
     }
-    
+
     function test_crossFade() {
         initTestFunction(true, false)
 
-        loadImage("../../graphics/phone_background.jpg")
-        
-        loadImage("../../graphics/tablet_background.jpg")
+        loadImage("../../../graphics/phone_background.jpg")
+
+        loadImage("../../../graphics/tablet_background.jpg")
 
         // Due to the internal implementation, __currentImage and __nextImage are swapped before the animation starts
         // Make sure z order reflects that too.
@@ -107,12 +107,11 @@
         compare(crossFadeImage.__nextImage.opacity > 0.5, true)
 
         waitForAnimation()
-        
+
         compare(crossFadeImage.__currentImage.opacity > 0.5, true)
         compare(crossFadeImage.__nextImage.opacity < 0.5, true)
-        
+
         cleanupTest()
-        
     }
 
     CrossFadeImage {

=== renamed file 'tests/unittests/tst_MathLocal.qml' => 'tests/unittests/Components/tst_MathLocal.qml'
--- tests/unittests/tst_MathLocal.qml	2013-02-27 20:06:20 +0000
+++ tests/unittests/Components/tst_MathLocal.qml	2013-04-09 10:00:31 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Components/Math.js" as MathLocal
+import "../../../Components/Math.js" as MathLocal
 
 TestCase {
     name: "MathLocalTest"

=== renamed file 'tests/unittests/tst_RatingStars.qml' => 'tests/unittests/Components/tst_RatingStars.qml'
--- tests/unittests/tst_RatingStars.qml	2013-02-27 20:06:20 +0000
+++ tests/unittests/Components/tst_RatingStars.qml	2013-04-09 10:00:31 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Components"
+import "../../../Components"
 
 TestCase {
     name: "RatingStarsTest"

=== renamed file 'tests/unittests/tst_TimeLocal.qml' => 'tests/unittests/Components/tst_TimeLocal.qml'
--- tests/unittests/tst_TimeLocal.qml	2013-03-11 13:07:33 +0000
+++ tests/unittests/Components/tst_TimeLocal.qml	2013-04-09 10:00:31 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import "../../Components/Time.js" as TimeLocal
+import "../../../Components/Time.js" as TimeLocal
 
 TestCase {
     name: "TimeLocalTest"