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

[Michael Zanetti]

Added a test for SideStage.

SideStage only adds the handle to the regular stage. The dragging in/out is handled by a revealer. All the rest of the functionality is covered by tst_Revealer and tst_Stage

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:557
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/378/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/379
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/379/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/254
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/254/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/796

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

the units.gu(2); units.gu(5) seem slightly magical, maybe it's worth it to make them properties?

review: Needs Information

[Michael Zanetti (mzanetti)]

> the units.gu(2); units.gu(5) seem slightly magical, maybe it's worth it to
> make them properties?

reworked that a bit. should be more readable now

[Andrea Cimitan (cimi)]

> > the units.gu(2); units.gu(5) seem slightly magical, maybe it's worth it to
> > make them properties?
>
> reworked that a bit. should be more readable now

looks readable to me now, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:558
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/398/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/140
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/399/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/398/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/274
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/274/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/278/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/824

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/160/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/146
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/160/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/94
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/94/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/833

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'SideStage/SideStage.qml'
--- SideStage/SideStage.qml	2013-02-15 18:04:59 +0000
+++ SideStage/SideStage.qml	2013-04-10 07:46:19 +0000
@@ -53,6 +53,7 @@
 
     SidestageHandle {
         id: handle
+        objectName: "sideStageHandle"
 
         anchors {
             top: parent.top

=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2013-04-08 17:15:32 +0000
+++ tests/unittests/CMakeLists.txt	2013-04-10 07:46:19 +0000
@@ -4,3 +4,4 @@
 set(qmltest_DEFAULT_PROPERTIES PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
 
 add_subdirectory(Components)
+add_subdirectory(SideStage)

=== added directory 'tests/unittests/SideStage'
=== added file 'tests/unittests/SideStage/CMakeLists.txt'
--- tests/unittests/SideStage/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/SideStage/CMakeLists.txt	2013-04-10 07:46:19 +0000
@@ -0,0 +1,1 @@
+add_qml_test(SideStage)

=== added file 'tests/unittests/SideStage/tst_SideStage.qml'
--- tests/unittests/SideStage/tst_SideStage.qml	1970-01-01 00:00:00 +0000
+++ tests/unittests/SideStage/tst_SideStage.qml	2013-04-10 07:46:19 +0000
@@ -0,0 +1,51 @@
+/*
+ * 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 "../../qmluitests/"
+import "../../../SideStage"
+import Ubuntu.Components 0.1
+
+UnityTestCase {
+    name: "SideStage"
+
+    SideStage {
+        id: sideStage
+        width: units.gu(30)
+        height: units.gu(30)
+        handleExpanded: sideStageRevealer.pressed
+        handleSizeCollapsed: units.gu(2)
+        handleSizeExpanded: units.gu(5)
+    }
+    
+    function test_handle_data() {
+        return [
+            {tag: "expanded", expanded: true},
+            {tag: "collapsed", expanded: false}
+        ]
+    }
+    
+    function test_handle(data) {
+        sideStage.handleExpanded = data.expanded
+        
+        if (data.expanded) {
+            tryCompare(findChild(sideStage, "sideStageHandle"), "width", sideStage.handleSizeExpanded);
+        } else {
+            tryCompare(findChild(sideStage, "sideStageHandle"), "width", sideStage.handleSizeCollapsed);
+        }
+    }
+}