Storage Framework

Merge lp:~michihenning/storage-framework/upload-download into lp:storage-framework/devel

upload-download
Merge into devel

Proposed by Michi Henning on 2016-10-12

Status:	Merged
Approved by:	Michi Henning on 2016-10-12
Approved revision:	106
Merged at revision:	79
Proposed branch:	lp:~michihenning/storage-framework/upload-download
Merge into:	lp:storage-framework/devel
Diff against target:	3131 lines (+1837/-204) 38 files modified include/unity/storage/qt/Downloader.h (+27/-16) include/unity/storage/qt/Item.h (+4/-0) include/unity/storage/qt/StorageError.h (+2/-3) include/unity/storage/qt/Uploader.h (+26/-14) include/unity/storage/qt/internal/AccountImpl.h (+4/-4) include/unity/storage/qt/internal/AccountsJobImpl.h (+3/-3) include/unity/storage/qt/internal/DownloaderImpl.h (+71/-0) include/unity/storage/qt/internal/Handler.h (+19/-3) include/unity/storage/qt/internal/ItemImpl.h (+5/-5) include/unity/storage/qt/internal/ItemJobImpl.h (+8/-8) include/unity/storage/qt/internal/ItemListJobImpl.h (+8/-8) include/unity/storage/qt/internal/ListJobImplBase.h (+2/-2) include/unity/storage/qt/internal/MultiItemJobImpl.h (+4/-4) include/unity/storage/qt/internal/MultiItemListJobImpl.h (+6/-6) include/unity/storage/qt/internal/StorageErrorImpl.h (+0/-1) include/unity/storage/qt/internal/UploaderImpl.h (+90/-0) include/unity/storage/qt/internal/VoidJobImpl.h (+8/-5) src/provider/CMakeLists.txt (+6/-1) src/provider/internal/Handler.cpp (+0/-1) src/qt/CMakeLists.txt (+10/-2) src/qt/Downloader.cpp (+76/-0) src/qt/Item.cpp (+0/-1) src/qt/Uploader.cpp (+86/-0) src/qt/client/CMakeLists.txt (+1/-1) src/qt/internal/AccountImpl.cpp (+7/-7) src/qt/internal/AccountsJobImpl.cpp (+7/-7) src/qt/internal/DownloaderImpl.cpp (+280/-0) src/qt/internal/ItemImpl.cpp (+71/-25) src/qt/internal/ItemJobImpl.cpp (+10/-9) src/qt/internal/ItemListJobImpl.cpp (+15/-15) src/qt/internal/ListJobImplBase.cpp (+3/-3) src/qt/internal/MultiItemJobImpl.cpp (+11/-11) src/qt/internal/MultiItemListJobImpl.cpp (+9/-8) src/qt/internal/StorageErrorImpl.cpp (+1/-9) src/qt/internal/UploaderImpl.cpp (+332/-0) src/qt/internal/VoidJobImpl.cpp (+6/-6) tests/remote-client/MockProvider.cpp (+28/-12) tests/remote-client/remote-client_test.cpp (+591/-4)
To merge this branch:	bzr merge lp:~michihenning/storage-framework/upload-download
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
unity-api-1-bot	continuous-integration		Approve on 2016-10-12
Unity API Team		2016-10-12	Pending
Review via email: mp+308209@code.launchpad.net

Commit message

Download implementation.

Description of the change

Download implementation.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-10-12:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/147/rebuild

review: Needs Fixing (continuous-integration)

lp:~michihenning/storage-framework/upload-download updated on 2016-10-12

100. By Michi Henning on 2016-10-12: Upload implementation with basic test only.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-10-12:

FAILED: Continuous integration, rev:100
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/148/
Executed test runs:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/148/rebuild

review: Needs Fixing (continuous-integration)

lp:~michihenning/storage-framework/upload-download updated on 2016-10-12

101. By Michi Henning on 2016-10-12: Fixed typos.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-10-12:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/149/rebuild

review: Needs Fixing (continuous-integration)

lp:~michihenning/storage-framework/upload-download updated on 2016-10-12

102. By Michi Henning on 2016-10-12: Got rid of DeletedError (not needed). Setting error info on cancallation now.
103. By Michi Henning on 2016-10-12: Work around compiler bug on Vivid: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60420

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-10-12:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/150/rebuild

review: Needs Fixing (continuous-integration)

lp:~michihenning/storage-framework/upload-download updated on 2016-10-12

104. By Michi Henning on 2016-10-12: Another fix for non-const reply argument.
Added suppression for tons of warnings on Vivid from provider/internal/ProviderInterface.cpp.
105. By Michi Henning on 2016-10-12: Two more Vivid errors.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-10-12:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/151/rebuild

review: Needs Fixing (continuous-integration)

lp:~michihenning/storage-framework/upload-download updated on 2016-10-12

106. By Michi Henning on 2016-10-12: Fixed more compiler warnings.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-10-12:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/152/rebuild

review: Approve (continuous-integration)

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-10-12:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/153/rebuild

review: Approve (continuous-integration)

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes:

Michi Henning

 === modified file 'include/unity/storage/qt/Downloader.h'
 --- include/unity/storage/qt/Downloader.h	2016-10-10 04:07:07 +0000
 +++ include/unity/storage/qt/Downloader.h	2016-10-12 08:09:09 +0000
@@ -18,7 +18,10 @@
  #pragma once
--#include <QIODevice>
++#include <unity/storage/qt/Item.h>
++#include <unity/storage/qt/StorageError.h>
++
++#include <QLocalSocket>
  namespace unity
+ {
@@ -26,17 +29,20 @@
+ {
  namespace qt
+ {
--
--class Item;
--class StorageError;
--
--class Q_DECL_EXPORT Downloader final : public QIODevice
++namespace internal
++{
++
++class DownloaderImpl;
++
++}  // namespace internal
++
++class Q_DECL_EXPORT Downloader final : public QLocalSocket
+ {
      Q_OBJECT
      Q_PROPERTY(bool isValid READ isValid NOTIFY statusChanged FINAL)
--    Q_PROPERTY(unity::Storage::qt::Downloader::Status status READ status NOTIFY statusChanged FINAL)
--    Q_PROPERTY(unity::Storage::qt::StorageError error READ error NOTIFY statusChanged FINAL)
--    Q_PROPERTY(unity::Storage::qt::Item item READ item NOTIFY statusChanged FINAL)
++    Q_PROPERTY(unity::storage::qt::Downloader::Status status READ status NOTIFY statusChanged FINAL)
++    Q_PROPERTY(unity::storage::qt::StorageError error READ error NOTIFY statusChanged FINAL)
++    Q_PROPERTY(unity::storage::qt::Item item READ item NOTIFY statusChanged FINAL)
  public:
      enum Status { Loading, Ready, Cancelled, Finished, Error };
@@ -45,12 +51,12 @@
      Downloader();
      virtual ~Downloader();
--    bool isValid();
++    bool isValid() const;        // Not nice, hides QLocalSocket::isValid()
      Status status() const;
--    StorageError error() const;
--    Item item() const;
++    StorageError error() const;  // Not nice, hides QLocalSocket::error()
++    Item item() const;           // TODO: Should we keep this?
--    Q_INVOKABLE void finishDownload(); // TODO: finish()
++    Q_INVOKABLE void finishDownload();
      Q_INVOKABLE void cancel();
      // TODO: will probably need QML invokable methods for reading and writing to/from QIODevice
@@ -58,11 +64,16 @@
  Q_SIGNALS:
      void statusChanged(unity::storage::qt::Downloader::Status status) const;
--protected:
--    virtual qint64 readData(char* data, qint64 maxSize) override;
--    virtual qint64 writeData(char const* data, qint64 maxSize) override;
++private:
++    Downloader(std::unique_ptr<internal::DownloaderImpl> p);
++
++    std::unique_ptr<internal::DownloaderImpl> p_;
++
++    friend class internal::DownloaderImpl;
  };
  }  // namespace qt
  }  // namespace storage
  }  // namespace unity
++
++Q_DECLARE_METATYPE(unity::storage::qt::Downloader::Status)
 === modified file 'include/unity/storage/qt/Item.h'
 --- include/unity/storage/qt/Item.h	2016-10-10 05:27:03 +0000
 +++ include/unity/storage/qt/Item.h	2016-10-12 08:09:09 +0000
@@ -39,6 +39,8 @@
+ {
  class ItemImpl;
++class DownloaderImpl;
++class UploaderImpl;
  }  // namespace internal
@@ -126,6 +128,8 @@
      std::shared_ptr<internal::ItemImpl> p_;
      friend class internal::ItemImpl;
++    friend class internal::DownloaderImpl;
++    friend class internal::UploaderImpl;
  };
  // Note: qHash(Item) does *not* return the same hash value is std::hash<Item> because
 === modified file 'include/unity/storage/qt/StorageError.h'
 --- include/unity/storage/qt/StorageError.h	2016-10-10 04:07:07 +0000
 +++ include/unity/storage/qt/StorageError.h	2016-10-12 08:09:09 +0000
@@ -58,9 +58,8 @@
      enum Type
+     {
--        NoError, LocalCommsError, RemoteCommsError, Deleted, RuntimeDestroyed, NotExists,
--        Exists, Conflict, PermissionDenied, Cancelled, LogicError, InvalidArgument, ResourceError,
--        QuotaExceeded,
++        NoError, LocalCommsError, RemoteCommsError, RuntimeDestroyed, NotExists, Exists, Conflict,
++        PermissionDenied, Cancelled, LogicError, InvalidArgument, ResourceError, QuotaExceeded,
          __LAST_STORAGE_ERROR
      };
      Q_ENUMS(Type)
 === modified file 'include/unity/storage/qt/Uploader.h'
 --- include/unity/storage/qt/Uploader.h	2016-10-10 04:07:07 +0000
 +++ include/unity/storage/qt/Uploader.h	2016-10-12 08:09:09 +0000
@@ -18,9 +18,10 @@
  #pragma once
--#include <unity/storage/common.h>
++#include <unity/storage/qt/Item.h>
++#include <unity/storage/qt/StorageError.h>
--#include <QIODevice>
++#include <QLocalSocket>
  namespace unity
+ {
@@ -28,31 +29,37 @@
+ {
  namespace qt
+ {
++namespace internal
++{
++
++class UploaderImpl;
++
++}  // namespace internal
  class Item;
  class StorageError;
--class Q_DECL_EXPORT Uploader final : public QIODevice
++class Q_DECL_EXPORT Uploader final : public QLocalSocket
+ {
      Q_OBJECT
--    Q_PROPERTY(bool isValid READ isValid NOTIFY statusChanged FINAL) // TODO: Need notify
++    Q_PROPERTY(bool isValid READ isValid NOTIFY statusChanged FINAL)
      Q_PROPERTY(unity::storage::qt::Uploader::Status status READ status NOTIFY statusChanged FINAL)
--    Q_PROPERTY(unity::storage::qt::StorageError READ error NOTIFY statusChanged FINAL)
--    Q_PROPERTY(unity::storage::qt::Item::ConflictPolicy policy READ policy CONSTANT FINAL)
--    Q_PROPERTY(qint64 sizeInBytes READ sizeInBytes CONSTANT FINAL)
++    Q_PROPERTY(unity::storage::qt::StorageError error READ error NOTIFY statusChanged FINAL)
++    Q_PROPERTY(unity::storage::qt::Item::ConflictPolicy policy READ policy NOTIFY statusChanged FINAL)
++    Q_PROPERTY(qint64 sizeInBytes READ sizeInBytes NOTIFY statusChanged FINAL)
      Q_PROPERTY(unity::storage::qt::Item item READ item NOTIFY statusChanged FINAL)
  public:
--    enum Status { Loading, Cancelled, Finished, Error };
++    enum Status { Loading, Ready, Cancelled, Finished, Error };
      Q_ENUMS(Status)
      Uploader();
      virtual ~Uploader();
--    bool isValid() const;
++    bool isValid() const;  // Not nice, hides QLocalSocket::isValid()
      Status status() const;
--    StorageError error() const;
--    ConflictPolicy policy() const;
++    StorageError error() const;  // Not nice, hides QLocalSocket::error()
++    Item::ConflictPolicy policy() const;
      qint64 sizeInBytes() const;
      Item item() const;
@@ -62,11 +69,16 @@
  Q_SIGNALS:
      void statusChanged(unity::storage::qt::Uploader::Status status) const;
--protected:
--    virtual qint64 readData(char* data, qint64 maxSize) override;
--    virtual qint64 writeData(char const* data, qint64 maxSize) override;
++private:
++    Uploader(std::unique_ptr<internal::UploaderImpl> p);
++
++    std::unique_ptr<internal::UploaderImpl> p_;
++
++    friend class internal::UploaderImpl;
  };
  }  // namespace qt
  }  // namespace storage
  }  // namespace unity
++
++Q_DECLARE_METATYPE(unity::storage::qt::Uploader::Status)
 === modified file 'include/unity/storage/qt/internal/AccountImpl.h'
 --- include/unity/storage/qt/internal/AccountImpl.h	2016-09-26 08:57:05 +0000
 +++ include/unity/storage/qt/internal/AccountImpl.h	2016-10-12 08:09:09 +0000
@@ -63,10 +63,10 @@
      size_t hash() const;
--    std::shared_ptr<RuntimeImpl> runtime() const;
++    std::shared_ptr<RuntimeImpl> runtime_impl() const;
      std::shared_ptr<ProviderInterface> provider() const;
--    static Account make_account(std::shared_ptr<RuntimeImpl> const& runtime,
++    static Account make_account(std::shared_ptr<RuntimeImpl> const& runtime_impl,
                                  QString const& bus_name,
                                  QString const& object_path,
                                  QString const& owner_id,
@@ -74,7 +74,7 @@
                                  QString const& description);
  private:
--    AccountImpl(std::shared_ptr<RuntimeImpl> const& runtime,
++    AccountImpl(std::shared_ptr<RuntimeImpl> const& runtime_impl,
                  QString const& bus_name,
                  QString const& object_path,
                  QString const& owner_id,
@@ -87,7 +87,7 @@
      QString owner_id_;
      QString owner_;
      QString description_;
--    std::weak_ptr<RuntimeImpl> runtime_;
++    std::weak_ptr<RuntimeImpl> runtime_impl_;
      std::shared_ptr<ProviderInterface> provider_;
      friend class unity::storage::qt::Account;
 === modified file 'include/unity/storage/qt/internal/AccountsJobImpl.h'
 --- include/unity/storage/qt/internal/AccountsJobImpl.h	2016-09-26 02:12:30 +0000
 +++ include/unity/storage/qt/internal/AccountsJobImpl.h	2016-10-12 08:09:09 +0000
@@ -35,7 +35,7 @@
+ {
      Q_OBJECT
  public:
--    AccountsJobImpl(AccountsJob* public_instance, std::shared_ptr<RuntimeImpl> const& runtime);
++    AccountsJobImpl(AccountsJob* public_instance, std::shared_ptr<RuntimeImpl> const& runtime_impl);
      AccountsJobImpl(AccountsJob* public_instance, StorageError const& error);
      virtual ~AccountsJobImpl() = default;
@@ -49,7 +49,7 @@
      void timeout();
  private:
--    std::shared_ptr<RuntimeImpl> get_runtime(QString const& method) const;
++    std::shared_ptr<RuntimeImpl> get_runtime_impl(QString const& method) const;
      void initialize_accounts();
      AccountsJob::Status emit_status_changed(AccountsJob::Status new_status) const;
@@ -57,7 +57,7 @@
      AccountsJob::Status status_;
      StorageError error_;
      QList<unity::storage::qt::Account> accounts_;
--    std::weak_ptr<RuntimeImpl> const runtime_;
++    std::weak_ptr<RuntimeImpl> const runtime_impl_;
      QTimer timer_;
      friend class unity::storage::qt::AccountsJob;
 === added file 'include/unity/storage/qt/internal/DownloaderImpl.h'
 --- include/unity/storage/qt/internal/DownloaderImpl.h	1970-01-01 00:00:00 +0000
 +++ include/unity/storage/qt/internal/DownloaderImpl.h	2016-10-12 08:09:09 +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 <michi.henning@canonical.com>
++ */
++
++#pragma once
++
++#include <unity/storage/qt/Downloader.h>
++
++#include <QDBusPendingReply>
++#include <QDBusUnixFileDescriptor>
++
++namespace unity
++{
++namespace storage
++{
++namespace qt
++{
++namespace internal
++{
++
++class DownloaderImpl : public QObject
++{
++    Q_OBJECT
++public:
++    DownloaderImpl(std::shared_ptr<ItemImpl> const& item_impl,
++                   QString const& method,
++                   QDBusPendingReply<QString, QDBusUnixFileDescriptor>& reply);
++    DownloaderImpl(StorageError const& e);
++    virtual ~DownloaderImpl();
++
++    bool isValid() const;
++    Downloader::Status status() const;
++    StorageError error() const;
++    Item item() const;
++
++    void finishDownload();
++    void cancel();
++
++    static Downloader* make_job(std::shared_ptr<ItemImpl> const& item_impl,
++                                QString const& method,
++                                QDBusPendingReply<QString, QDBusUnixFileDescriptor>& reply);
++    static Downloader* make_job(StorageError const& e);
++
++private:
++    Downloader* public_instance_;
++    Downloader::Status status_;
++    StorageError error_;
++    std::shared_ptr<ItemImpl> item_impl_;
++    QString download_id_;
++    QDBusUnixFileDescriptor fd_;
++    bool finalizing_ = false;
++};
++
++}  // namespace internal
++}  // namespace qt
++}  // namespace storage
++}  // namespace unity
 === modified file 'include/unity/storage/qt/internal/Handler.h'
 --- include/unity/storage/qt/internal/Handler.h	2016-09-29 03:17:56 +0000
 +++ include/unity/storage/qt/internal/Handler.h	2016-10-12 08:09:09 +0000
@@ -36,18 +36,32 @@
  namespace internal
+ {
++// TODO: HACK: The reply argument really should be passed by const reference, which also
++//             would make the explicit conversion of the call to QDBusPendingReply<QDBusArgs...>
++//             unnecessary. But this doesn't work with gcc 4.9: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60420
++//             Once we get rid of Vivid, this should be changed back to
++//
++//             Handler(QObject* parent,
++//                     QDBusPendingReply<DBusArgs...> const& reply,
++//                     std::function<void(decltype(reply)&)> const& success_closure,
++//                     std::function<void(StorageError const&)> const& error_closure)
++//
++//             Unfortunately, this const error ripples through the entire call hierarchy, so
++//             the various JobImpl that process replies also need to be changed back to accept
++//             a non-const reply.
++
  template<typename T>
  class Handler : public HandlerBase
+ {
  public:
      template<typename ... DBusArgs>
      Handler(QObject* parent,
--            QDBusPendingReply<DBusArgs...> const& reply,
++            QDBusPendingReply<DBusArgs...>& reply,
              std::function<void(decltype(reply)&)> const& success_closure,
              std::function<void(StorageError const&)> const& error_closure)
          : HandlerBase(parent,
                        reply,
--                      [this, success_closure, error_closure](QDBusPendingCallWatcher& call)
++                      [this, &reply, success_closure, error_closure](QDBusPendingCallWatcher& call)
+                           {
                                if (call.isError())
+                               {
@@ -81,8 +95,10 @@
                                    error_closure(e);
                                    return;
+                               }
++                              // TODO: See HACK above. Should just be success_closure(call);
++                              //       We do the assignment to get an lvalue from the reference.
                                QDBusPendingReply<DBusArgs...> r = call;
--                              success_closure(call);
++                              success_closure(r);
                            })
+     {
+     }
 === modified file 'include/unity/storage/qt/internal/ItemImpl.h'
 --- include/unity/storage/qt/internal/ItemImpl.h	2016-10-10 04:07:07 +0000
 +++ include/unity/storage/qt/internal/ItemImpl.h	2016-10-12 08:09:09 +0000
@@ -42,7 +42,7 @@
  public:
      ItemImpl();
      ItemImpl(storage::internal::ItemMetadata const& md,
--             std::shared_ptr<AccountImpl> const& account);
++             std::shared_ptr<AccountImpl> const& account_impl);
      ItemImpl(ItemImpl const&) = default;
      ItemImpl(ItemImpl&&) = delete;
      ~ItemImpl() = default;
@@ -82,9 +82,9 @@
      static Item make_item(QString const& method,
                            storage::internal::ItemMetadata const& md,
--                          std::shared_ptr<AccountImpl> const& account);
++                          std::shared_ptr<AccountImpl> const& account_impl);
--    std::shared_ptr<RuntimeImpl> runtime() const;
++    std::shared_ptr<RuntimeImpl> runtime_impl() const;
      std::shared_ptr<AccountImpl> account_impl() const;
  private:
@@ -98,7 +98,7 @@
      bool is_valid_;
      storage::internal::ItemMetadata md_;
--    std::shared_ptr<AccountImpl> account_;
++    std::shared_ptr<AccountImpl> account_impl_;
      friend class unity::storage::qt::Item;
  };
@@ -111,7 +111,7 @@
          auto e = StorageErrorImpl::logic_error(method + ": cannot create job from invalid item");
          return T::make_job(e);
+     }
--    auto runtime = account_->runtime();
++    auto runtime = account_impl_->runtime_impl();
      if (!runtime || !runtime->isValid())
+     {
          auto e = StorageErrorImpl::runtime_destroyed_error(method + ": Runtime was destroyed previously");
 === modified file 'include/unity/storage/qt/internal/ItemJobImpl.h'
 --- include/unity/storage/qt/internal/ItemJobImpl.h	2016-09-29 02:40:05 +0000
 +++ include/unity/storage/qt/internal/ItemJobImpl.h	2016-10-12 08:09:09 +0000
@@ -53,24 +53,24 @@
      StorageError error() const;
      Item item() const;
--    static ItemJob* make_job(std::shared_ptr<AccountImpl> const& account,
++    static ItemJob* make_job(std::shared_ptr<AccountImpl> const& account_impl,
                               QString const& method,
--                             QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
++                             QDBusPendingReply<storage::internal::ItemMetadata>& reply,
                               std::function<void(storage::internal::ItemMetadata const&)> const& validate);
--    static ItemJob* make_job(std::shared_ptr<ItemImpl> const&,
++    static ItemJob* make_job(std::shared_ptr<ItemImpl> const& item_impl,
                               QString const& method,
--                             QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
++                             QDBusPendingReply<storage::internal::ItemMetadata>& reply,
                               std::function<void(storage::internal::ItemMetadata const&)> const& validate);
      static ItemJob* make_job(StorageError const& e);
  private:
      ItemJobImpl(std::shared_ptr<AccountImpl> const& account,
                  QString const& method,
--                QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
++                QDBusPendingReply<storage::internal::ItemMetadata>& reply,
                  std::function<void(storage::internal::ItemMetadata const&)> const& validate);
--    ItemJobImpl(std::shared_ptr<ItemImpl> const& item,
++    ItemJobImpl(std::shared_ptr<ItemImpl> const& item_impl,
                  QString const& method,
--                QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
++                QDBusPendingReply<storage::internal::ItemMetadata>& reply,
                  std::function<void(storage::internal::ItemMetadata const&)> const& validate);
      ItemJobImpl(StorageError const& e);
@@ -78,7 +78,7 @@
      ItemJob::Status status_;
      StorageError error_;
      QString method_;
--    std::shared_ptr<AccountImpl> account_;
++    std::shared_ptr<AccountImpl> account_impl_;
      std::shared_ptr<ItemImpl> item_impl_;
      std::function<void(storage::internal::ItemMetadata const&)> validate_;
      Item item_;
 === modified file 'include/unity/storage/qt/internal/ItemListJobImpl.h'
 --- include/unity/storage/qt/internal/ItemListJobImpl.h	2016-10-10 03:55:32 +0000
 +++ include/unity/storage/qt/internal/ItemListJobImpl.h	2016-10-12 08:09:09 +0000
@@ -48,25 +48,25 @@
  public:
      virtual ~ItemListJobImpl() = default;
--    static ItemListJob* make_job(std::shared_ptr<AccountImpl> const& account,
++    static ItemListJob* make_job(std::shared_ptr<AccountImpl> const& account_impl,
                                   QString const& method,
--                                 QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
++                                 QDBusPendingReply<QList<storage::internal::ItemMetadata>>& reply,
                                   std::function<void(storage::internal::ItemMetadata const&)> const& validate);
--    static ItemListJob* make_job(std::shared_ptr<ItemImpl> const& item,
++    static ItemListJob* make_job(std::shared_ptr<ItemImpl> const& item_impl,
                                   QString const& method,
--                                 QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
++                                 QDBusPendingReply<QList<storage::internal::ItemMetadata>>& reply,
                                   std::function<void(storage::internal::ItemMetadata const&)> const& validate);
      static ItemListJob* make_job(StorageError const& error);
  private:
      ItemListJobImpl() = default;
--    ItemListJobImpl(std::shared_ptr<AccountImpl> const& account,
++    ItemListJobImpl(std::shared_ptr<AccountImpl> const& account_impl,
                      QString const& method,
--                    QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
++                    QDBusPendingReply<QList<storage::internal::ItemMetadata>>& reply,
                      std::function<void(storage::internal::ItemMetadata const&)> const& validate);
--    ItemListJobImpl(std::shared_ptr<ItemImpl> const& account,
++    ItemListJobImpl(std::shared_ptr<ItemImpl> const& item_impl,
                      QString const& method,
--                    QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
++                    QDBusPendingReply<QList<storage::internal::ItemMetadata>>& reply,
                      std::function<void(storage::internal::ItemMetadata const&)> const& validate);
      std::shared_ptr<ItemImpl> item_impl_;
 === modified file 'include/unity/storage/qt/internal/ListJobImplBase.h'
 --- include/unity/storage/qt/internal/ListJobImplBase.h	2016-10-10 03:55:32 +0000
 +++ include/unity/storage/qt/internal/ListJobImplBase.h	2016-10-12 08:09:09 +0000
@@ -49,7 +49,7 @@
+ {
  public:
      ListJobImplBase();  // Makes job in Finished state.
--    ListJobImplBase(std::shared_ptr<AccountImpl> const& account,
++    ListJobImplBase(std::shared_ptr<AccountImpl> const& account_impl,
                      QString const& method,
                      std::function<void(storage::internal::ItemMetadata const&)> const& validate);
      ListJobImplBase(StorageError const& error);
@@ -69,7 +69,7 @@
      ItemListJob::Status status_;
      StorageError error_;
      QString method_;
--    std::shared_ptr<AccountImpl> account_;
++    std::shared_ptr<AccountImpl> account_impl_;
      std::function<void(storage::internal::ItemMetadata const&)> validate_;
  };
 === modified file 'include/unity/storage/qt/internal/MultiItemJobImpl.h'
 --- include/unity/storage/qt/internal/MultiItemJobImpl.h	2016-09-30 01:48:08 +0000
 +++ include/unity/storage/qt/internal/MultiItemJobImpl.h	2016-10-12 08:09:09 +0000
@@ -50,16 +50,16 @@
      virtual ~MultiItemJobImpl() = default;
--    static ItemListJob* make_job(std::shared_ptr<AccountImpl> const& account,
++    static ItemListJob* make_job(std::shared_ptr<AccountImpl> const& account_impl,
                                   QString const& method,
--                                 ReplyType const& replies,
++                                 ReplyType& replies,
                                   ValidateFunc const& validate);
  private:
      MultiItemJobImpl() = default;
--    MultiItemJobImpl(std::shared_ptr<AccountImpl> const& account,
++    MultiItemJobImpl(std::shared_ptr<AccountImpl> const& account_impl,
                       QString const& method,
--                     ReplyType const& replies,
++                     ReplyType& replies,
                       ValidateFunc const& validate);
      int replies_remaining_;
 === modified file 'include/unity/storage/qt/internal/MultiItemListJobImpl.h'
 --- include/unity/storage/qt/internal/MultiItemListJobImpl.h	2016-10-10 03:55:32 +0000
 +++ include/unity/storage/qt/internal/MultiItemListJobImpl.h	2016-10-12 08:09:09 +0000
@@ -47,23 +47,23 @@
  public:
      using ReplyType = QDBusPendingReply<QList<storage::internal::ItemMetadata>, QString>;
      using ValidateFunc = std::function<void(storage::internal::ItemMetadata const&)>;
--    using FetchFunc = std::function<QDBusPendingReply<QList<unity::storage::internal::ItemMetadata>,
--                                                            QString>(QString const& page_token)>;
++    using FetchFunc = std::function
++                <QDBusPendingReply<QList<unity::storage::internal::ItemMetadata>, QString>(QString const& page_token)>;
      virtual ~MultiItemListJobImpl() = default;
--    static ItemListJob* make_job(std::shared_ptr<ItemImpl> const& item,
++    static ItemListJob* make_job(std::shared_ptr<ItemImpl> const& item_impl,
                                   QString const& method,
--                                 ReplyType const& reply,
++                                 ReplyType& reply,
                                   ValidateFunc const& validate,
                                   FetchFunc const& fetch_next);
      static ItemListJob* make_job(StorageError const& error);
  private:
      MultiItemListJobImpl() = default;
--    MultiItemListJobImpl(std::shared_ptr<ItemImpl> const& item,
++    MultiItemListJobImpl(std::shared_ptr<ItemImpl> const& item_impl,
                           QString const& method,
--                         ReplyType const& reply,
++                         ReplyType& reply,
                           ValidateFunc const& validate,
                           FetchFunc const& fetch_next);
 === modified file 'include/unity/storage/qt/internal/StorageErrorImpl.h'
 --- include/unity/storage/qt/internal/StorageErrorImpl.h	2016-10-10 01:18:01 +0000
 +++ include/unity/storage/qt/internal/StorageErrorImpl.h	2016-10-12 08:09:09 +0000
@@ -58,7 +58,6 @@
      // Factories to make things more convenient and ensure consistency.
      static StorageError local_comms_error(QString const& msg);
      static StorageError remote_comms_error(QString const& msg);
--    static StorageError deleted_error(QString const& msg, QString const& item_id);
      static StorageError runtime_destroyed_error(QString const& msg);
      static StorageError not_exists_error(QString const& msg, QString const& key);
      static StorageError exists_error(QString const& msg, QString const& item_id, QString const& item_name);
 === added file 'include/unity/storage/qt/internal/UploaderImpl.h'
 --- include/unity/storage/qt/internal/UploaderImpl.h	1970-01-01 00:00:00 +0000
 +++ include/unity/storage/qt/internal/UploaderImpl.h	2016-10-12 08:09:09 +0000
@@ -0,0 +1,90 @@
++/*
++ * 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 <michi.henning@canonical.com>
++ */
++
++#pragma once
++
++#include <unity/storage/qt/Uploader.h>
++
++#include <QDBusPendingReply>
++#include <QDBusUnixFileDescriptor>
++
++namespace unity
++{
++namespace storage
++{
++namespace internal
++{
++
++class ItemMetadata;
++
++}  // namespace internal
++
++namespace qt
++{
++namespace internal
++{
++
++class UploaderImpl : public QObject
++{
++    Q_OBJECT
++public:
++    UploaderImpl(std::shared_ptr<ItemImpl> const& item_impl,
++                 QString const& method,
++                 QDBusPendingReply<QString, QDBusUnixFileDescriptor>& reply,
++                 std::function<void(storage::internal::ItemMetadata const&)> const& validate,
++                 Item::ConflictPolicy policy,
++                 qint64 size_in_bytes);
++    UploaderImpl(StorageError const& e);
++    virtual ~UploaderImpl();
++
++    bool isValid() const;
++    Uploader::Status status() const;
++    StorageError error() const;
++    Item::ConflictPolicy policy() const;
++    qint64 sizeInBytes() const;
++    Item item() const;
++
++    void finishUpload();
++    void cancel();
++
++    static Uploader* make_job(std::shared_ptr<ItemImpl> const& item_impl,
++                              QString const& method,
++                              QDBusPendingReply<QString, QDBusUnixFileDescriptor>& reply,
++                              std::function<void(storage::internal::ItemMetadata const&)> const& validate,
++                              Item::ConflictPolicy policy,
++                              qint64 size_in_bytes);
++    static Uploader* make_job(StorageError const& e);
++
++private:
++    Uploader* public_instance_;
++    Uploader::Status status_;
++    StorageError error_;
++    QString method_;
++    std::shared_ptr<ItemImpl> item_impl_;
++    std::function<void(storage::internal::ItemMetadata const&)> validate_;
++    Item::ConflictPolicy policy_ = Item::ConflictPolicy::Overwrite;
++    qint64 size_in_bytes_ = 0;
++    QString upload_id_;
++    QDBusUnixFileDescriptor fd_;
++    bool finalizing_ = false;
++};
++
++}  // namespace internal
++}  // namespace qt
++}  // namespace storage
++}  // namespace unity
 === modified file 'include/unity/storage/qt/internal/VoidJobImpl.h'
 --- include/unity/storage/qt/internal/VoidJobImpl.h	2016-09-28 04:37:14 +0000
 +++ include/unity/storage/qt/internal/VoidJobImpl.h	2016-10-12 08:09:09 +0000
@@ -22,7 +22,10 @@
  #include <unity/storage/qt/StorageError.h>
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
  #include <QDBusPendingReply>
++#pragma GCC diagnostic pop
  namespace unity
+ {
@@ -45,22 +48,22 @@
      VoidJob::Status status() const;
      StorageError error() const;
--    static VoidJob* make_job(std::shared_ptr<ItemImpl> const& item,
++    static VoidJob* make_job(std::shared_ptr<ItemImpl> const& item_impl,
                               QString const& method,
--                             QDBusPendingReply<void> const& reply);
++                             QDBusPendingReply<void>& reply);
      static VoidJob* make_job(StorageError const& e);
  private:
--    VoidJobImpl(std::shared_ptr<ItemImpl> const& item,
++    VoidJobImpl(std::shared_ptr<ItemImpl> const& item_impl,
                  QString const& method,
--                QDBusPendingReply<void> const& reply);
++                QDBusPendingReply<void>& reply);
      VoidJobImpl(StorageError const& e);
      VoidJob* public_instance_;
      VoidJob::Status status_;
      StorageError error_;
      QString method_;
--    std::shared_ptr<ItemImpl> item_;
++    std::shared_ptr<ItemImpl> item_impl_;
  };
  }  // namespace internal
 === modified file 'src/provider/CMakeLists.txt'
 --- src/provider/CMakeLists.txt	2016-09-03 00:53:43 +0000
 +++ src/provider/CMakeLists.txt	2016-10-12 08:09:09 +0000
@@ -6,7 +6,7 @@
  qt5_add_dbus_interface(generated_files bus.xml businterface)
  set_source_files_properties(${generated_files} PROPERTIES
--  COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wmissing-field-initializers"
++  COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wno-missing-field-initializers"
    GENERATED TRUE
+ )
@@ -42,6 +42,11 @@
    ${CMAKE_SOURCE_DIR}/include/unity/storage/provider/internal/TempfileUploadJobImpl.h
    ${CMAKE_SOURCE_DIR}/include/unity/storage/provider/internal/UploadJobImpl.h
+ )
++
++set_source_files_properties(internal/ProviderInterface.cpp PROPERTIES
++  COMPILE_FLAGS "-Wno-missing-field-initializers"
++)
++
  add_dependencies(sf-provider-objects sf-provider-generated-files)
  set_target_properties(sf-provider-objects PROPERTIES
    AUTOMOC TRUE
 === modified file 'src/provider/internal/Handler.cpp'
 --- src/provider/internal/Handler.cpp	2016-08-12 06:19:22 +0000
 +++ src/provider/internal/Handler.cpp	2016-10-12 08:09:09 +0000
@@ -105,7 +105,6 @@
+             }
              catch (std::exception const& e)
+             {
--                qDebug() << e.what();
                  marshal_exception(current_exception());
+             }
              QMetaObject::invokeMethod(this, "send_reply", Qt::QueuedConnection);
 === modified file 'src/qt/CMakeLists.txt'
 --- src/qt/CMakeLists.txt	2016-10-10 05:24:16 +0000
 +++ src/qt/CMakeLists.txt	2016-10-12 08:09:09 +0000
@@ -9,8 +9,8 @@
      ${CMAKE_SOURCE_DIR}/data/provider.xml
      ProviderInterface
+ )
--set_source_files_properties(${generated_files} PROPERTIES
--    COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wmissing-field-initializers"
++set_source_files_properties(${generated_files} dbusmarshal.cpp PROPERTIES
++    COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wno-missing-field-initializers"
      GENERATED TRUE
+ )
@@ -18,14 +18,17 @@
  set(QT_CLIENT_LIB_V2_SRC
      Account.cpp
      AccountsJob.cpp
++    Downloader.cpp
      Item.cpp
      ItemJob.cpp
      ItemListJob.cpp
      Runtime.cpp
      StorageError.cpp
++    Uploader.cpp
      VoidJob.cpp
      internal/AccountImpl.cpp
      internal/AccountsJobImpl.cpp
++    internal/DownloaderImpl.cpp
      internal/HandlerBase.cpp
      internal/ItemImpl.cpp
      internal/ItemJobImpl.cpp
@@ -37,15 +40,19 @@
      internal/StorageErrorImpl.cpp
      internal/unmarshal_error.cpp
      internal/validate.cpp
++    internal/UploaderImpl.cpp
      internal/VoidJobImpl.cpp
      ${generated_files}
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/Account.h
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/AccountsJob.h
++    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/Downloader.h
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/Item.h
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/ItemJob.h
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/ItemListJob.h
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/Runtime.h
++    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/Uploader.h
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/VoidJob.h
++    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/DownloaderImpl.h
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/AccountsJobImpl.h
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/HandlerBase.h
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/ItemJobImpl.h
@@ -53,6 +60,7 @@
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/ListJobImplBase.h
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/MultiItemJobImpl.h
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/MultiItemListJobImpl.h
++    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/UploaderImpl.h
      ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/VoidJobImpl.h
+ )
 === added file 'src/qt/Downloader.cpp'
 --- src/qt/Downloader.cpp	1970-01-01 00:00:00 +0000
 +++ src/qt/Downloader.cpp	2016-10-12 08:09:09 +0000
@@ -0,0 +1,76 @@
++/*
++ * 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 <michi.henning@canonical.com>
++ */
++
++#include <unity/storage/qt/Downloader.h>
++
++#include <unity/storage/qt/internal/DownloaderImpl.h>
++
++#include <cassert>
++
++using namespace std;
++
++namespace unity
++{
++namespace storage
++{
++namespace qt
++{
++
++Downloader::Downloader() = default;
++
++Downloader::Downloader(unique_ptr<internal::DownloaderImpl> p)
++    : p_(move(p))
++{
++    assert(p_);
++}
++
++Downloader::~Downloader() = default;
++
++bool Downloader::isValid() const
++{
++    return p_->isValid();
++}
++
++Downloader::Status Downloader::status() const
++{
++    return p_->status();
++}
++
++StorageError Downloader::error() const
++{
++    return p_->error();
++}
++
++Item Downloader::item() const
++{
++    return p_->item();
++}
++
++void Downloader::finishDownload()
++{
++    p_->finishDownload();
++}
++
++void Downloader::cancel()
++{
++    p_->cancel();
++}
++
++}  // namespace qt
++}  // namespace storage
++}  // namespace unity
 === modified file 'src/qt/Item.cpp'
 --- src/qt/Item.cpp	2016-09-28 04:37:14 +0000
 +++ src/qt/Item.cpp	2016-10-12 08:09:09 +0000
@@ -20,7 +20,6 @@
  #include <unity/storage/qt/internal/ItemImpl.h>
  #include <cassert>
--#include <QDebug> // TODO: remove this
  using namespace std;
 === added file 'src/qt/Uploader.cpp'
 --- src/qt/Uploader.cpp	1970-01-01 00:00:00 +0000
 +++ src/qt/Uploader.cpp	2016-10-12 08:09:09 +0000
@@ -0,0 +1,86 @@
++/*
++ * 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 <michi.henning@canonical.com>
++ */
++
++#include <unity/storage/qt/Uploader.h>
++
++#include <unity/storage/qt/internal/UploaderImpl.h>
++
++#include <cassert>
++
++using namespace std;
++
++namespace unity
++{
++namespace storage
++{
++namespace qt
++{
++
++Uploader::Uploader() = default;
++
++Uploader::Uploader(unique_ptr<internal::UploaderImpl> p)
++    : p_(move(p))
++{
++    assert(p_);
++}
++
++Uploader::~Uploader() = default;
++
++bool Uploader::isValid() const
++{
++    return p_->isValid();
++}
++
++Uploader::Status Uploader::status() const
++{
++    return p_->status();
++}
++
++StorageError Uploader::error() const
++{
++    return p_->error();
++}
++
++Item::ConflictPolicy Uploader::policy() const
++{
++    return p_->policy();
++}
++
++qint64 Uploader::sizeInBytes() const
++{
++    return p_->sizeInBytes();
++}
++
++Item Uploader::item() const
++{
++    return p_->item();
++}
++
++void Uploader::finishUpload()
++{
++    p_->finishUpload();
++}
++
++void Uploader::cancel()
++{
++    p_->cancel();
++}
++
++}  // namespace qt
++}  // namespace storage
++}  // namespace unity
 === modified file 'src/qt/client/CMakeLists.txt'
 --- src/qt/client/CMakeLists.txt	2016-09-21 05:03:19 +0000
 +++ src/qt/client/CMakeLists.txt	2016-10-12 08:09:09 +0000
@@ -88,7 +88,7 @@
      ProviderInterface
+ )
  set_source_files_properties(${generated_files} PROPERTIES
--    COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wmissing-field-initializers"
++    COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wno-missing-field-initializers"
      GENERATED TRUE
+ )
 === modified file 'src/qt/internal/AccountImpl.cpp'
 --- src/qt/internal/AccountImpl.cpp	2016-09-29 02:40:05 +0000
 +++ src/qt/internal/AccountImpl.cpp	2016-10-12 08:09:09 +0000
@@ -47,7 +47,7 @@
+ {
+ }
--AccountImpl::AccountImpl(shared_ptr<RuntimeImpl> const& runtime,
++AccountImpl::AccountImpl(shared_ptr<RuntimeImpl> const& runtime_impl,
                           QString const& bus_name,
                           QString const& object_path,
                           QString const& owner_id,
@@ -59,8 +59,8 @@
      , owner_id_(owner_id)
      , owner_(owner)
      , description_(description)
--    , runtime_(runtime)
--    , provider_(new ProviderInterface(bus_name, object_path, runtime->connection()))
++    , runtime_impl_(runtime_impl)
++    , provider_(new ProviderInterface(bus_name, object_path, runtime_impl->connection()))
+ {
      assert(!bus_name.isEmpty());
      assert(!object_path.isEmpty());
@@ -85,7 +85,7 @@
+ {
      QString const method = "Account::roots()";
--    auto runtime = runtime_.lock();
++    auto runtime = runtime_impl_.lock();
      if (!is_valid_)
+     {
          auto e = StorageErrorImpl::logic_error(method + ": cannot create job from invalid account");
@@ -121,7 +121,7 @@
          auto e = StorageErrorImpl::logic_error(method + ": cannot create job from invalid account");
          return ItemJobImpl::make_job(e);
+     }
--    auto runtime = runtime_.lock();
++    auto runtime = runtime_impl_.lock();
      if (!runtime || !runtime->isValid())
+     {
          auto e = StorageErrorImpl::runtime_destroyed_error(method + ": Runtime was destroyed previously");
@@ -199,9 +199,9 @@
      return !operator<(other);
+ }
--shared_ptr<RuntimeImpl> AccountImpl::runtime() const
++shared_ptr<RuntimeImpl> AccountImpl::runtime_impl() const
+ {
--    return runtime_.lock();
++    return runtime_impl_.lock();
+ }
  shared_ptr<ProviderInterface> AccountImpl::provider() const
 === modified file 'src/qt/internal/AccountsJobImpl.cpp'
 --- src/qt/internal/AccountsJobImpl.cpp	2016-09-29 03:17:56 +0000
 +++ src/qt/internal/AccountsJobImpl.cpp	2016-10-12 08:09:09 +0000
@@ -50,13 +50,13 @@
  }  // namespace
--AccountsJobImpl::AccountsJobImpl(AccountsJob* public_instance, shared_ptr<RuntimeImpl> const& runtime)
++AccountsJobImpl::AccountsJobImpl(AccountsJob* public_instance, shared_ptr<RuntimeImpl> const& runtime_impl)
      : public_instance_(public_instance)
      , status_(AccountsJob::Status::Loading)
--    , runtime_(runtime)
++    , runtime_impl_(runtime_impl)
+ {
      assert(public_instance);
--    assert(runtime);
++    assert(runtime_impl);
      initialize_accounts();
+ }
@@ -89,7 +89,7 @@
  QList<Account> AccountsJobImpl::accounts() const
+ {
--    auto runtime = get_runtime("AccountsJob::accounts()");
++    auto runtime = get_runtime_impl("AccountsJob::accounts()");
      if (!runtime)
+     {
          return QList<Account>();
@@ -131,9 +131,9 @@
      return new_status;
+ }
--shared_ptr<RuntimeImpl> AccountsJobImpl::get_runtime(QString const& method) const
++shared_ptr<RuntimeImpl> AccountsJobImpl::get_runtime_impl(QString const& method) const
+ {
--    auto runtime = runtime_.lock();
++    auto runtime = runtime_impl_.lock();
      if (!runtime || !runtime->isValid())
+     {
          QString msg = method + ": Runtime was destroyed previously";
@@ -146,7 +146,7 @@
  void AccountsJobImpl::initialize_accounts()
+ {
--    auto runtime = get_runtime("AccountsJob()");
++    auto runtime = get_runtime_impl("AccountsJob()");
      assert(runtime);
      auto manager = runtime->accounts_manager();
 === added file 'src/qt/internal/DownloaderImpl.cpp'
 --- src/qt/internal/DownloaderImpl.cpp	1970-01-01 00:00:00 +0000
 +++ src/qt/internal/DownloaderImpl.cpp	2016-10-12 08:09:09 +0000
@@ -0,0 +1,280 @@
++/*
++ * 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 <michi.henning@canonical.com>
++ */
++
++#include <unity/storage/qt/internal/DownloaderImpl.h>
++
++#include "ProviderInterface.h"
++#include <unity/storage/qt/internal/Handler.h>
++#include <unity/storage/qt/internal/ItemImpl.h>
++#include <unity/storage/qt/internal/VoidJobImpl.h>
++#include <unity/storage/qt/ItemJob.h>
++
++#include <cassert>
++
++using namespace std;
++
++namespace unity
++{
++namespace storage
++{
++namespace qt
++{
++namespace internal
++{
++
++DownloaderImpl::DownloaderImpl(shared_ptr<ItemImpl> const& item_impl,
++                               QString const& method,
++                               QDBusPendingReply<QString, QDBusUnixFileDescriptor>& reply)
++    : status_(Downloader::Status::Loading)
++    , item_impl_(item_impl)
++{
++    assert(item_impl);
++    assert(!method.isEmpty());
++
++    auto process_reply = [this, method](decltype(reply)& r)
++    {
++        if (status_ != Downloader::Status::Loading)
++        {
++            return;  // Don't transition to a final state more than once.
++        }
++
++        auto runtime = item_impl_->runtime_impl();
++        if (!runtime || !runtime->isValid())
++        {
++            QString msg = method + ": Runtime was destroyed previously";
++            error_ = StorageErrorImpl::runtime_destroyed_error(msg);
++            public_instance_->abort();
++            public_instance_->setErrorString(msg);
++            status_ = Downloader::Status::Error;
++            Q_EMIT public_instance_->statusChanged(status_);
++            return;
++        }
++
++        download_id_ = r.argumentAt<0>();
++        fd_ = r.argumentAt<1>();
++        if (fd_.fileDescriptor() < 0)
++        {
++            // LCOV_EXCL_START
++            QString msg = method + ": invalid file descriptor returned by provider";
++            qCritical().noquote() << msg;
++            error_ = StorageErrorImpl::local_comms_error(msg);
++            public_instance_->abort();
++            public_instance_->setErrorString(msg);
++            status_ = Downloader::Status::Error;
++            Q_EMIT public_instance_->statusChanged(status_);
++            return;
++            // LCOV_EXCL_STOP
++        }
++
++        public_instance_->setSocketDescriptor(fd_.fileDescriptor(), QLocalSocket::ConnectedState, QIODevice::ReadOnly);
++        status_ = Downloader::Status::Ready;
++        Q_EMIT public_instance_->statusChanged(status_);
++    };
++
++    auto process_error = [this](StorageError const& error)
++    {
++        // TODO: This does not set the method
++        error_ = error;
++        status_ = Downloader::Status::Error;
++        public_instance_->abort();
++        public_instance_->setErrorString(error.errorString());
++        Q_EMIT public_instance_->statusChanged(status_);
++    };
++
++    new Handler<storage::internal::ItemMetadata>(this, reply, process_reply, process_error);
++}
++
++DownloaderImpl::DownloaderImpl(StorageError const& e)
++    : status_(Downloader::Status::Error)
++    , error_(e)
++{
++}
++
++DownloaderImpl::~DownloaderImpl()
++{
++    switch (status_)
++    {
++        case Downloader::Status::Loading:
++        case Downloader::Status::Finished:
++        case Downloader::Status::Cancelled:
++        case Downloader::Status::Error:
++            break;
++        case Downloader::Status::Ready:
++            public_instance_->abort();
++            break;
++        default:
++            abort();  // Impossible.  // LCOV_EXCL_LINE
++    }
++}
++
++bool DownloaderImpl::isValid() const
++{
++    return status_ != Downloader::Status::Error && status_ != Downloader::Status::Cancelled;
++}
++
++Downloader::Status DownloaderImpl::status() const
++{
++    return status_;
++}
++
++StorageError DownloaderImpl::error() const
++{
++    return error_;
++}
++
++Item DownloaderImpl::item() const
++{
++    if (status_ == Downloader::Status::Error)
++    {
++        return Item();
++    }
++    return Item(item_impl_);
++}
++
++void DownloaderImpl::finishDownload()
++{
++    static QString const method = "Downloader::finishDownload()";
++
++    // If we encountered an error earlier or were cancelled, or if finishDownload() was
++    // called already, we ignore the call.
++    if (status_ == Downloader::Status::Error || status_ == Downloader::Status::Cancelled || finalizing_)
++    {
++        return;
++    }
++
++    // Complain if we are asked to finalize while in the Loading or Finished state.
++    if (status_ != Downloader::Ready)
++    {
++        QString msg = method + ": cannot finalize while Downloader is not in the Ready state";
++        error_ = StorageErrorImpl::logic_error(msg);
++        public_instance_->abort();
++        public_instance_->setErrorString(msg);
++        status_ = Downloader::Status::Error;
++        Q_EMIT public_instance_->statusChanged(status_);
++        return;
++    }
++
++    auto runtime = item_impl_->runtime_impl();
++    if (!runtime || !runtime->isValid())
++    {
++        QString msg = method + ": Runtime was destroyed previously";
++        error_ = StorageErrorImpl::runtime_destroyed_error(msg);
++        status_ = Downloader::Status::Error;
++        Q_EMIT public_instance_->statusChanged(status_);
++        return;
++    }
++
++    finalizing_ = true;
++    auto reply = item_impl_->account_impl()->provider()->FinishDownload(download_id_);
++
++    auto process_reply = [this](decltype(reply)&)
++    {
++        if (status_ == Downloader::Status::Cancelled || status_ == Downloader::Status::Error)
++        {
++            return;  // Don't transition to a final state more than once.
++        }
++
++        auto runtime = item_impl_->runtime_impl();
++        if (!runtime || !runtime->isValid())
++        {
++            QString msg = method + ": Runtime was destroyed previously";
++            error_ = StorageErrorImpl::runtime_destroyed_error(msg);
++            public_instance_->abort();
++            public_instance_->setErrorString(msg);
++            status_ = Downloader::Status::Error;
++            Q_EMIT public_instance_->statusChanged(status_);
++            return;
++        }
++
++        status_ = Downloader::Status::Finished;
++        Q_EMIT public_instance_->statusChanged(status_);
++    };
++
++    auto process_error = [this](StorageError const& error)
++    {
++        if (status_ != Downloader::Status::Ready)
++        {
++            return;  // Don't transition to a final state more than once.
++        }
++
++        // TODO: this doesn't set the method
++        error_ = error;
++        public_instance_->abort();
++        public_instance_->setErrorString(error.errorString());
++        status_ = Downloader::Status::Error;
++        Q_EMIT public_instance_->statusChanged(status_);
++    };
++
++    new Handler<void>(this, reply, process_reply, process_error);
++}
++
++void DownloaderImpl::cancel()
++{
++    static QString const method = "Downloader::cancel()";
++
++    // If we are in a final state already, ignore the call.
++    if (   status_ == Downloader::Status::Error
++        || status_ == Downloader::Status::Finished
++        || status_ == Downloader::Status::Cancelled)
++    {
++        return;
++    }
++    auto runtime = item_impl_->runtime_impl();
++    if (!runtime || !runtime->isValid())
++    {
++        QString msg = method + ": Runtime was destroyed previously";
++        error_ = StorageErrorImpl::runtime_destroyed_error(msg);
++        status_ = Downloader::Status::Error;
++        Q_EMIT public_instance_->statusChanged(status_);
++        return;
++    }
++
++    QString msg = method + ": download was cancelled";
++    error_ = StorageErrorImpl::cancelled_error(msg);
++    public_instance_->abort();
++    public_instance_->setErrorString(msg);
++    status_ = Downloader::Status::Cancelled;
++    Q_EMIT public_instance_->statusChanged(status_);
++}
++
++Downloader* DownloaderImpl::make_job(shared_ptr<ItemImpl> const& item_impl,
++                                     QString const& method,
++                                     QDBusPendingReply<QString, QDBusUnixFileDescriptor>& reply)
++{
++    unique_ptr<DownloaderImpl> impl(new DownloaderImpl(item_impl, method, reply));
++    auto downloader = new Downloader(move(impl));
++    downloader->p_->public_instance_ = downloader;
++    return downloader;
++}
++
++Downloader* DownloaderImpl::make_job(StorageError const& e)
++{
++    unique_ptr<DownloaderImpl> impl(new DownloaderImpl(e));
++    auto downloader = new Downloader(move(impl));
++    downloader->p_->public_instance_ = downloader;
++    QMetaObject::invokeMethod(downloader,
++                              "statusChanged",
++                              Qt::QueuedConnection,
++                              Q_ARG(unity::storage::qt::Downloader::Status, downloader->p_->status_));
++    return downloader;
++}
++
++}  // namespace internal
++}  // namespace qt
++}  // namespace storage
++}  // namespace unity
 === modified file 'src/qt/internal/ItemImpl.cpp'
 --- src/qt/internal/ItemImpl.cpp	2016-10-10 23:31:31 +0000
 +++ src/qt/internal/ItemImpl.cpp	2016-10-12 08:09:09 +0000
@@ -20,10 +20,12 @@
  #include "ProviderInterface.h"
  #include <unity/storage/provider/metadata_keys.h>
++#include <unity/storage/qt/internal/DownloaderImpl.h>
  #include <unity/storage/qt/internal/ItemJobImpl.h>
  #include <unity/storage/qt/internal/ItemListJobImpl.h>
  #include <unity/storage/qt/internal/MultiItemJobImpl.h>
  #include <unity/storage/qt/internal/MultiItemListJobImpl.h>
++#include <unity/storage/qt/internal/UploaderImpl.h>
  #include <unity/storage/qt/internal/VoidJobImpl.h>
  #include <unity/storage/qt/internal/validate.h>
@@ -49,12 +51,12 @@
+ }
  ItemImpl::ItemImpl(storage::internal::ItemMetadata const& md,
--                   std::shared_ptr<AccountImpl> const& account)
++                   std::shared_ptr<AccountImpl> const& account_impl)
      : is_valid_(true)
      , md_(md)
--    , account_(account)
++    , account_impl_(account_impl)
+ {
--    assert(account);
++    assert(account_impl);
+ }
  QString ItemImpl::itemId() const
@@ -69,7 +71,7 @@
  Account ItemImpl::account() const
+ {
--    return is_valid_ ? account_ : Account();
++    return is_valid_ ? account_impl_ : Account();
+ }
  QString ItemImpl::etag() const
@@ -88,7 +90,7 @@
          case storage::ItemType::root:
              return Item::Type::Root;
          default:
--            abort();  // LCOV_EXCL_LINE // Impossible
++            abort();  // Impossible.  // LCOV_EXCL_LINE
+     }
+ }
@@ -133,7 +135,7 @@
      QList<QDBusPendingReply<storage::internal::ItemMetadata>> replies;
      for (auto const& id : md_.parent_ids)
+     {
--        auto reply = account_->provider()->Metadata(id);
++        auto reply = account_impl_->provider()->Metadata(id);
          replies.append(reply);
+     }
@@ -147,7 +149,7 @@
+         }
      };
--    return MultiItemJobImpl::make_job(account_, method, replies, validate);
++    return MultiItemJobImpl::make_job(account_impl_, method, replies, validate);
+ }
  ItemJob* ItemImpl::copy(Item const& newParent, QString const& newName) const
@@ -172,7 +174,7 @@
+         }
      };
--    auto reply = account_->provider()->Copy(md_.item_id, newParent.itemId(), newName);
++    auto reply = account_impl_->provider()->Copy(md_.item_id, newParent.itemId(), newName);
      auto This = const_pointer_cast<ItemImpl>(shared_from_this());
      return ItemJobImpl::make_job(This, method, reply, validate);
+ }
@@ -205,7 +207,7 @@
+         }
      };
--    auto reply = account_->provider()->Move(md_.item_id, newParent.itemId(), newName);
++    auto reply = account_impl_->provider()->Move(md_.item_id, newParent.itemId(), newName);
      auto This = const_pointer_cast<ItemImpl>(shared_from_this());
      return ItemJobImpl::make_job(This, method, reply, validate);
+ }
@@ -225,19 +227,63 @@
          return VoidJobImpl::make_job(e);
+     }
--    auto reply = account_->provider()->Delete(md_.item_id);
++    auto reply = account_impl_->provider()->Delete(md_.item_id);
      auto This = const_pointer_cast<ItemImpl>(shared_from_this());
      return VoidJobImpl::make_job(This, method, reply);
+ }
  Uploader* ItemImpl::createUploader(Item::ConflictPolicy policy, qint64 sizeInBytes) const
+ {
--    return nullptr;  // TODO
++    QString const method = "Item::createUploader()";
++
++    auto invalid_job = check_invalid_or_destroyed<UploaderImpl>(method);
++    if (invalid_job)
++    {
++        return invalid_job;
++    }
++    if (md_.type != storage::ItemType::file)
++    {
++        auto e = StorageErrorImpl::logic_error(method + ": cannot upload to a directory");
++        return UploaderImpl::make_job(e);
++    }
++    if (sizeInBytes < 0)
++    {
++        auto e = StorageErrorImpl::logic_error(method + ": size must be >= 0");
++        return UploaderImpl::make_job(e);
++    }
++
++    auto validate = [method](storage::internal::ItemMetadata const& md)
++    {
++        if (md.type != storage::ItemType::file)
++        {
++            throw StorageErrorImpl::local_comms_error(method + ": impossible directory item returned by provider");
++        }
++    };
++
++    auto etag = policy == Item::ConflictPolicy::Overwrite ? "" : md_.etag;
++    auto reply = account_impl_->provider()->Update(md_.item_id, sizeInBytes, etag);
++    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
++    return UploaderImpl::make_job(This, method, reply, validate, policy, sizeInBytes);
+ }
  Downloader* ItemImpl::createDownloader() const
+ {
--    return nullptr;  // TODO
++    QString const method = "Item::createDownloader()";
++
++    auto invalid_job = check_invalid_or_destroyed<DownloaderImpl>(method);
++    if (invalid_job)
++    {
++        return invalid_job;
++    }
++    if (md_.type != storage::ItemType::file)
++    {
++        auto e = StorageErrorImpl::logic_error(method + ": cannot download a directory");
++        return DownloaderImpl::make_job(e);
++    }
++
++    auto reply = account_impl_->provider()->Download(md_.item_id);
++    auto This = const_pointer_cast<ItemImpl>(shared_from_this());
++    return DownloaderImpl::make_job(This, method, reply);
+ }
  ItemListJob* ItemImpl::list() const
@@ -267,10 +313,10 @@
      auto fetch_next = [this](QString const& page_token)
+     {
--        return account_->provider()->List(md_.item_id, page_token);
++        return account_impl_->provider()->List(md_.item_id, page_token);
      };
--    auto reply = account_->provider()->List(md_.item_id, "");
++    auto reply = account_impl_->provider()->List(md_.item_id, "");
      auto This = const_pointer_cast<ItemImpl>(shared_from_this());
      return MultiItemListJobImpl::make_job(This, method, reply, validate, fetch_next);
+ }
@@ -294,7 +340,7 @@
+     {
      };
--    auto reply = account_->provider()->Lookup(md_.item_id, name);
++    auto reply = account_impl_->provider()->Lookup(md_.item_id, name);
      auto This = const_pointer_cast<ItemImpl>(shared_from_this());
      return ItemListJobImpl::make_job(This, method, reply, validate);
+ }
@@ -325,7 +371,7 @@
          throw StorageErrorImpl::local_comms_error(msg);
      };
--    auto reply = account_->provider()->CreateFolder(md_.item_id, name);
++    auto reply = account_impl_->provider()->CreateFolder(md_.item_id, name);
      auto This = const_pointer_cast<ItemImpl>(shared_from_this());
      return ItemJobImpl::make_job(This, method, reply, validate);
+ }
@@ -350,7 +396,7 @@
      if (is_valid_)
