00a56e5 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix setting some AS properties

00a56e5Michael Terry11 years ago

plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+12−2

compare with xenial

unifiedsplit

@@ -57,8 +57,18 @@ QDBusPendingCall AccountsServiceDBusAdaptor::setUserPropertyAsync(const QString

57{

58 QDBusInterface *iface = getUserInterface(user);

59 if (iface != nullptr && iface->isValid()) {

60+ if (interface == QStringLiteral("org.freedesktop.Accounts.User")) {

61+ // Standard AccountsService properties use special set methods.

62+ // It will not let you use the usual DBus property setters.

63+ QDBusInterface accountsIface(iface->service(),

64+ iface->path(),

65+ interface,

66+ iface->connection());

67+ return accountsIface.asyncCall(QStringLiteral("Set") + property, value);

68+ } else {

60− // The value needs to be carefully wrapped

69+ // The value needs to be carefully wrapped

61− return iface->asyncCall(QStringLiteral("Set"), interface, property, QVariant::fromValue(QDBusVariant(value)));

70+ return iface->asyncCall(QStringLiteral("Set"), interface, property, QVariant::fromValue(QDBusVariant(value)));

71+ }

62 }

72 }

63 return QDBusPendingCall::fromCompletedCall(QDBusMessage::createError(QDBusError::Other, QStringLiteral("Invalid Interface")));

73 return QDBusPendingCall::fromCompletedCall(QDBusMessage::createError(QDBusError::Other, QStringLiteral("Invalid Interface")));

64}

74}

tests/plugins/AccountsService/CMakeLists.txt+2−1

@@ -5,7 +5,7 @@ else()

5endif()

6macro(make_dbus_class NAME INTERFACE)

7 if(${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Adaptor.h)

8− execute_process(COMMAND ${QDBUSXML2CPP_EXECUTABLE} -c ${NAME}Adaptor -a ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Adaptor ${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml ${INTERFACE})

8+ execute_process(COMMAND ${QDBUSXML2CPP_EXECUTABLE} -c ${NAME}Adaptor -i types.h -a ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Adaptor ${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml ${INTERFACE})

9 endif()

10endmacro(make_dbus_class)

@@ -20,6 +20,7 @@ make_dbus_class(UscInput com.canonical.Unity.Input)

21include_directories(

22 ${CMAKE_CURRENT_BINARY_DIR}

23+ ${CMAKE_CURRENT_SOURCE_DIR}

23 ${CMAKE_SOURCE_DIR}/plugins/AccountsService

24 ${CMAKE_SOURCE_DIR}/plugins/AccountsService

24 )

25 )

tests/plugins/AccountsService/PropertiesServer.cpp+36−7

@@ -25,9 +25,7 @@

25#include <QDBusMessage>

26#include <QDBusMetaType>

28−using StringMap = QMap<QString,QString>;

28+#define IFACE_ACCOUNTS_USER QStringLiteral("org.freedesktop.Accounts.User")

29−using StringMapList = QList<StringMap>;

30−Q_DECLARE_METATYPE(StringMapList)

32PropertiesServer::PropertiesServer(QObject *parent)

30PropertiesServer::PropertiesServer(QObject *parent)

33 : QObject(parent)

31 : QObject(parent)

@@ -62,6 +60,38 @@ void PropertiesServer::Set(const QString &interface, const QString &property, co

62{

60{

63 QVariant newValue = variant.variant();

61 QVariant newValue = variant.variant();

63+ if (interface == IFACE_ACCOUNTS_USER) {

64+ sendErrorReply(QDBusError::InvalidArgs, QStringLiteral("Property is not writable"));

65+ return;

66+ }

67+

68+ internalSet(interface, property, newValue);

69+}

70+

71+void PropertiesServer::SetBackgroundFile(const QString &backgroundFile)

72+{

73+ internalSet(IFACE_ACCOUNTS_USER, QStringLiteral("BackgroundFile"), backgroundFile);

74+}

75+

76+void PropertiesServer::SetEmail(const QString &email)

77+{

78+ internalSet(IFACE_ACCOUNTS_USER, QStringLiteral("Email"), email);

79+}

80+

81+void PropertiesServer::SetInputSources(const StringMapList &inputSources)

82+{

83+ internalSet(IFACE_ACCOUNTS_USER, QStringLiteral("InputSources"), QVariant::fromValue(inputSources));

84+}

85+

86+void PropertiesServer::SetRealName(const QString &realName)

87+{

88+ internalSet(IFACE_ACCOUNTS_USER, QStringLiteral("RealName"), realName);

89+}

90+

91+void PropertiesServer::internalSet(const QString &interface, const QString &property, const QVariant &variant)

92+{

93+ QVariant newValue = variant;

94+

65 if (m_properties[interface].contains(property)) {

95 if (m_properties[interface].contains(property)) {

66 QVariant& oldValue = m_properties[interface][property];

96 QVariant& oldValue = m_properties[interface][property];

67 if (oldValue != newValue) {

97 if (oldValue != newValue) {

@@ -69,14 +99,12 @@ void PropertiesServer::Set(const QString &interface, const QString &property, co

69 if (interface == QStringLiteral("com.canonical.unity.AccountsService") &&

99 if (interface == QStringLiteral("com.canonical.unity.AccountsService") &&

70 property == QStringLiteral("LauncherItems")) {

100 property == QStringLiteral("LauncherItems")) {

71 newValue = QVariant::fromValue(qdbus_cast<QList<QVariantMap>>(newValue.value<QDBusArgument>()));

101 newValue = QVariant::fromValue(qdbus_cast<QList<QVariantMap>>(newValue.value<QDBusArgument>()));

72− } else if (interface == "org.freedesktop.Accounts.User" && property == "InputSources") {

73− newValue = QVariant::fromValue(qdbus_cast<StringMapList>(newValue.value<QDBusArgument>()));

74 }

102 }

103

76 oldValue = newValue;

104 oldValue = newValue;

105

78 // Special case for user properties.

106 // Special case for user properties.

79− if (interface == "org.freedesktop.Accounts.User") {

107+ if (interface == IFACE_ACCOUNTS_USER) {

80 Q_EMIT Changed();

108 Q_EMIT Changed();

81 } else {

109 } else {

82 QVariantMap propertyChanges;

110 QVariantMap propertyChanges;

@@ -108,6 +136,7 @@ void PropertiesServer::Reset()

108 m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseAccepted"] = false;

136 m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseAccepted"] = false;

109 m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseBasePath"] = "";

137 m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseBasePath"] = "";

110 m_properties["org.freedesktop.Accounts.User"]["BackgroundFile"] = "";

138 m_properties["org.freedesktop.Accounts.User"]["BackgroundFile"] = "";

111− m_properties["org.freedesktop.Accounts.User"]["RealName"] = "";

139+ m_properties["org.freedesktop.Accounts.User"]["Email"] = "";

112 m_properties["org.freedesktop.Accounts.User"]["InputSources"] = QVariant::fromValue(StringMapList());

140 m_properties["org.freedesktop.Accounts.User"]["InputSources"] = QVariant::fromValue(StringMapList());

141+ m_properties["org.freedesktop.Accounts.User"]["RealName"] = "";

113}

142}

tests/plugins/AccountsService/PropertiesServer.h+7

@@ -24,6 +24,7 @@

24#include <QDBusVariant>

25#include <QObject>

26#include <QString>

27+#include "types.h"

28class PropertiesServer: public QObject, protected QDBusContext

29class PropertiesServer: public QObject, protected QDBusContext

29{

30{

@@ -36,6 +37,10 @@ public Q_SLOTS:

36 QDBusVariant Get(const QString &interface, const QString &property) const;

37 QDBusVariant Get(const QString &interface, const QString &property) const;

37 QVariantMap GetAll(const QString &interface) const;

38 QVariantMap GetAll(const QString &interface) const;

38 void Set(const QString &interface, const QString &property, const QDBusVariant &variant);

39 void Set(const QString &interface, const QString &property, const QDBusVariant &variant);

40+ void SetBackgroundFile(const QString &backgroundFile);

41+ void SetEmail(const QString &email);

42+ void SetInputSources(const StringMapList &inputSources);

43+ void SetRealName(const QString &realName);

40 // mock only.

45 // mock only.

41 void Reset();

46 void Reset();

@@ -45,6 +50,8 @@ Q_SIGNALS:

45 void Changed();

50 void Changed();

47private:

52private:

53+ void internalSet(const QString &interface, const QString &property, const QVariant &variant);

54+

48 QHash<QString, QVariantMap> m_properties;

55 QHash<QString, QVariantMap> m_properties;

49};

56};

tests/plugins/AccountsService/client.cpp+46−12

@@ -19,16 +19,13 @@

20#include "AccountsService.h"

21#include "AccountsServiceDBusAdaptor.h"

22+#include "types.h"

22#include <QSignalSpy>

23#include <QSignalSpy>

23#include <QTest>

24#include <QTest>

24#include <QDebug>

25#include <QDebug>

25#include <QDBusReply>

26#include <QDBusReply>

26#include <QDBusMetaType>

27#include <QDBusMetaType>

28−using StringMap = QMap<QString,QString>;

29−using StringMapList = QList<StringMap>;

30−Q_DECLARE_METATYPE(StringMapList)

31−

32template <class T>

29template <class T>

33QVariant dbusVariant(const T& value) { return QVariant::fromValue(QDBusVariant(value)); }

30QVariant dbusVariant(const T& value) { return QVariant::fromValue(QDBusVariant(value)); }

@@ -263,10 +260,13 @@ private Q_SLOTS:

263 AccountsService session(this, QTest::currentTestFunction());

260 AccountsService session(this, QTest::currentTestFunction());

264

261

265 QCOMPARE(session.backgroundFile(), QString());

262 QCOMPARE(session.backgroundFile(), QString());

266− ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",

263+

264+ QDBusInterface accountsIface(m_userInterface->service(),

265+ m_userInterface->path(),

267− "org.freedesktop.Accounts.User",

266+ "org.freedesktop.Accounts.User");

268− "BackgroundFile",

267+ ASSERT_DBUS_CALL(accountsIface.asyncCall("SetBackgroundFile",

269− dbusVariant("/test/BackgroundFile")));

268+ "/test/BackgroundFile"));

269+

270 QTRY_COMPARE(session.backgroundFile(), QString("/test/BackgroundFile"));

271 }

272

@@ -311,6 +311,39 @@ private Q_SLOTS:

311 QCOMPARE(arguments.at(0).toInt(), 0);

312 }

313

314+ void testSetRealName()

315+ {

316+ AccountsService session(this, QTest::currentTestFunction());

317+

318+ // Just confirm that we can't set normal way

319+ auto message = m_userInterface->call("Set",

320+ "org.freedesktop.Accounts.User",

321+ "RealName",

322+ dbusVariant("Stallman"));

323+ QCOMPARE(message.type(), QDBusMessage::ErrorMessage);

324+ QCOMPARE(message.errorName(), QStringLiteral("org.freedesktop.DBus.Error.InvalidArgs"));

325+

326+ message = m_userInterface->call("Get",

327+ "org.freedesktop.Accounts.User",

328+ "RealName");

329+ QCOMPARE(message.type(), QDBusMessage::ReplyMessage);

330+ auto response = message.arguments().first().value<QDBusVariant>().variant().toString();

331+ QCOMPARE(response, QStringLiteral(""));

332+

333+ // Now try it via our AS wrapper and confirm it did get through, unlike above

334+ session.setRealName("Stallman");

335+

336+ QCOMPARE(session.realName(), QStringLiteral("Stallman"));

337+

338+ message = m_userInterface->call("Get",

339+ "org.freedesktop.Accounts.User",

340+ "RealName");

341+ QCOMPARE(message.type(), QDBusMessage::ReplyMessage);

342+ response = message.arguments().first().value<QDBusVariant>().variant().toString();

343+ QCOMPARE(response, QStringLiteral("Stallman"));

344+

345+ }

346+

314 void testAsynchronousChangeForKeymaps()

347 void testAsynchronousChangeForKeymaps()

315 {

348 {

316 AccountsService session(this, QTest::currentTestFunction());

349 AccountsService session(this, QTest::currentTestFunction());

@@ -325,10 +358,11 @@ private Q_SLOTS:

325 map2.insert("xkb", "fr");

358 map2.insert("xkb", "fr");

326 inputSources.append(map2);

359 inputSources.append(map2);

327

360

361+ QDBusInterface accountsIface(m_userInterface->service(),

328− ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",

362+ m_userInterface->path(),

329− "org.freedesktop.Accounts.User",

363+ "org.freedesktop.Accounts.User");

330− "InputSources",

364+ ASSERT_DBUS_CALL(accountsIface.asyncCall("SetInputSources",

331− QVariant::fromValue(QDBusVariant(QVariant::fromValue(inputSources)))));

365+ QVariant::fromValue(inputSources)));

332 QStringList result = {"cz+qwerty", "fr"};

366 QStringList result = {"cz+qwerty", "fr"};

333 QTRY_COMPARE(session.keymaps(), result);

367 QTRY_COMPARE(session.keymaps(), result);

334 }

368 }

tests/plugins/AccountsService/interfaces.xml+13

@@ -42,6 +42,19 @@

42 <interface name="com.ubuntu.location.providers.here.AccountsService" />

43 <interface name="org.freedesktop.Accounts.User">

44 <signal name="Changed" />

45+ <method name="SetBackgroundFile">

46+ <arg name="backgroundFile" type="s" direction="in" />

47+ </method>

48+ <method name="SetEmail">

49+ <arg name="email" type="s" direction="in" />

50+ </method>

51+ <method name="SetInputSources">

52+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="StringMapList"/>

53+ <arg name="inputSources" type="aa{ss}" direction="in" />

54+ </method>

55+ <method name="SetRealName">

56+ <arg name="realName" type="s" direction="in" />

57+ </method>

45 </interface>

58 </interface>

46 <interface name="com.canonical.unity.AccountsService.Private" />

59 <interface name="com.canonical.unity.AccountsService.Private" />