ubuntu-system-settings

Merge lp:~laney/ubuntu-system-settings/reset-api into lp:ubuntu-system-settings

reset-api
Merge into trunk

Proposed by Iain Lane on 2014-02-27

Status:	Merged
Approved by:	Sebastien Bacher on 2014-08-04
Approved revision:	504
Merged at revision:	863
Proposed branch:	lp:~laney/ubuntu-system-settings/reset-api
Merge into:	lp:ubuntu-system-settings
Diff against target:	541 lines (+268/-30) 17 files modified debian/control (+2/-0) lib/SystemSettings/plugin-interface.h (+9/-0) plugins/battery/plugin/battery-plugin.h (+3/-3) plugins/brightness/plugin/brightness-plugin.h (+3/-3) plugins/reset/ResetAllSettings.qml (+4/-2) plugins/system-update/plugin/update-plugin.h (+4/-3) src/plugin-manager.cpp (+12/-0) src/plugin-manager.h (+1/-0) src/plugin.cpp (+63/-5) src/plugin.h (+2/-0) tests/CMakeLists.txt (+4/-0) tests/data/phone.settings (+9/-0) tests/test-plugin.cpp (+18/-10) tests/test-plugin.h (+3/-3) tests/test-plugin2.cpp (+44/-0) tests/test-plugin2.h (+41/-0) tests/tst_plugins.cpp (+46/-1)
To merge this branch:	bzr merge lp:~laney/ubuntu-system-settings/reset-api
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-07-31
Sebastien Bacher (community)			Needs Fixing on 2014-07-29
Alberto Mardegan		2014-02-27	Needs Fixing on 2014-03-03
Review via email: mp+208661@code.launchpad.net

Commit message

Add a 'reset' API so that plugins can reset their settings to default. They can do this in one of two ways: by providing a function 'bool reset()' in their 'plugin' which returns true or by providing a top-level javascript function 'reset' in their page component.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-27:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/665/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-27:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/667/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alberto Mardegan (mardy) wrote on 2014-02-28:

On 02/27/2014 07:55 PM, Iain Lane wrote:
> + // Try to use the plugin's reset method
> + if (d->m_plugin2 && d->m_plugin2->reset())
> + return;
> +
> + // Otherwise, try to use one from the page component
> + QQmlComponent *component = pageComponent();

I'd suggest adding this (to avoid the need of changing the Online
Accounts panel at the same time):

/* If the plugin implements version 1 of the interface but not version
* 2, we assume that we won't find a "reset()" method in the
* pageComponent either.
*/
if (d->m_plugin && !d->m_plugin2)
return;

Revision history for this message

Iain Lane (laney) wrote on 2014-02-28:

On Fri, Feb 28, 2014 at 08:15:32AM -0000, Alberto Mardegan wrote:
> On 02/27/2014 07:55 PM, Iain Lane wrote:
> > + // Try to use the plugin's reset method
> > + if (d->m_plugin2 && d->m_plugin2->reset())
> > + return;
> > +
> > + // Otherwise, try to use one from the page component
> > + QQmlComponent *component = pageComponent();
>
> I'd suggest adding this (to avoid the need of changing the Online
> Accounts panel at the same time):
>
> /* If the plugin implements version 1 of the interface but not version
> * 2, we assume that we won't find a "reset()" method in the
> * pageComponent either.
> */
> if (d->m_plugin && !d->m_plugin2)
> return;

I did consider that, but I came to the conclusion that I think it should
still be valid to continue to use interface version 1 and provide
resetting via the PageComponent.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Revision history for this message

Iain Lane (laney) wrote on 2014-02-28:

Hold on, I'm going to write some tests / examples

Revision history for this message

Iain Lane (laney) wrote on 2014-02-28:

ok, tests added, see what you think now please

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-28:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/671/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-28:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/673/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alberto Mardegan (mardy) wrote on 2014-03-03:

L149: better delete the component here (though it's not leaked because it has the Plugin as its parent, so it's not a big issue)

L284,L285: indent the QML code one space more

L291: is this really needed? If it is, then maybe we should have this code in src/plugin.cpp, and not just in the test plugin.

All the rest looks fine to me, though I'd really like to see the addition of the code I suggested in the previous comment. :-)

review: Needs Fixing

Revision history for this message

Iain Lane (laney) wrote on 2014-03-03:

On Mon, Mar 03, 2014 at 09:45:11AM -0000, Alberto Mardegan wrote:
> Review: Needs Fixing
>
> L149: better delete the component here (though it's not leaked because it has the Plugin as its parent, so it's not a big issue)
>
> L284,L285: indent the QML code one space more

Fixing, thanks - actually 284 is redundant now so I'll delete that.

> L291: is this really needed? If it is, then maybe we should have this code in src/plugin.cpp, and not just in the test plugin.

Something is broken here. I was trying to see if it worked on the CI,
but it doesn't as you can see; will try to fix some other way soon.

  QWARN : PluginsTest::testReset() QQmlComponent: Component is not ready
  INFO : PluginsTest::testReset() Did not receive message: "Hello"
  FAIL! : PluginsTest::testReset() Not all expected messages were received

& my last revision just makes it hang altogether. I guess it probably
/should/ be in plugin.cpp though, yeah, if it's generally possible that
the returned component is not ready (which I suppose is true).

>
> All the rest looks fine to me, though I'd really like to see the addition of the code I suggested in the previous comment. :-)

I'll let Seb or another reviewer adjudicate. I gave my reasons already,
but I'm happy to defer if I get outvoted. :-)

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-03:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/674/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-03:

FAILED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/675/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3626
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3237/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3630
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3630/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3239
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3239/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5615/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4425

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/675/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-03-03:

> though I'd really like to see the addition of the code I suggested in the previous comment. :-)

what is going to happen without that code if we don't land -online at the same time? it seems the code is checking for a reset() and handle it not being there, so it shouldn't be an issue?

Revision history for this message

Iain Lane (laney) wrote on 2014-03-03:

On Mon, Mar 03, 2014 at 02:12:14PM -0000, Sebastien Bacher wrote:
> > though I'd really like to see the addition of the code I suggested in the previous comment. :-)
>
> what is going to happen without that code if we don't land -online at the same time? it seems the code is checking for a reset() and handle it not being there, so it shouldn't be an issue?

Because online accounts does something weird when you ask for its page
component - it unconditionally shows itself. So if you invoke the reset
action then the online accounts panel pops up.

Alberto's solution avoids this because online accounts doesn't implement
the '2' interface, so we would just skip resetting it completely.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-03-03:

thanks for the explanation, to me it looks like that check is low cost and makes things a bit more robust, so +1 for including it (though in practice it's likely only online-account is going to have the issue and we can batch those so it doesn't really matter much easier way)

Revision history for this message

Alberto Mardegan (mardy) wrote on 2014-03-03:

If that extra code bothers you, we can add it now and remove it later. :-)

Revision history for this message

Iain Lane (laney) wrote on 2014-03-03:

On Mon, Mar 03, 2014 at 02:46:35PM -0000, Sebastien Bacher wrote:
> thanks for the explanation, to me it looks like that check is low cost and makes things a bit more robust, so +1 for including it (though in practice it's likely only online-account is going to have the issue and we can batch those so it doesn't really matter much easier way)

OK then. I'll have to upgrade the plugins we provide to 2, and we need
to make sure that any future ones are 2, otherwise they won't be able to
be reset via qml/js.

I think it'll be a bit confusing and hard to debug if that ever happens,
so try to keep it in mind.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-03:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/676/rebuild

review: Approve (continuous-integration)

Revision history for this message

Jonas G. Drange (jonas-drange) wrote on 2014-07-29:

This looks great, thanks.

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-07-29:

needs to be rebased on trunk

review: Needs Fixing

lp:~laney/ubuntu-system-settings/reset-api updated on 2014-07-31

504. By Iain Lane on 2014-07-31: Merge trunk

Revision history for this message

Iain Lane (laney) wrote on 2014-07-31:

merged, fyi

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-31:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1111/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Iain Lane

Ubuntu Touch System Settings

 === modified file 'debian/control'
 --- debian/control	2014-07-30 19:47:49 +0000
 +++ debian/control	2014-07-31 14:07:19 +0000
@@ -25,6 +25,8 @@
                 qtbase5-private-dev,
                 qtdeclarative5-dev,
                 libapt-pkg-dev,
++# test-deps
++               qtdeclarative5-qtquick2-plugin,
                 libubuntuoneauth-2.0-dev,
                 libubuntu-download-manager-client-dev,
                 libubuntu-download-manager-common-dev,
 === modified file 'lib/SystemSettings/plugin-interface.h'
 --- lib/SystemSettings/plugin-interface.h	2013-05-09 11:03:58 +0000
 +++ lib/SystemSettings/plugin-interface.h	2014-07-31 14:07:19 +0000