+     {
          return other.is_valid_
--               && *account_ == *other.account_
++               && *account_impl_ == *other.account_impl_
                 && md_.item_id == other.md_.item_id;
+     }
      return !other.is_valid_;
@@ -372,11 +418,11 @@
          return false;
+     }
      assert(is_valid_ && other.is_valid_);
--    if (*account_ < *other.account_)
++    if (*account_impl_ < *other.account_impl_)
+     {
          return true;
+     }
--    if (*account_ > *other.account_)
++    if (*account_impl_ > *other.account_impl_)
+     {
          return false;
+     }
@@ -405,28 +451,28 @@
          return 0;
+     }
      size_t hash = 0;
--    boost::hash_combine(hash, account_->hash());
++    boost::hash_combine(hash, account_impl_->hash());
      boost::hash_combine(hash, qHash(md_.item_id));
      return hash;
+ }
  Item ItemImpl::make_item(QString const& method,
                           storage::internal::ItemMetadata const& md,
--                         std::shared_ptr<AccountImpl> const& account)
++                         std::shared_ptr<AccountImpl> const& account_impl)
+ {
      validate(method, md);  // Throws if no good.
--    auto p = make_shared<ItemImpl>(md, account);
++    auto p = make_shared<ItemImpl>(md, account_impl);
      return Item(p);
+ }
--shared_ptr<RuntimeImpl> ItemImpl::runtime() const
++shared_ptr<RuntimeImpl> ItemImpl::runtime_impl() const
+ {
--    return account_->runtime();
++    return account_impl_->runtime_impl();
+ }
  shared_ptr<AccountImpl> ItemImpl::account_impl() const
