Merge lp:~aacid/unity/filtergrid_test_findChild into lp:unity/phablet

[Albert Astals Cid]

Use findChild instead of property

[Michael Zanetti (mzanetti)]

cheers

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~aacid/unity/filtergrid_test_findChild/+merge/160034/+edit-commit-message

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:614
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~aacid/unity/filtergrid_test_findChild/+merge/160034/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/690/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/502
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/692
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/692/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/690
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/566
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/566/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1219

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Forgot to set the commit message, reapproving

[Michael Zanetti (mzanetti)]

I don't really like the usage of "as UT" when importing stuff that doesn't cause comflicts... but ok - matter of taste.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/230/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/507
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/230
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/230/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/164
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/164/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1224

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Michael reapproved again, top approving

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Components/FilterGrid.qml'
--- Components/FilterGrid.qml	2013-04-16 14:56:56 +0000
+++ Components/FilterGrid.qml	2013-04-22 10:29:31 +0000
@@ -53,7 +53,6 @@
     property alias cellHeight: iconTileGrid.cellHeight
 
     // for testing purposes
-    property alias __filterToggleButton: button
     property alias __expansionAnimation: heightAnimation
 
     height: childrenRect.height
@@ -101,6 +100,7 @@
 
         AbstractButton {
             id: button
+            objectName: "filterToggleButton"
 
             anchors {
                 top: parent.top

=== modified file 'tests/qmltests/Components/tst_FilterGrid.qml'
--- tests/qmltests/Components/tst_FilterGrid.qml	2013-04-09 14:49:00 +0000
+++ tests/qmltests/Components/tst_FilterGrid.qml	2013-04-22 10:29:31 +0000
@@ -19,6 +19,7 @@
 import "../../../Components"
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components 0.1
+import Unity.Test 0.1 as UT
 
 /*
   You should see 6 green squares (from "A" to "F") and a button "View all (12)".
@@ -114,7 +115,7 @@
         }
     }
 
-    TestCase {
+    UT.UnityTestCase {
         name: "FilterGrid"
         when: windowShown
 
@@ -152,7 +153,7 @@
         // 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
+            var filterToggleButton = findChild(filterGrid, "filterToggleButton");
 
             for (var i = 0; i < 4; ++i) {
                 collapsedRowCountSelector.selectedIndex = i