Merge lp:~unity-team/unity8/broken-indicator-tests into lp:unity8

[Michael Zanetti]

Fixed DefaultIndicatorPage test. Fixed warnings from test.

Fixed DefaultIndicatorPage test. Fixed warnings from test.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Albert Astals Cid (aacid)]

review: Approve

[Michael Zanetti (mzanetti)]

ok. tagspurious tag gone.

review: Abstain

[Albert Astals Cid (aacid)]

CI has already gone through qmluitests and they pass, still not finished the whole CI run but no need to wait for the rest for this

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1301
http://jenkins.qa.ubuntu.com/job/unity8-ci/4425/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5272/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1421
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1519
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4994/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6524
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6524/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13867

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4425/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Panel/IndicatorItem.qml'
--- qml/Panel/IndicatorItem.qml	2014-03-03 11:54:55 +0000
+++ qml/Panel/IndicatorItem.qml	2014-09-29 11:56:02 +0000
@@ -41,6 +41,12 @@
 
     Binding {
         target: item
+        property: "identifier"
+        value: identifier
+    }
+
+    Binding {
+        target: item
         property: "objectName"
         value: identifier + "-widget"
     }

=== modified file 'qml/Panel/Indicators/DefaultIndicatorPage.qml'
--- qml/Panel/Indicators/DefaultIndicatorPage.qml	2014-09-11 08:04:19 +0000
+++ qml/Panel/Indicators/DefaultIndicatorPage.qml	2014-09-29 11:56:02 +0000
@@ -130,7 +130,7 @@
             visible: status == Loader.Ready
 
             property int modelIndex: index
-            sourceComponent: factory.load(model, identifier)
+            sourceComponent: factory.load(model, main.identifier)
 
             onLoaded: {
                 if (item.hasOwnProperty("selected")) {

=== modified file 'qml/Panel/Indicators/IndicatorBase.qml'
--- qml/Panel/Indicators/IndicatorBase.qml	2014-08-20 08:39:09 +0000
+++ qml/Panel/Indicators/IndicatorBase.qml	2014-09-29 11:56:02 +0000
@@ -26,6 +26,7 @@
     enabled: menuObjectPath != ""
 
     //const
+    property string identifier
     property string busName
     property string actionsObjectPath
     property string menuObjectPath

=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
--- qml/Panel/Indicators/MenuItemFactory.qml	2014-09-24 10:00:26 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2014-09-29 11:56:02 +0000
@@ -823,7 +823,7 @@
     }
 
     function load(modelData, context) {
-        if (modelData.type !== undefined) {
+        if (modelData.type !== undefined && modelData.type !== "") {
             var component = undefined;
 
             var contextComponents = _map[context];

=== modified file 'qml/Panel/Indicators/VisibleIndicators.qml'
--- qml/Panel/Indicators/VisibleIndicators.qml	2014-01-30 14:54:01 +0000
+++ qml/Panel/Indicators/VisibleIndicators.qml	2014-09-29 11:56:02 +0000
@@ -55,6 +55,7 @@
         delegate: IndicatorDelegate {
             id: item
             objectName: model.identifier + "-delegate"
+            identifier: model.identifier
             Component.onCompleted: {
                 for(var pName in indicatorProperties) {
                     if (item.hasOwnProperty(pName)) {

=== modified file 'qml/Panel/MenuContent.qml'
--- qml/Panel/MenuContent.qml	2014-09-19 14:46:53 +0000
+++ qml/Panel/MenuContent.qml	2014-09-29 11:56:02 +0000
@@ -125,6 +125,12 @@
 
             Binding {
                 target: loader.item
+                property: "identifier"
+                value: identifier
+            }
+
+            Binding {
+                target: loader.item
                 property: "objectName"
                 value: identifier + "-page"
             }

=== modified file 'tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml'
--- tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml	2014-06-27 09:16:16 +0000
+++ tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml	2014-09-29 11:56:02 +0000
@@ -29,14 +29,14 @@
         id: page
 
         anchors.fill: parent
-        contentActive: true
 
         menuModel: UnityMenuModel {}
         busName: "test"
         actionsObjectPath: "test"
         menuObjectPath: "test"
 
-        rootMenuType: ""
+        identifier: "test-indicator"
+        rootMenuType: "com.canonical.indicator.root"
     }
 
     property var fullMenuData: [{
@@ -117,13 +117,8 @@
         name: "DefaultIndicatorPage"
 
         function init() {
-            page.stop();
             var mainMenu = findChild(page, "mainMenu");
-            verify(mainMenu.model === undefined);
-
-            page.rootMenuType = "com.canonical.indicator.root";
-            page.start();
-
+            page.menuModel.modelData = [];
             verify(mainMenu.model !== null);
         }
 
@@ -157,20 +152,5 @@
             var mainMenu = findChild(page, "mainMenu");
             tryCompare(mainMenu, "count", data.expectedCount);
         }
-
-        function test_empty_data() {
-            return [
-                { tag: "EmptyNoData", modelData: [], visible: true},
-                { tag: "EmptySubmenu", modelData: emptySubMenuData, visible: true},
-                { tag: "NotEmpty", modelData: fullMenuData, visible: false},
-            ]
-        }
-
-        function test_empty(data) {
-            page.menuModel.modelData = data.modelData;
-
-            var emptyLabel = findChild(page, "emptyLabel");
-            tryCompare(emptyLabel, "visible", data.visible);
-        }
     }
 }