Merge lp:~nick-dedekind/unity8/indicator-tests-qt5.2.1 into lp:unity8

[Nick Dedekind]

Remocked IndicatorModel to fix qt5.2.1 changes.

Remocked IndicatorModel to fix qt5.2.1 changes.

 * 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

 * 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

[lp:~nick-dedekind/unity8/indicator-tests-qt5.2.1]

749. By Nick Dedekind on 2014-03-03

removed unnecessary includes

750. By Nick Dedekind on 2014-03-03

comments to plugin cpp

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:750
http://jenkins.qa.ubuntu.com/job/unity8-ci/2420/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3622
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3233/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/945
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/945/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/941
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3626
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3626/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3235
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3235/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5612/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4421

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, this helps!

 * Did CI run pass? If not, please explain why.
Unrelated known failures due to uitk py3 transition not there yet and a Qt crash.

review: Approve

=== modified file 'qml/Panel/IndicatorItem.qml'
--- qml/Panel/IndicatorItem.qml	2014-01-13 17:40:09 +0000
+++ qml/Panel/IndicatorItem.qml	2014-03-03 12:00:54 +0000
@@ -19,37 +19,29 @@
 import Unity.Indicators 0.1 as Indicators
 import "../Components"
 
-Item {
-    id: indicatorItem
+Loader {
+    id: root
 
-    property alias widgetSource: loader.source
+    property alias widgetSource: root.source
     property bool dimmed: false
     property var indicatorProperties: undefined
-    property bool indicatorVisible: loader.item ? loader.item.enabled : false
+    property bool indicatorVisible: item ? item.enabled : false
     property string identifier
 
     opacity: dimmed ? 0.4 : 1
     Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.BriskDuration } }
 
