Merge lp:~michihenning/storage-framework/merge-devel into lp:storage-framework

[Michi Henning]

Merge devel at r99. Updated changelog.

Merged devel at r99. Updated changelog.

[lp:~michihenning/storage-framework/merge-devel]

15. By CI Train Bot Account on 2016-12-12

* Fix for lp:1644577, fail list job if metadata for any item is incorrect.
* Always emit itemsReady(), even if list is empty.
* Improvements to error logging and detail in error messages: lp:1644577
* Added separate registry service.

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-10-31 09:03:32 +0000
+++ CMakeLists.txt	2016-12-12 02:53:43 +0000
@@ -104,7 +104,7 @@
 include(CTest)
 enable_testing()
 
-include(EnableCoverageReport)
+find_package(CoverageReport)
 
 include(GNUInstallDirs)
 
@@ -138,6 +138,7 @@
         storage-framework-qt-local-client
         sf-provider-objects
         storage-framework-provider
+        storage-framework-registry
     FILTER
         ${CMAKE_SOURCE_DIR}/tests/*
         ${CMAKE_BINARY_DIR}/*

=== modified file 'data/registry.xml'
--- data/registry.xml	2016-05-04 14:32:07 +0000
+++ data/registry.xml	2016-12-12 02:53:43 +0000
@@ -3,33 +3,30 @@
 <node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
   <!--
       com.canonical.StorageFramework.Registry:
-      @short_description: Interface to query the backend registry
-
-      Inteface to query the repository of backends that are
-      available.
+      @short_description: Interface to retrieve providers that are configured in online accounts
   -->
   <interface name="com.canonical.StorageFramework.Registry">
-
     <!--
-        GetBackend:
-        @short_description: request access to a storage account
-        @service_id: if not empty, restrict results to accounts
-            matching this service ID.
-        @bus_name: the bus name of the storage provider
-        @path: the object path of the storage account at the provider
-
-        Interactively prompt the user to pick a storage account for
-        use by the application, and return the D-Bus endpoint that can
-        be used to communicate with the associated provider.
-
-        As this involves user interaction, the caller should use a
-        relatively long time out for this method call.
-        -->
-    <method name="GetProvider">
-      <arg type="s" name="service_id" direction="in" />
-
-      <arg type="s" name="bus_name" direction="out" />
-      <arg type="o" name="path" direction="out" />
+        List:
+        @short_description: Get the list of accounts
+        @accounts: Returned list of accounts.
+
+        Returns the list of provider accounts that are available
+        in online accounts. In essence, this method is a proxy
+        for the OnlineAccounts::Manager::availableAccounts() method.
+
+        The returned values are structs with the following members:
+          - bus name (e.g. "com.canonical.StorageFramework.Provider.OwnCloud")
+          - object path (e.g. "/provider/7")
+          - ID (e.g. 7, used for object path)
+          - service ID (e.g. "storage-provider-owncloud")
+          - display name (e.g. "[e-mail]")
+          - translated provider name (e.g. "OwnCloud")
+          - icon name
+    -->
+    <method name="ListAccounts">
+      <arg type="a(soussss)" name="accounts" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;unity::storage::internal::AccountDetails&gt;"/>
     </method>
   </interface>
 </node>

=== modified file 'debian/changelog'
--- debian/changelog	2016-11-04 12:22:33 +0000
+++ debian/changelog	2016-12-12 02:53:43 +0000
@@ -1,3 +1,12 @@
+storage-framework (0.2+17.04.20161104-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Fix for lp:1644577, fail list job if metadata for any item is incorrect.
+  * Always emit itemsReady(), even if list is empty.
+  * Improvements to error logging and detail in error messages: lp:1644577
+  * Added separate registry service.
+
+ -- Michi Henning <[e-mail]>  Fri, 09 Dec 2016 11:35:17 +1000
+
 storage-framework (0.2+17.04.20161104-0ubuntu1) zesty; urgency=medium
 
   [ Michi Henning ]

=== modified file 'debian/control'
--- debian/control	2016-11-04 12:22:33 +0000
+++ debian/control	2016-12-12 02:53:43 +0000
@@ -1,98 +1,13 @@
 # This file is autogenerated. DO NOT EDIT!
 #
 # Modifications should be made to ./debian/control.in instead.
-# This file is regenerated automatically in the clean target.
+# This file is regenerated automatically by bileto.
 #
 Source: storage-framework
-Section: libs
-Priority: optional
-Maintainer: Ubuntu Core Developers <[e-mail]>
-Standards-Version: 3.9.6
-Build-Depends: cmake,
-               cmake-extras (>= 0.4),
-               debhelper (>= 9),
-               devscripts,
-               doxygen,
-               google-mock,
-               libapparmor-dev,
-               libboost-filesystem-dev (>= 1.58) | libboost-filesystem1.58-dev,
-               libboost-system-dev (>= 1.58) | libboost-system1.58-dev,
-               libboost-thread-dev (>= 1.58) | libboost-thread1.58-dev,
-               libglib2.0-dev,
-               libgtest-dev,
-               libonline-accounts-qt-dev,
-               libqtdbustest1-dev,
-               libunity-api-dev,
-               lsb-release,
-               python3-dbus,
-               python3-gi,
-               qtbase5-dev,
-               qtbase5-dev-tools,
-               qtdeclarative5-dev,
-Homepage: https://launchpad.net/storage-framework
-# if you don't have have commit access to this branch but would like to upload
-# directly to Ubuntu, don't worry: your changes will be merged back into the
-# upstream branch
-Vcs-Bzr: lp:storage-framework
+
+# DO NOT EDIT THIS FILE. WE REALLY MEAN IT!
 
 Package: libstorage-framework-provider-1-5
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Library for Storage Framework providers
- Server-side runtime support for provider implementations.
-
-Package: libstorage-framework-qt-client-1-0
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Client library for the Storage Framework (API v1, soon to be removed)
- Runtime support for storage framework clients.
-
-Package: libstorage-framework-qt-client-2-0
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Client library for the Storage Framework
- Runtime support for storage framework clients.
-
-Package: libstorage-framework-qt-local-client-1-0
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Client library for the Storage Framework backed by the local file system
- A version of the client-side API that implements a local
- file system provider. This is intended mainly for testing;
- it allows application code to use the storage framework
- API without requiring use of DBus and cloud service account.
-
-Package: storage-framework-client-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: libstorage-framework-qt-client-1-0 (= ${binary:Version}),
-         libstorage-framework-qt-local-client-1-0 (= ${binary:Version}),
-         qtbase5-dev,
-         ${misc:Depends},
-Description: Header files for the Storage Framework client libraries
- Development C++ headers for the client side API.
-
-Package: storage-framework-provider-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: libstorage-framework-provider-1-5 (= ${binary:Version}),
-         libboost-thread-dev (>= 1.58) | libboost-thread1.58-dev,
-         ${misc:Depends},
-Description: Header files for the Storage Framework provider library
- Development C++ headers for the provider API.
+Description:  DO NOT EDIT THIS FILE, IT IS GENERATED FROM control.in
+ DO NOT EDIT THIS FILE

=== modified file 'debian/control.in'
--- debian/control.in	2016-09-30 01:47:57 +0000
+++ debian/control.in	2016-12-12 02:53:43 +0000
@@ -4,9 +4,8 @@
 Maintainer: Ubuntu Core Developers <[e-mail]>
 Standards-Version: 3.9.6
 Build-Depends: cmake,
-               cmake-extras (>= 0.4),
+               cmake-extras (>= 0.10),
                debhelper (>= 9),
-               devscripts,
                doxygen,
                google-mock,
                libapparmor-dev,
@@ -18,6 +17,7 @@
                libonline-accounts-qt-dev,
                libqtdbustest1-dev,
                libunity-api-dev,
+               licensecheck | devscripts (<< 2.16.6),
                lsb-release,
                python3-dbus,
                python3-gi,
@@ -48,12 +48,24 @@
 Description: Client library for the Storage Framework (API v1, soon to be removed)
  Runtime support for storage framework clients.
 
+Package: storage-framework-registry
+Architecture: any
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+#        TODO: should be removed once online accounts is fixed: lp:1643421
+         online-accounts-daemon,
+Description: Registry for the Storage Framework
+ DBus service that provides access to provider account information.
+
 Package: libstorage-framework-qt-client-2-0
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         storage-framework-registry
 Description: Client library for the Storage Framework
  Runtime support for storage framework clients.
 
@@ -76,6 +88,7 @@
 Pre-Depends: ${misc:Pre-Depends},
 Depends: libstorage-framework-qt-client-1-0 (= ${binary:Version}),
          libstorage-framework-qt-local-client-1-0 (= ${binary:Version}),
+         libstorage-framework-qt-client-2-0 (= ${binary:Version}),
          qtbase5-dev,
          ${misc:Depends},
 Description: Header files for the Storage Framework client libraries

=== added file 'debian/storage-framework-registry.install'
--- debian/storage-framework-registry.install	1970-01-01 00:00:00 +0000
+++ debian/storage-framework-registry.install	2016-12-12 02:53:43 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/*/storage-framework-registry
+usr/share/dbus-1/services/com.canonical.StorageFramework.Registry.service

=== modified file 'demo/demo.qml'
--- demo/demo.qml	2016-11-04 10:52:10 +0000
+++ demo/demo.qml	2016-12-12 02:53:43 +0000
@@ -48,7 +48,7 @@
         for (var i = 0; i < accounts.length; i++) {
           console.log("Account " + i + ": busName =     " + accounts[i].busName());
           console.log("Account " + i + ": objectPath =  " + accounts[i].objectPath());
-          console.log("Account " + i + ": displayName = " + accounts[i].displayName);
+          console.log("Account " + i + ": name =        " + accounts[i].name);
         }
       }
     }