@@ -35,9 +35,18 @@
                                   QObject *parent = 0) = 0;
  };
++class PluginInterface2: public PluginInterface
++{
++public:
++    /* Return true if a reset has been performed */
++    virtual bool reset() { return false; }
++};
++
  } // namespace
  Q_DECLARE_INTERFACE(SystemSettings::PluginInterface,
                      "com.ubuntu.SystemSettings.PluginInterface")
++Q_DECLARE_INTERFACE(SystemSettings::PluginInterface2,
++                    "com.ubuntu.SystemSettings.PluginInterface/2.0")
  #endif // SYSTEM_SETTINGS_PLUGIN_INTERFACE_H
 === modified file 'plugins/battery/plugin/battery-plugin.h'
 --- plugins/battery/plugin/battery-plugin.h	2013-08-20 12:12:07 +0000
 +++ plugins/battery/plugin/battery-plugin.h	2014-07-31 14:07:19 +0000
@@ -24,11 +24,11 @@
  #include <QObject>
  #include <SystemSettings/PluginInterface>
--class BatteryPlugin: public QObject, public SystemSettings::PluginInterface
++class BatteryPlugin: public QObject, public SystemSettings::PluginInterface2
+ {
      Q_OBJECT
--    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface")
--    Q_INTERFACES(SystemSettings::PluginInterface)
++    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface/2.0")
++    Q_INTERFACES(SystemSettings::PluginInterface2)
  public:
      BatteryPlugin();
 === modified file 'plugins/brightness/plugin/brightness-plugin.h'
 --- plugins/brightness/plugin/brightness-plugin.h	2014-01-27 13:01:26 +0000
 +++ plugins/brightness/plugin/brightness-plugin.h	2014-07-31 14:07:19 +0000
@@ -24,11 +24,11 @@
  #include <QObject>
  #include <SystemSettings/PluginInterface>
--class BrightnessPlugin: public QObject, public SystemSettings::PluginInterface
++class BrightnessPlugin: public QObject, public SystemSettings::PluginInterface2
+ {
      Q_OBJECT
--    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface")
--    Q_INTERFACES(SystemSettings::PluginInterface)
++    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface/2.0")
++    Q_INTERFACES(SystemSettings::PluginInterface2)
  public:
      SystemSettings::ItemBase *createItem(const QVariantMap &staticData,
 === modified file 'plugins/reset/ResetAllSettings.qml'
 --- plugins/reset/ResetAllSettings.qml	2013-08-23 14:05:39 +0000
 +++ plugins/reset/ResetAllSettings.qml	2014-07-31 14:07:19 +0000
@@ -29,8 +29,10 @@
          text: i18n.tr("The contents and layout of the launcher, and the filters in the home screen will be returned to their original settings.")
          Button {
              text: i18n.tr("Reset all system settings")
--            enabled: false /* TODO: enable when there is a backend */
--            onClicked: PopupUtils.close(dialog)
++            onClicked: {
++                pluginManager.resetPlugins()
++                PopupUtils.close(dialog)
++            }
+         }
          Button {
              text: i18n.tr("Cancel")
 === modified file 'plugins/system-update/plugin/update-plugin.h'
 --- plugins/system-update/plugin/update-plugin.h	2014-01-31 15:07:01 +0000
 +++ plugins/system-update/plugin/update-plugin.h	2014-07-31 14:07:19 +0000
@@ -24,11 +24,12 @@
  #include <QObject>
  #include <SystemSettings/PluginInterface>
--class CheckUpdatesPlugin: public QObject, public SystemSettings::PluginInterface
++class CheckUpdatesPlugin: public QObject,
++                          public SystemSettings::PluginInterface2
+ {
      Q_OBJECT
--    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface")
--    Q_INTERFACES(SystemSettings::PluginInterface)
++    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface/2.0")
++    Q_INTERFACES(SystemSettings::PluginInterface2)
  public:
      CheckUpdatesPlugin();
 === modified file 'src/plugin-manager.cpp'
 --- src/plugin-manager.cpp	2013-09-19 11:30:44 +0000
 +++ src/plugin-manager.cpp	2014-07-31 14:07:19 +0000
@@ -127,6 +127,18 @@
      return d->m_plugins.value(category);
+ }
++void PluginManager::resetPlugins()
++{
++    Q_D(const PluginManager);
++
++    typedef QMap<QString, Plugin *> Plugins;
++    Q_FOREACH (const Plugins &plugins, d->m_plugins.values()) {
++        Q_FOREACH (Plugin *plugin, plugins.values()) {
++            plugin->reset();
++        }
++    }
++}
++
  QAbstractItemModel *PluginManager::itemModel(const QString &category)
+ {
      Q_D(PluginManager);
 === modified file 'src/plugin-manager.h'
 --- src/plugin-manager.h	2013-09-19 11:30:44 +0000
 +++ src/plugin-manager.h	2014-07-31 14:07:19 +0000
@@ -50,6 +50,7 @@
      Q_INVOKABLE QObject *getByName(const QString &name) const;
      Q_INVOKABLE QAbstractItemModel *itemModel(const QString &category);
++    Q_INVOKABLE void resetPlugins();
      QString getFilter();
      void setFilter(const QString &filter);
 === modified file 'src/plugin.cpp'
 --- src/plugin.cpp	2013-12-05 17:40:46 +0000
 +++ src/plugin.cpp	2014-07-31 14:07:19 +0000
@@ -21,6 +21,7 @@
  #include "debug.h"
  #include "plugin.h"
++#include <QEventLoop>
  #include <QDir>
  #include <QFileInfo>
  #include <QJsonDocument>
@@ -55,6 +56,8 @@
      mutable Plugin *q_ptr;
      mutable ItemBase *m_item;
      mutable QPluginLoader m_loader;
++    mutable PluginInterface *m_plugin;
++    mutable PluginInterface2 *m_plugin2;
      QString m_baseName;
      QVariantMap m_data;
  };
@@ -64,7 +67,9 @@
  PluginPrivate::PluginPrivate(Plugin *q, const QFileInfo &manifest):
      q_ptr(q),
      m_item(0),
--    m_baseName(manifest.completeBaseName())
++    m_baseName(manifest.completeBaseName()),
++    m_plugin(0),
++    m_plugin2(0)
+ {
      QFile file(manifest.filePath());
      if (Q_UNLIKELY(!file.open(QIODevice::ReadOnly | QIODevice::Text))) {
@@ -105,14 +110,21 @@
          return false;
+     }
--    PluginInterface *interface =
--        qobject_cast<SystemSettings::PluginInterface*>(m_loader.instance());
--    if (Q_UNLIKELY(interface == 0)) {
++    m_plugin2 = qobject_cast<SystemSettings::PluginInterface2*>(
++                m_loader.instance());
++
++    if (m_plugin2)
++        m_plugin = m_plugin2;
++    else
++        m_plugin = qobject_cast<SystemSettings::PluginInterface*>(
++                    m_loader.instance());
++
++    if (Q_UNLIKELY(m_plugin == 0)) {
          qWarning() << name << "doesn't implement PluginInterface";
          return false;
+     }
--    m_item = interface->createItem(m_data);
++    m_item = m_plugin->createItem(m_data);
      if (m_item == 0) return false;
      QObject::connect(m_item, SIGNAL(iconChanged()),
@@ -222,6 +234,52 @@
      return d->m_data.value(keyHideByDefault, false).toBool();
+ }
++void Plugin::reset()
++{
++    Q_D(const Plugin);
++
++    d->ensureLoaded();
++
++    /* If the plugin implements version 1 of the interface but not version
++     * 2, we assume that we won't find a "reset()" method in the
++     * pageComponent either.
++     */
++    if (d->m_plugin && !d->m_plugin2)
++        return;
++
++    // Try to use the plugin's reset method
++    if (d->m_plugin2 && d->m_plugin2->reset())
++        return;
++
++    // Otherwise, try to use one from the page component
++    QQmlComponent *component = pageComponent();
++
++    if (!component)
++        return;
++
++    QObject *object = component->create();
++
++    // If it's there, try to search for the method
++    if (!object) {
++        delete component;
++        return;
++    }
++
++    const QMetaObject *metaObject = object->metaObject();
++    int index = metaObject->indexOfMethod(
++                QMetaObject::normalizedSignature("reset(void)"));
++
++    // and if that exists, call it
++    if (index >= 0) {
++        QMetaMethod method = metaObject->method(index);
++        method.invoke(object, Qt::DirectConnection);
++    }
++
++    delete object;
++    delete component;
++
++}
++
  QQmlComponent *Plugin::entryComponent()
+ {
      Q_D(const Plugin);
 === modified file 'src/plugin.h'
 --- src/plugin.h	2013-12-05 17:40:46 +0000
 +++ src/plugin.h	2014-07-31 14:07:19 +0000
@@ -60,6 +60,8 @@
      bool isVisible() const;
      bool hideByDefault() const;
++    void reset();
++
      QQmlComponent *entryComponent();
      QQmlComponent *pageComponent();
 === modified file 'tests/CMakeLists.txt'
 --- tests/CMakeLists.txt	2014-07-22 18:29:46 +0000
 +++ tests/CMakeLists.txt	2014-07-31 14:07:19 +0000
@@ -9,6 +9,10 @@
  target_link_librarieS(test-plugin SystemSettings)
  qt5_use_modules(test-plugin Core Qml)
++add_library(test-plugin2 SHARED test-plugin2.cpp test-plugin2.h)
++target_link_librarieS(test-plugin2 SystemSettings)
++qt5_use_modules(test-plugin2 Core Qml)
++
  add_executable(tst-plugins
      tst_plugins.cpp
      ../src/debug.cpp
 === added file 'tests/data/phone.settings'
 --- tests/data/phone.settings	1970-01-01 00:00:00 +0000
 +++ tests/data/phone.settings	2014-07-31 14:07:19 +0000
@@ -0,0 +1,9 @@
++{
++    "name": "Phone",
++    "icon": "nm-device-wireless",
++    "category": "misc",
++    "priority": 0,
++    "has-dynamic-keywords": true,
++    "has-dynamic-visibility": false,
++    "plugin": "test-plugin2"
++}
 === modified file 'tests/test-plugin.cpp'
 --- tests/test-plugin.cpp	2013-05-13 07:39:05 +0000
 +++ tests/test-plugin.cpp	2014-07-31 14:07:19 +0000
@@ -38,10 +38,13 @@
                                            QObject *parent = 0);
      virtual QQmlComponent *pageComponent(QQmlEngine *engine,
                                           QObject *parent = 0);
++private:
++    QQmlComponent *m_pageComponent;
  };
  TestItem::TestItem(const QVariantMap &staticData, QObject *parent):
--    ItemBase(staticData, parent)
++    ItemBase(staticData, parent),
++    m_pageComponent(0)
+ {
      QStringList keywords;
      keywords << "one" << "two" << "three";
@@ -59,17 +62,22 @@
      return 0;
+ }
++
  QQmlComponent *TestItem::pageComponent(QQmlEngine *engine, QObject *parent)
+ {
--    QQmlComponent *page = new QQmlComponent(engine, parent);
--    page->setData("import QtQuick 2.0\n"
--                  "Rectangle {\n"
--                  "  width: 200; height: 200;\n"
--                  "  objectName: \"myRect\"\n"
--                  "  color: \"red\""
--                  "}",
--                  QUrl());
--    return page;
++    if (m_pageComponent == NULL) {
++        QQmlComponent *page = new QQmlComponent(engine, parent);
++        page->setData("import QtQuick 2.0\n"
++                      "Rectangle {\n"
++                      "  function reset() { console.log('Hello') }\n"
++                      "  width: 200; height: 200;\n"
++                      "  objectName: \"myRect\"\n"
++                      "  color: \"red\""
++                      "}",
++                      QUrl());
++        m_pageComponent = page;
++    }
++    return m_pageComponent;
+ }
  TestPlugin::TestPlugin():
 === modified file 'tests/test-plugin.h'
 --- tests/test-plugin.h	2013-05-09 11:03:58 +0000
 +++ tests/test-plugin.h	2014-07-31 14:07:19 +0000
@@ -24,11 +24,11 @@
  #include <QObject>
  #include <SystemSettings/PluginInterface>
--class TestPlugin: public QObject, public SystemSettings::PluginInterface
++class TestPlugin: public QObject, public SystemSettings::PluginInterface2
+ {
      Q_OBJECT
--    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface")
--    Q_INTERFACES(SystemSettings::PluginInterface)
++    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface/2.0")
++    Q_INTERFACES(SystemSettings::PluginInterface2)
  public:
      TestPlugin();
 === added file 'tests/test-plugin2.cpp'
 --- tests/test-plugin2.cpp	1970-01-01 00:00:00 +0000
 +++ tests/test-plugin2.cpp	2014-07-31 14:07:19 +0000
@@ -0,0 +1,44 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2014 Canonical Ltd.
++ *
++ * Contact: Iain Lane <iain.lane@canonical.com>
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
++ */
++
++#include "test-plugin2.h"
++
++#include <QDebug>
++
++using namespace SystemSettings;
++
++TestPlugin2::TestPlugin2():
++    QObject()
++{
++}
++
++ItemBase *TestPlugin2::createItem(const QVariantMap &staticData,
++                                  QObject *parent)
++{
++    return NULL;
++}
++
++bool TestPlugin2::reset()
++{
++    qDebug() << "reset function in plugin";
++    return true;
++}
++
++#include "test-plugin2.moc"
 === added file 'tests/test-plugin2.h'
 --- tests/test-plugin2.h	1970-01-01 00:00:00 +0000
 +++ tests/test-plugin2.h	2014-07-31 14:07:19 +0000
@@ -0,0 +1,41 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2014 Canonical Ltd.
++ *
++ * Contact: Iain Lane <iain.lane@canonical.com>
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
++ */
++
++#ifndef SYSTEM_SETTINGS_TEST_PLUGIN2_H
++#define SYSTEM_SETTINGS_TEST_PLUGIN2_H
++
++#include <QObject>
++#include <SystemSettings/PluginInterface>
++
++class TestPlugin2: public QObject, public SystemSettings::PluginInterface2
++{
++    Q_OBJECT
++    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface/2.0")
++    Q_INTERFACES(SystemSettings::PluginInterface2)
++
++public:
++    TestPlugin2();
++
++    SystemSettings::ItemBase *createItem(const QVariantMap &staticData,
++                                         QObject *parent = 0);
++    bool reset();
++};
++
++#endif // SYSTEM_SETTINGS_TEST_PLUGIN2_H
 === modified file 'tests/tst_plugins.cpp'
 --- tests/tst_plugins.cpp	2013-09-18 13:32:17 +0000
 +++ tests/tst_plugins.cpp	2014-07-31 14:07:19 +0000
@@ -24,6 +24,8 @@
  #include <QDebug>
  #include <QObject>
++#include <QQmlContext>
++#include <QQmlEngine>
  #include <QSignalSpy>
  #include <QTest>
@@ -40,6 +42,8 @@
      void testCategory();
      void testKeywords();
      void testSorting();
++    void testReset();
++    void testResetInPlugin();
  };
  void PluginsTest::testCategory()
@@ -49,7 +53,7 @@
      manager.componentComplete();
      QSet<QString> expectedCategories;
--    expectedCategories << "phone" << "network";
++    expectedCategories << "phone" << "network" << "misc";
      QCOMPARE(manager.categories().toSet(), expectedCategories);
      QMap<QString, Plugin *> plugins = manager.plugins("phone");
@@ -118,5 +122,46 @@
      QCOMPARE(cellular->displayName(), QString("Bluetooth"));
+ }
++void PluginsTest::testReset()
++{
++
++    PluginManager manager;
++    manager.classBegin();
++    manager.componentComplete();
++
++    QAbstractItemModel *model(manager.itemModel("network"));
++    Plugin *wireless = (Plugin *) model->data(model->index(0, 0),
++                                         ItemModel::ItemRole).value<QObject *>();
++
++    QQmlEngine engine;
++    QQmlContext *context = new QQmlContext(engine.rootContext());
++    QQmlEngine::setContextForObject(wireless, context);
++
++    /* This is how you check that a debug message was printed */
++    QTest::ignoreMessage(QtDebugMsg, "Hello");
++    wireless->reset();
++}
++
++void PluginsTest::testResetInPlugin()
++{
++    PluginManager manager;
++    manager.classBegin();
++    manager.componentComplete();
++
++    QAbstractItemModel *model(manager.itemModel("misc"));
++    Plugin *phone = (Plugin *) model->data(model->index(0, 0),
++                                         ItemModel::ItemRole).value<QObject *>();
++
++    QQmlEngine engine;
++    QQmlContext *context = new QQmlContext(engine.rootContext());
++    QQmlEngine::setContextForObject(phone, context);
++
++    /* This is how you check that a debug message was printed */
++    /* qDebug() inserts a space at the end */
++    QTest::ignoreMessage(QtDebugMsg, "reset function in plugin ");
++
++    phone->reset();
++}
++
  QTEST_MAIN(PluginsTest);
  #include "tst_plugins.moc"

ubuntu-system-settings

Merge lp:~laney/ubuntu-system-settings/reset-api into lp:ubuntu-system-settings

Commit message

Description of the change

Preview Diff

Subscribers