-    width: loader.item ? loader.item.width : 0
-
-    Loader {
-        id: loader
-
-        onLoaded: {
-            item.height = Qt.binding(function() { return indicatorItem.height; });
-
-            for(var pName in indicatorProperties) {
-                if (item.hasOwnProperty(pName)) {
-                    item[pName] = indicatorProperties[pName];
-                }
+    onLoaded: {
+        for(var pName in indicatorProperties) {
+            if (item.hasOwnProperty(pName)) {
+                item[pName] = indicatorProperties[pName];
             }
         }
+    }
 
-        Binding {
-            target: loader.item
-            property: "objectName"
-            value: identifier + "-widget"
-        }
+    Binding {
+        target: item
+        property: "objectName"
+        value: identifier + "-widget"
     }
 }

=== modified file 'tests/mocks/Unity/Indicators/CMakeLists.txt'
--- tests/mocks/Unity/Indicators/CMakeLists.txt	2013-12-12 16:32:20 +0000
+++ tests/mocks/Unity/Indicators/CMakeLists.txt	2014-03-03 12:00:54 +0000
@@ -16,6 +16,7 @@
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp
+    fakeindicatorsmodel.cpp
 )
 
 set(IndicatorsFakeQml_RESOURCES

=== modified file 'tests/mocks/Unity/Indicators/IndicatorsModel.qml'
--- tests/mocks/Unity/Indicators/IndicatorsModel.qml	2014-01-14 16:44:35 +0000
+++ tests/mocks/Unity/Indicators/IndicatorsModel.qml	2014-03-03 12:00:54 +0000
@@ -17,12 +17,10 @@
 import QtQuick 2.0
 import Unity.Indicators 0.1 as Indicators
 
-ListModel {
-
-    property var indicatorData : undefined
-
-    function load() {
-        clear();
+Indicators.FakeIndicatorsModel {
+
+    function load(profile) {
+        unload();
 
         append({    "identifier": "indicator-fake1",
                     "position": 0,

=== added file 'tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp'
--- tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp	2014-03-03 12:00:54 +0000
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+#include "fakeindicatorsmodel.h"
+#include "indicators.h"
+
+FakeIndicatorsModel::FakeIndicatorsModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+    QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
+    QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
+    QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged()));
+}
+
+/*! \internal */
+FakeIndicatorsModel::~FakeIndicatorsModel()
+{
+    unload();
+}
+
+int FakeIndicatorsModel::count() const
+{
+    return rowCount();
+}
+
+void FakeIndicatorsModel::load(const QString&)
+{
+}
+
+void FakeIndicatorsModel::unload()
+{
+    beginResetModel();
+
+    qDeleteAll(m_indicators);
+    m_indicators.clear();
+
+    endResetModel();
+}
+
+
+void FakeIndicatorsModel::append(const QVariantMap& row)
+{
+    Indicator* new_row = new QHash<int, QVariant>();
+    for (auto iter = row.begin(); iter != row.end(); ++iter )
+    {
+        int key = roleNames().key(iter.key().toUtf8(), -1);
+        if (key != -1) {
+            new_row->insert(key, iter.value());
+        }
+    }
+
+    beginInsertRows(QModelIndex(), m_indicators.count(), m_indicators.count());
+
+    m_indicators.append(new_row);
+
+    endInsertRows();
+}
+
+QHash<int, QByteArray> FakeIndicatorsModel::roleNames() const
+{
+    static QHash<int, QByteArray> roles;
+    if (roles.isEmpty())
+    {
+        roles[IndicatorsModelRole::Identifier] = "identifier";
+        roles[IndicatorsModelRole::Position] = "position";
+        roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
+        roles[IndicatorsModelRole::PageSource] = "pageSource";
+        roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
+    }
+    return roles;
+}
+
+int FakeIndicatorsModel::columnCount(const QModelIndex &) const
+{
+    return 1;
+}
+
+Q_INVOKABLE QVariant FakeIndicatorsModel::data(int row, int role) const
+{
+    return data(index(row, 0), role);
+}
+
+QVariant FakeIndicatorsModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() >= m_indicators.size())
+        return QVariant();
+
+    Indicator* indicator = m_indicators[index.row()];
+    return indicator->value(role, QVariant());
+}
+
+QModelIndex FakeIndicatorsModel::parent(const QModelIndex&) const
+{
+    return QModelIndex();
+}
+
+int FakeIndicatorsModel::rowCount(const QModelIndex&) const
+{
+    return m_indicators.count();
+}

=== added file 'tests/mocks/Unity/Indicators/fakeindicatorsmodel.h'
--- tests/mocks/Unity/Indicators/fakeindicatorsmodel.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Indicators/fakeindicatorsmodel.h	2014-03-03 12:00:54 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+#ifndef FAKE_INDICATORSMODEL_H
+#define FAKE_INDICATORSMODEL_H
+
+#include <QAbstractListModel>
+
+class FakeIndicatorsModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_ENUMS(Roles)
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+public:
+
+    FakeIndicatorsModel(QObject *parent=0);
+    ~FakeIndicatorsModel();
+
+    Q_INVOKABLE void load(const QString& profile);
+    Q_INVOKABLE void unload();
+
+    Q_INVOKABLE void append(const QVariantMap& row);
+
+    Q_INVOKABLE QVariant data(int row, int role) const;
+
+    /* QAbstractItemModel */
+    QHash<int, QByteArray> roleNames() const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    QModelIndex parent (const QModelIndex &index) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+
+Q_SIGNALS:
+    void countChanged();
+
+private:
+    int count() const;
+
+    typedef QHash<int, QVariant> Indicator;
+    QList<Indicator*> m_indicators;
+};
+
+#endif // FAKE_INDICATORSMODEL_H

=== modified file 'tests/mocks/Unity/Indicators/fakeplugin.cpp'
--- tests/mocks/Unity/Indicators/fakeplugin.cpp	2013-12-12 16:32:20 +0000
+++ tests/mocks/Unity/Indicators/fakeplugin.cpp	2014-03-03 12:00:54 +0000
@@ -23,6 +23,7 @@
 #include "fakeplugin.h"
 
 // local
+#include "fakeindicatorsmodel.h"
 #include "indicators.h"
 #include "menucontentactivator.h"
 #include "unitymenumodelstack.h"
@@ -32,10 +33,15 @@
 {
     Q_INIT_RESOURCE(indicators_fake);
 
+    // internal
+    qmlRegisterType<FakeIndicatorsModel>(uri, 0, 1, "FakeIndicatorsModel");
+
+    // external
     qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
     qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");
     qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
 
+    // external uncreatables
     qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");
     qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");
     qmlRegisterUncreatableType<NetworkActionState>(uri, 0, 1, "NetworkActionState", "Can't create NetworkActionState class");

=== modified file 'tests/qmltests/Panel/tst_IndicatorRow.qml'
--- tests/qmltests/Panel/tst_IndicatorRow.qml	2014-01-30 14:58:20 +0000
+++ tests/qmltests/Panel/tst_IndicatorRow.qml	2014-03-03 12:00:54 +0000
@@ -70,13 +70,13 @@
         function test_set_current_item() {
             init_test();
             indicatorRow.setCurrentItemIndex(0);
-            compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake1", "Incorrect item at position 0");
+            compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake1", "Incorrect item at position 0");
 
             indicatorRow.setCurrentItemIndex(1);
-            compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake2", "Incorrect item at position 1");
+            compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake2", "Incorrect item at position 1");
 
             indicatorRow.setCurrentItemIndex(2);
-            compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake3", "Incorrect item at position 2");
+            compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake3", "Incorrect item at position 2");
         }
 
         function test_highlight_data() {

=== modified file 'tests/qmltests/Panel/tst_MenuContent.qml'
--- tests/qmltests/Panel/tst_MenuContent.qml	2014-01-30 14:58:20 +0000
+++ tests/qmltests/Panel/tst_MenuContent.qml	2014-03-03 12:00:54 +0000
@@ -133,7 +133,7 @@
                 var menuIndex = i%menuCount;
 
                 activate_content(menuIndex);
-                testTabObjectName = indicatorsModel.get(menuIndex).identifier;
+                testTabObjectName = indicatorsModel.data(menuIndex, Indicators.IndicatorsModelRole.Identifier);
                 compare(tabs.selectedTabIndex, menuIndex, "Current tab index does not match selected tab index");
                 tryCompareFunction(selected_tab_equals_test_tab, true);
             }