=== modified file 'demo/provider_test/provider-test.cpp'
--- demo/provider_test/provider-test.cpp	2016-11-03 02:43:43 +0000
+++ demo/provider_test/provider-test.cpp	2016-12-12 02:53:43 +0000
@@ -314,7 +314,7 @@
 int main(int argc, char **argv)
 {
     const std::string bus_name = "com.canonical.StorageFramework.Provider.ProviderTest";
-    std::string account_service_id = "google-drive-scope";
+    std::string account_service_id = "storage-provider-test";
     if (argc > 1)
     {
         account_service_id = argv[1];

=== added file 'include/unity/storage/internal/AccountDetails.h'
--- include/unity/storage/internal/AccountDetails.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/internal/AccountDetails.h	2016-12-12 02:53:43 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-align"
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#include <QDBusArgument>
+#pragma GCC diagnostic pop
+
+namespace unity
+{
+namespace storage
+{
+namespace internal
+{
+
+struct AccountDetails
+{
+    QString busName;
+    QDBusObjectPath objectPath;
+    quint32 id;
+    QString serviceId;
+    QString displayName;
+    QString providerName;
+    QString iconName;
+};
+
+bool operator==(AccountDetails const& lhs, AccountDetails const& rhs);
+bool operator!=(AccountDetails const& lhs, AccountDetails const& rhs);
+bool operator<(AccountDetails const& lhs, AccountDetails const& rhs);
+bool operator<=(AccountDetails const& lhs, AccountDetails const& rhs);
+bool operator>(AccountDetails const& lhs, AccountDetails const& rhs);
+bool operator>=(AccountDetails const& lhs, AccountDetails const& rhs);
+
+QDBusArgument& operator<<(QDBusArgument& argument, storage::internal::AccountDetails const& account);
+QDBusArgument const& operator>>(QDBusArgument const& argument, storage::internal::AccountDetails& account);
+
+}  // namespace internal
+}  // namespace storage
+}  // namespace unity
+
+Q_DECLARE_METATYPE(unity::storage::internal::AccountDetails)

=== added file 'include/unity/storage/internal/ActivityNotifier.h'
--- include/unity/storage/internal/ActivityNotifier.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/internal/ActivityNotifier.h	2016-12-12 02:53:43 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/internal/InactivityTimer.h>
+
+#include <cassert>
+#include <memory>
+
+namespace unity
+{
+namespace storage
+{
+namespace internal
+{
+
+class InactivityTimer;
+
+class ActivityNotifier
+{
+public:
+    ActivityNotifier(std::shared_ptr<InactivityTimer> const& timer)
+        : timer_(timer)
+    {
+        assert(timer);
+
+        timer_->request_started();
+    }
+
+    ~ActivityNotifier()
+    {
+        timer_->request_finished();
+    }
+
+private:
+    std::shared_ptr<InactivityTimer> timer_;
+};
+
+}  // namespace internal
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/internal/EnvVars.h'
--- include/unity/storage/internal/EnvVars.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/internal/EnvVars.h	2016-12-12 02:53:43 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/registry/Registry.h>
+
+#include <string>
+
+namespace unity
+{
+namespace storage
+{
+namespace internal
+{
+
+constexpr char const* REGISTRY_IDLE_TIMEOUT = "SF_REGISTRY_IDLE_TIMEOUT";  // Seconds, 0 means "never"
+constexpr int REGISTRY_IDLE_TIMEOUT_DFLT = 30;
+
+// Helper class to make retrieval of environment variables type-safe and
+// to sanity check the setting, if applicable. Also returns a default
+// setting, if applicable.
+
+class EnvVars
+{
+public:
+    static int registry_timeout_ms();
+
+    // Returns value of var_name in the environment, if set, and an empty string otherwise.
+    // Can be used for any environment variable, not just the ones defined above.
+    static std::string get(char const* var_name);
+};
+
+}  // namespace internal
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/internal/InactivityTimer.h'
--- include/unity/storage/internal/InactivityTimer.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/internal/InactivityTimer.h	2016-12-12 02:53:43 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-align"
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#include <QTimer>
+#pragma GCC diagnostic pop
+
+#include <functional>
+
+namespace unity
+{
+namespace storage
+{
+namespace internal
+{
+
+class InactivityTimer : public QObject
+{
+    Q_OBJECT
+
+public:
+    InactivityTimer(int timeout_ms, std::function<void()> timeout_func);
+    ~InactivityTimer();
+
+    void request_started();
+    void request_finished();
+
+private Q_SLOTS:
+    void timeout();
+
+private:
+    int timeout_ms_;
+    std::function<void()> timeout_func_;
+    QTimer timer_;
+    int32_t num_requests_;
+};
+
+}  // namespace internal
+}  // namespace storage
+}  // namespace unity

=== modified file 'include/unity/storage/internal/TraceMessageHandler.h'
--- include/unity/storage/internal/TraceMessageHandler.h	2016-08-25 05:18:37 +0000
+++ include/unity/storage/internal/TraceMessageHandler.h	2016-12-12 02:53:43 +0000
@@ -35,7 +35,10 @@
 class TraceMessageHandler final
 {
 public:
+    TraceMessageHandler();
     TraceMessageHandler(std::string const& prog_name);
+    TraceMessageHandler(QString const& prog_name);
+    TraceMessageHandler(char const* prog_name);
     ~TraceMessageHandler();
 
 private:

=== modified file 'include/unity/storage/qt/Account.h'
--- include/unity/storage/qt/Account.h	2016-11-03 06:41:00 +0000
+++ include/unity/storage/qt/Account.h	2016-12-12 02:53:43 +0000
@@ -47,6 +47,8 @@
     Q_PROPERTY(QString busName READ busName FINAL)
     Q_PROPERTY(QString objectPath READ objectPath FINAL)
     Q_PROPERTY(QString displayName READ displayName FINAL)
+    Q_PROPERTY(QString providerName READ providerName FINAL)
+    Q_PROPERTY(QString iconName READ iconName FINAL)
 
 public:
     Account();
@@ -60,7 +62,8 @@
     QString busName() const;
     QString objectPath() const;
     QString displayName() const;
-    // TODO: add more methods to retrieve additional info, such as description, icon ID, and service name.
+    QString providerName() const;
+    QString iconName() const;
 
     Q_INVOKABLE unity::storage::qt::ItemListJob* roots(QStringList const& keys = QStringList()) const;
     Q_INVOKABLE unity::storage::qt::ItemJob* get(QString const& itemId, QStringList const& keys = QStringList()) const;

=== modified file 'include/unity/storage/qt/AccountsJob.h'
--- include/unity/storage/qt/AccountsJob.h	2016-11-02 02:54:48 +0000
+++ include/unity/storage/qt/AccountsJob.h	2016-12-12 02:53:43 +0000
@@ -34,12 +34,10 @@
 {
 
 class AccountsJobImpl;
-class RuntimeImpl;
 
 }  // namespace internal
 
 class Account;
-class Runtime;
 class StorageError;
 
 class Q_DECL_EXPORT AccountsJob final : public QObject
@@ -65,14 +63,13 @@
     void statusChanged(unity::storage::qt::AccountsJob::Status status) const;
 
 private:
-    AccountsJob(std::shared_ptr<internal::RuntimeImpl> const& runtime);
-    AccountsJob(StorageError const& error);
+    AccountsJob(std::unique_ptr<internal::AccountsJobImpl> accounts_job_impl);
 
     QVariantList accountsAsVariantList() const;
 
     std::unique_ptr<internal::AccountsJobImpl> const p_;
 
-    friend class internal::RuntimeImpl;
+    friend class internal::AccountsJobImpl;
 };
 
 }  // namespace qt

=== modified file 'include/unity/storage/qt/Runtime.h'
--- include/unity/storage/qt/Runtime.h	2016-11-02 02:54:48 +0000
+++ include/unity/storage/qt/Runtime.h	2016-12-12 02:53:43 +0000
@@ -66,9 +66,9 @@
 
     Account make_test_account(QString const& bus_name,
                               QString const& object_path,
-                              QString const& id = "",
-                              QString const& serviceId = "",
-                              QString const& displayName = "") const;
+                              quint32 id = 999,
+                              QString const& service_id = "",
+                              QString const& name = "") const;
 
 private:
     std::shared_ptr<internal::RuntimeImpl> p_;

=== modified file 'include/unity/storage/qt/internal/AccountImpl.h'
--- include/unity/storage/qt/internal/AccountImpl.h	2016-11-03 06:41:00 +0000
+++ include/unity/storage/qt/internal/AccountImpl.h	2016-12-12 02:53:43 +0000
@@ -19,10 +19,7 @@
 #pragma once
 
 #include <unity/storage/qt/Item.h>
-
-#include <QString>
-
-#include <memory>
+#include <unity/storage/internal/AccountDetails.h>
 
 class ProviderInterface;
 
@@ -50,6 +47,8 @@
     QString busName() const;
     QString objectPath() const;
     QString displayName() const;
+    QString providerName() const;
+    QString iconName() const;
 
     ItemListJob* roots(QStringList const& keys) const;
     ItemJob* get(QString const& itemId, QStringList const& keys) const;
@@ -67,26 +66,14 @@
     std::shared_ptr<ProviderInterface> provider() const;
 
     static Account make_account(std::shared_ptr<RuntimeImpl> const& runtime_impl,
-                                QString const& bus_name,
-                                QString const& object_path,
-                                QString const& id,
-                                QString const& service_id,
-                                QString const& display_name);
+                                storage::internal::AccountDetails const& details);
 
 private:
     AccountImpl(std::shared_ptr<RuntimeImpl> const& runtime_impl,
-                QString const& bus_name,
-                QString const& object_path,
-                QString const& id,
-                QString const& service_id,
-                QString const& display_name);
+                storage::internal::AccountDetails const& details);
 
     bool is_valid_;
-    QString bus_name_;
-    QString object_path_;
-    QString id_;
-    QString service_id_;
-    QString display_name_;
+    storage::internal::AccountDetails details_;
     std::weak_ptr<RuntimeImpl> runtime_impl_;
     std::shared_ptr<ProviderInterface> provider_;
 

=== modified file 'include/unity/storage/qt/internal/AccountsJobImpl.h'
--- include/unity/storage/qt/internal/AccountsJobImpl.h	2016-11-02 02:54:48 +0000
+++ include/unity/storage/qt/internal/AccountsJobImpl.h	2016-12-12 02:53:43 +0000
@@ -18,9 +18,14 @@
 
 #pragma once
 
+#include <unity/storage/internal/AccountDetails.h>
 #include <unity/storage/qt/AccountsJob.h>
 
-#include <QTimer>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-align"
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QDBusPendingReply>
+#pragma GCC diagnostic pop
 
 namespace unity
 {
@@ -31,12 +36,16 @@
 namespace internal
 {
 
+class RuntimeImpl;
+
 class AccountsJobImpl : public QObject
 {
     Q_OBJECT
 public:
-    AccountsJobImpl(AccountsJob* public_instance, std::shared_ptr<RuntimeImpl> const& runtime_impl);
-    AccountsJobImpl(AccountsJob* public_instance, StorageError const& error);
+    AccountsJobImpl(std::shared_ptr<RuntimeImpl> const& runtime_impl,
+                    QString const& method,
+                    QDBusPendingReply<QList<storage::internal::AccountDetails>>& reply);
+    AccountsJobImpl(StorageError const& error);
     virtual ~AccountsJobImpl() = default;
 
     bool isValid() const;
@@ -45,21 +54,20 @@
     QList<Account> accounts() const;
     QVariantList accountsAsVariantList() const;
 
-private Q_SLOTS:
-    void manager_ready();
-    void timeout();
+    static AccountsJob* make_job(std::shared_ptr<RuntimeImpl> const& runtime_impl,
+                                 QString const& method,
+                                 QDBusPendingReply<QList<storage::internal::AccountDetails>>& reply);
+    static AccountsJob* make_job(StorageError const& e);
 
 private:
     std::shared_ptr<RuntimeImpl> get_runtime_impl(QString const& method) const;
-    void initialize_accounts();
     AccountsJob::Status emit_status_changed(AccountsJob::Status new_status) const;
 
-    AccountsJob* const public_instance_;
+    AccountsJob* public_instance_;
     AccountsJob::Status status_;
     StorageError error_;
-    QList<unity::storage::qt::Account> accounts_;
     std::weak_ptr<RuntimeImpl> const runtime_impl_;
-    QTimer timer_;
+    QList<Account> accounts_;
 
     friend class unity::storage::qt::AccountsJob;
 };

=== modified file 'include/unity/storage/qt/internal/Handler.h'
--- include/unity/storage/qt/internal/Handler.h	2016-11-04 04:13:45 +0000
+++ include/unity/storage/qt/internal/Handler.h	2016-12-12 02:53:43 +0000
@@ -71,7 +71,7 @@
                                       case StorageError::Type::NoError:
                                       {
                                           // LCOV_EXCL_START
-                                          QString msg = "impossible provider exception: " + e.errorString();
+                                          QString msg = "impossible service exception: " + e.errorString();
                                           qCritical().noquote() << msg;
                                           e = StorageErrorImpl::local_comms_error(msg);
                                           break;
@@ -82,7 +82,7 @@
                                       case StorageError::Type::ResourceError:
                                       {
                                           // Log these errors because they are unexpected.
-                                          QString msg = "provider exception: " + e.errorString();
+                                          QString msg = "service exception: " + e.errorString();
                                           qCritical().noquote() << msg;
                                           break;
                                       }

=== modified file 'include/unity/storage/qt/internal/RuntimeImpl.h'
--- include/unity/storage/qt/internal/RuntimeImpl.h	2016-09-22 01:52:20 +0000
+++ include/unity/storage/qt/internal/RuntimeImpl.h	2016-12-12 02:53:43 +0000
@@ -24,10 +24,11 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-align"
 #pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#include <OnlineAccounts/Manager>
 #include <QDBusConnection>
 #pragma GCC diagnostic pop
 
+class RegistryInterface;
+
 namespace unity
 {
 namespace storage
@@ -45,7 +46,7 @@
 {
 public:
     RuntimeImpl();
-    RuntimeImpl(QDBusConnection const& bus);
+    RuntimeImpl(QDBusConnection const& conn);
     RuntimeImpl(RuntimeImpl const&) = delete;
     RuntimeImpl(RuntimeImpl&&) = delete;
     ~RuntimeImpl();
@@ -58,19 +59,17 @@
     AccountsJob* accounts() const;
     StorageError shutdown();
 
-    std::shared_ptr<OnlineAccounts::Manager> accounts_manager() const;
-
     Account make_test_account(QString const& bus_name,
                               QString const& object_path,
-                              QString const& owner_id,
-                              QString const& owner,
-                              QString const& description);
+                              quint32 id,
+                              QString const& service_id,
+                              QString const& display_name);
 
 private:
     bool is_valid_;
     StorageError error_;
     QDBusConnection conn_;
-    std::shared_ptr<OnlineAccounts::Manager> accounts_manager_;
+    std::unique_ptr<RegistryInterface> registry_;
 
     friend class unity::storage::qt::Runtime;
 };

=== added directory 'include/unity/storage/registry'
=== added file 'include/unity/storage/registry/Registry.h'
--- include/unity/storage/registry/Registry.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/registry/Registry.h	2016-12-12 02:53:43 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <QString>
+
+namespace unity
+{
+namespace storage
+{
+namespace registry
+{
+
+static QString const BUS_NAME(QStringLiteral("com.canonical.StorageFramework.Registry"));
+static QString const OBJECT_PATH(QStringLiteral("/com/canonical/StorageFramework/Registry"));
+
+}  // namespace registry
+}  // namespace storage
+}  // namespace unity

=== added directory 'include/unity/storage/registry/internal'
=== added file 'include/unity/storage/registry/internal/ListAccountsHandler.h'
--- include/unity/storage/registry/internal/ListAccountsHandler.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/registry/internal/ListAccountsHandler.h	2016-12-12 02:53:43 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/internal/ActivityNotifier.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-align"
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <OnlineAccounts/Manager>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QTimer>
+#pragma GCC diagnostic pop
+
+namespace unity
+{
+namespace storage
+{
+namespace registry
+{
+namespace internal
+{
+
+class ListAccountsHandler : public QObject
+{
+    Q_OBJECT
+
+public:
+    ListAccountsHandler(QDBusConnection const& conn,
+                        QDBusMessage const& msg,
+                        std::shared_ptr<storage::internal::InactivityTimer> const& timer);
+    ~ListAccountsHandler();
+
+private Q_SLOTS:
+    void manager_ready();
+    void timeout();
+
+private:
+    void initialize_manager();
+
+    QDBusConnection const conn_;
+    QDBusMessage const msg_;
+    OnlineAccounts::Manager manager_;
+    QTimer timer_;
+    storage::internal::ActivityNotifier activity_notifier_;  // RAII guard variable
+
+    Q_DISABLE_COPY(ListAccountsHandler)
+};
+
+}  // namespace internal
+}  // namespace registry
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/registry/internal/RegistryAdaptor.h'
--- include/unity/storage/registry/internal/RegistryAdaptor.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/registry/internal/RegistryAdaptor.h	2016-12-12 02:53:43 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/internal/AccountDetails.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-align"
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QDBusConnection>
+#include <QDBusContext>
+#pragma GCC diagnostic pop
+
+#include <memory>
+
+namespace unity
+{
+namespace storage
+{
+namespace internal
+{
+
+class InactivityTimer;
+
+}  // namespace internal
+
+namespace registry
+{
+namespace internal
+{
+
+class RegistryAdaptor : public QObject, protected QDBusContext
+{
+    Q_OBJECT
+
+public:
+    RegistryAdaptor(QDBusConnection const& conn,
+                    std::shared_ptr<storage::internal::InactivityTimer> const& timer,
+                    QObject* parent = nullptr);
+    ~RegistryAdaptor();
+
+public Q_SLOTS:
+    QList<unity::storage::internal::AccountDetails> ListAccounts();
+
+private:
+    QDBusConnection conn_;
+    std::shared_ptr<storage::internal::InactivityTimer> timer_;
+
+    Q_DISABLE_COPY(RegistryAdaptor)
+};
+
+}  // namespace internal
+}  // namespace registry
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/registry/internal/qdbus-last-error-msg.h'
--- include/unity/storage/registry/internal/qdbus-last-error-msg.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/registry/internal/qdbus-last-error-msg.h	2016-12-12 02:53:43 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-align"
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QDBusConnection>
+#pragma GCC diagnostic pop
+
+namespace unity
+{
+namespace storage
+{
+namespace registry
+{
+namespace internal
+{
+
+QString last_error_msg(QDBusConnection const& conn);
+
+}  // namespace internal
+}  // namespace registry
+}  // namespace storage
+}  // namespace unity

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-07-06 00:59:42 +0000
+++ src/CMakeLists.txt	2016-12-12 02:53:43 +0000
@@ -1,3 +1,4 @@
 add_subdirectory(internal)
 add_subdirectory(provider)
 add_subdirectory(qt)
+add_subdirectory(registry)

=== added file 'src/internal/AccountDetails.cpp'
--- src/internal/AccountDetails.cpp	1970-01-01 00:00:00 +0000
+++ src/internal/AccountDetails.cpp	2016-12-12 02:53:43 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#include <unity/storage/internal/AccountDetails.h>
+
+using namespace unity::storage::internal;
+
+namespace unity
+{
+namespace storage
+{
+namespace internal
+{
+
+bool operator==(AccountDetails const& lhs, AccountDetails const& rhs)
+{
+   return    lhs.id == rhs.id
+          && lhs.serviceId == rhs.serviceId
+          && lhs.displayName == rhs.displayName;
+}
+
+bool operator!=(AccountDetails const& lhs, AccountDetails const& rhs)
+{
+    return !(lhs == rhs);
+}
+
+bool operator<(AccountDetails const& lhs, AccountDetails const& rhs)
+{
+    if (lhs.id < rhs.id)
+    {
+        return true;
+    }
+    if (lhs.id > rhs.id)
+    {
+        return false;
+    }
+    if (lhs.serviceId < rhs.serviceId)
+    {
+        return true;
+    }
+    if (lhs.serviceId > rhs.serviceId)
+    {
+        return false;
+    }
+    return lhs.displayName < rhs.displayName;
+}
+
+bool operator<=(AccountDetails const& lhs, AccountDetails const& rhs)
+{
+    return lhs < rhs || lhs == rhs;
+}
+
+bool operator>(AccountDetails const& lhs, AccountDetails const& rhs)
+{
+    return !(lhs <= rhs);
+}
+
+bool operator>=(AccountDetails const& lhs, AccountDetails const& rhs)
+{
+    return !(lhs < rhs);
+}
+
+QDBusArgument& operator<<(QDBusArgument& argument, storage::internal::AccountDetails const& account)
+{
+    argument.beginStructure();
+    argument << account.busName;
+    argument << account.objectPath;
+    argument << account.id;
+    argument << account.serviceId;
+    argument << account.displayName;
+    argument << account.providerName;
+    argument << account.iconName;
+    argument.endStructure();
+    return argument;
+}
+
+QDBusArgument const& operator>>(QDBusArgument const& argument, storage::internal::AccountDetails& account)
+{
+    argument.beginStructure();
+    argument >> account.busName;
+    argument >> account.objectPath;
+    argument >> account.id;
+    argument >> account.serviceId;
+    argument >> account.displayName;
+    argument >> account.providerName;
+    argument >> account.iconName;
+    argument.endStructure();
+    return argument;
+}
+
+}  // namespace internal
+}  // namespace storage
+}  // namespace unity

=== modified file 'src/internal/CMakeLists.txt'
--- src/internal/CMakeLists.txt	2016-08-12 06:19:22 +0000
+++ src/internal/CMakeLists.txt	2016-12-12 02:53:43 +0000
@@ -1,10 +1,18 @@
 set(src
+    AccountDetails.cpp
     dbusmarshal.cpp
+    EnvVars.cpp
+    InactivityTimer.cpp
     safe_strerror.cpp
     TraceMessageHandler.cpp
+    ${CMAKE_SOURCE_DIR}/include/unity/storage/internal/InactivityTimer.h
 )
 
+
 add_library(storage-framework-common-internal STATIC ${src})
+
+set_target_properties(storage-framework-common-internal PROPERTIES AUTOMOC TRUE)
+
 target_link_libraries(storage-framework-common-internal
     Qt5::DBus
 )

=== added file 'src/internal/EnvVars.cpp'
--- src/internal/EnvVars.cpp	1970-01-01 00:00:00 +0000
+++ src/internal/EnvVars.cpp	2016-12-12 02:53:43 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#include <unity/storage/internal/EnvVars.h>
+
+#include <cassert>
+#include <QDebug>
+
+#include <stdlib.h>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace internal
+{
+
+int EnvVars::registry_timeout_ms()
+{
+    int const dflt_val = REGISTRY_IDLE_TIMEOUT_DFLT * 1000;
+
+    auto const val = get(REGISTRY_IDLE_TIMEOUT);
+    if (val.empty())
+    {
+        return dflt_val;
+    }
+    try
+    {
+        size_t pos;
+        auto int_val = stoi(val, &pos);
+        if (pos != val.size())
+        {
+            throw invalid_argument("unexpected trailing character(s)");
+        }
+        if (int_val < 0)
+        {
+            throw invalid_argument("value must be >= 0");
+        }
+        return int_val;
+    }
+    catch (std::exception const& e)
+    {
+        qWarning().noquote().nospace() << "Invalid setting of env var " << QString::fromStdString(REGISTRY_IDLE_TIMEOUT)
+                                       << " (\"" << QString::fromStdString(val) << "\"): " << e.what();
+        qWarning().nospace() << "Using default value of " << REGISTRY_IDLE_TIMEOUT_DFLT;
+    }
+    return dflt_val;
+}
+
+string EnvVars::get(char const* var_name)
+{
+    assert(var_name != nullptr);
+
+    auto p = getenv(var_name);
+    if (!p)
+    {
+        return string();
+    }
+    return string(p);
+}
+
+}  // namespace internal
+}  // namespace storage
+}  // namespace unity

=== added file 'src/internal/InactivityTimer.cpp'
--- src/internal/InactivityTimer.cpp	1970-01-01 00:00:00 +0000
+++ src/internal/InactivityTimer.cpp	2016-12-12 02:53:43 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#include <unity/storage/internal/InactivityTimer.h>
+
+#include <QDebug>
+
+#include <cassert>
+
+namespace unity
+{
+namespace storage
+{
+namespace internal
+{
+
+InactivityTimer::InactivityTimer(int timeout_ms, std::function<void()> timeout_func)
+    : timeout_ms_(timeout_ms)
+    , timeout_func_(timeout_func)
+    , num_requests_(0)
+{
+    assert(timeout_ms_ >= 0);
+    assert(timeout_func);
+
+    connect(&timer_, &QTimer::timeout, this, &InactivityTimer::timeout);
+}
+
+InactivityTimer::~InactivityTimer() = default;
+
+void InactivityTimer::request_started()
+{
+    assert(num_requests_ >= 0);
+
+    if (num_requests_++ == 0)
+    {
+        timer_.stop();
+    }
+}
+
+void InactivityTimer::request_finished()
+{
+    assert(num_requests_ > 0);
+
+    if (--num_requests_ == 0)
+    {
+        timer_.start(timeout_ms_);
+    }
+}
+
+void InactivityTimer::timeout()
+{
+    timer_.stop();
+    disconnect(this);
+    try
+    {
+        timeout_func_();
+    }
+    catch (std::exception const& e)
+    {
+        auto msg = QString("InactivityTimer::timeout(): exception from timeout callback: ") + e.what();
+        qWarning().nospace() << msg;
+    }
+}
+
+} // namespace internal
+} // namespace storage
+} // namespace unity

=== modified file 'src/internal/TraceMessageHandler.cpp'
--- src/internal/TraceMessageHandler.cpp	2016-08-12 06:19:22 +0000
+++ src/internal/TraceMessageHandler.cpp	2016-12-12 02:53:43 +0000
@@ -80,10 +80,27 @@
 
 }  // namespace
 
+TraceMessageHandler::TraceMessageHandler()
+    : old_message_handler_(qInstallMessageHandler(trace_message_handler))
+{
+}
+
 TraceMessageHandler::TraceMessageHandler(string const& prog_name)
-{
-    prefix = prog_name;
-    old_message_handler_ = qInstallMessageHandler(trace_message_handler);
+    : TraceMessageHandler()
+{
+    prefix = prog_name;
+}
+
+TraceMessageHandler::TraceMessageHandler(QString const& prog_name)
+    : TraceMessageHandler()
+{
+    prefix = prog_name.toStdString();
+}
+
+TraceMessageHandler::TraceMessageHandler(char const* prog_name)
+    : TraceMessageHandler()
+{
+    prefix = prog_name;
 }
 
 TraceMessageHandler::~TraceMessageHandler()

=== modified file 'src/qt/Account.cpp'
--- src/qt/Account.cpp	2016-11-03 06:41:00 +0000
+++ src/qt/Account.cpp	2016-12-12 02:53:43 +0000
@@ -93,6 +93,16 @@
     return p_->displayName();
 }
 
+QString Account::providerName() const
+{
+    return p_->providerName();
+}
+
+QString Account::iconName() const
+{
+    return p_->iconName();
+}
+
 ItemListJob* Account::roots(QStringList const& keys) const
 {
     return p_->roots(keys);

=== modified file 'src/qt/AccountsJob.cpp'
--- src/qt/AccountsJob.cpp	2016-11-02 02:54:48 +0000
+++ src/qt/AccountsJob.cpp	2016-12-12 02:53:43 +0000
@@ -18,7 +18,6 @@
 
 #include <unity/storage/qt/AccountsJob.h>
 
-#include <unity/storage/qt/Account.h>
 #include <unity/storage/qt/internal/AccountsJobImpl.h>
 
 #include <QVariant>
@@ -33,13 +32,8 @@
 namespace qt
 {
 
-AccountsJob::AccountsJob(shared_ptr<internal::RuntimeImpl> const& runtime)
-    : p_(new internal::AccountsJobImpl(this, runtime))
-{
-}
-
-AccountsJob::AccountsJob(StorageError const& error)
-    : p_(new internal::AccountsJobImpl(this, error))
+AccountsJob::AccountsJob(unique_ptr<internal::AccountsJobImpl> accounts_job_impl)
+    : p_(move(accounts_job_impl))
 {
 }
 

=== modified file 'src/qt/CMakeLists.txt'
--- src/qt/CMakeLists.txt	2016-10-12 08:08:48 +0000
+++ src/qt/CMakeLists.txt	2016-12-12 02:53:43 +0000
@@ -4,11 +4,20 @@
     CLASSNAME ProviderInterface
     INCLUDE unity/storage/internal/dbusmarshal.h
 )
-
 qt5_add_dbus_interface(generated_files
     ${CMAKE_SOURCE_DIR}/data/provider.xml
     ProviderInterface
 )
+
+set_source_files_properties(${CMAKE_SOURCE_DIR}/data/registry.xml PROPERTIES
+    CLASSNAME RegistryInterface
+    INCLUDE unity/storage/internal/AccountDetails.h
+)
+qt5_add_dbus_interface(generated_files
+    ${CMAKE_SOURCE_DIR}/data/registry.xml
+    RegistryInterface
+)
+
 set_source_files_properties(${generated_files} dbusmarshal.cpp PROPERTIES
     COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wno-missing-field-initializers"
     GENERATED TRUE
@@ -71,7 +80,6 @@
 target_include_directories(storage-framework-qt-client-v2 PRIVATE
     ${Qt5DBus_INCLUDE_DIRS}
     ${Qt5Network_INCLUDE_DIRS}
-    ${ONLINEACCOUNTS_DEPS_INCLUDE_DIRS}
 )
 set_target_properties(storage-framework-qt-client-v2 PROPERTIES
     AUTOMOC TRUE
@@ -85,7 +93,6 @@
     Qt5::Core
     Qt5::DBus
     Qt5::Network
-    ${ONLINEACCOUNTS_DEPS_LDFLAGS}
 )
 install(
     TARGETS storage-framework-qt-client-v2

=== modified file 'src/qt/Runtime.cpp'
--- src/qt/Runtime.cpp	2016-09-22 01:52:20 +0000
+++ src/qt/Runtime.cpp	2016-12-12 02:53:43 +0000
@@ -70,11 +70,11 @@
 
 Account Runtime::make_test_account(QString const& bus_name,
                                    QString const& object_path,
-                                   QString const& owner_id,
-                                   QString const& owner,
-                                   QString const& description) const
+                                   quint32 id,
+                                   QString const& service_id,
+                                   QString const& display_name) const
 {
-    return p_->make_test_account(bus_name, object_path, owner_id, owner, description);
+    return p_->make_test_account(bus_name, object_path, id, service_id, display_name);
 }
 
 }  // namespace qt

=== modified file 'src/qt/client/internal/remote_client/RuntimeImpl.cpp'
--- src/qt/client/internal/remote_client/RuntimeImpl.cpp	2016-11-02 09:32:53 +0000
+++ src/qt/client/internal/remote_client/RuntimeImpl.cpp	2016-12-12 02:53:43 +0000
@@ -47,7 +47,7 @@
 
 static const map<QString, QString> BUS_NAMES =
 {
-    { "google-drive-scope", "com.canonical.StorageFramework.Provider.ProviderTest" },
+    { "storage-provider-test", "com.canonical.StorageFramework.Provider.ProviderTest" },
     { "com.canonical.scopes.mcloud_mcloud_mcloud", "com.canonical.StorageFramework.Provider.McloudProvider" },
     { "storage-provider-owncloud", "com.canonical.StorageFramework.Provider.OwnCloud" },
     { "storage-provider-onedrive", "com.canonical.StorageFramework.Provider.OnedriveProvider" },

=== modified file 'src/qt/internal/AccountImpl.cpp'
--- src/qt/internal/AccountImpl.cpp	2016-11-03 06:41:00 +0000
+++ src/qt/internal/AccountImpl.cpp	2016-12-12 02:53:43 +0000
@@ -48,37 +48,39 @@
 }
 
 AccountImpl::AccountImpl(shared_ptr<RuntimeImpl> const& runtime_impl,
-                         QString const& bus_name,
-                         QString const& object_path,
-                         QString const& id,
-                         QString const& service_id,
-                         QString const& display_name)
+                         storage::internal::AccountDetails const& details)
     : is_valid_(true)
-    , bus_name_(bus_name)
-    , object_path_(object_path)
-    , id_(id)
-    , service_id_(service_id)
-    , display_name_(display_name)
+    , details_(details)
     , runtime_impl_(runtime_impl)
-    , provider_(new ProviderInterface(bus_name, object_path, runtime_impl->connection()))
+    , provider_(new ProviderInterface(details.busName, details.objectPath.path(), runtime_impl->connection()))
 {
-    assert(!bus_name.isEmpty());
-    assert(!object_path.isEmpty());
+    assert(!details.busName.isEmpty());
+    assert(!details.objectPath.path().isEmpty());
 }
 
 QString AccountImpl::busName() const
 {
-    return is_valid_ ? bus_name_ : "";
+    return is_valid_ ? details_.busName : "";
 }
 
 QString AccountImpl::objectPath() const
 {
-    return is_valid_ ? object_path_ : "";
+    return is_valid_ ? details_.objectPath.path() : QDBusObjectPath().path();
 }
 
 QString AccountImpl::displayName() const
 {
-    return is_valid_ ? display_name_ : "";
+    return is_valid_ ? details_.displayName : "";
+}
+
+QString AccountImpl::providerName() const
+{
+    return is_valid_ ? details_.providerName : "";
+}
+
+QString AccountImpl::iconName() const
+{
+    return is_valid_ ? details_.iconName : "";
 }
 
 ItemListJob* AccountImpl::roots(QStringList const& keys) const
@@ -101,7 +103,8 @@
     {
         if (md.type != ItemType::root)
         {
-            QString msg = method + ": provider returned non-root item type: " + QString::number(int(md.type));
+            QString msg = method + ": provider returned non-root item type: " + QString::number(int(md.type)) +
+                          " (id = " + md.item_id + ")";
             qCritical().noquote() << msg;
             throw StorageErrorImpl::local_comms_error(msg);
         }
@@ -141,10 +144,7 @@
 {
     if (is_valid_)
     {
-        return    other.is_valid_
-               && id_ == other.id_
-               && service_id_ == other.service_id_
-               && display_name_ == other.display_name_;
+        return other.is_valid_ && details_ == other.details_;
     }
     return !other.is_valid_;
 }
@@ -164,24 +164,7 @@
     {
         return false;
     }
-    assert(is_valid_ && other.is_valid_);
-    if (id_ < other.id_)
-    {
-        return true;
-    }
-    if (id_ > other.id_)
-    {
-        return false;
-    }
-    if (service_id_ < other.service_id_)
-    {
-        return true;
-    }
-    if (service_id_ > other.service_id_)
-    {
-        return false;
-    }
-    return display_name_ < other.display_name_;
+    return details_ < other.details_;
 }
 
 bool AccountImpl::operator<=(AccountImpl const& other) const
@@ -215,21 +198,16 @@
     {
         return 0;
     }
-    size_t hash = 0;
-    boost::hash_combine(hash, qHash(service_id_));
-    boost::hash_combine(hash, qHash(id_));
-    boost::hash_combine(hash, qHash(display_name_));
+    size_t hash = details_.id;
+    boost::hash_combine(hash, qHash(details_.serviceId));
+    boost::hash_combine(hash, qHash(details_.displayName));
     return hash;
 }
 
 Account AccountImpl::make_account(shared_ptr<RuntimeImpl> const& runtime,
-                                  QString const& bus_name,
-                                  QString const& object_path,
-                                  QString const& id,
-                                  QString const& service_id,
-                                  QString const& display_name)
+                                  storage::internal::AccountDetails const& details)
 {
-    shared_ptr<AccountImpl> p(new AccountImpl(runtime, bus_name, object_path, id, service_id, display_name));
+    shared_ptr<AccountImpl> p(new AccountImpl(runtime, details));
     return Account(p);
 }
 

=== modified file 'src/qt/internal/AccountsJobImpl.cpp'
--- src/qt/internal/AccountsJobImpl.cpp	2016-11-03 07:33:40 +0000
+++ src/qt/internal/AccountsJobImpl.cpp	2016-12-12 02:53:43 +0000
@@ -18,12 +18,12 @@
 
 #include <unity/storage/qt/internal/AccountsJobImpl.h>
 
+#include "RegistryInterface.h"
 #include <unity/storage/qt/internal/AccountImpl.h>
+#include <unity/storage/qt/internal/Handler.h>
 #include <unity/storage/qt/internal/RuntimeImpl.h>
 #include <unity/storage/qt/internal/StorageErrorImpl.h>
 
-#include <OnlineAccounts/Account>
-
 #include <cassert>
 
 using namespace std;
@@ -37,38 +37,45 @@
 namespace internal
 {
 
-namespace
-{
-
-// TODO: We retrieve the accounts directly from online accounts until we have a working registry.
-
-static map<QString, QString> const BUS_NAMES =
-{
-    { "google-drive-scope", "com.canonical.StorageFramework.Provider.ProviderTest" },
-    { "com.canonical.scopes.mcloud_mcloud_mcloud", "com.canonical.StorageFramework.Provider.McloudProvider" },
-    { "storage-provider-owncloud", "com.canonical.StorageFramework.Provider.OwnCloud" },
-    { "storage-provider-onedrive", "com.canonical.StorageFramework.Provider.OnedriveProvider" },
-};
-
-}  // namespace
-
-AccountsJobImpl::AccountsJobImpl(AccountsJob* public_instance, shared_ptr<RuntimeImpl> const& runtime_impl)
-    : public_instance_(public_instance)
-    , status_(AccountsJob::Status::Loading)
+AccountsJobImpl::AccountsJobImpl(shared_ptr<RuntimeImpl> const& runtime_impl,
+                                 QString const& method,
+                                 QDBusPendingReply<QList<storage::internal::AccountDetails>>& reply)
+    : status_(AccountsJob::Status::Loading)
     , runtime_impl_(runtime_impl)
 {
-    assert(public_instance);
     assert(runtime_impl);
 
-    initialize_accounts();
+    auto process_reply = [this, method](decltype(reply)& r)
+    {
+        auto runtime = get_runtime_impl(method);
+        if (!runtime || !runtime->isValid())
+        {
+            return;
+        }
+
+        for (auto const& ad : r.value())
+        {
+            auto a = AccountImpl::make_account(runtime, ad);
+            accounts_.append(a);
+        }
+        status_ = AccountsJob::Status::Finished;
+        Q_EMIT public_instance_->statusChanged(status_);
+    };
+
+    auto process_error = [this](StorageError const& error)
+    {
+        error_ = error;
+        status_ = AccountsJob::Status::Error;
+        Q_EMIT public_instance_->statusChanged(status_);
+    };
+
+    new Handler<QList<storage::internal::AccountDetails>>(this, reply, process_reply, process_error);
 }
 
-AccountsJobImpl::AccountsJobImpl(AccountsJob* public_instance, StorageError const& error)
-    : public_instance_(public_instance)
-    , status_(AccountsJob::Status::Loading)
+AccountsJobImpl::AccountsJobImpl(StorageError const& error)
+    : status_(AccountsJob::Status::Error)
     , error_(error)
 {
-    assert(public_instance);
     assert(error.type() != StorageError::Type::NoError);
 
     status_ = emit_status_changed(AccountsJob::Status::Error);
@@ -113,21 +120,27 @@
     return account_list;
 }
 
-void AccountsJobImpl::manager_ready()
+AccountsJob* AccountsJobImpl::make_job(shared_ptr<RuntimeImpl> const& runtime,
+                                       QString const& method,
+                                       QDBusPendingReply<QList<storage::internal::AccountDetails>>& reply)
 {
-    timer_.stop();
-    disconnect(this);
-    initialize_accounts();
+    unique_ptr<AccountsJobImpl> impl(new AccountsJobImpl(runtime, method, reply));
+    auto job = new AccountsJob(move(impl));
+    job->p_->public_instance_ = job;
+    return job;
 }
 
-// LCOV_EXCL_START
-void AccountsJobImpl::timeout()
+AccountsJob* AccountsJobImpl::make_job(StorageError const& error)
 {
-    disconnect(this);
-    error_ = StorageErrorImpl::local_comms_error("AccountsJob(): timeout retrieving Online accounts");
-    status_ = emit_status_changed(AccountsJob::Status::Error);
+    unique_ptr<AccountsJobImpl> impl(new AccountsJobImpl(error));
+    auto job = new AccountsJob(move(impl));
+    job->p_->public_instance_ = job;
+    QMetaObject::invokeMethod(job,
+                              "statusChanged",
+                              Qt::QueuedConnection,
+                              Q_ARG(unity::storage::qt::AccountsJob::Status, job->p_->status_));
+    return job;
 }
-// LCOV_EXCL_STOP
 
 AccountsJob::Status AccountsJobImpl::emit_status_changed(AccountsJob::Status new_status) const
 {
@@ -152,43 +165,11 @@
         auto This = const_cast<AccountsJobImpl*>(this);
         This->error_ = StorageErrorImpl::runtime_destroyed_error(msg);
         This->status_ = emit_status_changed(AccountsJob::Status::Error);
+        return nullptr;
     }
     return runtime;
 }
 
-void AccountsJobImpl::initialize_accounts()
-{
-    auto runtime = get_runtime_impl("AccountsJob()");
-    assert(runtime);
-
-    auto manager = runtime->accounts_manager();
-    if (!manager->isReady())
-    {
-        connect(manager.get(), &OnlineAccounts::Manager::ready, this, &AccountsJobImpl::manager_ready);
-        connect(&timer_, &QTimer::timeout, this, &AccountsJobImpl::timeout);
-        timer_.setSingleShot(true);
-        timer_.start(30000);  // TODO: Need config for this eventually.
-        return;
-    }
-
-    for (auto const map_entry : BUS_NAMES)
-    {
-        auto service_id = map_entry.first;
-        for (auto const& a : manager->availableAccounts(service_id))
-        {
-            auto object_path = QStringLiteral("/provider/%1").arg(a->id());
-            auto bus_name = map_entry.second;
-            accounts_.append(AccountImpl::make_account(runtime,
-                                                       bus_name,
-                                                       object_path,
-                                                       QString::number(a->id()),
-                                                       a->serviceId(),
-                                                       a->displayName()));
-        }
-    }
-    status_ = emit_status_changed(AccountsJob::Status::Finished);
-}
-
 }  // namespace internal
 }  // namespace qt
 }  // namespace storage

=== modified file 'src/qt/internal/ItemImpl.cpp'
--- src/qt/internal/ItemImpl.cpp	2016-11-03 03:41:24 +0000
+++ src/qt/internal/ItemImpl.cpp	2016-12-12 02:53:43 +0000
@@ -153,7 +153,7 @@
     {
         if (md.type == ItemType::file)
         {
-            QString msg = method + ": provider returned a file as a parent";
+            QString msg = method + ": provider returned a file as a parent (id = " + md.item_id + ")";
             qCritical().noquote() << msg;
             throw StorageErrorImpl::local_comms_error(msg);
         }
@@ -178,7 +178,8 @@
             ||
             (md_.type != ItemType::file && md.type == ItemType::file))
         {
-            QString msg = method + ": source and target item type differ";
+            QString msg = method + "provider error: source and target item type differ (source id = " +
+                          md_.item_id + ", target id = " + md.item_id + ")";
             qCritical().noquote() << msg;
             throw StorageErrorImpl::local_comms_error(msg);
         }
@@ -203,7 +204,7 @@
     {
         if (md.type == ItemType::root)
         {
-            QString msg = method + ": impossible root item returned by provider";
+            QString msg = method + ": impossible root item returned by provider (id = " + md.item_id + ")";
             qCritical().noquote() << msg;
             throw StorageErrorImpl::local_comms_error(msg);
         }
@@ -211,7 +212,8 @@
             ||
             (md_.type != ItemType::file && md.type == ItemType::file))
         {
-            QString msg = method + ": provider error: source and target item type differ";
+            QString msg = method + ": provider error: source and target item type differ (source id = " +
+                          md_.item_id + ", target id = " + md.item_id + ")";
             qCritical().noquote() << msg;
             throw StorageErrorImpl::local_comms_error(msg);
         }
@@ -266,7 +268,7 @@
     {
         if (md.type != storage::ItemType::file)
         {
-            QString msg = method + ": impossible folder item returned by provider";
+            QString msg = method + ": impossible folder item returned by provider (id = " + md.item_id + ")";
             qCritical().noquote() << msg;
             throw StorageErrorImpl::local_comms_error(msg);
         }
@@ -318,7 +320,7 @@
     {
         if (md.type == storage::ItemType::root)
         {
-            QString msg = method + ": impossible root item returned by provider";
+            QString msg = method + ": impossible root item returned by provider (id = " + md.item_id + ")";
             qCritical().noquote() << msg;
             throw StorageErrorImpl::local_comms_error(msg);
         }
@@ -379,7 +381,7 @@
         {
             return;
         }
-        QString msg = method + ": impossible file item returned by provider";
+        QString msg = method + ": impossible file item returned by provider (id = " + md.item_id + ")";
         qCritical().noquote() << msg;
         throw StorageErrorImpl::local_comms_error(msg);
     };
@@ -423,7 +425,7 @@
     {
         if (md.type != storage::ItemType::file)
         {
-            QString msg = method + ": impossible folder item returned by provider";
+            QString msg = method + ": impossible folder item returned by provider (id = " + md.item_id + ")";
             qCritical().noquote() << msg;
             throw StorageErrorImpl::local_comms_error(msg);
         }

=== modified file 'src/qt/internal/ItemListJobImpl.cpp'
--- src/qt/internal/ItemListJobImpl.cpp	2016-10-12 07:23:15 +0000
+++ src/qt/internal/ItemListJobImpl.cpp	2016-12-12 02:53:43 +0000
@@ -62,16 +62,14 @@
                 auto item = ItemImpl::make_item(method_, md, account_impl_);
                 items.append(item);
             }
-            catch (StorageError const&)
+            catch (StorageError const& e)
             {
                 // Bad metadata received from provider, validate_() or make_item() have logged it.
+                error_ = e;
             }
         }
-        status_ = ItemListJob::Status::Finished;
-        if (!items.isEmpty())
-        {
-            Q_EMIT public_instance_->itemsReady(items);
-        }
+        status_ = error_.type() == StorageError::NoError ? ItemListJob::Finished : ItemListJob::Error;
+        Q_EMIT public_instance_->itemsReady(items);
         Q_EMIT public_instance_->statusChanged(status_);
     };
 

