libqtdbusmock

Merge lp:~unity-api-team/libqtdbusmock/template-parameters into lp:libqtdbusmock

  1. template-parameters
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 42
Merged at revision: 42
Proposed branch: lp:~unity-api-team/libqtdbusmock/template-parameters
Merge into: lp:libqtdbusmock
Diff against target: 255 lines (+146/-11)
6 files modified
debian/changelog (+9/-0)
debian/control (+2/-2)
debian/libqtdbusmock1.symbols (+13/-1)
src/libqtdbusmock/DBusMock.cpp (+80/-8)
src/libqtdbusmock/DBusMock.h (+27/-0)
tests/libqtdbusmock/TestDBusMock.cpp (+15/-0)
To merge this branch: bzr merge lp:~unity-api-team/libqtdbusmock/template-parameters
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+273844@code.launchpad.net

Commit message

Enable the passing of parameters to templates. Add extra templates. Fix version number of registerTemplate symbol (marked 0changeme). Depend on python-dbusmock >= 0.16

Description of the change

Enable the passing of parameters to templates. Add extra templates. Fix version number of registerTemplate symbol (marked 0changeme). Depend on python-dbusmock >= 0.16

To post a comment you must log in.
lp:~unity-api-team/libqtdbusmock/template-parameters updated
42. By Pete Woods

