Merge lp:~unity-team/unity/phablet.tests_coding-style into lp:unity/phablet

[Andrea Cimitan]

Coding styles for tests

Coding styles for tests

[Daniel d'Andrada (dandrader)]

"""
We follow a couple of coding guidelines, to keep consistency:
1. [...]
2. [...]
"""

This text is already under the "General Guidelines" section. So you don't have to say that you're talking about guidelines in the text itself. I.e. You can remove that first introductory line.
Secondly, the existing paragraphs in this section are not numbered. So you either have them all numbered or you don't number any of them.

-----------------------------

" 2. Both TestCase/UnityTestCase and their functions are placed after properties and Components being tested."

For the sake of clarity I would rephrase that to just:

" 2. The [Unity]TestCase comes after the Components being tested."

------------------------------

tests/unittests/README duplicates a lot of content from tests/qmluitest/README. Just as with source code, we should apply the "don't repeate yourself"[1] practice to documentation as well.
So if both dirs have recommendations in common, move the README to the tests parent dir. Adapt the first paragraph by modifying its beginning from "Tests here" to "Tests under qmluidir".

[1] - http://en.wikipedia.org/wiki/Don%27t_repeat_yourself

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:558
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/372/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/101
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/373/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/372/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/248/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/252/console

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Copyright headers are merged now. Merge this with trunk and CI will pass again.

[Daniel d'Andrada (dandrader)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:559
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/374/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/375
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/375/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/250
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/250/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/785

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

review: Approve (continuous-integration)

=== renamed file 'tests/qmluitests/README' => 'tests/README'
--- tests/qmluitests/README	2013-04-03 14:28:06 +0000
+++ tests/README	2013-04-09 15:51:21 +0000
@@ -1,9 +1,12 @@
+For qmluitests and unittests tests.
+
+
 General guidelines
 ==================
 
-Tests here should be designed in a way that they can be run either automatically
-(with qmltestrunner) or manually (with qmlscene). So make sure you add UI controls
-for manual interaction and labels for monitoring output when needed.
+Tests under qmluitests dir should be designed in a way that they can be run either
+automatically (with qmltestrunner) or manually (with qmlscene). So make sure you
+add UI controls for manual interaction and labels for monitoring output when needed.
 
 The order in which tests are run should not matter. The test application
 should be in its initial state before each and every test function is called.
@@ -11,6 +14,25 @@
 one starts. A convenient way of doing so is using the init() function of the
 TestCase component. It gets called automatically before each test function.
 
+The name property of [Unity]TestCase does not include a 'Test' suffix.
+Both [Unity]TestCase and their functions are placed after properties
+and Components being tested.
+e.g.:
+    Item {
+        Component { }
+
+        Component { }
+
+        TestCase {
+            name: "Launcher"
+
+            property var exampleProperty
+
+            function test_something() {}
+        }
+    }
+
+
 Documenting
 ===========
 

=== modified file 'tests/qmluitests/Components/tst_DraggingArea.qml'
--- tests/qmluitests/Components/tst_DraggingArea.qml	2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Components/tst_DraggingArea.qml	2013-04-09 15:51:21 +0000
@@ -35,85 +35,6 @@
     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
@@ -181,4 +102,83 @@
             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);
+        }
+    }
 }

=== modified file 'tests/qmluitests/Components/tst_FilterGrid.qml'
--- tests/qmluitests/Components/tst_FilterGrid.qml	2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Components/tst_FilterGrid.qml	2013-04-09 15:51:21 +0000
@@ -25,92 +25,10 @@
   Once you press that button other 6 green squares (from "G" to "L") should show up.
 */
 Rectangle {
-    id: rootRect
     width: gridRect.width + controls.width
     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)
@@ -195,5 +113,86 @@
             }
         }
     }
+
+    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
+        }
+    }
 }
 

=== modified file 'tests/qmluitests/Components/tst_ResponsiveGridView.qml'
--- tests/qmluitests/Components/tst_ResponsiveGridView.qml	2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Components/tst_ResponsiveGridView.qml	2013-04-09 15:51:21 +0000
@@ -25,78 +25,6 @@
     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)
@@ -189,4 +117,76 @@
             }
         }
     }
+
+    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
+        }
+    }
 }

=== modified file 'tests/qmluitests/Components/tst_Revealer.qml'
--- tests/qmluitests/Components/tst_Revealer.qml	2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Components/tst_Revealer.qml	2013-04-09 15:51:21 +0000
@@ -28,12 +28,39 @@
   + black rects).
  */
 Item {
-    id: rootItem
     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: "RevealerTest"
+        name: "Revealer"
         when: windowShown
 
         /*
@@ -231,33 +258,5 @@
             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
-    }
 }
 

=== modified file 'tests/qmluitests/Components/tst_Showable.qml'
--- tests/qmluitests/Components/tst_Showable.qml	2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Components/tst_Showable.qml	2013-04-09 15:51:21 +0000
@@ -28,12 +28,80 @@
   This transparency change is the animation change set for the show/hide of the showable.
 */
 Item {
-    id: rootItem
     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: "ShowableTest"
+        name: "Showable"
         when: windowShown
 
         function init_test() {
@@ -87,73 +155,4 @@
             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() }
-        }
-    }
 }

=== modified file 'tests/qmluitests/Components/tst_Stage.qml'
--- tests/qmluitests/Components/tst_Stage.qml	2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Components/tst_Stage.qml	2013-04-09 15:51:21 +0000
@@ -23,151 +23,9 @@
 import "tst_Stage"
 
 Rectangle {
-    id: root
-
     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.
@@ -331,4 +189,144 @@
             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)
+        }
+    }
 }

=== modified file 'tests/qmluitests/Components/tst_Stage/FakeApplicationScreenshot.qml'
--- tests/qmluitests/Components/tst_Stage/FakeApplicationScreenshot.qml	2013-04-09 12:30:58 +0000
+++ tests/qmluitests/Components/tst_Stage/FakeApplicationScreenshot.qml	2013-04-09 15:51:21 +0000
@@ -17,8 +17,6 @@
 import QtQuick 2.0
 
 Item {
-    id: root
-
     property var application
     property bool withBackground: true
     property bool ready: application != undefined

=== modified file 'tests/qmluitests/Components/tst_Tile.qml'
--- tests/qmluitests/Components/tst_Tile.qml	2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Components/tst_Tile.qml	2013-04-09 15:51:21 +0000
@@ -27,8 +27,17 @@
 
     property bool helper: false
 
+    Tile {
+        id: tile
+        anchors.fill: parent
+        source: "../../../graphics/[e-mail]"
+        text: "Testing rocks, debugging sucks!"
+        imageWidth: width
+        imageHeight: width
+    }
+
     UnityTestCase {
-        name: "TileTest"
+        name: "Tile"
         when: windowShown
 
         function test_click_highlight() {
@@ -58,13 +67,4 @@
             mouseRelease(label, 1, 1)
         }
     }
-
-    Tile {
-        id: tile
-        anchors.fill: parent
-        source: "../../../graphics/[e-mail]"
-        text: "Testing rocks, debugging sucks!"
-        imageWidth: width
-        imageHeight: width
-    }
 }

=== modified file 'tests/qmluitests/Dash/tst_DashPreview.qml'
--- tests/qmluitests/Dash/tst_DashPreview.qml	2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Dash/tst_DashPreview.qml	2013-04-09 15:51:21 +0000
@@ -27,8 +27,72 @@
 
     property bool helper: false
 
+    DashPreview {
+        id: preview
+        anchors.fill: parent
+        title: "Testing rocks, debugging sucks!"
+        forceSquare: true
+
+        buttons: Row {
+            width: parent.width
+            height: units.gu(5)
+            Rectangle {
+                width: parent.width / 3
+                height: parent.height
+                color: "blue"
+                MouseArea {
+                    id: buttonMouseArea
+                    objectName: "buttonMouseArea"
+                    anchors.fill: parent
+                    onClicked: root.helper = true
+                }
+            }
+            Rectangle {
+                width: parent.width / 3
+                height: parent.height
+                color: "green"
+            }
+        }
+
+        caption: Label { text: "Caption label" }
+
+        description: Column {
+            id: testContent
+            objectName: "testContent"
+            width: parent.width
+            height: units.gu(50)
+            Rectangle {
+                width: parent.width
+                height: parent.height / 3
+                color: "green"
+            }
+            Rectangle {
+                width: parent.width
+                height: parent.height / 3
+                color: "red"
+            }
+            Rectangle {
+                width: parent.width
+                height: parent.height / 3
+                color: "blue"
+            }
+        }
+    }
+
+    SignalSpy {
+        id: closeSpy
+        target: preview
+        signalName: "close"
+    }
+
+    SignalSpy {
+        id: previewClickedSpy
+        target: preview
+        signalName: "previewImageClicked"
+    }
+
     UnityTestCase {
-        name: "PreviewTest"
+        name: "DashPreview"
         when: windowShown
 
         function test_close() {
@@ -108,70 +172,5 @@
             // reset to false in case any other test wants to use it
             root.helper = false
         }
-
-    }
-
-    DashPreview {
-        id: preview
-        anchors.fill: parent
-        title: "Testing rocks, debugging sucks!"
-        forceSquare: true
-
-        buttons: Row {
-            width: parent.width
-            height: units.gu(5)
-            Rectangle {
-                width: parent.width / 3
-                height: parent.height
-                color: "blue"
-                MouseArea {
-                    id: buttonMouseArea
-                    objectName: "buttonMouseArea"
-                    anchors.fill: parent
-                    onClicked: root.helper = true
-                }
-            }
-            Rectangle {
-                width: parent.width / 3
-                height: parent.height
-                color: "green"
-            }
-        }
-
-        caption: Label { text: "Caption label" }
-
-        description: Column {
-            id: testContent
-            objectName: "testContent"
-            width: parent.width
-            height: units.gu(50)
-            Rectangle {
-                width: parent.width
-                height: parent.height / 3
-                color: "green"
-            }
-            Rectangle {
-                width: parent.width
-                height: parent.height / 3
-                color: "red"
-            }
-            Rectangle {
-                width: parent.width
-                height: parent.height / 3
-                color: "blue"
-            }
-        }
-    }
-
-    SignalSpy {
-        id: closeSpy
-        target: preview
-        signalName: "close"
-    }
-
-    SignalSpy {
-        id: previewClickedSpy
-        target: preview
-        signalName: "previewImageClicked"
     }
 }

=== modified file 'tests/qmluitests/Greeter/tst_Greeter.qml'
--- tests/qmluitests/Greeter/tst_Greeter.qml	2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Greeter/tst_Greeter.qml	2013-04-09 15:51:21 +0000
@@ -24,8 +24,25 @@
     width: units.gu(120)
     height: units.gu(80)
 
+    Greeter {
+        id: greeter
+        anchors.fill: parent
+    }
+
+    SignalSpy {
+        id: unlockSpy
+        target: greeter
+        signalName: "unlocked"
+    }
+
+    SignalSpy {
+        id: selectionSpy
+        target: greeter
+        signalName: "selected"
+    }
+
     UnityTestCase {
-        name: "GreeterTest"
+        name: "Greeter"
         when: windowShown
 
         function test_cycle_data() {
@@ -95,21 +112,4 @@
             compare(unlockSpy.count, 1)
         }
     }
-
-    Greeter {
-        id: greeter
-        anchors.fill: parent
-    }
-
-    SignalSpy {
-        id: unlockSpy
-        target: greeter
-        signalName: "unlocked"
-    }
-
-    SignalSpy {
-        id: selectionSpy
-        target: greeter
-        signalName: "selected"
-    }
 }

=== modified file 'tests/qmluitests/Hud/tst_Hud.qml'
--- tests/qmluitests/Hud/tst_Hud.qml	2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Hud/tst_Hud.qml	2013-04-09 15:51:21 +0000
@@ -33,8 +33,12 @@
         }
     }
 
+    HudClientStub {
+        id: hudClientStub
+    }
+
     UnityTestCase {
-        name: "HudTest"
+        name: "Hud"
         when: windowShown
 
         function resetToInitialState() {
@@ -277,8 +281,4 @@
             compare(hudClientStub.lastParametrizedCommandCommited, true, "Confirming does commit")
         }
     }
-
-    HudClientStub {
-        id: hudClientStub
-    }
 }

=== modified file 'tests/qmluitests/Launcher/tst_Launcher.qml'
--- tests/qmluitests/Launcher/tst_Launcher.qml	2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Launcher/tst_Launcher.qml	2013-04-09 15:51:21 +0000
@@ -23,13 +23,40 @@
 /* Nothing is shown at first. If you drag from left edge you will bring up the
    launcher. */
 Item {
-    id: root
     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: "LauncherTest"
+        name: "Launcher"
         when: windowShown
 
         // Drag from the left edge of the screen rightwards and check that the launcher
@@ -215,32 +242,4 @@
             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++;
-        }
-    }
 }