=== modified file 'src/qt/internal/MultiItemListJobImpl.cpp'
--- src/qt/internal/MultiItemListJobImpl.cpp	2016-10-12 07:23:15 +0000
+++ src/qt/internal/MultiItemListJobImpl.cpp	2016-12-12 02:53:43 +0000
@@ -86,10 +86,7 @@
         {
             status_ = ItemListJob::Status::Finished;
         }
-        if (!items.isEmpty())
-        {
-            Q_EMIT public_instance_->itemsReady(items);
-        }
+        Q_EMIT public_instance_->itemsReady(items);
         if (token.isEmpty())
         {
             Q_EMIT public_instance_->statusChanged(status_);

=== modified file 'src/qt/internal/RuntimeImpl.cpp'
--- src/qt/internal/RuntimeImpl.cpp	2016-10-10 05:24:16 +0000
+++ src/qt/internal/RuntimeImpl.cpp	2016-12-12 02:53:43 +0000
@@ -18,15 +18,17 @@
 
 #include <unity/storage/qt/internal/RuntimeImpl.h>
 
+#include "RegistryInterface.h"
 #include <unity/storage/internal/dbusmarshal.h>
-#include <unity/storage/qt/AccountsJob.h>
+#include <unity/storage/internal/EnvVars.h>
 #include <unity/storage/qt/internal/AccountImpl.h>
+#include <unity/storage/qt/internal/AccountsJobImpl.h>
 #include <unity/storage/qt/internal/StorageErrorImpl.h>
-#include <unity/storage/qt/Item.h>
 #include <unity/storage/qt/ItemJob.h>
 #include <unity/storage/qt/ItemListJob.h>
 #include <unity/storage/qt/Runtime.h>
 #include <unity/storage/qt/VoidJob.h>
+#include <unity/storage/registry/Registry.h>
 
 #include <QDBusError>
 #include <QDBusMetaType>
@@ -57,6 +59,9 @@
 
     qDBusRegisterMetaType<unity::storage::internal::ItemMetadata>();
     qDBusRegisterMetaType<QList<unity::storage::internal::ItemMetadata>>();
+
+    qDBusRegisterMetaType<unity::storage::internal::AccountDetails>();
+    qDBusRegisterMetaType<QList<unity::storage::internal::AccountDetails>>();
 }
 
 }