Enable the passing of parameters to templates
Add extra templates
Depend on python-dbusmock >= 0.16

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2015-10-06 11:47:54 +0000
+++ debian/changelog 2015-10-09 10:55:59 +0000
@@ -1,3 +1,12 @@
1libqtdbusmock (0.5-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Enable the passing of parameters to templates.
4 * Add methods for all templates from dbusmock.
5 * Fix version number of registerTemplate symbol (marked 0changeme).
6 * Depend on python-dbusmock >= 0.16
7
8 -- Pete Woods <pete.woods@canonical.com> Fri, 09 Oct 2015 11:54:18 +0100
9
1libqtdbusmock (0.4+15.10.20151006.3-0ubuntu1) wily; urgency=medium10libqtdbusmock (0.4+15.10.20151006.3-0ubuntu1) wily; urgency=medium
211
3 [ Pete Woods ]12 [ Pete Woods ]
413
=== modified file 'debian/control'
--- debian/control 2015-10-06 11:46:45 +0000
+++ debian/control 2015-10-09 10:55:59 +0000
@@ -9,7 +9,7 @@
9 libqtdbustest1-dev,9 libqtdbustest1-dev,
10 network-manager-dev,10 network-manager-dev,
11 pkg-config,11 pkg-config,
12 python3-dbusmock (>= 0.14),12 python3-dbusmock (>= 0.16),
13 qtbase5-dev,13 qtbase5-dev,
14Standards-Version: 3.9.414Standards-Version: 3.9.4
15Homepage: https://launchpad.net/libqtdbustest15Homepage: https://launchpad.net/libqtdbustest
@@ -22,7 +22,7 @@
22Architecture: any22Architecture: any
23Multi-Arch: same23Multi-Arch: same
24Pre-Depends: ${misc:Pre-Depends},24Pre-Depends: ${misc:Pre-Depends},
25Depends: python3-dbusmock,25Depends: python3-dbusmock (>= 0.16),
26 ${misc:Depends},26 ${misc:Depends},
27 ${shlibs:Depends},27 ${shlibs:Depends},
28Description: Library for mocking DBus interactions using Qt28Description: Library for mocking DBus interactions using Qt
2929
=== modified file 'debian/libqtdbusmock1.symbols'
--- debian/libqtdbusmock1.symbols 2015-10-06 11:47:54 +0000
+++ debian/libqtdbusmock1.symbols 2015-10-09 10:55:59 +0000
@@ -39,7 +39,19 @@
39 (c++)"QtDBusMock::DBusMock::registerNotificationDaemon()@Base" 0.3+15.04.2015033139 (c++)"QtDBusMock::DBusMock::registerNotificationDaemon()@Base" 0.3+15.04.20150331
40 (c++)"QtDBusMock::DBusMock::registerOfono()@Base" 0.3+15.04.2015033140 (c++)"QtDBusMock::DBusMock::registerOfono()@Base" 0.3+15.04.20150331
41 (c++)"QtDBusMock::DBusMock::registerURfkill()@Base" 0.3+15.04.2015033141 (c++)"QtDBusMock::DBusMock::registerURfkill()@Base" 0.3+15.04.20150331
42 (c++)"QtDBusMock::DBusMock::registerTemplate(QString const&, QString const&, QDBusConnection::BusType)@Base" 0changeme42 (c++)"QtDBusMock::DBusMock::registerOfono(QMap<QString, QVariant> const&)@Base" 0replaceme
43 (c++)"QtDBusMock::DBusMock::registerBluez4(QMap<QString, QVariant> const&)@Base" 0replaceme
44 (c++)"QtDBusMock::DBusMock::registerBluez5(QMap<QString, QVariant> const&)@Base" 0replaceme
45 (c++)"QtDBusMock::DBusMock::registerLogind(QMap<QString, QVariant> const&)@Base" 0replaceme
46 (c++)"QtDBusMock::DBusMock::registerUpower(QMap<QString, QVariant> const&)@Base" 0replaceme
47 (c++)"QtDBusMock::DBusMock::registerURfkill(QMap<QString, QVariant> const&)@Base" 0replaceme
48 (c++)"QtDBusMock::DBusMock::registerTemplate(QString const&, QString const&, QMap<QString, QVariant> const&, QDBusConnection::BusType)@Base" 0replaceme
49 (c++)"QtDBusMock::DBusMock::registerTimeDate(QMap<QString, QVariant> const&)@Base" 0replaceme
50 (c++)"QtDBusMock::DBusMock::registerPolicyKit(QMap<QString, QVariant> const&)@Base" 0replaceme
51 (c++)"QtDBusMock::DBusMock::registerNetworkManager(QMap<QString, QVariant> const&)@Base" 0replaceme
52 (c++)"QtDBusMock::DBusMock::registerGnomeScreensaver(QMap<QString, QVariant> const&)@Base" 0replaceme
53 (c++)"QtDBusMock::DBusMock::registerNotificationDaemon(QMap<QString, QVariant> const&)@Base" 0replaceme
54 (c++)"QtDBusMock::DBusMock::registerTemplate(QString const&, QString const&, QDBusConnection::BusType)@Base" 0.2+14.10.20140730-0ubuntu1
43 (c++)"QtDBusMock::DBusMock::networkManagerInterface()@Base" 0.155 (c++)"QtDBusMock::DBusMock::networkManagerInterface()@Base" 0.1
44 (c++)"QtDBusMock::DBusMock::notificationDaemonInterface()@Base" 0.3+15.04.2015033156 (c++)"QtDBusMock::DBusMock::notificationDaemonInterface()@Base" 0.3+15.04.20150331
45 (c++)"QtDBusMock::DBusMock::ofonoInterface()@Base" 0.3+15.04.2015033157 (c++)"QtDBusMock::DBusMock::ofonoInterface()@Base" 0.3+15.04.20150331
4658
=== modified file 'src/libqtdbusmock/DBusMock.cpp'
--- src/libqtdbusmock/DBusMock.cpp 2015-03-06 05:37:46 +0000
+++ src/libqtdbusmock/DBusMock.cpp 2015-10-09 10:55:59 +0000
@@ -20,6 +20,7 @@
20#include <libqtdbustest/QProcessDBusService.h>20#include <libqtdbustest/QProcessDBusService.h>
2121
22#include <NetworkManager.h>22#include <NetworkManager.h>
23#include <QJsonDocument>
2324
24using namespace QtDBusTest;25using namespace QtDBusTest;
2526
@@ -70,28 +71,99 @@
70void DBusMock::registerTemplate(const QString &service,71void DBusMock::registerTemplate(const QString &service,
71 const QString &templateName,72 const QString &templateName,
72 QDBusConnection::BusType busType) {73 QDBusConnection::BusType busType) {
74 registerTemplate(service, templateName, QVariantMap(), busType);
75}
76
77
78void DBusMock::registerTemplate(const QString &service,
79 const QString &templateName,
80 const QVariantMap& parameters,
81 QDBusConnection::BusType busType) {
82 QStringList arguments;
83 arguments << "-m" << "dbusmock";
84 arguments << "--template" << templateName;
85
86 if (!parameters.isEmpty())
87 {
88 auto doc = QJsonDocument::fromVariant(parameters);
89 arguments << "--parameters" << QString::fromUtf8(doc.toJson(QJsonDocument::Compact));
90 }
91
73 d->m_testRunner.registerService(92 d->m_testRunner.registerService(
74 DBusServicePtr(93 DBusServicePtr(
75 new QProcessDBusService(service,94 new QProcessDBusService(service, busType, "python3",
76 busType, "python3",95 arguments)));
77 QStringList() << "-m" << "dbusmock" << "--template"96}
78 << templateName)));97
98void DBusMock::registerBluez5(const QVariantMap& parameters) {
99 registerTemplate("org.bluez", "bluez5", parameters,
100 QDBusConnection::SystemBus);
101}
102
103void DBusMock::registerBluez4(const QVariantMap& parameters) {
104 registerTemplate("org.bluez", "bluez4", parameters,
105 QDBusConnection::SystemBus);
106}
107
108void DBusMock::registerGnomeScreensaver(const QVariantMap& parameters) {
109 registerTemplate("org.gnome.ScreenSaver", "gnome_screensaver", parameters,
110 QDBusConnection::SessionBus);
111}
112
113void DBusMock::registerLogind(const QVariantMap& parameters) {
114 registerTemplate("org.freedesktop.login1", "logind", parameters,
115 QDBusConnection::SystemBus);
79}116}
80117
81void DBusMock::registerNetworkManager() {118void DBusMock::registerNetworkManager() {
82 registerTemplate(NM_DBUS_SERVICE, "networkmanager", QDBusConnection::SystemBus);119 registerNetworkManager(QVariantMap());
120}
121
122void DBusMock::registerNetworkManager(const QVariantMap& parameters) {
123 registerTemplate(NM_DBUS_SERVICE, "networkmanager", parameters,
124 QDBusConnection::SystemBus);
83}125}
84126
85void DBusMock::registerNotificationDaemon() {127void DBusMock::registerNotificationDaemon() {
86 registerTemplate("org.freedesktop.Notifications", "notification_daemon", QDBusConnection::SessionBus);128 registerNotificationDaemon(QVariantMap());
129}
130
131void DBusMock::registerNotificationDaemon(const QVariantMap& parameters) {
132 registerTemplate("org.freedesktop.Notifications", "notification_daemon",
133 parameters, QDBusConnection::SessionBus);
87}134}
88135
89void DBusMock::registerOfono() {136void DBusMock::registerOfono() {
90 registerTemplate("org.ofono", "ofono", QDBusConnection::SystemBus);137 registerOfono(QVariantMap());
138}
139
140void DBusMock::registerOfono(const QVariantMap& parameters) {
141 registerTemplate("org.ofono", "ofono", parameters,
142 QDBusConnection::SystemBus);
143}
144
145void DBusMock::registerPolicyKit(const QVariantMap& parameters) {
146 registerTemplate("org.freedesktop.PolicyKit1", "polkitd", parameters,
147 QDBusConnection::SystemBus);
148}
149
150void DBusMock::registerTimeDate(const QVariantMap& parameters) {
151 registerTemplate("org.freedesktop.timedate1", "timedated", parameters,
152 QDBusConnection::SystemBus);
91}153}
92154
93void DBusMock::registerURfkill() {155void DBusMock::registerURfkill() {
94 registerTemplate("org.freedesktop.URfkill", "urfkill", QDBusConnection::SystemBus);156 registerURfkill(QVariantMap());
157}
158
159void DBusMock::registerUpower(const QVariantMap& parameters) {
160 registerTemplate("org.freedesktop.UPower", "upower", parameters,
161 QDBusConnection::SystemBus);
162}
163
164void DBusMock::registerURfkill(const QVariantMap& parameters) {
165 registerTemplate("org.freedesktop.URfkill", "urfkill", parameters,
166 QDBusConnection::SystemBus);
95}167}
96168
97void DBusMock::registerCustomMock(const QString &name, const QString &path,169void DBusMock::registerCustomMock(const QString &name, const QString &path,
98170
=== modified file 'src/libqtdbusmock/DBusMock.h'
--- src/libqtdbusmock/DBusMock.h 2015-03-06 05:37:46 +0000
+++ src/libqtdbusmock/DBusMock.h 2015-10-09 10:55:59 +0000
@@ -49,14 +49,41 @@
49 const QString &templateName,49 const QString &templateName,
50 QDBusConnection::BusType busType);50 QDBusConnection::BusType busType);
5151
52 virtual void registerTemplate(const QString &service,
53 const QString &templateName,
54 const QVariantMap& parameters,
55 QDBusConnection::BusType busType);
56
57 virtual void registerBluez4(const QVariantMap& parameters = QVariantMap());
58
59 virtual void registerBluez5(const QVariantMap& parameters = QVariantMap());
60
61 virtual void registerGnomeScreensaver(const QVariantMap& parameters = QVariantMap());
62
63 virtual void registerLogind(const QVariantMap& parameters = QVariantMap());
64
52 virtual void registerNetworkManager();65 virtual void registerNetworkManager();
5366
67 virtual void registerNetworkManager(const QVariantMap& parameters);
68
54 virtual void registerNotificationDaemon();69 virtual void registerNotificationDaemon();
5570
71 virtual void registerNotificationDaemon(const QVariantMap& parameters);
72
56 virtual void registerOfono();73 virtual void registerOfono();
5774
75 virtual void registerOfono(const QVariantMap& parameters);
76
77 virtual void registerPolicyKit(const QVariantMap& parameters = QVariantMap());
78
79 virtual void registerTimeDate(const QVariantMap& parameters = QVariantMap());
80
58 virtual void registerURfkill();81 virtual void registerURfkill();
5982
83 virtual void registerURfkill(const QVariantMap& parameters);
84
85 virtual void registerUpower(const QVariantMap& parameters = QVariantMap());
86
60 virtual void registerCustomMock(const QString &name, const QString &path,87 virtual void registerCustomMock(const QString &name, const QString &path,
61 const QString &interface, QDBusConnection::BusType);88 const QString &interface, QDBusConnection::BusType);
6289
6390
=== modified file 'tests/libqtdbusmock/TestDBusMock.cpp'
--- tests/libqtdbusmock/TestDBusMock.cpp 2014-07-25 16:28:08 +0000
+++ tests/libqtdbusmock/TestDBusMock.cpp 2015-10-09 10:55:59 +0000
@@ -101,6 +101,21 @@
101 ASSERT_EQ(1, devices.value().size());101 ASSERT_EQ(1, devices.value().size());
102}102}
103103
104TEST_F(TestDBusMock, StartsDBusMockTemplateParameters) {
105 dbusMock.registerUpower({{"DaemonVersion", "0.99.0"}, {"OnBattery", true}});
106 dbusTestRunner.startServices();
107
108 EXPECT_TRUE(
109 processListContains(
110 "python3 -m dbusmock --template upower --parameters {\"DaemonVersion\":\"0.99.0\",\"OnBattery\":true}"));
111
112 QDBusInterface iface("org.freedesktop.UPower", "/org/freedesktop/UPower",
113 "org.freedesktop.UPower", dbusTestRunner.systemConnection());
114
115 EXPECT_EQ("0.99.0", iface.property("DaemonVersion").toString());
116 EXPECT_TRUE(iface.property("OnBattery").toBool());
117}
118
104TEST_F(TestDBusMock, StartsDBusMockWithTemplate) {119TEST_F(TestDBusMock, StartsDBusMockWithTemplate) {
105 dbusMock.registerTemplate(NM_DBUS_SERVICE,120 dbusMock.registerTemplate(NM_DBUS_SERVICE,
106 "networkmanager",121 "networkmanager",

Subscribers

People subscribed via source and target branches

to all changes: