Merge lp:~unity-team/unity/phablet.test_IndicatorItem into lp:unity/phablet

[Andrea Cimitan]

Adds tests for IndicatorItem

Adds tests for IndicatorItem

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:559
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/377/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/378
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/253
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/253/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/793

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:561
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/380/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/112/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/381
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/381/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/256
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/256/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/802

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:561
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/381/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/382
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/382/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/381
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/257
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/257/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/803

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Now that IndicatorItem is changed to have public properties, you should set them in IndicatorRow.qml. Right now Indicators are broken.

Just add this to the IndicatorItem in IndicatorRow.qml

label: model.label
iconSource: model.iconSource

(I'm wondering if we also should fix tst_IndicatorRow to actually find such issues. Tests are still passing even though it is broken)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:562
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/404/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/405
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/405/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/404
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/280
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/280/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/835

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/165/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/165/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/165/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/99/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/99/console

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/169/
Executed test runs:
    None: http://s-jenkins:8080/job/unity-phablet-qmluitests/169/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/169/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/103/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Last autolanding attempt was aborted so that the job configuration could be updated. A rebuild has already been started.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/170/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/171/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/170/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/170/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/104/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/104/console

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

There's a conflict now.

[Michał Sawicz (saviq)]

Still conflicting!

review: Needs Fixing

[Michael Zanetti (mzanetti)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:563
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/507/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/285/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/508
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/508/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/507
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/383
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/383/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/957

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Panel/IndicatorItem.qml'
--- Panel/IndicatorItem.qml	2013-04-05 12:44:49 +0000
+++ Panel/IndicatorItem.qml	2013-04-12 13:17:26 +0000
@@ -20,6 +20,8 @@
 Item {
     id: indicatorItem
 
+    property alias iconSource: itemImage.source
+    property alias label: itemLabel.text
     property bool highlighted: false
     property bool dimmed: false
 
@@ -37,6 +39,7 @@
 
     Row {
         id: itemRow
+        objectName: "itemRow"
         anchors {
             top: parent.top
             bottom: parent.bottom
@@ -46,7 +49,8 @@
         opacity: dimmed ? 0.4 : 1
 
         Image {
-            source: iconSource
+            id: itemImage
+            objectName: "itemImage"
             visible: source != ""
             height: units.gu(2.5)
             width: units.gu(2.5)
@@ -55,7 +59,7 @@
 
         Label {
             id: itemLabel
-            text: label
+            objectName: "itemLabel"
             color: "#f3f3e7"
             opacity: 0.8
             font.family: "Ubuntu"

=== modified file 'Panel/IndicatorRow.qml'
--- Panel/IndicatorRow.qml	2013-04-05 12:44:49 +0000
+++ Panel/IndicatorRow.qml	2013-04-12 13:17:26 +0000
@@ -59,6 +59,8 @@
 
                property int ownIndex: index
 
+               label: model.label
+               iconSource: model.iconSource
                highlighted: indicatorRow.state == "reveal" || indicatorRow.state == "locked" || indicatorRow.state == "commit" ? ownIndex == indicatorRow.currentItemIndex : false
                dimmed: { //See FIXME in Indicators regarding the "states" change
                    if (indicatorRow.state == "initial" || indicatorRow.state == "") {

=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2013-04-12 07:49:37 +0000
+++ tests/unittests/CMakeLists.txt	2013-04-12 13:17:26 +0000
@@ -4,5 +4,6 @@
 set(qmltest_DEFAULT_PROPERTIES PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
 
 add_subdirectory(Components)
+add_subdirectory(Panel)
 add_subdirectory(SideStage)
-add_subdirectory(plugins)
\ No newline at end of file
+add_subdirectory(plugins)

=== added directory 'tests/unittests/Panel'
=== added file 'tests/unittests/Panel/CMakeLists.txt'
--- tests/unittests/Panel/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/Panel/CMakeLists.txt	2013-04-12 13:17:26 +0000
@@ -0,0 +1,1 @@
+add_qml_test(IndicatorItem)

=== added file 'tests/unittests/Panel/tst_IndicatorItem.qml'
--- tests/unittests/Panel/tst_IndicatorItem.qml	1970-01-01 00:00:00 +0000
+++ tests/unittests/Panel/tst_IndicatorItem.qml	2013-04-12 13:17:26 +0000
@@ -0,0 +1,81 @@
+/*
+ * 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 "../../../Panel"
+import Ubuntu.Components 0.1
+
+Rectangle {
+    width: units.gu(10)
+    height: units.gu(5)
+    color: "black"
+
+    IndicatorItem {
+        id: indicatorItem
+        anchors.fill: parent
+        iconSource: "../../../Panel/graphics/Clock.png"
+        label: "Clock"
+    }
+
+    UnityTestCase {
+        name: "IndicatorItem"
+
+        function init_test() {
+            indicatorItem.iconSource = "../../../Panel/graphics/Clock.png"
+            indicatorItem.label = "Clock"
+        }
+
+        function test_dimmed() {
+            init_test()
+
+            var itemRow = findChild(indicatorItem, "itemRow")
+            indicatorItem.dimmed = true
+            compare(itemRow.opacity > 0, true, "IndicatorItem opacity should not be 0")
+            compare(itemRow.opacity < 1, true, "IndicatorItem opacity should not be 1")
+        }
+
+        function test_empty() {
+            init_test()
+
+            indicatorItem.iconSource = ""
+            indicatorItem.label = ""
+            compare(indicatorItem.visible, false, "IndicatorItem should not be visible")
+        }
+
+        function test_noLabel() {
+            init_test()
+
+            var itemImage = findChild(indicatorItem, "itemImage")
+            var itemLabel = findChild(indicatorItem, "itemLabel")
+            indicatorItem.label = ""
+            compare(itemImage.visible, true, "The image should be visible")
+            compare(itemImage.width > 0, true, "The image should have a positive width")
+            compare(itemLabel.width > 0, false, "The label should not have a positive width")
+        }
+
+        function test_noImage() {
+            init_test()
+
+            var itemImage = findChild(indicatorItem, "itemImage")
+            var itemLabel = findChild(indicatorItem, "itemLabel")
+            indicatorItem.iconSource = ""
+            compare(itemImage.visible, false, "The image should not be visible")
+            compare(itemLabel.width > 0, true, "The label should have a positive width")
+        }
+    }
+}