@@ -66,10 +71,12 @@
 {
 }
 
-RuntimeImpl::RuntimeImpl(QDBusConnection const& bus)
+RuntimeImpl::RuntimeImpl(QDBusConnection const& conn)
     : is_valid_(true)
-    , conn_(bus)
-    , accounts_manager_(new OnlineAccounts::Manager("", conn_))
+    , conn_(conn)
+    , registry_(new RegistryInterface(storage::registry::BUS_NAME,
+                                      storage::registry::OBJECT_PATH,
+                                      conn_))
 {
     register_meta_types();
 }
@@ -96,13 +103,17 @@
 
 AccountsJob* RuntimeImpl::accounts() const
 {
+    QString const method = "Runtime::accounts()";
+
     if (!is_valid_)
     {
         QString msg = "Runtime::accounts(): Runtime was destroyed previously";
-        return new AccountsJob(StorageErrorImpl::runtime_destroyed_error(msg));
+        return AccountsJobImpl::make_job(StorageErrorImpl::runtime_destroyed_error(msg));
     }
-    auto This = const_cast<RuntimeImpl*>(this);
-    return new AccountsJob(This->shared_from_this());
+
+    auto reply = registry_->ListAccounts();
+    auto This = const_pointer_cast<RuntimeImpl>(shared_from_this());
+    return AccountsJobImpl::make_job(This, method, reply);
 }
 
 StorageError RuntimeImpl::shutdown()
@@ -116,23 +127,14 @@
     return error_;
 }
 
-shared_ptr<OnlineAccounts::Manager> RuntimeImpl::accounts_manager() const
-{
-    return accounts_manager_;
-}
-
 Account RuntimeImpl::make_test_account(QString const& bus_name,
                                        QString const& object_path,
-                                       QString const& owner_id,
-                                       QString const& owner,
-                                       QString const& description)
+                                       quint32 id,
+                                       QString const& service_id,
+                                       QString const& name)
 {
-    return AccountImpl::make_account(shared_from_this(),
-                                     bus_name,
-                                     object_path,
-                                     owner_id,
-                                     owner,
-                                     description);
+    storage::internal::AccountDetails ad{bus_name, QDBusObjectPath(object_path), id, service_id, name, "", ""};
+    return AccountImpl::make_account(shared_from_this(), ad);
 }
 
 }  // namespace internal