=== modified file 'tests/qmluitests/Panel/tst_IndicatorRow.qml'
--- tests/qmluitests/Panel/tst_IndicatorRow.qml	2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Panel/tst_IndicatorRow.qml	2013-04-09 15:51:21 +0000
@@ -36,8 +36,26 @@
         indicatorRow.currentItem = null;
     }
 
+    PanelBackground {
+        anchors.fill: indicatorRow
+    }
+
+    IndicatorRow {
+        id: indicatorRow
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        indicatorsModel: indicatorModel
+    }
+
+    ChewieUI.PluginModel {
+        id: indicatorModel
+    }
+
     UnityTestCase {
-        name: "IndicatorRowTest"
+        name: "IndicatorRow"
         when: windowShown
 
         function test_set_current_item() {
@@ -54,7 +72,7 @@
     }
 
     UnityTestCase {
-        name: "IndicatorRow_IconPositionTest"
+        name: "IndicatorRow_IconPosition"
         when: windowShown
 
         function get_indicator_item_at(index) {
@@ -76,7 +94,7 @@
     }
 
     UnityTestCase {
-        name: "IndicatorRow_HighlightTest"
+        name: "IndicatorRow_Highlight"
         when: windowShown
 
         function get_indicator_item_at(index) {
@@ -150,7 +168,7 @@
     }
 
     UnityTestCase {
-        name: "IndicatorRow_DimmedTest"
+        name: "IndicatorRow_Dimmed"
         when: windowShown
 
         function get_indicator_item_at(index) {
@@ -235,22 +253,4 @@
             compare(get_indicator_item_at(4).dimmed, true, "Indicator should dim when in overview");
         }
     }
-
-    PanelBackground {
-        anchors.fill: indicatorRow
-    }
-
-    IndicatorRow {
-        id: indicatorRow
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-
-        indicatorsModel: indicatorModel
-    }
-
-    ChewieUI.PluginModel {
-        id: indicatorModel
-    }
 }

=== modified file 'tests/qmluitests/Panel/tst_SearchIndicator.qml'
--- tests/qmluitests/Panel/tst_SearchIndicator.qml	2013-04-09 09:58:41 +0000
+++ tests/qmluitests/Panel/tst_SearchIndicator.qml	2013-04-09 15:51:21 +0000
@@ -24,8 +24,19 @@
     width: units.gu(9)
     height: units.gu(3)
 
+    SignalSpy {
+        id: clickedSpy
+        target: searchIndicator
+        signalName: "clicked"
+    }
+
+    SearchIndicator {
+        id: searchIndicator
+        anchors.fill: parent
+    }
+
     UnityTestCase {
-        name: "SearchIndicatorTest"
+        name: "SearchIndicator"
         when: windowShown
 
         function test_clickedSignal() {
@@ -49,15 +60,4 @@
             tryCompare(container, "y", 0)
         }
     }
-
-    SignalSpy {
-        id: clickedSpy
-        target: searchIndicator
-        signalName: "clicked"
-    }
-
-    SearchIndicator {
-        id: searchIndicator
-        anchors.fill: parent
-    }
 }

=== modified file 'tests/unittests/Components/tst_AnimationControllerWithSignals.qml'
--- tests/unittests/Components/tst_AnimationControllerWithSignals.qml	2013-04-08 16:25:49 +0000
+++ tests/unittests/Components/tst_AnimationControllerWithSignals.qml	2013-04-09 15:51:21 +0000
@@ -20,104 +20,10 @@
 
 TestCase {
     id: testCase
-    name: "AnimationControllerWithSignalsTest"
+    name: "AnimationControllerWithSignals"
 
     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
@@ -139,4 +45,98 @@
     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;
+    }
 }

=== modified file 'tests/unittests/Components/tst_Carousel.qml'
--- tests/unittests/Components/tst_Carousel.qml	2013-04-08 16:25:49 +0000
+++ tests/unittests/Components/tst_Carousel.qml	2013-04-09 15:51:21 +0000
@@ -19,7 +19,7 @@
 import "../../../Components/carousel.js" as Carousel
 
 TestCase {
-    name: "CarouselTest"
+    name: "Carousel"
 
     property real carouselWidth
     property int itemCount
@@ -47,6 +47,7 @@
                   x: 600, carouselWidth:400, tileWidth:100, itemCount:10, result: 9},
                ]
     }