+ {
--    return account_;
++    return account_impl_;
+ }
  }  // namespace internal
 === modified file 'src/qt/internal/ItemJobImpl.cpp'
 --- src/qt/internal/ItemJobImpl.cpp	2016-09-30 01:48:08 +0000
 +++ src/qt/internal/ItemJobImpl.cpp	2016-10-12 08:09:09 +0000
@@ -36,22 +36,22 @@
  namespace internal
+ {
--ItemJobImpl::ItemJobImpl(shared_ptr<AccountImpl> const& account,
++ItemJobImpl::ItemJobImpl(shared_ptr<AccountImpl> const& account_impl,
                           QString const& method,
--                         QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
++                         QDBusPendingReply<storage::internal::ItemMetadata>& reply,
                           std::function<void(storage::internal::ItemMetadata const&)> const& validate)
      : status_(ItemJob::Status::Loading)
      , method_(method)
--    , account_(account)
++    , account_impl_(account_impl)
      , validate_(validate)
+ {
      assert(!method.isEmpty());
--    assert(account);
++    assert(account_impl);
      assert(validate);
      auto process_reply = [this](decltype(reply)& r)
+     {
--        auto runtime = account_->runtime();
++        auto runtime = account_impl_->runtime_impl();
          if (!runtime || !runtime->isValid())
+         {
              error_ = StorageErrorImpl::runtime_destroyed_error(method_ + ": Runtime was destroyed previously");
@@ -64,12 +64,13 @@
          try
+         {
              validate_(metadata);
--            item_ = ItemImpl::make_item(method_, metadata, account_);
++            item_ = ItemImpl::make_item(method_, metadata, account_impl_);
              status_ = ItemJob::Status::Finished;
+         }
          catch (StorageError const& e)
+         {
              // Bad metadata received from provider, validate_() or make_item() have logged it.
++            // TODO: This does not set the method.
              error_ = e;
              status_ = ItemJob::Status::Error;
+         }
@@ -88,7 +89,7 @@
  ItemJobImpl::ItemJobImpl(shared_ptr<ItemImpl> const& item,
                           QString const& method,
--                         QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
++                         QDBusPendingReply<storage::internal::ItemMetadata>& reply,
                           std::function<void(storage::internal::ItemMetadata const&)> const& validate)
      : ItemJobImpl(item->account_impl(), method, reply, validate)
+ {
@@ -123,7 +124,7 @@
  ItemJob* ItemJobImpl::make_job(shared_ptr<AccountImpl> const& account,
                                 QString const& method,
--                               QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
++                               QDBusPendingReply<storage::internal::ItemMetadata>& reply,
                                 std::function<void(storage::internal::ItemMetadata const&)> const& validate)
+ {
      unique_ptr<ItemJobImpl> impl(new ItemJobImpl(account, method, reply, validate));
@@ -134,7 +135,7 @@
  ItemJob* ItemJobImpl::make_job(shared_ptr<ItemImpl> const& item,
                                 QString const& method,
--                               QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
++                               QDBusPendingReply<storage::internal::ItemMetadata>& reply,
                                 std::function<void(storage::internal::ItemMetadata const&)> const& validate)
+ {
      unique_ptr<ItemJobImpl> impl(new ItemJobImpl(item, method, reply, validate));
 === modified file 'src/qt/internal/ItemListJobImpl.cpp'
 --- src/qt/internal/ItemListJobImpl.cpp	2016-10-10 03:55:32 +0000
 +++ src/qt/internal/ItemListJobImpl.cpp	2016-10-12 08:09:09 +0000
@@ -35,15 +35,15 @@
  namespace internal
+ {
--ItemListJobImpl::ItemListJobImpl(shared_ptr<AccountImpl> const& account,
++ItemListJobImpl::ItemListJobImpl(shared_ptr<AccountImpl> const& account_impl,
                                   QString const& method,
--                                 QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
++                                 QDBusPendingReply<QList<storage::internal::ItemMetadata>>& reply,
                                   std::function<void(storage::internal::ItemMetadata const&)> const& validate)
--    : ListJobImplBase(account, method, validate)
++    : ListJobImplBase(account_impl, method, validate)
+ {
      auto process_reply = [this](decltype(reply)& r)
+     {
--        auto runtime = account_->runtime();
++        auto runtime = account_impl_->runtime_impl();
          if (!runtime || !runtime->isValid())
+         {
              error_ = StorageErrorImpl::runtime_destroyed_error(method_ + ": Runtime was destroyed previously");
@@ -59,7 +59,7 @@
              try
+             {
                  validate_(md);
--                auto item = ItemImpl::make_item(method_, md, account_);
++                auto item = ItemImpl::make_item(method_, md, account_impl_);
                  items.append(item);
+             }
              catch (StorageError const&)
@@ -86,32 +86,32 @@
      new Handler<QList<storage::internal::ItemMetadata>>(this, reply, process_reply, process_error);
+ }
--ItemListJobImpl::ItemListJobImpl(shared_ptr<ItemImpl> const& item,
++ItemListJobImpl::ItemListJobImpl(shared_ptr<ItemImpl> const& item_impl,
                                   QString const& method,
--                                 QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
++                                 QDBusPendingReply<QList<storage::internal::ItemMetadata>>& reply,
                                   std::function<void(storage::internal::ItemMetadata const&)> const& validate)
--    : ItemListJobImpl(item->account_impl(), method, reply, validate)
++    : ItemListJobImpl(item_impl->account_impl(), method, reply, validate)
+ {
--    item_impl_ = item;
++    item_impl_ = item_impl;
+ }
--ItemListJob* ItemListJobImpl::make_job(shared_ptr<AccountImpl> const& account,
++ItemListJob* ItemListJobImpl::make_job(shared_ptr<AccountImpl> const& account_impl,
                                         QString const& method,
--                                       QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
++                                       QDBusPendingReply<QList<storage::internal::ItemMetadata>>& reply,
                                         std::function<void(storage::internal::ItemMetadata const&)> const& validate)
+ {
--    unique_ptr<ItemListJobImpl> impl(new ItemListJobImpl(account, method, reply, validate));
++    unique_ptr<ItemListJobImpl> impl(new ItemListJobImpl(account_impl, method, reply, validate));
      auto job = new ItemListJob(move(impl));
      job->p_->set_public_instance(job);
      return job;
+ }
--ItemListJob* ItemListJobImpl::make_job(shared_ptr<ItemImpl> const& item,
++ItemListJob* ItemListJobImpl::make_job(shared_ptr<ItemImpl> const& item_impl,
                                         QString const& method,
--                                       QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
++                                       QDBusPendingReply<QList<storage::internal::ItemMetadata>>& reply,
                                         std::function<void(storage::internal::ItemMetadata const&)> const& validate)
+ {
--    unique_ptr<ItemListJobImpl> impl(new ItemListJobImpl(item, method, reply, validate));
++    unique_ptr<ItemListJobImpl> impl(new ItemListJobImpl(item_impl, method, reply, validate));
      auto job = new ItemListJob(move(impl));
      job->p_->set_public_instance(job);
      return job;
 === modified file 'src/qt/internal/ListJobImplBase.cpp'
 --- src/qt/internal/ListJobImplBase.cpp	2016-09-29 03:17:56 +0000
 +++ src/qt/internal/ListJobImplBase.cpp	2016-10-12 08:09:09 +0000
@@ -41,16 +41,16 @@
+ {
+ }
--ListJobImplBase::ListJobImplBase(shared_ptr<AccountImpl> const& account,
++ListJobImplBase::ListJobImplBase(shared_ptr<AccountImpl> const& account_impl,
                                   QString const& method,
                                   std::function<void(storage::internal::ItemMetadata const&)> const& validate)
      : status_(ItemListJob::Status::Loading)
      , method_(method)
--    , account_(account)
++    , account_impl_(account_impl)
      , validate_(validate)
+ {
      assert(!method.isEmpty());
--    assert(account);
++    assert(account_impl);
      assert(validate);
+ }
 === modified file 'src/qt/internal/MultiItemJobImpl.cpp'
 --- src/qt/internal/MultiItemJobImpl.cpp	2016-09-30 01:48:08 +0000
 +++ src/qt/internal/MultiItemJobImpl.cpp	2016-10-12 08:09:09 +0000
@@ -35,15 +35,15 @@
  namespace internal
+ {
--MultiItemJobImpl::MultiItemJobImpl(shared_ptr<AccountImpl> const& account,
++MultiItemJobImpl::MultiItemJobImpl(shared_ptr<AccountImpl> const& account_impl,
                                     QString const& method,
--                                   ReplyType const& replies,
++                                   ReplyType& replies,
                                     ValidateFunc const& validate)
--    : ListJobImplBase(account, method, validate)
++    : ListJobImplBase(account_impl, method, validate)
      , replies_remaining_(replies.size())
+ {
      assert(!method.isEmpty());
--    assert(account);
++    assert(account_impl);
      assert(validate);
      // We ask the provider for the metadata for each of this item's parents.
@@ -52,7 +52,7 @@
      // If anything goes wrong at all, we report the first error and then ignore all
      // other replies.
--    auto process_reply = [this](QDBusPendingReply<storage::internal::ItemMetadata> const& r)
++    auto process_reply = [this](QDBusPendingReply<storage::internal::ItemMetadata>& r)
+     {
          if (status_ != ItemListJob::Status::Loading)
+         {
@@ -61,7 +61,7 @@
          --replies_remaining_;
--        auto runtime = account_->runtime();
++        auto runtime = account_impl_->runtime_impl();
          if (!runtime || !runtime->isValid())
+         {
              error_ = StorageErrorImpl::runtime_destroyed_error(method_ + ": Runtime was destroyed previously");
@@ -75,7 +75,7 @@
          try
+         {
              validate_(metadata);
--            item = ItemImpl::make_item(method_, metadata, account_);
++            item = ItemImpl::make_item(method_, metadata, account_impl_);
+         }
          catch (StorageError const& e)
+         {
@@ -110,18 +110,18 @@
          Q_EMIT public_instance_->statusChanged(status_);
      };
--    for (auto const& reply : replies)
++    for (auto& reply : replies)
+     {
          new Handler<storage::internal::ItemMetadata>(this, reply, process_reply, process_error);
+     }
+ }
--ItemListJob* MultiItemJobImpl::make_job(shared_ptr<AccountImpl> const& account,
++ItemListJob* MultiItemJobImpl::make_job(shared_ptr<AccountImpl> const& account_impl,
                                          QString const& method,
--                                        ReplyType const& replies,
++                                        ReplyType& replies,
                                          ValidateFunc const& validate)
+ {
--    unique_ptr<MultiItemJobImpl> impl(new MultiItemJobImpl(account, method, replies, validate));
++    unique_ptr<MultiItemJobImpl> impl(new MultiItemJobImpl(account_impl, method, replies, validate));
      auto job = new ItemListJob(move(impl));
      job->p_->set_public_instance(job);
      return job;
 === modified file 'src/qt/internal/MultiItemListJobImpl.cpp'
 --- src/qt/internal/MultiItemListJobImpl.cpp	2016-10-10 04:07:07 +0000
 +++ src/qt/internal/MultiItemListJobImpl.cpp	2016-10-12 08:09:09 +0000
@@ -35,17 +35,17 @@
  namespace internal
+ {
--MultiItemListJobImpl::MultiItemListJobImpl(shared_ptr<ItemImpl> const& item,
++MultiItemListJobImpl::MultiItemListJobImpl(shared_ptr<ItemImpl> const& item_impl,
                                             QString const& method,
--                                           ReplyType const& reply,
++                                           ReplyType& reply,
                                             ValidateFunc const& validate,
                                             FetchFunc const& fetch_next)
--    : ListJobImplBase(item->account_impl(), method, validate)
++    : ListJobImplBase(item_impl->account_impl(), method, validate)
      , fetch_next_(fetch_next)
+ {
      assert(fetch_next);
--    item_impl_ = item;
++    item_impl_ = item_impl;
      process_reply_ = [this](ReplyType const& r)
+     {
@@ -53,7 +53,7 @@
+         {
              return;
+         }
--        auto runtime = item_impl_->account_impl()->runtime();
++        auto runtime = item_impl_->account_impl()->runtime_impl();
          if (!runtime || !runtime->isValid())
+         {
              error_ = StorageErrorImpl::runtime_destroyed_error(method_ + ": Runtime was destroyed previously");
@@ -69,7 +69,7 @@
              try
+             {
                  validate_(md);
--                auto item = ItemImpl::make_item(method_, md, account_);
++                auto item = ItemImpl::make_item(method_, md, account_impl_);
                  items.append(item);
+             }
              catch (StorageError const& e)
@@ -96,7 +96,8 @@
+         }
          else
+         {
--            new Handler<ReplyType>(this, fetch_next_(token), process_reply_, process_error_);
++            auto reply = fetch_next_(token);
++            new Handler<ReplyType>(this, reply, process_reply_, process_error_);
+         }
      };
@@ -115,7 +116,7 @@
  ItemListJob* MultiItemListJobImpl::make_job(shared_ptr<ItemImpl> const& item,
                                              QString const& method,
--                                            ReplyType const& reply,
++                                            ReplyType& reply,
                                              ValidateFunc const& validate,
                                              FetchFunc const& fetch_next)
+ {
 === modified file 'src/qt/internal/StorageErrorImpl.cpp'
 --- src/qt/internal/StorageErrorImpl.cpp	2016-10-10 04:07:07 +0000
 +++ src/qt/internal/StorageErrorImpl.cpp	2016-10-12 08:09:09 +0000
@@ -40,7 +40,6 @@
      QStringLiteral("NoError"),
      QStringLiteral("LocalCommsError"),
      QStringLiteral("RemoteCommsError"),
--    QStringLiteral("Deleted"),
      QStringLiteral("RuntimeDestroyed"),
      QStringLiteral("NotExists"),
      QStringLiteral("Exists"),
@@ -86,8 +85,7 @@
  StorageErrorImpl::StorageErrorImpl(StorageError::Type type, QString const& msg, QString const& key)
      : StorageErrorImpl(type)
+ {
--    assert(   type == StorageError::Type::Deleted
--           || type == StorageError::Type::NotExists);
++    assert(type == StorageError::Type::NotExists);
      assert(!msg.isEmpty());
      message_ = msg;
@@ -177,12 +175,6 @@
      return StorageError(move(p));
+ }
--StorageError StorageErrorImpl::deleted_error(QString const& msg, QString const& item_id)
--{
--    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::Deleted, msg, item_id));
--    return StorageError(move(p));
--}
--
  StorageError StorageErrorImpl::runtime_destroyed_error(QString const& msg)
+ {
      unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::RuntimeDestroyed, msg));
 === added file 'src/qt/internal/UploaderImpl.cpp'
 --- src/qt/internal/UploaderImpl.cpp	1970-01-01 00:00:00 +0000
 +++ src/qt/internal/UploaderImpl.cpp	2016-10-12 08:09:09 +0000
@@ -0,0 +1,332 @@
++/*
++ * 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 <michi.henning@canonical.com>
++ */
++
++#include <unity/storage/qt/internal/UploaderImpl.h>
++
++#include "ProviderInterface.h"
++#include <unity/storage/qt/internal/Handler.h>
++#include <unity/storage/qt/internal/ItemImpl.h>
++#include <unity/storage/qt/internal/VoidJobImpl.h>
++#include <unity/storage/qt/ItemJob.h>
++
++#include <cassert>
++
++using namespace std;
++
++namespace unity
++{
++namespace storage
++{
++namespace qt
++{
++namespace internal
++{
++
++UploaderImpl::UploaderImpl(shared_ptr<ItemImpl> const& item_impl,
++                           QString const& method,
++                           QDBusPendingReply<QString, QDBusUnixFileDescriptor>& reply,
++                           std::function<void(storage::internal::ItemMetadata const&)> const& validate,
++                           Item::ConflictPolicy policy,
++                           qint64 size_in_bytes)
++    : status_(Uploader::Status::Loading)
++    , method_(method)
++    , item_impl_(item_impl)
++    , validate_(validate)
++    , policy_(policy)
++    , size_in_bytes_(size_in_bytes)
++{
++    assert(item_impl);
++    assert(validate);
++    assert(!method.isEmpty());
++    assert(size_in_bytes >= 0);
++
++    auto process_reply = [this, method](decltype(reply)& r)
++    {
++        if (status_ != Uploader::Status::Loading)
++        {
++            return;  // Don't transition to a final state more than once.
++        }
++
++        auto runtime = item_impl_->runtime_impl();
++        if (!runtime || !runtime->isValid())
++        {
++            QString msg = method + ": Runtime was destroyed previously";
++            error_ = StorageErrorImpl::runtime_destroyed_error(msg);
++            public_instance_->abort();
++            public_instance_->setErrorString(msg);
++            status_ = Uploader::Status::Error;
++            Q_EMIT public_instance_->statusChanged(status_);
++            return;
++        }
++
++        upload_id_ = r.argumentAt<0>();
++        fd_ = r.argumentAt<1>();
++        if (fd_.fileDescriptor() < 0)
++        {
++            // LCOV_EXCL_START
++            QString msg = method + ": invalid file descriptor returned by provider";
++            qCritical().noquote() << msg;
++            error_ = StorageErrorImpl::local_comms_error(msg);
++            public_instance_->abort();
++            public_instance_->setErrorString(msg);
++            status_ = Uploader::Status::Error;
++            Q_EMIT public_instance_->statusChanged(status_);
++            return;
++            // LCOV_EXCL_STOP
++        }
++
++        public_instance_->setSocketDescriptor(fd_.fileDescriptor(), QLocalSocket::ConnectedState, QIODevice::WriteOnly);
++        status_ = Uploader::Status::Ready;
++        Q_EMIT public_instance_->statusChanged(status_);
++    };
++
++    auto process_error = [this](StorageError const& error)
++    {
++        // TODO: This does not set the method
++        error_ = error;
++        status_ = Uploader::Status::Error;
++        public_instance_->abort();
++        public_instance_->setErrorString(error.errorString());
++        Q_EMIT public_instance_->statusChanged(status_);
++    };
++
++    new Handler<storage::internal::ItemMetadata>(this, reply, process_reply, process_error);
++}
++
++UploaderImpl::UploaderImpl(StorageError const& e)
++    : status_(Uploader::Status::Error)
++    , error_(e)
++{
++}
++
++UploaderImpl::~UploaderImpl()
++{
++    switch (status_)
++    {
++        case Uploader::Status::Loading:
++        case Uploader::Status::Finished:
++        case Uploader::Status::Cancelled:
++        case Uploader::Status::Error:
++            break;
++        case Uploader::Status::Ready:
++            public_instance_->abort();
++            break;
++        default:
++            abort();  // Impossible.  // LCOV_EXCL_LINE
++    }
++}
++
++bool UploaderImpl::isValid() const
++{
++    return status_ != Uploader::Status::Error && status_ != Uploader::Status::Cancelled;
++}
++
++Uploader::Status UploaderImpl::status() const
++{
++    return status_;
++}
++
++StorageError UploaderImpl::error() const
++{
++    return error_;
++}
++
++Item::ConflictPolicy UploaderImpl::policy() const
++{
++    return policy_;
++}
++
++qint64 UploaderImpl::sizeInBytes() const
++{
++    return size_in_bytes_;
++}
++
++Item UploaderImpl::item() const
++{
++    if (status_ == Uploader::Status::Error || status_ == Uploader::Status::Cancelled)
++    {
++        return Item();
++    }
++    return Item(item_impl_);
++}
++
++void UploaderImpl::finishUpload()
++{
++    static QString const method = "Uploader::finishUpload()";
++
++    // If we encountered an error earlier or were cancelled, or if finishUpload() was
++    // called already, we ignore the call.
++    if (status_ == Uploader::Status::Error || status_ == Uploader::Status::Cancelled || finalizing_)
++    {
++        return;
++    }
++
++    // Complain if we are asked to finalize while in the Loading or Finished state.
++    if (status_ != Uploader::Ready)
++    {
++        QString msg = method + ": cannot finalize while Uploader is not in the Ready state";
++        error_ = StorageErrorImpl::logic_error(msg);
++        public_instance_->abort();
++        public_instance_->setErrorString(msg);
++        status_ = Uploader::Status::Error;
++        Q_EMIT public_instance_->statusChanged(status_);
++        return;
++    }
++
++    auto runtime = item_impl_->runtime_impl();
++    if (!runtime || !runtime->isValid())
++    {
++        QString msg = method + ": Runtime was destroyed previously";
++        error_ = StorageErrorImpl::runtime_destroyed_error(msg);
++        status_ = Uploader::Status::Error;
++        Q_EMIT public_instance_->statusChanged(status_);
++        return;
++    }
++
++    finalizing_ = true;
++    public_instance_->disconnectFromServer();
++    auto reply = item_impl_->account_impl()->provider()->FinishUpload(upload_id_);
++
++    auto process_reply = [this](decltype(reply)& r)
++    {
++        if (status_ == Uploader::Status::Cancelled || status_ == Uploader::Status::Error)
++        {
++            return;  // Don't transition to a final state more than once.
++        }
++
++        auto runtime = item_impl_->runtime_impl();
++        if (!runtime || !runtime->isValid())
++        {
++            QString msg = method + ": Runtime was destroyed previously";
++            error_ = StorageErrorImpl::runtime_destroyed_error(msg);
++            public_instance_->abort();
++            public_instance_->setErrorString(msg);
++            status_ = Uploader::Status::Error;
++            Q_EMIT public_instance_->statusChanged(status_);
++            return;
++        }
++
++        auto metadata = r.value();
++        try
++        {
++            validate_(metadata);
++            item_impl_ = make_shared<ItemImpl>(metadata, item_impl_->account_impl());
++            status_ = Uploader::Status::Finished;
++        }
++        catch (StorageError const& e)
++        {
++            // Bad metadata received from provider, validate_() or make_item() have logged it.
++            // TODO: This does not set the method.
++            error_ = e;
++            status_ = Uploader::Status::Error;
++        }
++        Q_EMIT public_instance_->statusChanged(status_);
++    };
++
++    auto process_error = [this](StorageError const& error)
++    {
++        if (status_ != Uploader::Status::Ready)
++        {
++            return;  // Don't transition to a final state more than once.
++        }
++
++        // TODO: this doesn't set the method
++        error_ = error;
++        public_instance_->abort();
++        public_instance_->setErrorString(error.errorString());
++        status_ = Uploader::Status::Error;
++        Q_EMIT public_instance_->statusChanged(status_);
++    };
++
++    new Handler<void>(this, reply, process_reply, process_error);
++}
++
++void UploaderImpl::cancel()
++{
++    static QString const method = "Uploader::cancel()";
++
++    // If we are in a final state already, ignore the call.
++    if (   status_ == Uploader::Status::Error
++        || status_ == Uploader::Status::Finished
++        || status_ == Uploader::Status::Cancelled)
++    {
++        return;
++    }
++    auto runtime = item_impl_->runtime_impl();
++    if (!runtime || !runtime->isValid())
++    {
++        QString msg = method + ": Runtime was destroyed previously";
++        error_ = StorageErrorImpl::runtime_destroyed_error(msg);
++        status_ = Uploader::Status::Error;
++        Q_EMIT public_instance_->statusChanged(status_);
++        return;
++    }
++
++    if (!upload_id_.isEmpty())
++    {
++        // We just send the cancel and ignore any reply because it is best-effort only.
++        auto reply = item_impl_->account_impl()->provider()->CancelUpload(upload_id_);
++
++        auto process_reply = [](decltype(reply)&)
++        {
++        };
++
++        auto process_error = [](StorageError const&)
++        {
++        };
++
++        new Handler<void>(this, reply, process_reply, process_error);
++    }
++
++    QString msg = method + ": upload was cancelled";
++    error_ = StorageErrorImpl::cancelled_error(msg);
++    public_instance_->abort();
++    public_instance_->setErrorString(msg);
++    status_ = Uploader::Status::Cancelled;
++    Q_EMIT public_instance_->statusChanged(status_);
++}
++
++Uploader* UploaderImpl::make_job(shared_ptr<ItemImpl> const& item_impl,
++                                 QString const& method,
++                                 QDBusPendingReply<QString, QDBusUnixFileDescriptor>& reply,
++                                 std::function<void(storage::internal::ItemMetadata const&)> const& validate,
++                                 Item::ConflictPolicy policy,
++                                 qint64 size_in_bytes)
++{
++    unique_ptr<UploaderImpl> impl(new UploaderImpl(item_impl, method, reply, validate, policy, size_in_bytes));
++    auto uploader = new Uploader(move(impl));
++    uploader->p_->public_instance_ = uploader;
++    return uploader;
++}
++
++Uploader* UploaderImpl::make_job(StorageError const& e)
++{
++    unique_ptr<UploaderImpl> impl(new UploaderImpl(e));
++    auto uploader = new Uploader(move(impl));
++    uploader->p_->public_instance_ = uploader;
++    QMetaObject::invokeMethod(uploader,
++                              "statusChanged",
++                              Qt::QueuedConnection,
++                              Q_ARG(unity::storage::qt::Uploader::Status, uploader->p_->status_));
++    return uploader;
++}
++
++}  // namespace internal
++}  // namespace qt
++}  // namespace storage
++}  // namespace unity
 === modified file 'src/qt/internal/VoidJobImpl.cpp'
 --- src/qt/internal/VoidJobImpl.cpp	2016-09-29 03:17:56 +0000
 +++ src/qt/internal/VoidJobImpl.cpp	2016-10-12 08:09:09 +0000
@@ -33,19 +33,19 @@
  namespace internal
+ {
--VoidJobImpl::VoidJobImpl(shared_ptr<ItemImpl> const& item,
++VoidJobImpl::VoidJobImpl(shared_ptr<ItemImpl> const& item_impl,
                           QString const& method,
--                         QDBusPendingReply<void> const& reply)
++                         QDBusPendingReply<void>& reply)
      : status_(VoidJob::Status::Loading)
      , method_(method)
--    , item_(item)
++    , item_impl_(item_impl)
+ {
      assert(!method_.isEmpty());
--    assert(item);
++    assert(item_impl);
      auto process_reply = [this](decltype(reply)&)
+     {
--        auto runtime = item_->runtime();
++        auto runtime = item_impl_->runtime_impl();
          if (!runtime || !runtime->isValid())
+         {
              error_ = StorageErrorImpl::runtime_destroyed_error(method_ + ": Runtime was destroyed previously");
@@ -91,7 +91,7 @@
  VoidJob* VoidJobImpl::make_job(shared_ptr<ItemImpl> const& item,
                                 QString const& method,
--                               QDBusPendingReply<void> const& reply)
++                               QDBusPendingReply<void>& reply)
+ {
      unique_ptr<VoidJobImpl> impl(new VoidJobImpl(item, method, reply));
      auto job = new VoidJob(move(impl));
 === modified file 'tests/remote-client/MockProvider.cpp'
 --- tests/remote-client/MockProvider.cpp	2016-10-10 03:55:32 +0000
 +++ tests/remote-client/MockProvider.cpp	2016-10-12 08:09:09 +0000
@@ -46,7 +46,7 @@
  boost::future<ItemList> MockProvider::roots(Context const&)
+ {
--    if (cmd_ == "slow_roots")
++    if (cmd_ == "roots_slow")
+     {
          this_thread::sleep_for(chrono::seconds(1));
+     }
@@ -258,37 +258,45 @@
      return make_ready_future<Item>(metadata);
+ }
--string make_job_id()
--{
--    static int last_job_id = 0;
--    return to_string(++last_job_id);
--}
--
  boost::future<unique_ptr<UploadJob>> MockProvider::create_file(
      string const&, string const&,
      int64_t, string const&, bool, Context const&)
+ {
--    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob(make_job_id()));
++    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob());
+ }
  boost::future<unique_ptr<UploadJob>> MockProvider::update(
      string const&, int64_t, string const&, Context const&)
+ {
--    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob(make_job_id()));
++    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob());
+ }
  boost::future<unique_ptr<DownloadJob>> MockProvider::download(
      string const&, Context const&)
+ {
--    unique_ptr<DownloadJob> job(new MockDownloadJob(make_job_id()));
++    if (cmd_ == "download_slow")
++    {
++        this_thread::sleep_for(chrono::seconds(1));
++    }
++    if (cmd_ == "download_error")
++    {
++        unique_ptr<DownloadJob> job(new MockDownloadJob());
++        ResourceException e("test error", 42);
++        job->report_error(make_exception_ptr(e));
++        return make_exceptional_future<unique_ptr<DownloadJob>>(e);
++    }
++    unique_ptr<DownloadJob> job(new MockDownloadJob(cmd_));
      const char contents[] = "Hello world";
--    if (write(job->write_socket(), contents, sizeof(contents)) != sizeof(contents))
++    if (write(job->write_socket(), contents, strlen(contents)) != int(strlen(contents)))
+     {
          ResourceException e("download(): write failed", errno);
          job->report_error(make_exception_ptr(e));
          return make_exceptional_future<unique_ptr<DownloadJob>>(e);
+     }
--    job->report_complete();
++    if (cmd_ != "finish_download_error" && cmd_ != "finish_download_slow_error")
++    {
++        job->report_complete();
++    }
      return make_ready_future(std::move(job));
+ }
@@ -402,5 +410,13 @@
  boost::future<void> MockDownloadJob::finish()
+ {
++    if (cmd_ == "finish_download_slow" || cmd_ == "finish_download_slow_error")
++    {
++        this_thread::sleep_for(chrono::seconds(1));
++    }
++    if (cmd_ == "finish_download_error" || cmd_ == "finish_download_slow_error")
++    {
++        return make_exceptional_future<void>(NotExistsException("no such item", "item_id"));
++    }
      return make_ready_future();
+ }
 === modified file 'tests/remote-client/remote-client_test.cpp'
 --- tests/remote-client/remote-client_test.cpp	2016-10-10 23:31:31 +0000
 +++ tests/remote-client/remote-client_test.cpp	2016-10-12 08:09:09 +0000
@@ -54,10 +54,13 @@
      Account acc_;
  };
++class RuntimeTest : public ProviderFixture {};
++
  class AccountTest : public RemoteClientTest {};
  class CopyTest : public RemoteClientTest {};
  class CreateFolderTest : public RemoteClientTest {};
  class DeleteTest : public RemoteClientTest {};
++class DownloadTest : public RemoteClientTest {};
  class GetTest : public RemoteClientTest {};
  class ItemTest : public RemoteClientTest {};
  class ListTest : public RemoteClientTest {};
@@ -65,7 +68,7 @@
  class MoveTest : public RemoteClientTest {};
  class ParentsTest : public RemoteClientTest {};
  class RootsTest : public RemoteClientTest {};
--class RuntimeTest : public ProviderFixture {};
++class UploadTest : public RemoteClientTest {};
  TEST(Runtime, lifecycle)
+ {
@@ -428,7 +431,7 @@
  TEST_F(RootsTest, runtime_destroyed_while_item_list_job_running)
+ {
--    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("slow_roots")));
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("roots_slow")));
      unique_ptr<ItemListJob> j(acc_.roots());
      EXPECT_TRUE(j->isValid());
@@ -767,7 +770,7 @@
      auto arg = spy.takeFirst();
      EXPECT_EQ(VoidJob::Status::Error, qvariant_cast<VoidJob::Status>(arg.at(0)));
--    EXPECT_EQ("Item::deleteItem(): Runtime was destroyed previously", j->error().message()) << j->error().message().toStdString();
++    EXPECT_EQ("Item::deleteItem(): Runtime was destroyed previously", j->error().message());
+ }
  TEST_F(DeleteTest, invalid_item)
@@ -1555,7 +1558,7 @@
      EXPECT_FALSE(j->isValid());
      EXPECT_EQ(ItemJob::Status::Error, j->status());
      EXPECT_EQ(StorageError::Type::LogicError, j->error().type());
--    EXPECT_EQ("LogicError: Item::copy(): newParent cannot be a file", j->error().errorString()) << j->error().errorString().toStdString();
++    EXPECT_EQ("LogicError: Item::copy(): newParent cannot be a file", j->error().errorString());
      QSignalSpy spy(j.get(), &ItemJob::statusChanged);
      spy.wait(SIGNAL_WAIT_TIME);
@@ -2234,6 +2237,590 @@
      EXPECT_EQ(StorageError::Type::PermissionDenied, j->error().type());
+ }
++// TODO: This leaks:
++// ==4645== 1,369 (272 direct, 1,097 indirect) bytes in 1 blocks are definitely lost in loss record 193 of 203
++// ==4645==    at 0x4C2E0EF: operator new(unsigned long) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
++// ==4645==    by 0x4FD9D0A: boost::promise<void>::promise() (future.hpp:2309)
++// ==4645==    by 0x4FDA6F2: boost::make_ready_future() (future.hpp:3935)
++// ==4645==    by 0x4FD96B0: unity::storage::provider::internal::DownloadJobImpl::cancel(unity::storage::provider::DownloadJob&) (DownloadJobImpl.cpp:161)
++// ==4645==    by 0x4FEE198: void unity::storage::provider::internal::PendingJobs::cancel_job<unity::storage::provider::DownloadJob>(std::shared_ptr<unity::storage::provider::DownloadJob> const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) (PendingJobs.cpp:181)
++// ==4645==    by 0x4FEA3BF: unity::storage::provider::internal::PendingJobs::~PendingJobs() (PendingJobs.cpp:55)
++// ==4645==    by 0x4FEA6CD: unity::storage::provider::internal::PendingJobs::~PendingJobs() (PendingJobs.cpp:61)
++// ==4645==    by 0x4F8E927: std::default_delete<unity::storage::provider::internal::PendingJobs>::operator()(unity::storage::provider::internal::PendingJobs*) const (unique_ptr.h:76)
++// ==4645==    by 0x4F8D85B: std::unique_ptr<unity::storage::provider::internal::PendingJobs, std::default_delete<unity::storage::provider::internal::PendingJobs> >::~unique_ptr() (unique_ptr.h:236)
++// ==4645==    by 0x4F89449: unity::storage::provider::internal::AccountData::~AccountData() (AccountData.h:51)
++// ==4645==    by 0x504D9A6: void __gnu_cxx::new_allocator<unity::storage::provider::internal::AccountData>::destroy<unity::storage::provider::internal::AccountData>(unity::storage::provider::internal::AccountData*) (new_allocator.h:124)
++// ==4645==    by 0x504D8AA: void std::allocator_traits<std::allocator<unity::storage::provider::internal::AccountData> >::destroy<unity::storage::provider::internal::AccountData>(std::allocator<unity::storage::provider::internal::AccountData>&, unity::storage::provider::internal::AccountData*) (alloc_traits.h:542)
++
++TEST_F(DownloadTest, memory_leak)
++{
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider()));
++
++    Item root;
++    {
++        unique_ptr<ItemJob> j(acc_.get("root_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        root = j->item();
++    }
++
++    Item child;
++    {
++        unique_ptr<ItemJob> j(acc_.get("child_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        child = j->item();
++    }
++
++    unique_ptr<Downloader> downloader(child.createDownloader());
++    EXPECT_TRUE(downloader->isValid());
++    EXPECT_EQ(Downloader::Status::Loading, downloader->status());
++    EXPECT_EQ(StorageError::NoError, downloader->error().type());
++    EXPECT_EQ(child, downloader->item());
++
++    {
++        QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        auto arg = spy.takeFirst();
++        EXPECT_EQ(Downloader::Status::Ready, qvariant_cast<Downloader::Status>(arg.at(0)));
++    }
++}
++
++TEST_F(DownloadTest, basic)
++{
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider()));
++
++    Item root;
++    {
++        unique_ptr<ItemJob> j(acc_.get("root_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        root = j->item();
++    }
++
++    Item child;
++    {
++        unique_ptr<ItemJob> j(acc_.get("child_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        child = j->item();
++    }
++
++    unique_ptr<Downloader> downloader(child.createDownloader());
++    EXPECT_TRUE(downloader->isValid());
++    EXPECT_EQ(Downloader::Status::Loading, downloader->status());
++    EXPECT_EQ(StorageError::NoError, downloader->error().type());
++    EXPECT_EQ(child, downloader->item());
++
++    QSignalSpy status_spy(downloader.get(), &Downloader::statusChanged);
++    {
++        QSignalSpy read_spy(downloader.get(), &Downloader::readyRead);
++        ASSERT_TRUE(status_spy.wait(SIGNAL_WAIT_TIME));
++        auto arg = status_spy.takeFirst();
++        EXPECT_EQ(Downloader::Status::Ready, qvariant_cast<Downloader::Status>(arg.at(0)));
++
++        if (read_spy.count() != 1)
++        {
++            read_spy.wait(SIGNAL_WAIT_TIME);
++        }
++    }
++    auto data = downloader->readAll();
++    EXPECT_EQ(QByteArray("Hello world", -1), data);
++
++    downloader->finishDownload();
++    ASSERT_TRUE(status_spy.wait(SIGNAL_WAIT_TIME));
++    auto arg = status_spy.takeFirst();
++    EXPECT_EQ(Downloader::Status::Finished, qvariant_cast<Downloader::Status>(arg.at(0)));
++}
++
++TEST_F(DownloadTest, runtime_destroyed)
++{
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider()));
++
++    Item root;
++    {
++        unique_ptr<ItemJob> j(acc_.get("root_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        root = j->item();
++    }
++
++    Item child;
++    {
++        unique_ptr<ItemJob> j(acc_.get("child_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        child = j->item();
++    }
++
++    EXPECT_EQ(StorageError::Type::NoError, runtime_->shutdown().type());
++
++    unique_ptr<Downloader> downloader(child.createDownloader());
++    EXPECT_FALSE(downloader->isValid());
++    EXPECT_EQ(Downloader::Status::Error, downloader->status());
++    EXPECT_EQ(StorageError::RuntimeDestroyed, downloader->error().type());
++    EXPECT_EQ("RuntimeDestroyed: Item::createDownloader(): Runtime was destroyed previously",
++              downloader->error().errorString());
++    EXPECT_EQ(Item(), downloader->item());
++
++    // Signal must arrive.
++    {
++        QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++        auto arg = spy.takeFirst();
++        EXPECT_EQ(Downloader::Status::Error, qvariant_cast<Downloader::Status>(arg.at(0)));
++    }
++}
++
++TEST_F(DownloadTest, runtime_destroyed_while_download_running)
++{
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("download_slow")));
++
++    Item root;
++    {
++        unique_ptr<ItemJob> j(acc_.get("root_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        root = j->item();
++    }
++
++    Item child;
++    {
++        unique_ptr<ItemJob> j(acc_.get("child_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        child = j->item();
++    }
++
++    unique_ptr<Downloader> downloader(child.createDownloader());
++    EXPECT_TRUE(downloader->isValid());
++
++    EXPECT_EQ(StorageError::Type::NoError, runtime_->shutdown().type());  // Destroy runtime, provider still sleeping
++
++    // Signal must arrive.
++    {
++        QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++        auto arg = spy.takeFirst();
++        EXPECT_EQ(Downloader::Status::Error, qvariant_cast<Downloader::Status>(arg.at(0)));
++    }
++
++    EXPECT_FALSE(downloader->isValid());
++    EXPECT_EQ(Downloader::Status::Error, downloader->status());
++    EXPECT_EQ(StorageError::RuntimeDestroyed, downloader->error().type());
++    EXPECT_EQ("RuntimeDestroyed: Item::createDownloader(): Runtime was destroyed previously",
++              downloader->error().errorString());
++    EXPECT_EQ(Item(), downloader->item());
++}
++
++TEST_F(DownloadTest, download_error)
++{
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("download_error")));
++
++    Item root;
++    {
++        unique_ptr<ItemJob> j(acc_.get("root_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        root = j->item();
++    }
++
++    Item child;
++    {
++        unique_ptr<ItemJob> j(acc_.get("child_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        child = j->item();
++    }
++
++    unique_ptr<Downloader> downloader(child.createDownloader());
++    EXPECT_TRUE(downloader->isValid());
++
++    // Signal must arrive.
++    {
++        QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++        auto arg = spy.takeFirst();
++        EXPECT_EQ(Downloader::Status::Error, qvariant_cast<Downloader::Status>(arg.at(0)));
++    }
++
++    EXPECT_FALSE(downloader->isValid());
++    EXPECT_EQ(Downloader::Status::Error, downloader->status());
++    EXPECT_EQ(StorageError::ResourceError, downloader->error().type());
++    EXPECT_EQ("ResourceError: test error", downloader->error().errorString());
++    EXPECT_EQ(42, downloader->error().errorCode());
++    EXPECT_EQ(Item(), downloader->item());
++
++    // For coverage: call finishDownload() while in the Error state.
++    {
++        QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++        downloader->finishDownload();
++        EXPECT_FALSE(spy.wait(1000));
++    }
++}
++
++TEST_F(DownloadTest, finish_too_soon)
++{
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider()));
++
++    Item root;
++    {
++        unique_ptr<ItemJob> j(acc_.get("root_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        root = j->item();
++    }
++
++    Item child;
++    {
++        unique_ptr<ItemJob> j(acc_.get("child_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        child = j->item();
++    }
++
++    unique_ptr<Downloader> downloader(child.createDownloader());
++    EXPECT_TRUE(downloader->isValid());
++
++    QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++
++    downloader->finishDownload();
++
++    ASSERT_EQ(1, spy.count());
++    auto arg = spy.takeFirst();
++    EXPECT_EQ(Downloader::Status::Error, qvariant_cast<Downloader::Status>(arg.at(0)));
++
++    EXPECT_FALSE(downloader->isValid());
++    EXPECT_EQ(Downloader::Status::Error, downloader->status());
++    EXPECT_EQ(StorageError::LogicError, downloader->error().type());
++    EXPECT_EQ("LogicError: Downloader::finishDownload(): cannot finalize while Downloader is not in the Ready state",
++              downloader->error().errorString());
++}
++
++TEST_F(DownloadTest, finish_runtime_destroyed)
++{
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider()));
++
++    Item root;
++    {
++        unique_ptr<ItemJob> j(acc_.get("root_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        root = j->item();
++    }
++
++    Item child;
++    {
++        unique_ptr<ItemJob> j(acc_.get("child_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        child = j->item();
++    }
++
++    unique_ptr<Downloader> downloader(child.createDownloader());
++    EXPECT_TRUE(downloader->isValid());
++
++    {
++        QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++        auto arg = spy.takeFirst();
++        EXPECT_EQ(Downloader::Status::Ready, qvariant_cast<Downloader::Status>(arg.at(0)));
++    }
++
++    QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++
++    EXPECT_EQ(StorageError::Type::NoError, runtime_->shutdown().type());  // Destroy runtime
++
++    downloader->finishDownload();
++
++    ASSERT_EQ(1, spy.count());
++    auto arg = spy.takeFirst();
++    EXPECT_EQ(Downloader::Status::Error, qvariant_cast<Downloader::Status>(arg.at(0)));
++
++    EXPECT_FALSE(downloader->isValid());
++    EXPECT_EQ(Downloader::Status::Error, downloader->status());
++    EXPECT_EQ(StorageError::RuntimeDestroyed, downloader->error().type());
++    EXPECT_EQ("Downloader::finishDownload(): Runtime was destroyed previously", downloader->error().message());
++}
++
++TEST_F(DownloadTest, finish_runtime_destroyed_while_reply_outstanding)
++{
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("finish_download_slow")));
++
++    Item root;
++    {
++        unique_ptr<ItemJob> j(acc_.get("root_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        root = j->item();
++    }
++
++    Item child;
++    {
++        unique_ptr<ItemJob> j(acc_.get("child_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        child = j->item();
++    }
++
++    unique_ptr<Downloader> downloader(child.createDownloader());
++    EXPECT_TRUE(downloader->isValid());
++
++    {
++        QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++        auto arg = spy.takeFirst();
++        EXPECT_EQ(Downloader::Status::Ready, qvariant_cast<Downloader::Status>(arg.at(0)));
++    }
++
++    QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++
++    downloader->finishDownload();
++
++    EXPECT_EQ(StorageError::Type::NoError, runtime_->shutdown().type());  // Destroy runtime, provider still sleeping
++
++    ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++    auto arg = spy.takeFirst();
++    EXPECT_EQ(Downloader::Status::Error, qvariant_cast<Downloader::Status>(arg.at(0)));
++
++    EXPECT_FALSE(downloader->isValid());
++    EXPECT_EQ(Downloader::Status::Error, downloader->status());
++    EXPECT_EQ(StorageError::RuntimeDestroyed, downloader->error().type());
++    EXPECT_EQ("Downloader::finishDownload(): Runtime was destroyed previously", downloader->error().message());
++}
++
++TEST_F(DownloadTest, finish_twice)
++{
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider()));
++
++    Item root;
++    {
++        unique_ptr<ItemJob> j(acc_.get("root_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        root = j->item();
++    }
++
++    Item child;
++    {
++        unique_ptr<ItemJob> j(acc_.get("child_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        child = j->item();
++    }
++
++    unique_ptr<Downloader> downloader(child.createDownloader());
++    EXPECT_TRUE(downloader->isValid());
++
++    {
++        QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++        auto arg = spy.takeFirst();
++        EXPECT_EQ(Downloader::Status::Ready, qvariant_cast<Downloader::Status>(arg.at(0)));
++    }
++
++    QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++
++    downloader->finishDownload();
++    downloader->finishDownload();
++
++    ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++    auto arg = spy.takeFirst();
++    EXPECT_EQ(Downloader::Status::Finished, qvariant_cast<Downloader::Status>(arg.at(0)));
++}
++
++TEST_F(DownloadTest, finish_error)
++{
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("finish_download_error")));
++
++    Item root;
++    {
++        unique_ptr<ItemJob> j(acc_.get("root_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        root = j->item();
++    }
++
++    Item child;
++    {
++        unique_ptr<ItemJob> j(acc_.get("child_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        child = j->item();
++    }
++
++    unique_ptr<Downloader> downloader(child.createDownloader());
++    EXPECT_TRUE(downloader->isValid());
++
++    {
++        QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++        auto arg = spy.takeFirst();
++        EXPECT_EQ(Downloader::Status::Ready, qvariant_cast<Downloader::Status>(arg.at(0)));
++    }
++
++    QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++
++    downloader->finishDownload();
++
++    ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++    auto arg = spy.takeFirst();
++    EXPECT_EQ(Downloader::Status::Error, qvariant_cast<Downloader::Status>(arg.at(0)));
++
++    EXPECT_FALSE(downloader->isValid());
++    EXPECT_EQ(Downloader::Status::Error, downloader->status());
++    EXPECT_EQ(StorageError::NotExists, downloader->error().type());
++    EXPECT_EQ("no such item", downloader->error().message());
++    EXPECT_EQ("item_id", downloader->error().itemId());
++    EXPECT_EQ("item_id", downloader->error().itemName());
++    EXPECT_EQ("NotExists", downloader->error().name());
++}
++
++TEST_F(DownloadTest, cancel)
++{
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("finish_download_slow_error")));
++
++    Item root;
++    {
++        unique_ptr<ItemJob> j(acc_.get("root_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        root = j->item();
++    }
++
++    Item child;
++    {
++        unique_ptr<ItemJob> j(acc_.get("child_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        child = j->item();
++    }
++
++    unique_ptr<Downloader> downloader(child.createDownloader());
++    EXPECT_TRUE(downloader->isValid());
++
++    {
++        QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++        auto arg = spy.takeFirst();
++        EXPECT_EQ(Downloader::Status::Ready, qvariant_cast<Downloader::Status>(arg.at(0)));
++    }
++
++    QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++
++    downloader->finishDownload();
++
++    downloader->cancel();
++    downloader->cancel();  // Second time for coverage
++
++    downloader->finishDownload();  // Second time for coverage
++
++    EXPECT_EQ(1, spy.count());
++    auto arg = spy.takeFirst();
++    EXPECT_EQ(Downloader::Status::Cancelled, qvariant_cast<Downloader::Status>(arg.at(0)));
++
++    EXPECT_EQ(Downloader::Status::Cancelled, downloader->status());
++    EXPECT_EQ(StorageError::Type::Cancelled, downloader->error().type());
++    EXPECT_EQ("Downloader::cancel(): download was cancelled", downloader->error().message());
++
++    // We wait here to get coverage for when the reply to a finishDownload() call
++    // finds the downloader in a final state.
++    EXPECT_FALSE(spy.wait(2000));
++}
++
++TEST_F(DownloadTest, cancel_runtime_destroyed)
++{
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("finish_download_slow_error")));
++
++    Item root;
++    {
++        unique_ptr<ItemJob> j(acc_.get("root_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        root = j->item();
++    }
++
++    Item child;
++    {
++        unique_ptr<ItemJob> j(acc_.get("child_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        child = j->item();
++    }
++
++    unique_ptr<Downloader> downloader(child.createDownloader());
++    EXPECT_TRUE(downloader->isValid());
++
++    {
++        QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++        auto arg = spy.takeFirst();
++        EXPECT_EQ(Downloader::Status::Ready, qvariant_cast<Downloader::Status>(arg.at(0)));
++    }
++
++    QSignalSpy spy(downloader.get(), &Downloader::statusChanged);
++
++    EXPECT_EQ(StorageError::Type::NoError, runtime_->shutdown().type());  // Destroy runtime
++
++    downloader->cancel();
++
++    if (spy.count() == 0)
++    {
++        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++    }
++    auto arg = spy.takeFirst();
++    EXPECT_EQ(Downloader::Status::Error, qvariant_cast<Downloader::Status>(arg.at(0)));
++
++    EXPECT_EQ(Downloader::Status::Error, downloader->status());
++    EXPECT_EQ(StorageError::Type::RuntimeDestroyed, downloader->error().type());
++    EXPECT_EQ("Downloader::cancel(): Runtime was destroyed previously", downloader->error().message());
++}
++
++TEST_F(UploadTest, basic)
++{
++    set_provider(unique_ptr<provider::ProviderBase>(new MockProvider()));
++
++    Item root;
++    {
++        unique_ptr<ItemJob> j(acc_.get("root_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        root = j->item();
++    }
++
++    Item child;
++    {
++        unique_ptr<ItemJob> j(acc_.get("child_id"));
++        QSignalSpy spy(j.get(), &ItemJob::statusChanged);
++        spy.wait(SIGNAL_WAIT_TIME);
++        child = j->item();
++    }
++
++    QByteArray contents("Hello world", -1);
++    unique_ptr<Uploader> uploader(child.createUploader(Item::ConflictPolicy::Overwrite, contents.size()));
++    EXPECT_TRUE(uploader->isValid());
++    EXPECT_EQ(Uploader::Status::Loading, uploader->status());
++    EXPECT_EQ(StorageError::NoError, uploader->error().type());
++    EXPECT_EQ(child, uploader->item());
++
++    {
++        QSignalSpy spy(uploader.get(), &Uploader::statusChanged);
++        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++        auto arg = spy.takeFirst();
++        EXPECT_EQ(Uploader::Status::Ready, qvariant_cast<Uploader::Status>(arg.at(0)));
++    }
++
++    EXPECT_EQ(contents.size(), uploader->write(contents));
++
++    QSignalSpy spy(uploader.get(), &Uploader::statusChanged);
++    uploader->finishUpload();
++    ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
++    auto arg = spy.takeFirst();
++    EXPECT_EQ(Uploader::Status::Finished, qvariant_cast<Uploader::Status>(arg.at(0)));
++
++    EXPECT_EQ(Uploader::Status::Finished, uploader->status());
++}
++
  int main(int argc, char** argv)
+ {
      QCoreApplication app(argc, argv);