=== modified file 'src/qt/internal/validate.cpp'
--- src/qt/internal/validate.cpp	2016-11-02 06:06:32 +0000
+++ src/qt/internal/validate.cpp	2016-12-12 02:53:43 +0000
@@ -110,69 +110,81 @@
 {
     using namespace unity::storage::metadata;
 
-    QString prefix = method + ": received invalid metadata from provider: ";
-
-    // Basic sanity checks for mandatory fields.
-    if (md.item_id.isEmpty())
-    {
-        throw StorageErrorImpl::local_comms_error(prefix + "item_id cannot be empty");
-    }
-    if (md.type != ItemType::root)
-    {
-        if (md.parent_ids.isEmpty())
-        {
-            throw StorageErrorImpl::local_comms_error(prefix + "file or folder must have at least one parent ID");
-        }
-        for (int i = 0; i < md.parent_ids.size(); ++i)
-        {
-            if (md.parent_ids.at(i).isEmpty())
-            {
-                throw StorageErrorImpl::local_comms_error(prefix + "parent_id of file or folder cannot be empty");
-            }
-        }
-    }
-    if (md.type == ItemType::root && !md.parent_ids.isEmpty())
-    {
-        throw StorageErrorImpl::local_comms_error(prefix + "parent_ids of root must be empty");
-    }
-    if (md.type != ItemType::root)  // Dropbox does not support metadata for roots.
-    {
-        if (md.name.isEmpty())
-        {
-            throw StorageErrorImpl::local_comms_error(prefix + "name cannot be empty");
-        }
-    }
-    if (md.type == ItemType::file && md.etag.isEmpty())  // WebDav doesn't do etag for folders.
-    {
-        throw StorageErrorImpl::local_comms_error(prefix + "etag of a file cannot be empty");
-    }
-
-    // Sanity check metadata to make sure only known metadata keys appear.
-    QMapIterator<QString, QVariant> actual(md.metadata);
-    while (actual.hasNext())
-    {
-        actual.next();
-        auto known = known_metadata.find(actual.key().toStdString());
-        if (known == known_metadata.end())
-        {
-            qWarning().noquote().nospace() << prefix << "unknown metadata key: \"" << actual.key() << "\"";
-        }
-        else
-        {
-            validate_type_and_value(prefix, actual, known);
-        }
-    }
-
-    // Sanity check metadata to make sure that mandatory fields are present.
-    if (md.type == ItemType::file)
-    {
-        if (!md.metadata.contains(metadata::SIZE_IN_BYTES) ||
-            !md.metadata.contains(metadata::LAST_MODIFIED_TIME))
-        {
-            QString msg = prefix + "missing key \"" + metadata::SIZE_IN_BYTES + "\" "
-                          "in metadata for \"" + md.item_id + "\"";
-            throw StorageErrorImpl::local_comms_error(msg);
-        }
+    QString prefix = method + ": received invalid metadata from provider";
+    if (!md.item_id.isEmpty())
+    {
+        prefix += " (id = " + md.item_id + ")";
+    }
+    prefix += ": ";
+
+    try
+    {
+        // Basic sanity checks for mandatory fields.
+        if (md.item_id.isEmpty())
+        {
+            throw StorageErrorImpl::local_comms_error(prefix + "item_id cannot be empty");
+        }
+        if (md.type != ItemType::root)
+        {
+            if (md.parent_ids.isEmpty())
+            {
+                throw StorageErrorImpl::local_comms_error(prefix + "file or folder must have at least one parent ID");
+            }
+            for (int i = 0; i < md.parent_ids.size(); ++i)
+            {
+                if (md.parent_ids.at(i).isEmpty())
+                {
+                    throw StorageErrorImpl::local_comms_error(prefix + "parent_id of file or folder cannot be empty");
+                }
+            }
+        }
+        if (md.type == ItemType::root && !md.parent_ids.isEmpty())
+        {
+            throw StorageErrorImpl::local_comms_error(prefix + "parent_ids of root must be empty");
+        }
+        if (md.type != ItemType::root)  // Dropbox does not support metadata for roots.
+        {
+            if (md.name.isEmpty())
+            {
+                throw StorageErrorImpl::local_comms_error(prefix + "name cannot be empty");
+            }
+        }
+        if (md.type == ItemType::file && md.etag.isEmpty())  // WebDav doesn't do etag for folders.
+        {
+            throw StorageErrorImpl::local_comms_error(prefix + "etag of a file cannot be empty");
+        }
+
+        // Sanity check metadata to make sure only known metadata keys appear.
+        QMapIterator<QString, QVariant> actual(md.metadata);
+        while (actual.hasNext())
+        {
+            actual.next();
+            auto known = known_metadata.find(actual.key().toStdString());
+            if (known == known_metadata.end())
+            {
+                qWarning().noquote().nospace() << prefix << "unknown metadata key: \"" << actual.key() << "\"";
+            }
+            else
+            {
+                validate_type_and_value(prefix, actual, known);
+            }
+        }
+
+        // Sanity check metadata to make sure that mandatory fields are present.
+        if (md.type == ItemType::file)
+        {
+            if (!md.metadata.contains(metadata::SIZE_IN_BYTES) ||
+                !md.metadata.contains(metadata::LAST_MODIFIED_TIME))
+            {
+                QString msg = prefix + "missing key \"" + metadata::SIZE_IN_BYTES + "\" in metadata";
+                throw StorageErrorImpl::local_comms_error(msg);
+            }
+        }
+    }
+    catch (StorageError const& e)
+    {
+        qCritical().noquote() << e.errorString();
+        throw;
     }
 }
 

=== added directory 'src/registry'
=== added file 'src/registry/CMakeLists.txt'
--- src/registry/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/registry/CMakeLists.txt	2016-12-12 02:53:43 +0000
@@ -0,0 +1,47 @@
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${ONLINEACCOUNTS_DEPS_INCLUDE_DIRS}
+)
+
+set(TARGET "storage-framework-registry")
+
+qt5_add_dbus_adaptor(adaptor_files
+    ${CMAKE_SOURCE_DIR}/data/registry.xml
+    unity/storage/registry/internal/RegistryAdaptor.h
+    unity::storage::registry::internal::RegistryAdaptor
+)
+
+set_source_files_properties(${adaptor_files} PROPERTIES
+    COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wno-missing-field-initializers"
+    GENERATED TRUE
+)
+
+add_executable(${TARGET}
+    internal/ListAccountsHandler.cpp
+    internal/qdbus-last-error-msg.cpp
+    internal/RegistryAdaptor.cpp
+    main.cpp
+    ${CMAKE_SOURCE_DIR}/include/unity/storage/registry/internal/ListAccountsHandler.h
+    ${CMAKE_SOURCE_DIR}/include/unity/storage/registry/internal/RegistryAdaptor.h
+    ${adaptor_files})
+
+set_target_properties(${TARGET} PROPERTIES AUTOMOC TRUE)
+
+target_link_libraries(${TARGET}
+    storage-framework-common-internal
+    Qt5::Core
+    Qt5::DBus
+    ${ONLINEACCOUNTS_DEPS_LDFLAGS}
+)
+
+install(
+    TARGETS ${TARGET}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
+)
+
+configure_file(com.canonical.StorageFramework.Registry.service.in com.canonical.StorageFramework.Registry.service)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.StorageFramework.Registry.service
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
+)

=== added file 'src/registry/com.canonical.StorageFramework.Registry.service.in'
--- src/registry/com.canonical.StorageFramework.Registry.service.in	1970-01-01 00:00:00 +0000
+++ src/registry/com.canonical.StorageFramework.Registry.service.in	2016-12-12 02:53:43 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.canonical.StorageFramework.Registry
+Exec=@CMAKE_INSTALL_FULL_LIBDIR@/@PROJECT_NAME@/storage-framework-registry

=== added directory 'src/registry/internal'
=== added file 'src/registry/internal/ListAccountsHandler.cpp'
--- src/registry/internal/ListAccountsHandler.cpp	1970-01-01 00:00:00 +0000
+++ src/registry/internal/ListAccountsHandler.cpp	2016-12-12 02:53:43 +0000
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#include <unity/storage/registry/internal/ListAccountsHandler.h>
+
+#include <unity/storage/internal/AccountDetails.h>
+#include <unity/storage/registry/internal/qdbus-last-error-msg.h>
+
+#include <OnlineAccounts/Account>
+#include <QDebug>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace registry
+{
+namespace internal
+{
+
+ListAccountsHandler::ListAccountsHandler(QDBusConnection const& conn,
+                                         QDBusMessage const& msg,
+                                         shared_ptr<storage::internal::InactivityTimer> const& timer)
+    : conn_(conn)
+    , msg_(msg)
+    , manager_("", conn)
+    , activity_notifier_(timer)
+{
+    connect(&manager_, &OnlineAccounts::Manager::ready, this, &ListAccountsHandler::manager_ready);
+    connect(&timer_, &QTimer::timeout, this, &ListAccountsHandler::timeout);
+    timer_.setSingleShot(true);
+    timer_.start(25000);  // TODO: Need config for this eventually.
+}
+
+ListAccountsHandler::~ListAccountsHandler() = default;
+
+namespace
+{
+
+// TODO: This is a hack until Online Accounts is updated to give us the provider ID, provider name, and icon name.
+
+struct ProviderDetails
+{
+    char const* bus_name;
+    char const* provider_name;
+};
+
+static map<QString, ProviderDetails> const BUS_NAMES =
+{
+    { "storage-provider-test", { "com.canonical.StorageFramework.Provider.ProviderTest", "Test Provider" } },
+    { "com.canonical.scopes.mcloud_mcloud_mcloud", { "com.canonical.StorageFramework.Provider.McloudProvider", "mcloud" } },
+    { "storage-provider-owncloud", { "com.canonical.StorageFramework.Provider.OwnCloud", "ownCloud" } },
+    { "storage-provider-onedrive", { "com.canonical.StorageFramework.Provider.OnedriveProvider", "OneDrive" } },
+};
+
+}  // namespace
+
+void ListAccountsHandler::manager_ready()
+{
+    timer_.stop();
+    disconnect(this);
+    deleteLater();
+
+    QList<storage::internal::AccountDetails> accounts;
+    for (auto const& acct : manager_.availableAccounts())
+    {
+        auto const it = BUS_NAMES.find(acct->serviceId());
+        if (it == BUS_NAMES.end())
+        {
+            continue;
+        }
+
+        storage::internal::AccountDetails ad;
+        ad.busName = it->second.bus_name;
+        ad.objectPath = QDBusObjectPath(QStringLiteral("/provider/%1").arg(acct->id()));
+        ad.id = acct->id();
+        ad.serviceId = acct->serviceId();
+        ad.displayName = acct->displayName();
+        ad.providerName = it->second.provider_name;
+        ad.iconName = "";
+
+        accounts.append(ad);
+    }
+
+    if (!conn_.send(msg_.createReply(QVariant::fromValue(accounts))))
+    {
+        auto msg = last_error_msg(conn_);
+        qCritical().noquote() << "ListAccounts(): could not send DBus reply" + msg;
+    }
+}
+
+void ListAccountsHandler::timeout()
+{
+    disconnect(this);
+    deleteLater();
+
+    QString err = QString("cannot contact Online Accounts: request timed out after ") +
+                  QString::number(timer_.interval()) + " ms";
+    qCritical().noquote() << err;
+    if (!conn_.send(msg_.createErrorReply(QDBusError::Other, err)))
+    {
+        auto msg = last_error_msg(conn_);
+        qCritical().noquote() << "ListAccounts(): could not send DBus error reply" + msg;
+    }
+}
+
+} // namespace internal
+} // namespace registry
+} // namespace storage
+} // namespace unity

=== added file 'src/registry/internal/RegistryAdaptor.cpp'
--- src/registry/internal/RegistryAdaptor.cpp	1970-01-01 00:00:00 +0000
+++ src/registry/internal/RegistryAdaptor.cpp	2016-12-12 02:53:43 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#include <unity/storage/registry/internal/RegistryAdaptor.h>
+
+#include <unity/storage/registry/internal/ListAccountsHandler.h>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace registry
+{
+namespace internal
+{
+
+RegistryAdaptor::RegistryAdaptor(QDBusConnection const& conn,
+                                 shared_ptr<storage::internal::InactivityTimer> const& timer,
+                                 QObject* parent)
+    : QObject(parent)
+    , conn_(conn)
+    , timer_(timer)
+{
+}
+
+RegistryAdaptor::~RegistryAdaptor() = default;
+
+QList<unity::storage::internal::AccountDetails> RegistryAdaptor::ListAccounts()
+{
+    new ListAccountsHandler(conn_, message(), timer_);  // Handler deletes itself once done.
+    setDelayedReply(true);
+    return QList<unity::storage::internal::AccountDetails>();
+}
+
+} // namespace internal
+} // namespace registry
+} // namespace storage
+} // namespace unity

=== added file 'src/registry/internal/qdbus-last-error-msg.cpp'
--- src/registry/internal/qdbus-last-error-msg.cpp	1970-01-01 00:00:00 +0000
+++ src/registry/internal/qdbus-last-error-msg.cpp	2016-12-12 02:53:43 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#include <unity/storage/registry/internal/qdbus-last-error-msg.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-align"
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QDBusError>
+#pragma GCC diagnostic pop
+
+namespace unity
+{
+namespace storage
+{
+namespace registry
+{
+namespace internal
+{
+
+QString last_error_msg(QDBusConnection const& conn)
+{
+    auto msg = conn.lastError().message();
+    if (!msg.isEmpty())
+    {
+        msg = ": " + msg;
+    }
+    return msg;
+}
+
+}  // namespace internal
+}  // namespace registry
+}  // namespace storage
+}  // namespace unity

=== added file 'src/registry/main.cpp'
--- src/registry/main.cpp	1970-01-01 00:00:00 +0000
+++ src/registry/main.cpp	2016-12-12 02:53:43 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+#include "registryadaptor.h"
+#include <unity/storage/internal/EnvVars.h>
+#include <unity/storage/internal/InactivityTimer.h>
+#include <unity/storage/internal/TraceMessageHandler.h>
+#include <unity/storage/registry/internal/qdbus-last-error-msg.h>
+#include <unity/storage/registry/internal/RegistryAdaptor.h>
+#include <unity/storage/registry/Registry.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-align"
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QCoreApplication>
+#include <QDBusArgument>
+#include <QDBusError>
+#include <QFileInfo>
+#pragma GCC diagnostic pop
+
+using namespace unity::storage;
+using namespace unity::storage::registry::internal;
+using namespace std;
+
+int main(int argc, char* argv[])
+{
+    auto const prog_name = QFileInfo(argv[0]).fileName();
+    internal::TraceMessageHandler message_handler(prog_name);
+
+    int rc = 1;
+    try
+    {
+        QCoreApplication app(argc, argv);
+
+        auto conn = QDBusConnection::sessionBus();
+
+        int const timeout_ms = internal::EnvVars::registry_timeout_ms();
+        auto timeout_func = [&app, timeout_ms]
+        {
+            qInfo().noquote().nospace() << "Exiting after " << QString::number(timeout_ms) << " ms of idle time";
+            app.quit();
+        };
+        auto inactivity_timer = make_shared<unity::storage::internal::InactivityTimer>(timeout_ms, timeout_func);
+
+        registry::internal::RegistryAdaptor registry_adaptor(conn, inactivity_timer);
+        new ::RegistryAdaptor(&registry_adaptor);
+
+        auto const& object_path = registry::OBJECT_PATH;
+        if (!conn.registerObject(object_path, &registry_adaptor))
+        {
+            auto msg = last_error_msg(conn);
+            throw runtime_error(string("Could not register object path ") +
+                                       object_path.toStdString() + msg.toStdString());
+        }
+
+        qDBusRegisterMetaType<unity::storage::internal::AccountDetails>();
+        qDBusRegisterMetaType<QList<unity::storage::internal::AccountDetails>>();
+
+        auto const& bus_name = registry::BUS_NAME;
+        if (!conn.registerService(bus_name))
+        {
+            auto msg = last_error_msg(conn);
+            throw runtime_error(string("Could not acquire DBus name ") + bus_name.toStdString() + msg.toStdString());
+        }
+
+        rc = app.exec();
+
+        if (!conn.unregisterService(bus_name))
+        {
+            auto msg = last_error_msg(conn);
+            throw runtime_error(string("Could not release DBus name ") + bus_name.toStdString() + msg.toStdString());
+        }
+    }
+    catch (std::exception const& e)
+    {
+        qCritical().noquote() << e.what();
+    }
+
+    return rc;
+}

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-09-08 08:33:59 +0000
+++ tests/CMakeLists.txt	2016-12-12 02:53:43 +0000
@@ -1,10 +1,4 @@
-# We add -g so we get debug info for the gtest stack frames with gdb.
-# The warnings are suppressed so we get a noise-free build for gtest and gmock.
-
-set(old_cxx_flags ${CMAKE_CXX_FLAGS})
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wno-old-style-cast -Wno-missing-field-initializers")
 find_package(GMock)