+
     function test_getContinuousIndex(data) {
         carouselWidth = data.carouselWidth
         tileWidth = data.tileWidth
@@ -80,6 +81,7 @@
 //                  index: 9, carouselWidth:400, tileWidth:100, itemCount:10, drawBuffer:100, result: 500},
                ]
     }
+
     function test_getXFromContinuousIndex(data) {
         carouselWidth = data.carouselWidth
         tileWidth = data.tileWidth
@@ -145,6 +147,7 @@
                  {distance: 1, continuousIndex: 50, numberOfItems: 53, scaleFactor: 2, result: 0.996666666}, // = 1 - (1 / 300) - distanceToBounds is used
                ]
     }
+
     function test_getItemScale(data) {
         var scale = Carousel.getItemScale(data.distance,
                                           data.continuousIndex,
@@ -176,6 +179,7 @@
                  {distance: 1, scale: 0, maxScale: 1, maxTranslation: 0, result: 0},
                ]
     }
+
     function test_getItemTranslation(data) {
         var scale = Carousel.getItemTranslation(data.distance,
                                                 data.scale,

=== modified file 'tests/unittests/Components/tst_CrossFadeImage.qml'
--- tests/unittests/Components/tst_CrossFadeImage.qml	2013-04-08 16:25:49 +0000
+++ tests/unittests/Components/tst_CrossFadeImage.qml	2013-04-09 15:51:21 +0000
@@ -19,7 +19,7 @@
 import "../../../Components"
 
 TestCase {
-    name: "CrossFadeImageTest"
+    name: "CrossFadeImage"
 
     property alias status: crossFadeImage.status
     property alias source: crossFadeImage.source
@@ -27,6 +27,15 @@
     property alias fadeInFirst: crossFadeImage.fadeInFirst
     property alias running: crossFadeImage.running
 
+    CrossFadeImage {
+        id: crossFadeImage
+    }
+
+    SignalSpy {
+        id: signalSpy
+        target: crossFadeImage
+    }
+
     function initTestFunction(argCrossFade, argFadeInFirst) {
         source = ""
         crossFade = argCrossFade
@@ -113,13 +122,4 @@
 
         cleanupTest()
     }
-
-    CrossFadeImage {
-        id: crossFadeImage
-    }
-
-    SignalSpy {
-        id: signalSpy
-        target: crossFadeImage
-    }
 }

=== modified file 'tests/unittests/Components/tst_MathLocal.qml'
--- tests/unittests/Components/tst_MathLocal.qml	2013-04-08 16:25:49 +0000
+++ tests/unittests/Components/tst_MathLocal.qml	2013-04-09 15:51:21 +0000
@@ -19,7 +19,7 @@
 import "../../../Components/Math.js" as MathLocal
 
 TestCase {
-    name: "MathLocalTest"
+    name: "MathLocal"
 
     property int minValue
     property int maxValue

=== modified file 'tests/unittests/Components/tst_RatingStars.qml'
--- tests/unittests/Components/tst_RatingStars.qml	2013-04-08 16:25:49 +0000
+++ tests/unittests/Components/tst_RatingStars.qml	2013-04-09 15:51:21 +0000
@@ -19,12 +19,18 @@
 import "../../../Components"
 
 TestCase {
-    name: "RatingStarsTest"
+    name: "RatingStars"
 
     property int maximumRating: 5
     property int rating: 3
     property alias effectiveRating: ratingStars.effectiveRating
 
+    RatingStars {
+        id: ratingStars
+        maximumRating: parent.maximumRating
+        rating: parent.rating
+    }
+
     function test_rating_init() {
         compare(effectiveRating, rating, "EffectiveRating not initialized properly")
     }
@@ -53,10 +59,4 @@
         rating = maximumRating
         compare(effectiveRating, maximumRating, "EffectiveRating not calculated correctly")
     }
-
-    RatingStars {
-        id: ratingStars
-        maximumRating: parent.maximumRating
-        rating: parent.rating
-    }
 }

=== modified file 'tests/unittests/Components/tst_TimeLocal.qml'
--- tests/unittests/Components/tst_TimeLocal.qml	2013-04-08 16:25:49 +0000
+++ tests/unittests/Components/tst_TimeLocal.qml	2013-04-09 15:51:21 +0000
@@ -19,7 +19,7 @@
 import "../../../Components/Time.js" as TimeLocal
 
 TestCase {
-    name: "TimeLocalTest"
+    name: "TimeLocal"
 
     property var readableDate