Merge lp:~saviq/unity8/fix-test-notifications into lp:unity8

[Michał Sawicz]

Add missing nameOwner property to mock UnityMenuModel.

Got introduced to the real plugin in https://code.launchpad.net/~larsu/qmenumodel/add-nameowner-property/+merge/226428

* 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

[Michael Terry (mterry)]

Sure

 * Did you perform an exploratory manual test run of the code change and any related functionality?
 - Sure, it built fine.

 * Did CI run pass? If not, please explain why.
 - TBD

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1055
http://jenkins.qa.ubuntu.com/job/unity8-ci/3474/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2153
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/475/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/568
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/568/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3313
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10027

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/mocks/QMenuModel/unitymenumodel.cpp'
--- tests/mocks/QMenuModel/unitymenumodel.cpp	2013-12-12 16:32:20 +0000
+++ tests/mocks/QMenuModel/unitymenumodel.cpp	2014-07-17 18:14:26 +0000
@@ -126,6 +126,11 @@
 {
 }
 
+QString UnityMenuModel::nameOwner() const
+{
+    return QString("");
+}
+
 int UnityMenuModel::rowCount(const QModelIndex&) const
 {
     return m_modelData.count();

=== modified file 'tests/mocks/QMenuModel/unitymenumodel.h'
--- tests/mocks/QMenuModel/unitymenumodel.h	2013-10-11 17:16:52 +0000
+++ tests/mocks/QMenuModel/unitymenumodel.h	2014-07-17 18:14:26 +0000
@@ -32,6 +32,7 @@
     Q_PROPERTY(QVariantMap actions READ actions WRITE setActions NOTIFY actionsChanged)
     Q_PROPERTY(QByteArray menuObjectPath READ menuObjectPath WRITE setMenuObjectPath NOTIFY menuObjectPathChanged)
     Q_PROPERTY(ActionStateParser* actionStateParser READ actionStateParser WRITE setActionStateParser NOTIFY actionStateParserChanged)
+    Q_PROPERTY(QString nameOwner READ nameOwner NOTIFY nameOwnerChanged)
 
 public:
     UnityMenuModel(QObject *parent = NULL);
@@ -56,6 +57,8 @@
     ActionStateParser* actionStateParser() const;
     void setActionStateParser(ActionStateParser* actionStateParser);
 
+    QString nameOwner() const;
+
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
@@ -79,6 +82,7 @@
     void menuObjectPathChanged();
     void actionStateParserChanged();
     void modelDataChanged();
+    void nameOwnerChanged();
 
 private:
     QVariantMap rowData(int row) const;