-set(CMAKE_CXX_FLAGS ${old_cxx_flags})
 
 configure_file(testsetup.h.in testsetup.h @ONLY)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
@@ -12,6 +6,7 @@
 add_subdirectory(utils)
 
 set(unit_test_dirs
+    registry
     local-client
     remote-client
     remote-client-v1

=== modified file 'tests/copyright/check_copyright.sh'
--- tests/copyright/check_copyright.sh	2016-11-04 10:52:10 +0000
+++ tests/copyright/check_copyright.sh	2016-12-12 02:53:43 +0000
@@ -22,6 +22,8 @@
 # Check that we have acceptable license information in our source files.
 #
 
+set -eu
+
 usage()
 {
     echo "usage: check_copyright dir [ignore_dir]" >&2
@@ -31,6 +33,9 @@
 [ $# -lt 1 ] && usage
 [ $# -gt 2 ] && usage
 
+source_dir="$1"
+ignore_dir="${2:-}"
+
 ignore_pat="\\.sci$|\\.swp$|\\.bzr|debian|qmldir|HACKING|ubsan-suppress|valgrind-suppress|\\.txt$|\\.xml$|\\.in$|\\.dox$|\\.yaml$"
 
 #
@@ -39,15 +44,16 @@
 # the output with grep -F, so we don't get false positives from licensecheck.
 #
 
-[ $# -eq 2 ] && ignore_dir="$2"
-
-if [ -n "$ignore_dir" ]
-then
-    licensecheck -i "$ignore_pat" -r "$1" | grep -F "$ignore_dir" -v | grep 'No copyright'
+licensecheck -i "$ignore_pat" -r "$source_dir" > licensecheck.log
+if [ -n "$ignore_dir" ]; then
+    cat licensecheck.log | grep -v -F "$ignore_dir" | grep "No copyright" > filtered.log || :
 else
-    licensecheck -i "$ignore_pat" -r "$1" | grep 'No copyright'
+    cat licensecheck.log | grep "No copyright" > filtered.log || :
 fi
 
-[ $? -eq 0 ] && exit 1
+if [ -s filtered.log ]; then
+    cat filtered.log
+    exit 1
+fi
 
 exit 0

=== modified file 'tests/headers/CMakeLists.txt'
--- tests/headers/CMakeLists.txt	2016-09-08 08:33:59 +0000
+++ tests/headers/CMakeLists.txt	2016-12-12 02:53:43 +0000
@@ -41,14 +41,14 @@
     add_test(stand-alone-${location}-headers
         ${CMAKE_CURRENT_SOURCE_DIR}/compile_headers.py
             ${extra_defines}
-            ${public_inc_dir} ${CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER_ARG1} -fPIC -fsyntax-only -I${root_inc_dir} -I${public_inc_dir} ${other_inc_dirs} ${CMAKE_CXX_FLAGS} ${extra_inc_dirs}")
+            ${public_inc_dir} ${CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER_ARG1} -fPIC -I${root_inc_dir} -I${public_inc_dir} ${other_inc_dirs} ${CMAKE_CXX_FLAGS} ${extra_inc_dirs}")
 
     # Test that each internal header compiles stand-alone.
     if (IS_DIRECTORY ${internal_inc_dir})
         add_test(stand-alone-${location}-internal-headers
             ${CMAKE_CURRENT_SOURCE_DIR}/compile_headers.py
                 ${extra_defines}
-                ${internal_inc_dir} ${CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER_ARG1} -fPIC -fsyntax-only -I${root_inc_dir} -I${internal_inc_dir} ${other_inc_dirs} ${CMAKE_CXX_FLAGS} ${extra_inc_dirs}")
+                ${internal_inc_dir} ${CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER_ARG1} -fPIC -I${root_inc_dir} -I${internal_inc_dir} ${other_inc_dirs} ${CMAKE_CXX_FLAGS} ${extra_inc_dirs}")
     endif()
 
     if (NOT ${public_inc_dir} MATCHES "/internal/")

=== modified file 'tests/headers/compile_headers.py'
--- tests/headers/compile_headers.py	2016-08-22 04:35:33 +0000
+++ tests/headers/compile_headers.py	2016-12-12 02:53:43 +0000
@@ -52,7 +52,6 @@
 import shlex
 import subprocess
 import sys
-import tempfile
 import concurrent.futures, multiprocessing
 
 #
@@ -74,16 +73,20 @@
 #
 def run_compiler(hdr, compiler, copts, define, verbose, hdr_dir):
     try:
-        src = tempfile.NamedTemporaryFile(suffix='.cpp', dir='.')
+        compile_dir = "./.header_tests"
+        os.makedirs(compile_dir, exist_ok=True)
+        src_name = os.path.join(compile_dir, hdr) + ".cpp"
+
+        if not os.path.exists(src_name):
+            src_fd = os.open(src_name, os.O_WRONLY | os.O_CREAT)
+            src = os.fdopen(src_fd, 'w')
+            src.write("#include <" + hdr + ">" + "\n")
+            src.write("#include <" + hdr + ">" + "\n")  # To test that double-inclusion is safe
 
         # Add any extra defines to the command line.
         for flag in define:
             copts = "-D" + flag + " " + copts
 
-        src.write(bytes("#include <" + hdr + ">" + "\n", 'UTF-8'))
-        src.flush()                                                 # Need this to make the file visible
-        src_name = os.path.join('.', src.name)
-
         if verbose:
             print(compiler + " -c " + src_name + " " + copts)
 
@@ -91,13 +94,13 @@
         if status != 0:
             message("cannot compile \"" + hdr + "\"") # Yes, write to stdout because this is expected output
 
-        obj = os.path.splitext(src_name)[0] + ".o"
+        obj = hdr + ".o"
         try:
             os.unlink(obj)
         except:
             pass
 
-        gcov = os.path.splitext(src_name)[0] + ".gcno"
+        gcov = hdr + ".gcno"
         try:
             os.unlink(gcov)
         except:

=== modified file 'tests/local-client/local-client_test.cpp'
--- tests/local-client/local-client_test.cpp	2016-08-26 04:45:56 +0000
+++ tests/local-client/local-client_test.cpp	2016-12-12 02:53:43 +0000
@@ -21,7 +21,11 @@
 #include <unity/storage/qt/client/internal/local_client/boost_filesystem.h>
 #include <unity/storage/qt/client/internal/local_client/tmpfile_prefix.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <QCoreApplication>
 #include <QFile>
 #include <QFutureWatcher>

=== modified file 'tests/provider-AccountData/AccountData_test.cpp'
--- tests/provider-AccountData/AccountData_test.cpp	2016-09-28 11:58:35 +0000
+++ tests/provider-AccountData/AccountData_test.cpp	2016-12-12 02:53:43 +0000
@@ -22,7 +22,11 @@
 
 #include <utils/DBusEnvironment.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <OnlineAccounts/Account>
 #include <OnlineAccounts/Manager>
 #include <QCoreApplication>

=== modified file 'tests/provider-DBusPeerCache/DBusPeerCache_test.cpp'
--- tests/provider-DBusPeerCache/DBusPeerCache_test.cpp	2016-07-28 03:10:57 +0000
+++ tests/provider-DBusPeerCache/DBusPeerCache_test.cpp	2016-12-12 02:53:43 +0000
@@ -20,7 +20,11 @@
 
 #include <utils/DBusEnvironment.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <OnlineAccounts/Account>
 #include <OnlineAccounts/Manager>
 #include <QCoreApplication>

=== modified file 'tests/provider-ProviderInterface/TestProvider.cpp'
--- tests/provider-ProviderInterface/TestProvider.cpp	2016-11-03 02:43:43 +0000
+++ tests/provider-ProviderInterface/TestProvider.cpp	2016-12-12 02:53:43 +0000
@@ -87,7 +87,7 @@
 boost::future<Item> TestUploadJob::finish()
 {
     boost::promise<Item> p;
-    printf("TestUploadJob::finish(): %d read of expected %d\n", (int) bytes_read_, (int) size_);
+    printf("TestUploadJob::finish(): %d read of expected %d\n", int(bytes_read_), int(size_));
     notifier_.setEnabled(false);
     drain();
     if (bytes_read_ == size_)
@@ -139,7 +139,7 @@
 
 void TestUploadJob::read_some()
 {
-    printf("TestUploadJob::read_some(): %d read of expected %d\n", (int) bytes_read_, (int) size_);
+    printf("TestUploadJob::read_some(): %d read of expected %d\n", int(bytes_read_), int(size_));
 
     char buf[5];
     ssize_t n_read = read(read_socket(), buf, sizeof(buf));
@@ -248,7 +248,7 @@
 boost::future<void> TestDownloadJob::finish()
 {
     boost::promise<void> p;
-    if (bytes_written_ < (ssize_t)data_.size())
+    if (bytes_written_ < ssize_t(data_.size()))
     {
         p.set_exception(LogicException("Not all data read"));
     }
@@ -261,14 +261,14 @@
 
 void TestDownloadJob::write_some()
 {
-    if (bytes_written_ >= (ssize_t)data_.size()) {
+    if (bytes_written_ >= ssize_t(data_.size())) {
         report_complete();
         timer_.stop();
         return;
     }
 
     ssize_t n_written = write(write_socket(), data_.data() + bytes_written_,
-                              min(data_.size() - bytes_written_, (size_t)2));
+                              min(data_.size() - bytes_written_, size_t(2)));
     if (n_written < 0)
     {
         int error_code = errno;

=== added directory 'tests/registry'
=== added file 'tests/registry/CMakeLists.txt'
--- tests/registry/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/registry/CMakeLists.txt	2016-12-12 02:53:43 +0000
@@ -0,0 +1,20 @@
+add_executable(registry_test registry_test.cpp)
+#set_target_properties(remote-client_test PROPERTIES AUTOMOC TRUE)
+
+#add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}" -DBOOST_THREAD_VERSION=4)
+#include_directories(${GLIB_DEPS_INCLUDE_DIRS})
+
+#target_link_libraries(remote-client_test
+#    storage-framework-provider
+#    storage-framework-qt-client-v2
+#    Qt5::Network
+#    Qt5::Test
+#    ${Boost_LIBRARIES}
+#    ${GLIB_DEPS_LIBRARIES}
+#    testutils
+#    gtest
+#)
+add_test(registry registry_test)
+#add_dependencies(remote-client_test qt-client-all-headers provider-test)
+
+#set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)

=== added file 'tests/registry/registry_test.cpp'
--- tests/registry/registry_test.cpp	1970-01-01 00:00:00 +0000
+++ tests/registry/registry_test.cpp	2016-12-12 02:53:43 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2016 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 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 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: Michi Henning <[e-mail]>
+ */
+
+int main(int argc, char** argv)
+{
+#if 0
+    QCoreApplication app(argc, argv);
+
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+#endif
+}

=== modified file 'tests/remote-client-v1/remote-client-v1_test.cpp'
--- tests/remote-client-v1/remote-client-v1_test.cpp	2016-09-26 02:37:03 +0000
+++ tests/remote-client-v1/remote-client-v1_test.cpp	2016-12-12 02:53:43 +0000
@@ -56,7 +56,7 @@
     void SetUp() override
     {
         dbus_.reset(new DBusEnvironment);
-        dbus_->add_demo_provider("google-drive-scope");
+        dbus_->add_demo_provider("storage-provider-test");
         dbus_->start_services();
     }
 
@@ -150,7 +150,7 @@
     }
     for (auto acc : accounts)
     {
-        if (acc->owner_id() == "google-drive-scope")
+        if (acc->owner_id() == "storage-provider-test")
         {
             return acc;
         }
@@ -198,8 +198,8 @@
     auto acc = get_account(runtime);
     EXPECT_EQ(runtime, acc->runtime());
     EXPECT_EQ("", acc->owner());
-    EXPECT_EQ("google-drive-scope", acc->owner_id());
-    EXPECT_EQ("Fake google account", acc->description());
+    EXPECT_EQ("storage-provider-test", acc->owner_id());
+    EXPECT_EQ("Fake test account", acc->description());
 }
 
 TEST_F(RuntimeTest, roots)

=== modified file 'tests/remote-client/CMakeLists.txt'
--- tests/remote-client/CMakeLists.txt	2016-09-08 08:33:59 +0000
+++ tests/remote-client/CMakeLists.txt	2016-12-12 02:53:43 +0000
@@ -15,6 +15,6 @@
     gtest
 )
 add_test(remote-client remote-client_test)
-add_dependencies(remote-client_test qt-client-all-headers provider-test)
+add_dependencies(remote-client_test qt-client-all-headers storage-framework-registry)
 
 set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)

=== modified file 'tests/remote-client/remote-client_test.cpp'
--- tests/remote-client/remote-client_test.cpp	2016-11-04 07:33:07 +0000
+++ tests/remote-client/remote-client_test.cpp	2016-12-12 02:53:43 +0000
@@ -22,7 +22,11 @@
 #include <utils/gtest_printer.h>
 #include <utils/ProviderFixture.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <QSignalSpy>
 
 #include <unordered_set>
@@ -121,77 +125,77 @@
 
     {
         auto acc = runtime_->make_test_account(service_connection_->baseService(), object_path(),
-                                               "id", "sid", "displayName");
+                                               99, "sid", "name");
         EXPECT_TRUE(acc.isValid());
         EXPECT_EQ(service_connection_->baseService(), acc.busName());
         EXPECT_EQ(object_path(), acc.objectPath());
-        EXPECT_EQ("displayName", acc.displayName());
+        EXPECT_EQ("name", acc.displayName());
 
         // Copy constructor
         Account a2(acc);
         EXPECT_TRUE(a2.isValid());
         EXPECT_EQ(service_connection_->baseService(), a2.busName());
         EXPECT_EQ(object_path(), a2.objectPath());
-        EXPECT_EQ("displayName", a2.displayName());
+        EXPECT_EQ("name", a2.displayName());
 
         // Move constructor
         Account a3(move(a2));
         EXPECT_TRUE(a3.isValid());
         EXPECT_EQ(service_connection_->baseService(), a3.busName());
         EXPECT_EQ(object_path(), a3.objectPath());
-        EXPECT_EQ("displayName", a3.displayName());
+        EXPECT_EQ("name", a3.displayName());
 
         // Moved-from object must be invalid
         EXPECT_FALSE(a2.isValid());
 
         // Moved-from object must be assignable
         auto a4 = runtime_->make_test_account(service_connection_->baseService(), object_path(),
-                                              "id4", "sid4", "displayName4");
+                                              99, "sid4", "name4");
         a2 = a4;
         EXPECT_TRUE(a2.isValid());
         EXPECT_EQ(service_connection_->baseService(), a2.busName());
         EXPECT_EQ(object_path(), a2.objectPath());
-        EXPECT_EQ("displayName4", a2.displayName());
+        EXPECT_EQ("name4", a2.displayName());
     }
 
     {
-        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "id", "sid", "dn");
-        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "id2", "sid2", "dn2");
+        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 99, "sid", "dn");
+        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 100, "sid2", "n2");
 
         // Copy assignment
         a1 = a2;
         EXPECT_TRUE(a2.isValid());
         EXPECT_EQ(service_connection_->baseService(), a1.busName());
         EXPECT_EQ(object_path(), a1.objectPath());
-        EXPECT_EQ("dn2", a1.displayName());
+        EXPECT_EQ("n2", a1.displayName());
 
         // Self-assignment
         a2 = a2;
         EXPECT_TRUE(a2.isValid());
         EXPECT_EQ(service_connection_->baseService(), a1.busName());
         EXPECT_EQ(object_path(), a1.objectPath());
-        EXPECT_EQ("dn2", a1.displayName());
+        EXPECT_EQ("n2", a1.displayName());
 
         // Move assignment
         auto a3 = runtime_->make_test_account(service_connection_->baseService(), object_path(),
-                                              "id3", "sid3", "dn3");
+                                              101, "sid3", "n3");
         a1 = move(a3);
         EXPECT_TRUE(a1.isValid());
         EXPECT_EQ(service_connection_->baseService(), a1.busName());
         EXPECT_EQ(object_path(), a1.objectPath());
-        EXPECT_EQ("dn3", a1.displayName());
+        EXPECT_EQ("n3", a1.displayName());
 
         // Moved-from object must be invalid
         EXPECT_FALSE(a3.isValid());
 
         // Moved-from object must be assignable
         auto a4 = runtime_->make_test_account(service_connection_->baseService(), object_path(),
-                                              "id4", "sid4", "dn4");
+                                              102, "sid4", "n4");
         a2 = a4;
         EXPECT_TRUE(a2.isValid());
         EXPECT_EQ(service_connection_->baseService(), a2.busName());
         EXPECT_EQ(object_path(), a2.objectPath());
-        EXPECT_EQ("dn4", a2.displayName());
+        EXPECT_EQ("n4", a2.displayName());
     }
 }
 
@@ -231,8 +235,8 @@
 
     {
         // a1 < a2 for ID
-        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "x", "x");
-        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "b", "x", "x");
+        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "x", "x");
+        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 2, "x", "x");
 
         EXPECT_FALSE(a1 == a2);
         EXPECT_TRUE(a1 != a2);
@@ -252,8 +256,8 @@
 
     {
         // a1 < a2 for service ID
-        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "a", "x");
-        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "b", "x");
+        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "a", "x");
+        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "b", "x");
 
         EXPECT_FALSE(a1 == a2);
         EXPECT_TRUE(a1 != a2);
@@ -273,8 +277,8 @@
 
     {
         // a1 < a2 for display name
-        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "a", "a");
-        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "a", "b");
+        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "a", "a");
+        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "a", "b");
 
         EXPECT_FALSE(a1 == a2);
         EXPECT_TRUE(a1 != a2);
@@ -294,8 +298,8 @@
 
     {
         // a1 == a2
-        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "a", "a");
-        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "a", "a");
+        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "a", "a");
+        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "a", "a");
 
         EXPECT_TRUE(a1 == a2);
         EXPECT_FALSE(a1 != a2);
@@ -319,14 +323,14 @@
     unordered_set<Account>();  // Just to show that this works.
 
     Account a1;
-    EXPECT_EQ(0, hash<Account>()(a1));
-    EXPECT_EQ(0, a1.hash());
-    EXPECT_EQ(0, qHash(a1));
+    EXPECT_EQ(0u, hash<Account>()(a1));
+    EXPECT_EQ(0u, a1.hash());
+    EXPECT_EQ(0u, qHash(a1));
 
-    auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "a", "a");
+    auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "a", "a");
     // Due to different return types (size_t vs uint), hash() and qHash() do not return the same value.
-    EXPECT_NE(0, a2.hash());
-    EXPECT_NE(0, qHash(a2));
+    EXPECT_NE(0u, a2.hash());
+    EXPECT_NE(0u, qHash(a2));
 }
 
 TEST_F(AccountTest, accounts)
@@ -347,17 +351,29 @@
     EXPECT_EQ(AccountsJob::Status::Finished, j->status());
     EXPECT_EQ(StorageError::Type::NoError, j->error().type());
 
-    EXPECT_TRUE(runtime_->connection().isConnected());  // Just for coverage.
-
     auto accounts = j->accounts();
+    EXPECT_GT(accounts.size(), 0);
 
-    // We don't check the contents of accounts here because we are using the real online accounts manager
-    // in this test. This means that the number and kind of accounts that are returned depends
-    // on what provider accounts the test user has configured.
+    // The fake online accounts service includes a "com.canonical.StorageFramework.Provider.ProviderTest" account.
+    bool found = false;
+    for (auto const& a : accounts)
+    {
+        qDebug() << a.busName();
+        if (a.busName() == "com.canonical.StorageFramework.Provider.ProviderTest")
+        {
+            found = true;
+            EXPECT_EQ("Test Provider", a.providerName());
+            // TODO: add tests for the other account properties.
+            break;
+        }
+    }
+    EXPECT_TRUE(found);
 }
 
 TEST_F(AccountTest, runtime_destroyed)
 {
+    EXPECT_TRUE(runtime_->connection().isConnected());  // Just for coverage.
+
     EXPECT_EQ(StorageError::Type::NoError, runtime_->shutdown().type());  // Destroy runtime.
 
     AccountsJob* j = runtime_->accounts();
@@ -504,11 +520,23 @@
     QSignalSpy ready_spy(j.get(), &ItemListJob::itemsReady);
     QSignalSpy status_spy(j.get(), &ItemListJob::statusChanged);
     status_spy.wait(SIGNAL_WAIT_TIME);
-    auto arg = status_spy.takeFirst();
-
-    // Bad metadata is ignored, so status is finished, and itemsReady was never called.
-    EXPECT_EQ(ItemListJob::Status::Finished, qvariant_cast<ItemListJob::Status>(arg.at(0)));
-    EXPECT_EQ(0, status_spy.count());
+    {
+        auto arg = status_spy.takeFirst();
+        EXPECT_EQ(ItemListJob::Status::Error, qvariant_cast<ItemListJob::Status>(arg.at(0)));
+    }
+
+    if (ready_spy.count() != 1)
+    {
+        ready_spy.wait(SIGNAL_WAIT_TIME);
+    }
+    auto arg = ready_spy.takeFirst();
+    auto items = qvariant_cast<QList<Item>>(arg.at(0));
+    EXPECT_EQ(0, items.size());
+
+    EXPECT_EQ(ItemListJob::Status::Error, j->status());
+    EXPECT_EQ(StorageError::Type::LocalCommsError, j->error().type());
+    EXPECT_EQ("LocalCommsError: Account::roots(): provider returned non-root item type: 0 (id = root_id)",
+              j->error().errorString());
 }
 
 TEST_F(GetTest, basic)
@@ -679,8 +707,9 @@
     spy.wait(SIGNAL_WAIT_TIME);
 
     EXPECT_EQ(ItemJob::Status::Error, j->status());
-    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: "
-              "file or folder must have at least one parent ID", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider (id = child_id): "
+              "file or folder must have at least one parent ID"
+              , j->error().errorString());
 }
 
 TEST_F(MetadataTest, empty_parent)
@@ -693,8 +722,9 @@
     spy.wait(SIGNAL_WAIT_TIME);
 
     EXPECT_EQ(ItemJob::Status::Error, j->status());
-    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: "
-              "parent_id of file or folder cannot be empty", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider (id = child_id): "
+              "parent_id of file or folder cannot be empty",
+              j->error().errorString());
 }
 
 TEST_F(MetadataTest, root_with_parent)
@@ -707,8 +737,9 @@
     spy.wait(SIGNAL_WAIT_TIME);
 
     EXPECT_EQ(ItemJob::Status::Error, j->status());
-    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: "
-              "parent_ids of root must be empty", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider (id = root_id): "
+              "parent_ids of root must be empty",
+              j->error().errorString());
 }
 
 TEST_F(MetadataTest, empty_name)
@@ -721,8 +752,9 @@
     spy.wait(SIGNAL_WAIT_TIME);
 
     EXPECT_EQ(ItemJob::Status::Error, j->status());
-    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: "
-              "name cannot be empty", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider (id = child_id): "
+              "name cannot be empty",
+              j->error().errorString());
 }
 
 TEST_F(MetadataTest, empty_etag)
@@ -735,8 +767,9 @@
     spy.wait(SIGNAL_WAIT_TIME);
 
     EXPECT_EQ(ItemJob::Status::Error, j->status());
-    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: "
-              "etag of a file cannot be empty", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider (id = child_id): "
+              "etag of a file cannot be empty",
+              j->error().errorString());
 }
 
 TEST_F(MetadataTest, unknown_key)
@@ -762,8 +795,9 @@
     spy.wait(SIGNAL_WAIT_TIME);
 
     EXPECT_EQ(ItemJob::Status::Error, j->status());
-    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: "
-              "missing key \"size_in_bytes\" in metadata for \"child_id\"", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider (id = child_id): "
+              "missing key \"size_in_bytes\" in metadata",
+              j->error().errorString());
 }
 
 TEST_F(MetadataTest, wrong_type_for_time)
@@ -776,8 +810,9 @@
     spy.wait(SIGNAL_WAIT_TIME);
 
     EXPECT_EQ(ItemJob::Status::Error, j->status());
-    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: last_modified_time: "
-              "expected value of type QString, but received value of type qlonglong", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider (id = child_id): "
+              "last_modified_time: expected value of type QString, but received value of type qlonglong",
+              j->error().errorString());
 }
 
 TEST_F(MetadataTest, bad_parse_for_time)
@@ -790,8 +825,9 @@
     spy.wait(SIGNAL_WAIT_TIME);
 
     EXPECT_EQ(ItemJob::Status::Error, j->status());
-    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: last_modified_time: "
-              "value \"xyz\" does not parse as ISO-8601 date", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider (id = child_id): "
+              "last_modified_time: value \"xyz\" does not parse as ISO-8601 date",
+              j->error().errorString());
 }
 
 TEST_F(MetadataTest, missing_timezone)
@@ -804,8 +840,9 @@
     spy.wait(SIGNAL_WAIT_TIME);
 
     EXPECT_EQ(ItemJob::Status::Error, j->status());
-    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: last_modified_time: "
-              "value \"2007-04-05T14:30\" lacks a time zone specification", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider (id = child_id): "
+              "last_modified_time: value \"2007-04-05T14:30\" lacks a time zone specification",
+              j->error().errorString());
 }
 
 TEST_F(MetadataTest, wrong_type_for_size)
@@ -818,8 +855,9 @@
     spy.wait(SIGNAL_WAIT_TIME);
 
     EXPECT_EQ(ItemJob::Status::Error, j->status());
-    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: size_in_bytes: "
-              "expected value of type qlonglong, but received value of type QString", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider (id = child_id): "
+              "size_in_bytes: expected value of type qlonglong, but received value of type QString",
+              j->error().errorString());
 }
 
 TEST_F(MetadataTest, negative_size)
@@ -832,8 +870,9 @@
     spy.wait(SIGNAL_WAIT_TIME);
 
     EXPECT_EQ(ItemJob::Status::Error, j->status());
-    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: size_in_bytes: "
-              "expected value >= 0, but received -1", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider (id = child_id): "
+              "size_in_bytes: expected value >= 0, but received -1",
+              j->error().errorString());
 }
 
 TEST_F(DeleteTest, basic)
@@ -1121,9 +1160,9 @@
 
         unordered_set<Item>();  // Just to show that this works.
 
-        EXPECT_EQ(0, hash<Item>()(i1));
-        EXPECT_EQ(0, i1.hash());
-        EXPECT_EQ(0, qHash(i1));
+        EXPECT_EQ(0u, hash<Item>()(i1));
+        EXPECT_EQ(0u, i1.hash());
+        EXPECT_EQ(0u, qHash(i1));
     }
 
     {
@@ -1155,15 +1194,15 @@
         EXPECT_FALSE(i2 > i1);
         EXPECT_FALSE(i2 >= i1);
 
-        EXPECT_NE(0, i1.hash());
-        EXPECT_NE(0, qHash(i1));
+        EXPECT_NE(0u, i1.hash());
+        EXPECT_NE(0u, qHash(i1));
     }
 
     {
         // Both items valid with identical metadata, but different accounts (a1 < a2).
 
-        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "x", "x");
-        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "b", "x", "x");
+        auto a1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1, "x", "x");
+        auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 2, "x", "x");
 
         Item i1;
         Item i2;
@@ -1485,7 +1524,7 @@
         auto arg = spy.takeFirst();
         EXPECT_EQ(ItemListJob::Status::Error, qvariant_cast<ItemListJob::Status>(arg.at(0)));
 
-        EXPECT_EQ("Item::parents(): provider returned a file as a parent", j->error().message());
+        EXPECT_EQ("Item::parents(): provider returned a file as a parent (id = root_id)", j->error().message());
     }
 }
 
@@ -1639,11 +1678,12 @@
 {
     set_provider(unique_ptr<provider::ProviderBase>(new MockProvider()));
 
-    auto test_account = runtime_->make_test_account(service_connection_->baseService(), object_path(), "test_account");
+    auto acc1 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 1);
+    auto acc2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), 2);
 
     Item root1;
     {
-        unique_ptr<ItemJob> j(test_account.get("root_id"));
+        unique_ptr<ItemJob> j(acc1.get("root_id"));
         QSignalSpy spy(j.get(), &ItemJob::statusChanged);
         spy.wait(SIGNAL_WAIT_TIME);
         root1 = j->item();
@@ -1652,7 +1692,7 @@
 
     Item root2;
     {
-        unique_ptr<ItemJob> j(acc_.get("root_id"));
+        unique_ptr<ItemJob> j(acc2.get("root_id"));
         QSignalSpy spy(j.get(), &ItemJob::statusChanged);
         spy.wait(SIGNAL_WAIT_TIME);
         root2 = j->item();
@@ -1661,7 +1701,7 @@
 
     Item child;
     {
-        unique_ptr<ItemJob> j(acc_.get("child_id"));
+        unique_ptr<ItemJob> j(acc2.get("child_id"));
         QSignalSpy spy(j.get(), &ItemJob::statusChanged);
         spy.wait(SIGNAL_WAIT_TIME);
         child = j->item();
@@ -1751,7 +1791,9 @@
     EXPECT_FALSE(j->isValid());
     EXPECT_EQ(ItemJob::Status::Error, j->status());
     EXPECT_EQ(StorageError::Type::LocalCommsError, j->error().type());
-    EXPECT_EQ("LocalCommsError: Item::copy(): source and target item type differ", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Item::copy()provider error: source and target item type differ "
+              "(source id = child_id, target id = new_item_id)",
+              j->error().errorString());
 }
 
 TEST_F(MoveTest, basic)
@@ -1863,7 +1905,8 @@
     EXPECT_EQ(ItemJob::Status::Error, j->status());
     EXPECT_EQ(StorageError::Type::LocalCommsError, j->error().type());
     EXPECT_EQ("LocalCommsError", j->error().name());
-    EXPECT_EQ("LocalCommsError: Item::move(): impossible root item returned by provider", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Item::move(): impossible root item returned by provider (id = root_id)",
+              j->error().errorString());
 }
 
 TEST_F(MoveTest, type_mismatch)
@@ -1899,7 +1942,8 @@
     EXPECT_FALSE(j->isValid());
     EXPECT_EQ(ItemJob::Status::Error, j->status());
     EXPECT_EQ(StorageError::Type::LocalCommsError, j->error().type());
-    EXPECT_EQ("LocalCommsError: Item::move(): provider error: source and target item type differ",
+    EXPECT_EQ("LocalCommsError: Item::move(): provider error: source and target item type differ "
+              "(source id = child_id, target id = child_id)",
               j->error().errorString());
 }
 
@@ -2094,7 +2138,7 @@
     auto status = qvariant_cast<ItemJob::Status>(arg.at(0));
     EXPECT_EQ(ItemJob::Status::Error, status);
 
-    EXPECT_EQ("LocalCommsError: Item::createFolder(): impossible file item returned by provider",
+    EXPECT_EQ("LocalCommsError: Item::createFolder(): impossible file item returned by provider (id = new_folder_id)",
               j->error().errorString());
 }
 
@@ -2157,7 +2201,10 @@
     QSignalSpy ready_spy(j.get(), &ItemListJob::itemsReady);
     QSignalSpy status_spy(j.get(), &ItemListJob::statusChanged);
     status_spy.wait(SIGNAL_WAIT_TIME);
-    ASSERT_EQ(0, ready_spy.count());
+    if (ready_spy.count() == 0)
+    {
+        ASSERT_TRUE(ready_spy.wait(SIGNAL_WAIT_TIME));
+    }
 
     EXPECT_EQ(ItemListJob::Status::Finished, j->status());
 
@@ -2303,7 +2350,8 @@
     auto arg = spy.takeFirst();
     EXPECT_EQ(ItemListJob::Status::Error, qvariant_cast<ItemListJob::Status>(arg.at(0)));
 
-    EXPECT_EQ("LocalCommsError: Item::list(): impossible root item returned by provider", j->error().errorString());
+    EXPECT_EQ("LocalCommsError: Item::list(): impossible root item returned by provider (id = child_id)",
+              j->error().errorString());
 }
 
 TEST_F(ListTest, runtime_destroyed_while_item_list_job_running)
@@ -3026,7 +3074,7 @@
 
     unique_ptr<Uploader> uploader(child.createUploader(Item::ConflictPolicy::IgnoreConflict, 20));
     EXPECT_FALSE(uploader->isValid());
-    EXPECT_EQ(Downloader::Status::Error, uploader->status());
+    EXPECT_EQ(Uploader::Status::Error, uploader->status());
     EXPECT_EQ(StorageError::RuntimeDestroyed, uploader->error().type());
     EXPECT_EQ("RuntimeDestroyed: Item::createUploader(): Runtime was destroyed previously",
               uploader->error().errorString());
@@ -3370,7 +3418,8 @@
 
     EXPECT_EQ(Uploader::Status::Error, uploader->status());
     EXPECT_EQ(StorageError::Type::LocalCommsError, uploader->error().type());
-    EXPECT_EQ("Item::createUploader(): impossible folder item returned by provider", uploader->error().message());
+    EXPECT_EQ("Item::createUploader(): impossible folder item returned by provider (id = some_id)",
+              uploader->error().message());
 }
 
 TEST_F(UploadTest, cancel_success)
@@ -3702,7 +3751,8 @@
     EXPECT_EQ(Uploader::Status::Error, qvariant_cast<Uploader::Status>(arg.at(0)));
 
     EXPECT_EQ(StorageError::Type::LocalCommsError, uploader->error().type());
-    EXPECT_EQ("Item::createFile(): impossible folder item returned by provider", uploader->error().message());
+    EXPECT_EQ("Item::createFile(): impossible folder item returned by provider (id = some_id)",
+              uploader->error().message());
 }
 
 TEST_F(CreateFileTest, exists)

=== modified file 'tests/utils/DBusEnvironment.cpp'
--- tests/utils/DBusEnvironment.cpp	2016-08-04 10:12:01 +0000
+++ tests/utils/DBusEnvironment.cpp	2016-12-12 02:53:43 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "DBusEnvironment.h"
+#include <unity/storage/registry/Registry.h>
 
 #include <testsetup.h>
 
@@ -27,6 +28,9 @@
 char const ACCOUNTS_BUS_NAME[] = "com.ubuntu.OnlineAccounts.Manager";
 char const FAKE_ACCOUNTS_SERVICE[] = TEST_SRC_DIR "/utils/fake-online-accounts-daemon.py";
 
+char const REGISTRY_TEST_BUS_NAME[] = "com.ubuntu.StorageFramework.TestRegistry";
+char const REGISTRY_SERVICE[] = TEST_BIN_DIR "/../src/registry/storage-framework-registry";
+
 char const DEMO_PROVIDER_BUS_NAME[] = "com.canonical.StorageFramework.Provider.ProviderTest";
 char const DEMO_PROVIDER_SERVICE[] = TEST_BIN_DIR "/../demo/provider_test/provider-test";
 }
@@ -38,6 +42,11 @@
                                 ACCOUNTS_BUS_NAME, QDBusConnection::SessionBus,
                                 FAKE_ACCOUNTS_SERVICE, {}));
     runner_->registerService(accounts_service_);
+
+    registry_service_.reset(new QtDBusTest::QProcessDBusService(
+                                unity::storage::registry::BUS_NAME, QDBusConnection::SessionBus,
+                                REGISTRY_SERVICE, {}));
+    runner_->registerService(registry_service_);
 }
 
 DBusEnvironment::~DBusEnvironment()

=== modified file 'tests/utils/DBusEnvironment.h'
--- tests/utils/DBusEnvironment.h	2016-08-04 10:12:01 +0000
+++ tests/utils/DBusEnvironment.h	2016-12-12 02:53:43 +0000
@@ -45,5 +45,6 @@
 private:
     std::unique_ptr<QtDBusTest::DBusTestRunner> runner_;
     QSharedPointer<QtDBusTest::QProcessDBusService> accounts_service_;
+    QSharedPointer<QtDBusTest::QProcessDBusService> registry_service_;
     QSharedPointer<QtDBusTest::QProcessDBusService> demo_provider_;
 };

=== modified file 'tests/utils/ProviderFixture.h'
--- tests/utils/ProviderFixture.h	2016-09-26 02:37:03 +0000
+++ tests/utils/ProviderFixture.h	2016-12-12 02:53:43 +0000
@@ -23,7 +23,11 @@
 #include <utils/DBusEnvironment.h>
 #include <utils/ProviderClient.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <OnlineAccounts/Account>
 #include <OnlineAccounts/Manager>
 #include <QDBusConnection>

=== removed file 'tests/utils/com.ubuntu.OnlineAccounts.Manager.xml'
--- tests/utils/com.ubuntu.OnlineAccounts.Manager.xml	2016-07-12 02:25:26 +0000
+++ tests/utils/com.ubuntu.OnlineAccounts.Manager.xml	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-
-<node name="/com/ubuntu/OnlineAccounts/Manager">
-  <interface name="com.ubuntu.OnlineAccounts.Manager">
-
-    <!--
-      Global concepts:
-
-      Clients are identified by their "applicationId", which is the
-      "<package>_<app>" of the client.
-
-      The "serviceId" is an application-specific name for an account provider.
-      That is, the "serviceId" contains the information about the application
-      which will use it, and the account provider (e.g. "google", "facebook").
-      "serviceId"s are backed by files shipped with the application, which can
-      contain application/account-provider specific information, such as the
-      ClientId and ClientSecret to be used when authentication with OAuth 2.0. 
-      An application can ship more than one "serviceId", if they refer to
-      different account providers; that is, one application can have a
-      serviceId for Google and one for Facebook, but the same application
-      cannot have one for GMail and another for Picasa.
-    -->
-
-    <!--
-      GetAccounts: returns a list of account IDs that satisfy the given
-      filters.
-
-      Allowed keys for the "filters" parameter (any combination is allowed,
-      though not all combinations might make sense):
-
-      - "applicationId" ("s"): the "<package>_<app>" of the client. An
-        unconfined application can specify this in order to restrict the set
-        of results to only those accounts that the application has been
-        authorized to use. For confined apps, OA will deduce the
-        applicationId from the apparmor label of the caller.
-
-      - "serviceId" ("s"): if the application wants to list only those
-        accounts coming from a specific provider (e.g., "Facebook").
-
-      - "accountId" ("u"): the ID of an account.
-
-      In any case, an application will receive only those accounts which the
-      user has authorized the application to use. See
-        http://wiki.ubuntu.com/OnlineAccounts
-      for an overview of the UI experience.
-
-      Disabled accounts will not be returned.
-    -->
-    <method name="GetAccounts">
-      <arg name="filters" type="a{sv}" direction="in" />
-      <!--
-        The return value is a list of account IDs paired with a dictionary of account data.
-        This will always include:
-        - "serviceId" (s)
-        - "displayName" (s)
-        Other settings stored on the account will also be included, such as the
-        server address and port of an owncloud or IMAP account, but we haven't
-        defined exactly how. Possibly, all account-specific keys will be
-        prefixed by "settings/", in order not to clash with the keys defined at
-        the framework level.
-      -->
-      <arg name="accounts" type="a(ua{sv})" direction="out" />
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0"
-                  value="QList&lt;AccountInfo&gt;"/>
-    </method>
-
-    <!--
-      Authenticate: request authentication credentials for the given
-      account ID in the context of a particular service.
-
-      If "interactive" is false, an error will be returned if
-      user interaction would be required to retrieve the
-      credentials.
-
-      If "invalidate" is true, any stored credentials will be
-      ignored and new credentials will be requested from the account
-      provider.
-    -->
-    <method name="Authenticate">
-      <arg name="accountId" type="u" direction="in" />
-      <arg name="serviceId" type="s" direction="in" />
-      <arg name="interactive" type="b" direction="in" />
-      <arg name="invalidate" type="b" direction="in" />
-      <!--
-        This dictionary can be used to specify OAuth client keys or permission
-        scopes. While it's possible to statically define them a the "serviceId"
-        level, some apps might want to change this information at runtime.
-        Possible use cases:
-        1) OAuth keys are retrieved from a server (so that they can be updated
-           when the old ones are revoked).
-        2) An app might want to use different keys when talking to GMail and
-           Picasa.
-        3) The scope list can also be dynamic, and depending on how the user is
-           using the app.
-        4) SASL: the parameters would contain the latest challenge got from the
-           server.
-      --> 
-      <arg name="parameters" type="a{sv}" direction="in" />
-      <arg name="credentials" type="a{sv}" direction="out" />
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In4" value="QVariantMap"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
-    </method>
-
-    <!--
-      RequestAccess: register a new account for use with the given
-      service.
-      This method also performs the authentication, since that's what apps
-      would do as soon as they get the account.
-    -->
-    <method name="RequestAccess">
-      <arg name="serviceId" type="s" direction="in" />
-      <arg name="parameters" type="a{sv}" direction="in" />
-      <arg name="account" type="(ua{sv})" direction="out" />
-      <arg name="credentials" type="a{sv}" direction="out" />
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="AccountInfo"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
-    </method>
-
-    <!--
-      AccountChanged: emitted when account details are changed.
-
-      The apparmor policy will NOT ALLOW confined applications to receive
-      this signal on the account manager object path (which might be
-      /com/ubuntu/OnlineAccounts/Manager). Only unconfined applications will
-      be able to listen to this signal from that object path.
-
-      Confined apps will have to catch this signal from a different object path:
-      /com/ubuntu/OnlineAccounts/Manager/@{APP_PKGNAME_DBUS}, which will
-      deliver the signal only for those accounts which the app has been
-      authorized to use.
-    -->
-    <signal name="AccountChanged">
-      <!--
-        The serviceId will also be included in the "account" dictionary. The
-        reason for having it also here is to allow clients to filter D-Bus
-        messages by arg0. This can be important for unconfined clients, which
-        would otherwise be woken up by any account change, even those not
-          relevant to them.
-      -->
-      <arg name="serviceId" type="s" />
-      <!--
-        The dictionary contains a changeType key, type "u", whose value is
-        enum { enabled, disabled, changed }
-      -->
-      <arg name="account" type="(ua{sv})" />
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="AccountInfo"/>
-    </signal>
-
-  </interface>
-</node>

=== modified file 'tests/utils/fake-online-accounts-daemon.py'
--- tests/utils/fake-online-accounts-daemon.py	2016-11-01 03:36:29 +0000
+++ tests/utils/fake-online-accounts-daemon.py	2016-12-12 02:53:43 +0000
@@ -17,7 +17,6 @@
 
 """A fake version of the OnlineAccounts D-Bus service."""
 
-import os
 import sys
 
 import dbus.service
@@ -28,9 +27,6 @@
 OBJECT_PATH = "/com/ubuntu/OnlineAccounts/Manager"
 OA_IFACE = "com.ubuntu.OnlineAccounts.Manager"
 
-INTERFACE_XML = os.path.join(os.path.dirname(__file__),
-                             "com.ubuntu.OnlineAccounts.Manager.xml")
-
 AUTH_OAUTH1 = 1
 AUTH_OAUTH2 = 2
 AUTH_PASSWORD = 3
@@ -90,16 +86,16 @@
         }, signature="sv")
 
 class Account:
-    def __init__(self, account_id, display_name, service_id, credentials, settings=None):
+    def __init__(self, account_id, name, service_id, credentials, settings=None):
         self.account_id = account_id
-        self.display_name = display_name
+        self.name = name
         self.service_id = service_id
         self.credentials = credentials
         self.settings = settings
 
     def serialise(self):
         account_info = dbus.Dictionary({
-            "displayName": dbus.String(self.display_name),
+            "displayName": dbus.String(self.name),
             "serviceId": dbus.String(self.service_id),
             "authMethod": dbus.Int32(self.credentials.method),
         }, signature="sv")
@@ -114,12 +110,12 @@
         self.accounts = accounts
 
     @dbus.service.method(dbus_interface=OA_IFACE,
-                         in_signature="a{sv}", out_signature="a(ua{sv})")
+                         in_signature="a{sv}", out_signature="a(ua{sv})aa{sv}")
     def GetAccounts(self, filters):
         #print("GetAccounts %r" % filters)
         sys.stdout.flush()
         return dbus.Array([a.serialise() for a in self.accounts],
-                          signature="a(ua{sv})")
+                          signature="a(ua{sv})"), dbus.Array(signature="a{sv}")
 
     @dbus.service.method(dbus_interface=OA_IFACE,
                          in_signature="usbba{sv}", out_signature="a{sv}")
@@ -178,8 +174,8 @@
         Account(4, "Password host account", "password-host-service",
                 Password_Bug1628473("joe", "secret"),
                 {"host": "http://www.example.com/"}),
-        Account(42, "Fake google account", "google-drive-scope",
-                OAuth2("fake-google-access-token", 0, [])),
+        Account(42, "Fake test account", "storage-provider-test",
+                OAuth2("fake-test-access-token", 0, [])),
         Account(99, "Fake mcloud account", "com.canonical.scopes.mcloud_mcloud_mcloud",
                 OAuth2("fake-mcloud-access-token", 0, [])),
     ]