Merge lp:~mandel/ubuntu-download-manager/add-manager-implementation into lp:ubuntu-download-manager

[Manuel de la Peña]

Provides the initial implementation of the Manager class that allows to create downloads in the UDM via the client lib.

Provides the initial implementation of the Manager class that allows to create downloads in the UDM via the client lib.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/270/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/159/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/159/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/270/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-manager-implementation]

203. By Manuel de la Peña on 2014-01-14

Increate timeout to make CI happy.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:203
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/271/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/160/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/160/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/271/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-manager-implementation]

204. By Manuel de la Peña on 2014-01-14

Increase the timeout for CI.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:204
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/272/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/161/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/161/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/272/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-manager-implementation]

205. By Manuel de la Peña on 2014-01-15

Larger timeout for CI.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:205
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/274/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/163/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/274/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-manager-implementation]

206. By Manuel de la Peña on 2014-01-16

USe the QEventLoop trick to try and do not use timeuts for the CI.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:206
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/275/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/164/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/275/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-manager-implementation]

207. By Manuel de la Peña on 2014-01-16

Remove the signal spy because if makes CI fail.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:207
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/277/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/166/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/166/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/277/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-manager-implementation]

208. By Manuel de la Peña on 2014-01-17

USe xvfb so that there are no issues in CI.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/284/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/173/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/173/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/284/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-manager-implementation]

209. By Manuel de la Peña on 2014-01-20

Provide dbus-launch for the headless CI.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/286/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/175/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/175/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/286/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-manager-implementation]

210. By Manuel de la Peña on 2014-01-21

Add code to allow starting the daemon.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:210
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/287/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/176/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/176/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/287/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-manager-implementation]

211. By Manuel de la Peña on 2014-01-22

Reverted to revno before the CI fiasco.

212. By Manuel de la Peña on 2014-01-22

Use dbus-test-runner.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/289/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/178/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/178/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/289/rebuild

review: Needs Fixing (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[lp:~mandel/ubuntu-download-manager/add-manager-implementation]

213. By Manuel de la Peña on 2014-01-22

Fix packaging.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/291/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/180/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/180/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/291/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-manager-implementation]

214. By Manuel de la Peña on 2014-01-22

Fix debian -dev packages.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:214
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/293/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/182/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/182/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/293/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-manager-implementation]

215. By Manuel de la Peña on 2014-01-22

Use the arch location to fix issues with the .pc

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:215
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/184
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/184/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/295/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-manager-implementation]

216. By Manuel de la Peña on 2014-01-22

Install correctly in arm.

217. By Manuel de la Peña on 2014-01-22

Correct x86 location.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:217
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/297/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/186

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/297/rebuild

review: Approve (continuous-integration)

=== modified file 'common-project-config.pri'
--- common-project-config.pri	2013-12-13 15:24:14 +0000
+++ common-project-config.pri	2014-01-22 15:16:38 +0000
@@ -27,7 +27,16 @@
     message("==== install prefix set to `$${INSTALL_PREFIX}'")
 }
 
-INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
+ARCH = $$system(uname -m)
+contains( ARCH, x86_64 ) {
+    INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib/x86_64-linux-gnu
+} else {
+    contains( ARCH, i686) {
+        INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib/i386-linux-gnu
+    } else {
+        INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib/arm-linux-gnueabihf
+    }
+}
 
 # default library directory can be overriden by defining LIBDIR when
 # running qmake

=== modified file 'debian/control'
--- debian/control	2013-12-03 16:41:58 +0000
+++ debian/control	2014-01-22 15:16:38 +0000
@@ -8,7 +8,8 @@
                qtsystems5-dev,
                libdbus-1-dev,
                libqt5sql5-sqlite,
-               libnih-dbus-dev
+               libnih-dbus-dev,
+               dbus-test-runner
 Maintainer: Manuel de la Peña <[e-mail]>
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-system-image
@@ -27,6 +28,16 @@
  .
  This package includes the common shared library between the client lib and and the service lib.
 
+Package: ubuntu-download-manager-common-dev
+Section: libdevel
+Architecture: any
+Depends: ubuntu-download-manager-common1(= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: QT library for Ubuntu Download Manager - development files
+ .
+ This package contains the common headers shared between the client library and the daemon library.
+
 Package: ubuntu-download-manager-priv1
 Section: libs
 Architecture: any
@@ -49,6 +60,17 @@
  .
  This package includes the public shared library.
 
+Package: ubuntu-download-manager-client-dev
+Section: libdevel
+Architecture: any
+Depends: ubuntu-download-manager-common1(= ${binary:Version}),
+         ubuntu-download-manager-client1(= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: QT library for Ubuntu Download Manager - development files
+ .
+ This package contains the header that can be used to allow an application use the Ubuntu Download Manager client library.
+
 Package: ubuntu-download-manager
 Section: net
 Architecture: any

=== modified file 'debian/ubuntu-download-manager-client-dev.install'
--- debian/ubuntu-download-manager-client-dev.install	2013-12-04 10:51:41 +0000
+++ debian/ubuntu-download-manager-client-dev.install	2014-01-22 15:16:38 +0000
@@ -1,3 +1,5 @@
+usr/include/ubuntu/download_manager/error.h
 usr/include/ubuntu/download_manager/manager.h
-usr/lib/*/libubuntu-download-manager-client.so
+usr/include/ubuntu/download_manager/download.h
+usr/include/ubuntu/download_manager/group_download.h
 usr/lib/*/pkgconfig/ubuntu-download-manager-client.pc

=== modified file 'debian/ubuntu-download-manager-client1.install'
--- debian/ubuntu-download-manager-client1.install	2013-12-03 16:41:58 +0000
+++ debian/ubuntu-download-manager-client1.install	2014-01-22 15:16:38 +0000
@@ -1,1 +1,1 @@
-usr/lib/libubuntu-download-manager-client.so.*
+usr/lib/*/libubuntu-download-manager-client.so.*

=== modified file 'debian/ubuntu-download-manager-common-dev.install'
--- debian/ubuntu-download-manager-common-dev.install	2013-12-04 00:57:13 +0000
+++ debian/ubuntu-download-manager-common-dev.install	2014-01-22 15:16:38 +0000
@@ -1,5 +1,4 @@
 usr/include/ubuntu/download_manager/metatypes.h
 usr/include/ubuntu/download_manager/download_struct.h
 usr/include/ubuntu/download_manager/group_download_struct.h
-usr/lib/*/libubuntu-download-manager-common.so
 usr/lib/*/pkgconfig/ubuntu-download-manager-common.pc

=== modified file 'debian/ubuntu-download-manager-common1.install'
--- debian/ubuntu-download-manager-common1.install	2013-12-03 12:25:56 +0000
+++ debian/ubuntu-download-manager-common1.install	2014-01-22 15:16:38 +0000
@@ -1,1 +1,1 @@
-usr/lib/libubuntu-download-manager-common.so.*
+usr/lib/*/libubuntu-download-manager-common.so.*

=== modified file 'debian/ubuntu-download-manager-priv1.install'
--- debian/ubuntu-download-manager-priv1.install	2013-12-03 12:25:56 +0000
+++ debian/ubuntu-download-manager-priv1.install	2014-01-22 15:16:38 +0000
@@ -1,1 +1,1 @@
-usr/lib/libubuntu-download-manager-priv.so.*
+usr/lib/*/libubuntu-download-manager-priv.so.*

=== modified file 'download-manager.pro'
--- download-manager.pro	2013-12-03 13:29:34 +0000
+++ download-manager.pro	2014-01-22 15:16:38 +0000
@@ -7,11 +7,19 @@
     ubuntu-download-manager-common \
     ubuntu-download-manager-priv \
     ubuntu-download-manager \
+    ubuntu-download-manager-client \
+    ubuntu-download-manager-test-lib \
     ubuntu-download-manager-tests \
-    ubuntu-download-manager-client
+    ubuntu-download-manager-client-tests
 
 ubuntu-download-manager-priv.depends = ubuntu-download-manager-common
 
 ubuntu-download-manager.depends = ubuntu-download-manager-priv
 
-ubuntu-download-manager-tests.depends = ubuntu-download-manager-priv
+ubuntu-download-manager-client.depends = ubuntu-download-manager-common
+
+ubuntu-download-manager-tests.depends += ubuntu-download-manager-test-lib
+ubuntu-download-manager-tests.depends += ubuntu-download-manager-priv
+
+ubuntu-download-manager-client-tests.depends += ubuntu-download-manager-test-lib
+ubuntu-download-manager-client-tests.depends += ubuntu-download-manager-client

=== added directory 'ubuntu-download-manager-client-tests'
=== added file 'ubuntu-download-manager-client-tests/main.cpp'
--- ubuntu-download-manager-client-tests/main.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client-tests/main.cpp	2014-01-22 15:16:38 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <QCoreApplication>
+#include <ubuntu/download_manager/tests/test_runner.h>
+
+int main(int argc, char *argv[]) {
+    QCoreApplication a(argc, argv);
+    return RUN_ALL_QTESTS(argc, argv);
+}

=== added file 'ubuntu-download-manager-client-tests/test_download_watch.cpp'
--- ubuntu-download-manager-client-tests/test_download_watch.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client-tests/test_download_watch.cpp	2014-01-22 15:16:38 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <QSignalSpy>
+#include "test_download_watch.h"
+
+TestDownloadWatch::TestDownloadWatch(QObject *parent)
+    : DaemonTestCase("TestDownloadWatch", parent) {
+}
+
+void
+TestDownloadWatch::onSuccessCb(Download* down) {
+    _calledSuccess = true;
+    delete down;
+}
+
+void
+TestDownloadWatch::onErrorCb(Download* err) {
+    _calledError = true;
+    delete err;
+}
+
+void
+TestDownloadWatch::init() {
+    DaemonTestCase::init();
+    _calledSuccess = false;
+    _calledError = false;
+    _manager = Manager::createSessionManager(daemonPath(), this);
+}
+
+void
+TestDownloadWatch::cleanup() {
+    delete _manager;
+    DaemonTestCase::cleanup();
+}
+
+void
+TestDownloadWatch::testCallbackIsExecuted() {
+    QString url = "http://www.python.org/ftp/python/3.3.3/Python-3.3.3.tar.xz";
+    QVariantMap metadata;
+    QMap<QString, QString> headers;
+    DownloadStruct down(url, metadata, headers);
+
+    DownloadCb cb = std::bind(&TestDownloadWatch::onSuccessCb, this,
+        std::placeholders::_1);
+    DownloadCb errCb = std::bind(&TestDownloadWatch::onErrorCb, this,
+        std::placeholders::_1);
+
+    QSignalSpy spy(_manager, SIGNAL(downloadCreated(Download*)));
+    _manager->createDownload(down, cb, errCb);
+
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 50000);
+    QVERIFY(_calledSuccess);
+    QVERIFY(!_calledError);
+}
+
+void
+TestDownloadWatch::testErrCallbackIsExecuted() {
+    QString url = "";  // we should get an error with an empty string
+    QVariantMap metadata;
+    QMap<QString, QString> headers;
+    DownloadStruct down(url, metadata, headers);
+
+    DownloadCb cb = std::bind(&TestDownloadWatch::onSuccessCb, this,
+        std::placeholders::_1);
+    DownloadCb errCb = std::bind(&TestDownloadWatch::onErrorCb, this,
+        std::placeholders::_1);
+
+    QSignalSpy spy(_manager, SIGNAL(downloadCreated(Download*)));
+    _manager->createDownload(down, cb, errCb);
+
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 50000);
+    QVERIFY(!_calledSuccess);
+    QVERIFY(_calledError);
+}

=== added file 'ubuntu-download-manager-client-tests/test_download_watch.h'
--- ubuntu-download-manager-client-tests/test_download_watch.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client-tests/test_download_watch.h	2014-01-22 15:16:38 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef TEST_DOWNLOAD_WATCH_H
+#define TEST_DOWNLOAD_WATCH_H
+
+#include <functional>
+#include <ubuntu/download_manager/download.h>
+#include <ubuntu/download_manager/error.h>
+#include <ubuntu/download_manager/manager.h>
+#include <QObject>
+#include <ubuntu/download_manager/tests/client/daemon_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+
+using namespace Ubuntu::DownloadManager;
+
+class TestDownloadWatch : public DaemonTestCase {
+    Q_OBJECT
+
+ public:
+    explicit TestDownloadWatch(QObject *parent = 0);
+
+ private:
+    void onSuccessCb(Download* down);
+    void onErrorCb(Download* err);
+    void onDownloadError(Download* down);
+
+ private slots:  // NOLINT(whitespace/indent)
+
+    void init() override;
+    void cleanup() override;
+    void testCallbackIsExecuted();
+    void testErrCallbackIsExecuted();
+
+ private:
+    bool _calledSuccess = false;
+    bool _calledError = false;
+    Manager* _manager;
+};
+
+DECLARE_TEST(TestDownloadWatch)
+
+#endif // TEST_DOWNLOAD_WATCH_H

=== added file 'ubuntu-download-manager-client-tests/test_group_watch.cpp'
--- ubuntu-download-manager-client-tests/test_group_watch.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client-tests/test_group_watch.cpp	2014-01-22 15:16:38 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <QSignalSpy>
+#include "test_group_watch.h"
+
+TestGroupWatch::TestGroupWatch(QObject* parent)
+    : DaemonTestCase("TestGroupWatch", parent) {
+}
+
+void
+TestGroupWatch::onSuccessCb(GroupDownload* down) {
+    delete down;
+    _calledSuccess = true;
+}
+
+void
+TestGroupWatch::onErrorCb(GroupDownload* err) {
+    delete err;
+    _calledError = true;
+}
+
+void
+TestGroupWatch::init() {
+    DaemonTestCase::init();
+    _calledSuccess = false;
+    _calledError = false;
+    _algo = "Md5";
+    _manager = Manager::createSessionManager(daemonPath(), this);
+}
+
+void
+TestGroupWatch::cleanup() {
+    delete _manager;
+    DaemonTestCase::cleanup();
+}
+
+void
+TestGroupWatch::testCallbackIsExecuted() {
+    QList<GroupDownloadStruct> downloadsStruct;
+    downloadsStruct.append(GroupDownloadStruct("http://one.ubunt.com",
+        "local_file", ""));
+    downloadsStruct.append(GroupDownloadStruct("http://ubuntu.com",
+        "other_local_file", ""));
+    downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
+        "other_reddit_local_file", ""));
+
+    GroupCb cb = std::bind(&TestGroupWatch::onSuccessCb, this,
+        std::placeholders::_1);
+    GroupCb errCb = std::bind(&TestGroupWatch::onErrorCb, this,
+        std::placeholders::_1);
+
+    QSignalSpy spy(_manager, SIGNAL(groupCreated(GroupDownload*)));
+    _manager->createDownload(downloadsStruct, _algo, false, _metadata, _headers,
+        cb, errCb);
+
+    QTRY_COMPARE(spy.count(), 1);
+    QVERIFY(_calledSuccess);
+    QVERIFY(!_calledError);
+}
+
+void
+TestGroupWatch::testErrCallbackIsExecuted() {
+    QList<GroupDownloadStruct> downloadsStruct;
+    downloadsStruct.append(GroupDownloadStruct("http://one.ubunt.com",
+        "local_file", ""));
+    downloadsStruct.append(GroupDownloadStruct("http://ubuntu.com",
+        "local_file", ""));  // same local path that raises an error
+    downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
+        "other_reddit_local_file", ""));
+
+    GroupCb cb = std::bind(&TestGroupWatch::onSuccessCb, this,
+        std::placeholders::_1);
+    GroupCb errCb = std::bind(&TestGroupWatch::onErrorCb, this,
+        std::placeholders::_1);
+
+    QSignalSpy spy(_manager, SIGNAL(groupCreated(GroupDownload*)));
+    _manager->createDownload(downloadsStruct, _algo, false, _metadata, _headers,
+        cb, errCb);
+
+    QTRY_COMPARE(spy.count(), 1);
+    QVERIFY(!_calledSuccess);
+    QVERIFY(_calledError);
+}

=== added file 'ubuntu-download-manager-client-tests/test_group_watch.h'
--- ubuntu-download-manager-client-tests/test_group_watch.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client-tests/test_group_watch.h	2014-01-22 15:16:38 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef TEST_GROUP_WATCH_H
+#define TEST_GROUP_WATCH_H
+
+#include <functional>
+#include <ubuntu/download_manager/group_download.h>
+#include <ubuntu/download_manager/error.h>
+#include <ubuntu/download_manager/manager.h>
+#include <QObject>
+#include <ubuntu/download_manager/tests/client/daemon_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+
+using namespace Ubuntu::DownloadManager;
+
+class TestGroupWatch : public DaemonTestCase {
+    Q_OBJECT
+
+ public:
+    explicit TestGroupWatch(QObject* parent = 0);
+
+ private:
+    void onSuccessCb(GroupDownload* down);
+    void onErrorCb(GroupDownload* err);
+
+ private slots:  // NOLINT(whitespace/indent)
+
+    void init() override;
+    void cleanup() override;
+    void testCallbackIsExecuted();
+    void testErrCallbackIsExecuted();
+
+ private:
+    bool _calledSuccess = false;
+    bool _calledError = false;
+    QString _algo;
+    QVariantMap _metadata;
+    QMap<QString, QString> _headers;
+    Manager* _manager;
+};
+
+DECLARE_TEST(TestGroupWatch)
+
+#endif // TEST_GROUP_WATCH_H

=== added file 'ubuntu-download-manager-client-tests/ubuntu-download-manager-client-tests.pro'
--- ubuntu-download-manager-client-tests/ubuntu-download-manager-client-tests.pro	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client-tests/ubuntu-download-manager-client-tests.pro	2014-01-22 15:16:38 +0000
@@ -0,0 +1,44 @@
+include( ../common-project-config.pri )
+include( ../common-vars.pri )
+
+QT       += network core testlib dbus systeminfo sql
+QT       -= gui
+
+TARGET = ubuntu-download-manager-client-tests
+CONFIG   += console
+CONFIG   -= app_bundle
+
+TEMPLATE = app
+
+HEADERS += \
+    test_group_watch.h \
+    test_download_watch.h
+
+SOURCES += main.cpp \
+    test_group_watch.cpp \
+    test_download_watch.cpp
+
+LIBS += -L$$OUT_PWD/../ubuntu-download-manager-common/ -lubuntu-download-manager-common
+
+INCLUDEPATH += $$PWD/../ubuntu-download-manager-common
+DEPENDPATH += $$PWD/../ubuntu-download-manager-common
+
+LIBS += -L$$OUT_PWD/../ubuntu-download-manager-client/ -lubuntu-download-manager-client
+
+INCLUDEPATH += $$PWD/../ubuntu-download-manager-client
+DEPENDPATH += $$PWD/../ubuntu-download-manager-client
+
+LIBS += -L$$OUT_PWD/../ubuntu-download-manager-test-lib/ -lubuntu-download-manager-test-lib
+
+INCLUDEPATH += $$PWD/../ubuntu-download-manager-test-lib
+DEPENDPATH += $$PWD/../ubuntu-download-manager-test-lib
+
+LIBS += -L$$OUT_PWD/../ubuntu-download-manager-priv/ -lubuntu-download-manager-priv
+
+INCLUDEPATH += $$PWD/../ubuntu-download-manager-priv
+DEPENDPATH += $$PWD/../ubuntu-download-manager-priv
+
+
+check.depends = $${TARGET}
+check.commands = LD_LIBRARY_PATH=$$OUT_PWD/../ubuntu-download-manager-common:$$OUT_PWD/../ubuntu-download-manager-client:$$OUT_PWD/../ubuntu-download-manager-test-lib:$$OUT_PWD/../ubuntu-download-manager-priv  dbus-test-runner --task=./$${TARGET}
+QMAKE_EXTRA_TARGETS += check

=== modified file 'ubuntu-download-manager-client/ubuntu-download-manager-client.pro'
--- ubuntu-download-manager-client/ubuntu-download-manager-client.pro	2013-12-03 16:41:58 +0000
+++ ubuntu-download-manager-client/ubuntu-download-manager-client.pro	2014-01-22 15:16:38 +0000
@@ -9,13 +9,23 @@
 
 DEFINES += UBUNTUDOWNLOADMANAGERCLIENT_LIBRARY
 
-SOURCES += ubuntu/download_manager/manager.cpp
+SOURCES += ubuntu/download_manager/manager.cpp \
+           ubuntu/download_manager/manager_interface.cpp \
+           ubuntu/download_manager/download.cpp \
+           ubuntu/download_manager/group_download.cpp \
+           ubuntu/download_manager/manager_pendingcall_watcher.cpp \
+           ubuntu/download_manager/error.cpp
 
 public_headers = \
-    ubuntu/download_manager/manager.h
+    ubuntu/download_manager/manager.h \
+    ubuntu/download_manager/download.h \
+    ubuntu/download_manager/group_download.h \
+    ubuntu/download_manager/error.h
 
 private_headers = \
-    ubuntu-download-manager-client_global.h
+    ubuntu-download-manager-client_global.h \
+    ubuntu/download_manager/manager_interface.h \
+    ubuntu/download_manager/manager_pendingcall_watcher.h
 
 HEADERS +=\
     $$public_headers \

=== added file 'ubuntu-download-manager-client/ubuntu/download_manager/download.cpp'
--- ubuntu-download-manager-client/ubuntu/download_manager/download.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client/ubuntu/download_manager/download.cpp	2014-01-22 15:16:38 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "error.h"
+#include "download.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+Download::Download(Error* err, QObject* parent)
+    : QObject(parent),
+      _error(err) {
+    // TODO(mandel): complete implementation
+    Q_UNUSED(err);
+}
+
+Download::Download(QDBusObjectPath path, QObject* parent)
+    : QObject(parent) {
+    // TODO(mandel): complete implementation
+    Q_UNUSED(path);
+}
+
+Download::~Download() {
+    delete _error;
+}
+
+bool
+Download::isError() {
+    // TODO(mandel): complete implementation
+    return false;
+}
+
+Error*
+Download::error() {
+    // TODO(mandel): complete implementation
+    return NULL;
+}
+
+}  // DownloadManager
+
+}  // Ubuntu

=== added file 'ubuntu-download-manager-client/ubuntu/download_manager/download.h'
--- ubuntu-download-manager-client/ubuntu/download_manager/download.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client/ubuntu/download_manager/download.h	2014-01-22 15:16:38 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_H
+#define UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_H
+
+#include <QDBusObjectPath>
+#include <QObject>
+#include "ubuntu-download-manager-client_global.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+class Error;
+class ManagerPrivate;
+class DownloadPrivate;
+class UBUNTUDOWNLOADMANAGERCLIENTSHARED_EXPORT Download : public QObject {
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(Download)
+
+    // allow the manager to create downloads
+    friend class ManagerPrivate;
+    friend class DownloadManagerPendingCallWatcher;
+
+ public:
+    virtual ~Download();
+    bool isError();
+    Error* error();
+
+ protected:
+    Download(Error* err, QObject* parent = 0);
+    Download(QDBusObjectPath path, QObject* parent = 0);
+
+ private:
+    // TODO(mandel): move this to pimpl, here to ensure no mem leaks atm
+    Error* _error = NULL;
+    // use pimpl pattern so that users do not have to be recompiled
+    DownloadPrivate* d_ptr;
+
+};
+
+}  // Ubuntu
+
+}  // DownloadManager
+
+#endif  // UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_H

=== added file 'ubuntu-download-manager-client/ubuntu/download_manager/error.cpp'
--- ubuntu-download-manager-client/ubuntu/download_manager/error.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client/ubuntu/download_manager/error.cpp	2014-01-22 15:16:38 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <QDBusError>
+#include "error.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+Error::Error(QDBusError err, QObject *parent)
+    : QObject(parent) {
+    Q_UNUSED(err);
+}
+
+}  // DownloadManager
+
+}  // Ubuntu

=== added file 'ubuntu-download-manager-client/ubuntu/download_manager/error.h'
--- ubuntu-download-manager-client/ubuntu/download_manager/error.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client/ubuntu/download_manager/error.h	2014-01-22 15:16:38 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef UBUNTU_DOWNLOADMANAGER_CLIENT_ERROR_H
+#define UBUNTU_DOWNLOADMANAGER_CLIENT_ERROR_H
+
+#include <QObject>
+#include "ubuntu-download-manager-client_global.h"
+
+class QDBusError;
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+class UBUNTUDOWNLOADMANAGERCLIENTSHARED_EXPORT Error : public QObject {
+    Q_OBJECT
+
+public:
+    Error(QDBusError err, QObject *parent = 0);
+    
+};
+
+}  // DownloadManager
+
+}  // Ubuntu
+
+#endif // ERROR_H

=== added file 'ubuntu-download-manager-client/ubuntu/download_manager/group_download.cpp'
--- ubuntu-download-manager-client/ubuntu/download_manager/group_download.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client/ubuntu/download_manager/group_download.cpp	2014-01-22 15:16:38 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "error.h"
+#include "group_download.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+GroupDownload::GroupDownload(Error* err, QObject* parent)
+    : QObject(parent),
+      _error(err) {
+    // TODO(mandel): complete implementation
+    Q_UNUSED(err);
+}
+
+GroupDownload::GroupDownload(QDBusObjectPath path, QObject *parent)
+    : QObject(parent) {
+    // TODO(mandel): complete implementation
+    Q_UNUSED(path);
+}
+
+GroupDownload::~GroupDownload() {
+    delete _error;
+}
+
+bool
+GroupDownload::isError() {
+    // TODO(mandel): complete implementation
+    return false;
+}
+
+Error*
+GroupDownload::error() {
+    // TODO(mandel): complete implementation
+    return NULL;
+}
+
+}  // DownloadManager
+
+}  // Ubuntu

=== added file 'ubuntu-download-manager-client/ubuntu/download_manager/group_download.h'
--- ubuntu-download-manager-client/ubuntu/download_manager/group_download.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client/ubuntu/download_manager/group_download.h	2014-01-22 15:16:38 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef UBUNTU_DOWNLOADMANAGER_CLIENT_GROUP_DOWNLOAD_H
+#define UBUNTU_DOWNLOADMANAGER_CLIENT_GROUP_DOWNLOAD_H
+
+#include <QDBusObjectPath>
+#include <QObject>
+#include "ubuntu-download-manager-client_global.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+class Error;
+class ManagerPrivate;
+class GroupDownloadPrivate;
+class UBUNTUDOWNLOADMANAGERCLIENTSHARED_EXPORT GroupDownload : public QObject {
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(GroupDownload)
+
+    // allow the manager to create downloads
+    friend class ManagerPrivate;
+    friend class GroupManagerPendingCallWatcher;
+
+ public:
+
+    virtual ~GroupDownload();
+    bool isError();
+    Error* error();
+
+ protected:
+    GroupDownload(Error* err, QObject* parent = 0);
+    GroupDownload(QDBusObjectPath path, QObject* parent = 0);
+    
+ private:
+    // TODO(mandel): move this to pimpl, here to ensure no mem leaks atm
+    Error* _error = NULL;
+    // use pimpl pattern so that users do not have to be recompiled
+    GroupDownloadPrivate* d_ptr;
+
+};
+
+}  // DownloadManager
+
+}  // Ubuntu
+
+#endif // GROUP_DOWNLOAD_H

=== modified file 'ubuntu-download-manager-client/ubuntu/download_manager/manager.cpp'
--- ubuntu-download-manager-client/ubuntu/download_manager/manager.cpp	2013-12-04 10:51:41 +0000
+++ ubuntu-download-manager-client/ubuntu/download_manager/manager.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -16,9 +16,20 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QDBusObjectPath>
+#include <ubuntu/download_manager/system/dbus_connection.h>
+#include "download.h"
+#include "error.h"
+#include "group_download.h"
+#include "manager_interface.h"
+#include "manager_pendingcall_watcher.h"
 #include "manager.h"
 
 
+#define DOWNLOAD_SERVICE "com.canonical.applications.Downloader"
+#define MANAGER_PATH "/"
+
+
 namespace Ubuntu {
 
 namespace DownloadManager {
@@ -31,31 +42,98 @@
     Q_DECLARE_PUBLIC(Manager)
 
  public:
-    explicit ManagerPrivate(Manager* parent)
+    ManagerPrivate(QDBusConnection conn, const QString& path, Manager* parent)
         : q_ptr(parent) {
+        _dbusInterface = new ManagerInterface(path, MANAGER_PATH,
+            conn);
+    }
+
+    // used for testing purposes
+    ManagerPrivate(ManagerInterface* interface, Manager* parent)
+        : _dbusInterface(interface),
+          q_ptr(parent) {
+    }
+
+    ~ManagerPrivate() {
+        delete _dbusInterface;
     }
 
     Download* createDownload(DownloadStruct downStruct) {
-        Q_UNUSED(downStruct);
-        return NULL;
-    }
-
-    void createDownload(DownloadStruct downStruct, DownloadCreationCb cb) {
-        Q_UNUSED(downStruct);
-        Q_UNUSED(cb);
-    }
-
-    GroupDownload* createDownload(GroupDownloadStruct groupStruct) {
-        Q_UNUSED(groupStruct);
-        return NULL;
-    }
-
-    void createDownload(GroupDownloadStruct groupStruct, GroupCreationCb cb) {
-        Q_UNUSED(groupStruct);
-        Q_UNUSED(cb);
+        Q_Q(Manager);
+        QDBusPendingReply<QDBusObjectPath> reply =
+            _dbusInterface->createDownload(downStruct);
+        // blocking other method should be used
+        reply.waitForFinished();
+        if (reply.isError()) {
+            auto err = new Error(reply.error());
+            return new Download(err);
+        } else {
+            auto path = reply.value();
+            auto down = new Download(path, q);
+            emit q->downloadCreated(down);
+            return down;
+        }
+    }
+
+    void createDownload(DownloadStruct downStruct,
+                        DownloadCb cb,
+                        DownloadCb errCb) {
+        Q_Q(Manager);
+        QDBusPendingCall call =
+            _dbusInterface->createDownload(downStruct);
+        auto watcher = new DownloadManagerPendingCallWatcher(call, cb, errCb,
+                static_cast<QObject*>(q));
+        q->connect(watcher, SIGNAL(callbackExecuted()),
+            q, SLOT(onWatcherDone()));
+    }
+
+    GroupDownload* createDownload(StructList downs,
+                                  const QString& algorithm,
+                                  bool allowed3G,
+                                  const QVariantMap& metadata,
+                                  StringMap headers) {
+        Q_Q(Manager);
+        QDBusPendingReply<QDBusObjectPath> reply =
+            _dbusInterface->createDownloadGroup(downs,
+                algorithm, allowed3G, metadata, headers);
+        // blocking other method should be used
+        reply.waitForFinished();
+        if (reply.isError()) {
+            Error* err = new Error(reply.error());
+            return new GroupDownload(err);
+        } else {
+            auto path = reply.value();
+            auto down = new GroupDownload(path, q);
+            emit q->groupCreated(down);
+            return down;
+        }
+    }
+
+    void createDownload(StructList downs,
+                        const QString& algorithm,
+                        bool allowed3G,
+                        const QVariantMap& metadata,
+                        StringMap headers,
+                        GroupCb cb,
+                        GroupCb errCb) {
+        Q_Q(Manager);
+        QDBusPendingCall call =
+            _dbusInterface->createDownloadGroup(downs,
+                algorithm, allowed3G, metadata, headers);
+        auto watcher = new GroupManagerPendingCallWatcher(call, cb, errCb,
+                static_cast<QObject*>(q));
+        q->connect(watcher, SIGNAL(callbackExecuted()),
+            q, SLOT(onWatcherDone()));
+    }
+
+    void onWatcherDone() {
+        Q_Q(Manager);
+        auto senderObj = q->sender();
+        senderObj->deleteLater();
     }
 
  private:
+    ManagerInterface* _dbusInterface;
     Manager* q_ptr;
 };
 
@@ -63,8 +141,36 @@
  * PUBLIC IMPLEMENTATION
  */
 
-Manager::Manager(QObject* parent)
-    : QObject(parent){
+Manager::Manager(QDBusConnection conn, const QString& path, QObject* parent)
+    : QObject(parent),
+      d_ptr(new ManagerPrivate(conn, path, this)){
+}
+
+Manager::Manager(ManagerInterface* interface, QObject* parent)
+    : QObject(parent),
+      d_ptr(new ManagerPrivate(interface, this)) {
+}
+
+Manager::~Manager() {
+    delete d_ptr;
+}
+
+Manager*
+Manager::createSessionManager(const QString& path, QObject* parent) {
+    if (path.isEmpty()) {
+        return new Manager(QDBusConnection::sessionBus(), DOWNLOAD_SERVICE, parent);
+    } else {
+        return new Manager(QDBusConnection::sessionBus(), path, parent);
+    }
+}
+
+Manager*
+Manager::createSystemManager(const QString& path, QObject* parent) {
+    if (path.isEmpty()) {
+        return new Manager(QDBusConnection::systemBus(), DOWNLOAD_SERVICE, parent);
+    } else {
+        return new Manager(QDBusConnection::systemBus(), path, parent);
+    }
 }
 
 Download*
@@ -74,21 +180,34 @@
 }
 
 void
-Manager::createDownload(DownloadStruct downStruct, DownloadCreationCb cb) {
+Manager::createDownload(DownloadStruct downStruct,
+                        DownloadCb cb,
+                        DownloadCb errCb) {
     Q_D(Manager);
-    d->createDownload(downStruct, cb);
+    d->createDownload(downStruct, cb, errCb);
 }
 
 GroupDownload*
-Manager::createDownload(GroupDownloadStruct  groupStruct) {
+Manager::createDownload(StructList downs,
+                        const QString &algorithm,
+                        bool allowed3G,
+                        const QVariantMap &metadata,
+                        StringMap headers) {
     Q_D(Manager);
-    return d->createDownload(groupStruct);
+    return d->createDownload(downs, algorithm, allowed3G, metadata, headers);
 }
 
 void
-Manager::createDownload(GroupDownloadStruct  groupStruct, GroupCreationCb cb) {
+Manager::createDownload(StructList downs,
+                        const QString& algorithm,
+                        bool allowed3G,
+                        const QVariantMap& metadata,
+                        StringMap headers,
+                        GroupCb cb,
+                        GroupCb errCb) {
     Q_D(Manager);
-    d->createDownload(groupStruct, cb);
+    d->createDownload(downs, algorithm, allowed3G, metadata, headers, cb,
+        errCb);
 }
 
 }  // DownloadManager

=== modified file 'ubuntu-download-manager-client/ubuntu/download_manager/manager.h'
--- ubuntu-download-manager-client/ubuntu/download_manager/manager.h	2013-12-04 10:51:41 +0000
+++ ubuntu-download-manager-client/ubuntu/download_manager/manager.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -20,7 +20,10 @@
 #define UBUNTU_DOWNLOADMANAGER_CLIENT_MANAGER_H
 
 #include <functional>
+#include <QList>
+#include <QDBusConnection>
 #include <QObject>
+#include <ubuntu/download_manager/metatypes.h>
 #include <ubuntu/download_manager/download_struct.h>
 #include <ubuntu/download_manager/group_download_struct.h>
 #include "ubuntu-download-manager-client_global.h"
@@ -30,28 +33,56 @@
 namespace DownloadManager {
 
 class Download;
+class Error;
 class GroupDownload;
+class ManagerInterface;
 
-typedef std::function<void(Download*)> DownloadCreationCb;
-typedef std::function<void(GroupDownload*)> GroupCreationCb;
+typedef std::function<void(Download*)> DownloadCb;
+typedef std::function<void(GroupDownload*)> GroupCb;
 
 class ManagerPrivate;
 class UBUNTUDOWNLOADMANAGERCLIENTSHARED_EXPORT Manager : public QObject {
     Q_DECLARE_PRIVATE(Manager)
     Q_OBJECT
 
+    // allow watchers to emit the signals
+    friend class DownloadManagerPendingCallWatcher;
+    friend class GroupManagerPendingCallWatcher;
+
  public:
-    explicit Manager(QObject* parent);
-
+    virtual ~Manager();
     virtual Download* createDownload(DownloadStruct downStruct);
-    virtual void createDownload(DownloadStruct downStruct, DownloadCreationCb cb);
-    virtual GroupDownload* createDownload(GroupDownloadStruct groupStruct);
-    virtual void createDownload(GroupDownloadStruct groupStruct, GroupCreationCb cb);
+    virtual void createDownload(DownloadStruct downStruct,
+                                DownloadCb cb,
+                                DownloadCb errCb);
+    virtual GroupDownload* createDownload(StructList downs,
+                                          const QString &algorithm,
+                                          bool allowed3G,
+                                          const QVariantMap &metadata,
+                                          StringMap headers);
+    virtual void createDownload(StructList downs,
+                                const QString &algorithm,
+                                bool allowed3G,
+                                const QVariantMap &metadata,
+                                StringMap headers,
+                                GroupCb cb,
+                                GroupCb errCb);
+
+    static Manager* createSessionManager(const QString& path = "", QObject* parent=0);
+    static Manager* createSystemManager(const QString& path = "", QObject* parent=0);
 
  signals:
     void downloadCreated(Download* down);
     void groupCreated(GroupDownload* down);
 
+ protected:
+    Manager(QDBusConnection conn, const QString& path = "", QObject* parent= 0);
+    // used for testing purposes
+    Manager(ManagerInterface* interface, QObject* parent);
+
+ private:
+    Q_PRIVATE_SLOT(d_func(), void onWatcherDone())
+
  private:
     // use pimpl pattern so that users do not have to be recompiled
     ManagerPrivate* d_ptr;

=== added file 'ubuntu-download-manager-client/ubuntu/download_manager/manager_interface.cpp'
--- ubuntu-download-manager-client/ubuntu/download_manager/manager_interface.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client/ubuntu/download_manager/manager_interface.cpp	2014-01-22 15:16:38 +0000
@@ -0,0 +1,33 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp com.canonical.applications.download_manager.xml -p manager_interface -c ManagerInterface
+ *
+ * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "manager_interface.h"
+
+/*
+ * Implementation of interface class ManagerInterface
+ */
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+ManagerInterface::ManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+ManagerInterface::~ManagerInterface()
+{
+}
+
+}  // Ubuntu
+
+}  // DownloadManager

=== added file 'ubuntu-download-manager-client/ubuntu/download_manager/manager_interface.h'
--- ubuntu-download-manager-client/ubuntu/download_manager/manager_interface.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client/ubuntu/download_manager/manager_interface.h	2014-01-22 15:16:38 +0000
@@ -0,0 +1,111 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp com.canonical.applications.download_manager.xml -p manager_interface -c ManagerInterface
+ *
+ * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef MANAGER_INTERFACE_H_1386155846
+#define MANAGER_INTERFACE_H_1386155846
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+#include <ubuntu/download_manager/metatypes.h>
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+/*
+ * Proxy class for interface com.canonical.applications.DownloadManager
+ */
+class ManagerInterface: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "com.canonical.applications.DownloadManager"; }
+
+public:
+    ManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~ManagerInterface();
+
+public Q_SLOTS: // METHODS
+    inline QDBusPendingReply<> allowGSMDownload(bool allowed)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(allowed);
+        return asyncCallWithArgumentList(QLatin1String("allowGSMDownload"), argumentList);
+    }
+
+    inline QDBusPendingReply<QDBusObjectPath> createDownload(DownloadStruct download)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(download);
+        return asyncCallWithArgumentList(QLatin1String("createDownload"), argumentList);
+    }
+
+    inline QDBusPendingReply<QDBusObjectPath> createDownloadGroup(StructList downloads, const QString &algorithm, bool allowed3G, const QVariantMap &metadata, StringMap headers)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(downloads) << QVariant::fromValue(algorithm) << QVariant::fromValue(allowed3G) << QVariant::fromValue(metadata) << QVariant::fromValue(headers);
+        return asyncCallWithArgumentList(QLatin1String("createDownloadGroup"), argumentList);
+    }
+
+    inline QDBusPendingReply<qulonglong> defaultThrottle()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("defaultThrottle"), argumentList);
+    }
+
+    inline QDBusPendingReply<> exit()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("exit"), argumentList);
+    }
+
+    inline QDBusPendingReply<QList<QDBusObjectPath> > getAllDownloads()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("getAllDownloads"), argumentList);
+    }
+
+    inline QDBusPendingReply<QList<QDBusObjectPath> > getAllDownloadsWithMetadata(const QString &name, const QString &value)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(name) << QVariant::fromValue(value);
+        return asyncCallWithArgumentList(QLatin1String("getAllDownloadsWithMetadata"), argumentList);
+    }
+
+    inline QDBusPendingReply<bool> isGSMDownloadAllowed()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("isGSMDownloadAllowed"), argumentList);
+    }
+
+    inline QDBusPendingReply<> setDefaultThrottle(qulonglong speed)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(speed);
+        return asyncCallWithArgumentList(QLatin1String("setDefaultThrottle"), argumentList);
+    }
+
+Q_SIGNALS: // SIGNALS
+    void downloadCreated(const QDBusObjectPath &path);
+};
+
+}  // DownloadManager
+
+}  // Ubuntu
+
+#endif

=== added file 'ubuntu-download-manager-client/ubuntu/download_manager/manager_pendingcall_watcher.cpp'
--- ubuntu-download-manager-client/ubuntu/download_manager/manager_pendingcall_watcher.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client/ubuntu/download_manager/manager_pendingcall_watcher.cpp	2014-01-22 15:16:38 +0000
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <QDebug>
+#include <QDBusPendingReply>
+#include <QDBusObjectPath>
+#include "download.h"
+#include "error.h"
+#include "group_download.h"
+#include "manager.h"
+#include "manager_pendingcall_watcher.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+
+DownloadManagerPendingCallWatcher::DownloadManagerPendingCallWatcher(
+                                                  const QDBusPendingCall& call,
+                                                  DownloadCb cb,
+                                                  DownloadCb errCb,
+                                                  QObject* parent)
+    : QDBusPendingCallWatcher(call, parent),
+      _cb(cb),
+      _errCb(errCb) {
+    connect(this, &QDBusPendingCallWatcher::finished,
+        this, &DownloadManagerPendingCallWatcher::onFinished);
+}
+
+void
+DownloadManagerPendingCallWatcher::onFinished(QDBusPendingCallWatcher* watcher) {
+    QDBusPendingReply<QDBusObjectPath> reply = *watcher;
+    auto man = static_cast<Manager*>(parent());
+    if (reply.isError()) {
+        qDebug() << "ERROR" << reply.error() << reply.error().type();
+        // creater error and deal with it
+        auto err = new Error(reply.error());
+        auto down = new Download(err);
+        _errCb(down);
+        emit man->downloadCreated(down);
+    } else {
+        qDebug() << "Success!";
+        auto path = reply.value();
+        auto down = new Download(path);
+        emit man->downloadCreated(down);
+        _cb(down);
+    }
+    emit callbackExecuted();
+    watcher->deleteLater();
+}
+
+
+GroupManagerPendingCallWatcher::GroupManagerPendingCallWatcher(
+                                            const QDBusPendingCall& call,
+                                            GroupCb cb,
+                                            GroupCb errCb,
+                                            QObject* parent)
+    : QDBusPendingCallWatcher(call, parent),
+      _cb(cb),
+      _errCb(errCb) {
+    connect(this, &QDBusPendingCallWatcher::finished,
+        this, &GroupManagerPendingCallWatcher::onFinished);
+}
+
+void
+GroupManagerPendingCallWatcher::onFinished(QDBusPendingCallWatcher* watcher) {
+    QDBusPendingReply<QDBusObjectPath> reply = *watcher;
+    auto man = static_cast<Manager*>(parent());
+    if (reply.isError()) {
+        // creater error and deal with it
+        auto err = new Error(reply.error());
+        auto down = new GroupDownload(err);
+        _errCb(down);
+        emit man->groupCreated(down);
+    } else {
+        QDBusObjectPath path = reply.value();
+        auto down = new GroupDownload(path);
+        emit man->groupCreated(down);
+        _cb(down);
+    }
+    emit callbackExecuted();
+    watcher->deleteLater();
+}
+
+}  // DownloadManager
+
+}  // Ubuntu

=== added file 'ubuntu-download-manager-client/ubuntu/download_manager/manager_pendingcall_watcher.h'
--- ubuntu-download-manager-client/ubuntu/download_manager/manager_pendingcall_watcher.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-client/ubuntu/download_manager/manager_pendingcall_watcher.h	2014-01-22 15:16:38 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef UBUNTU_DOWNLOADMANAGER_CLIENT_MANAGER_PENDINGCALL_WATCHER_H
+#define UBUNTU_DOWNLOADMANAGER_CLIENT_MANAGER_PENDINGCALL_WATCHER_H
+
+#include <functional>
+#include <QDBusPendingCallWatcher>
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+class Download;
+class Error;
+class GroupDownload;
+
+typedef std::function<void(Download*)> DownloadCb;
+typedef std::function<void(GroupDownload*)> GroupCb;
+
+class DownloadManagerPendingCallWatcher : public QDBusPendingCallWatcher {
+    Q_OBJECT
+
+ public:
+    DownloadManagerPendingCallWatcher(const QDBusPendingCall& call,
+                                      DownloadCb cb,
+                                      DownloadCb errCb,
+                                      QObject* parent = 0);
+    
+ signals:
+    void callbackExecuted();
+    
+ private slots:
+    void onFinished(QDBusPendingCallWatcher* watcher);
+
+ private:
+    DownloadCb _cb;
+    DownloadCb _errCb;
+};
+
+
+class GroupManagerPendingCallWatcher : public QDBusPendingCallWatcher {
+    Q_OBJECT
+
+ public:
+    GroupManagerPendingCallWatcher(const QDBusPendingCall& call,
+                                   GroupCb cb,
+                                   GroupCb errCb,
+                                   QObject* parent = 0);
+
+ signals:
+    void callbackExecuted();
+
+ private slots:
+    void onFinished(QDBusPendingCallWatcher* watcher);
+
+ private:
+    GroupCb _cb;
+    GroupCb _errCb;
+};
+
+}  // DownloadManager
+
+}  // Ubuntu
+
+#endif  // UBUNTU_DOWNLOADMANAGER_CLIENT_MANAGER_PENDINGCALL_WATCHER_H

=== modified file 'ubuntu-download-manager-common/ubuntu-download-manager-common.pro'
--- ubuntu-download-manager-common/ubuntu-download-manager-common.pro	2013-12-03 11:36:40 +0000
+++ ubuntu-download-manager-common/ubuntu-download-manager-common.pro	2014-01-22 15:16:38 +0000
@@ -12,6 +12,7 @@
 SOURCES += \
     ubuntu/download_manager/download_struct.cpp \
     ubuntu/download_manager/group_download_struct.cpp \
+    ubuntu/download_manager/system/dbus_connection.cpp \
     ubuntu/download_manager/system/hash_algorithm.cpp
 
 public_headers = \
@@ -21,6 +22,7 @@
 
 private_headers = \
     ubuntu_download_manager_common_global.h \
+    ubuntu/download_manager/system/dbus_connection.h \
     ubuntu/download_manager/system/hash_algorithm.h
 
 HEADERS +=\

=== renamed file 'ubuntu-download-manager-priv/system/dbus_connection.cpp' => 'ubuntu-download-manager-common/ubuntu/download_manager/system/dbus_connection.cpp'
--- ubuntu-download-manager-priv/system/dbus_connection.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-common/ubuntu/download_manager/system/dbus_connection.cpp	2014-01-22 15:16:38 +0000
@@ -29,12 +29,22 @@
      _conn(QDBusConnection::connectToBus(QDBusConnection::ActivationBus, "DBUS")) {
 }
 
+DBusConnection::DBusConnection(QDBusConnection conn, QObject* parent)
+    : QObject(parent),
+      _conn(conn) {
+}
+
 bool
 DBusConnection::registerService(const QString& serviceName) {
     return _conn.registerService(serviceName);
 }
 
 bool
+DBusConnection::unregisterService(const QString& serviceName) {
+    return _conn.unregisterService(serviceName);
+}
+
+bool
 DBusConnection::registerObject(const QString& path,
                     QObject* object,
                     QDBusConnection::RegisterOptions options) {

=== renamed file 'ubuntu-download-manager-priv/system/dbus_connection.h' => 'ubuntu-download-manager-common/ubuntu/download_manager/system/dbus_connection.h'
--- ubuntu-download-manager-priv/system/dbus_connection.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-common/ubuntu/download_manager/system/dbus_connection.h	2014-01-22 15:16:38 +0000
@@ -31,9 +31,11 @@
 class DBusConnection : public QObject {
     Q_OBJECT
  public:
-    explicit DBusConnection(QObject *parent = 0);
+    explicit DBusConnection(QObject* parent = 0);
+    DBusConnection(QDBusConnection conn, QObject* parent = 0);
 
     virtual bool registerService(const QString& serviceName);
+    virtual bool unregisterService(const QString& serviceName);
     virtual bool registerObject(const QString& path, QObject* object,
         QDBusConnection::RegisterOptions options = QDBusConnection::ExportAdaptors);  // NOLINT(whitespace/line_length)
     virtual void unregisterObject(const QString& path,

=== modified file 'ubuntu-download-manager-priv/downloads/daemon.cpp'
--- ubuntu-download-manager-priv/downloads/daemon.cpp	2013-11-28 16:01:44 +0000
+++ ubuntu-download-manager-priv/downloads/daemon.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -25,6 +25,7 @@
 #include "downloads/download_manager_adaptor.h"
 #include "system/application.h"
 #include "system/logger.h"
+#include "system/timer.h"
 
 #define DISABLE_TIMEOUT "-disable-timeout"
 #define SELFSIGNED_CERT "-self-signed-certs"
@@ -34,6 +35,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 /**
  * PRIVATE IMPLEMENATION
  */
@@ -80,6 +83,9 @@
 
     void enableTimeout(bool enabled) {
         _isTimeoutEnabled = enabled;
+        if (!_isTimeoutEnabled) {
+            _shutDownTimer->stop();
+        }
     }
 
     bool isStoppable() {
@@ -100,11 +106,11 @@
 
     void start(QString path) {
         TRACE;
+        _path = path;
         _downAdaptor = new DownloadManagerAdaptor(_downInterface);
-        bool ret = _conn->registerService(path);
+        bool ret = _conn->registerService(_path);
         if (ret) {
-            qDebug() << "Service registered to"
-                << "com.canonical.applications.Downloader";
+            qDebug() << "Service registered to" << _path;
             ret = _conn->registerObject("/", _downInterface);
             qDebug() << ret;
             if (!ret) {
@@ -119,6 +125,14 @@
         _app->exit(-1);
     }
 
+    void stop() {
+        // stop listening in the service
+        bool ret = _conn->unregisterService(_path);
+        if (!ret) {
+            qCritical() << "Could not unregister service at" << _path;
+        }
+    }
+
     void onTimeout() {
         qDebug() << "Timeout reached, shutdown service.";
         _app->exit(0);
@@ -194,14 +208,15 @@
     }
 
  private:
+    QString _path = "";
     bool _isTimeoutEnabled = true;
     bool _stoppable = false;
     QList<QSslCertificate> _certs;
-    Application* _app;
-    Timer* _shutDownTimer;
-    DBusConnection* _conn;
-    Manager* _downInterface;
-    DownloadManagerAdaptor* _downAdaptor;
+    Application* _app = nullptr;
+    Timer* _shutDownTimer = nullptr;
+    DBusConnection* _conn = nullptr;
+    Manager* _downInterface = nullptr;
+    DownloadManagerAdaptor* _downAdaptor = nullptr;
     Daemon* q_ptr;
 };
 
@@ -269,6 +284,14 @@
     d->start(path);
 }
 
+void
+Daemon::stop() {
+    Q_D(Daemon);
+    d->stop();
+}
+
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/daemon.h'
--- ubuntu-download-manager-priv/downloads/daemon.h	2013-11-28 16:01:44 +0000
+++ ubuntu-download-manager-priv/downloads/daemon.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -22,16 +22,24 @@
 #include <QObject>
 #include <QSslCertificate>
 #include <QSharedPointer>
+#include <ubuntu/download_manager/system/dbus_connection.h>
 #include "app-downloader-lib_global.h"
-#include "downloads/manager.h"
-#include "system/application.h"
-#include "system/dbus_connection.h"
-#include "system/timer.h"
 
 namespace Ubuntu {
 
 namespace DownloadManager {
 
+namespace System {
+
+class Application;
+class DBusConnection;
+class Timer;
+
+}
+
+namespace Daemon {
+
+class Manager;
 class DaemonPrivate;
 class APPDOWNLOADERLIBSHARED_EXPORT Daemon : public QObject {
     Q_DECLARE_PRIVATE(Daemon)
@@ -39,9 +47,9 @@
 
  public:
     explicit Daemon(QObject *parent = 0);
-    Daemon(Application* app,
-           DBusConnection* conn,
-           Timer* timer,
+    Daemon(System::Application* app,
+           System::DBusConnection* conn,
+           System::Timer* timer,
            Manager* man,
            QObject *parent = 0);
     virtual ~Daemon();
@@ -57,6 +65,7 @@
 
  public slots:  // NOLINT (whitespace/indent)
     void start(QString path="com.canonical.applications.Downloader");
+    void stop();
 
  private:
     Q_PRIVATE_SLOT(d_func(), void onTimeout())
@@ -67,6 +76,8 @@
     DaemonPrivate* d_ptr;
 };
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/download.cpp'
--- ubuntu-download-manager-priv/downloads/download.cpp	2013-12-20 22:57:15 +0000
+++ ubuntu-download-manager-priv/downloads/download.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -25,6 +25,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 Download::Download(const QString& id,
                    const QString& path,
                    bool isConfined,
@@ -125,6 +127,8 @@
     emit error(errorStr);
 }
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/download.h'
--- ubuntu-download-manager-priv/downloads/download.h	2013-11-27 12:26:15 +0000
+++ ubuntu-download-manager-priv/downloads/download.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -35,6 +35,8 @@
 
 using namespace System;
 
+namespace Daemon {
+
 class Download : public QObject {
     Q_OBJECT
 
@@ -175,6 +177,8 @@
     QObject* _adaptor = NULL;
 };
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/download_manager_adaptor.cpp'
--- ubuntu-download-manager-priv/downloads/download_manager_adaptor.cpp	2013-10-25 11:44:53 +0000
+++ ubuntu-download-manager-priv/downloads/download_manager_adaptor.cpp	2014-01-22 15:16:38 +0000
@@ -21,6 +21,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 /*
  * Implementation of adaptor class DownloadManagerAdaptor
  */
@@ -103,6 +105,8 @@
     QMetaObject::invokeMethod(parent(), "setDefaultThrottle", Q_ARG(qulonglong, speed));
 }
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/download_manager_adaptor.h'
--- ubuntu-download-manager-priv/downloads/download_manager_adaptor.h	2013-11-12 12:30:18 +0000
+++ ubuntu-download-manager-priv/downloads/download_manager_adaptor.h	2014-01-22 15:16:38 +0000
@@ -29,6 +29,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 /*
  * Adaptor class for interface com.canonical.applications.DownloadManager
  */
@@ -99,6 +101,8 @@
     void downloadCreated(const QDBusObjectPath &path);
 };
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/downloads_db.cpp'
--- ubuntu-download-manager-priv/downloads/downloads_db.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-priv/downloads/downloads_db.cpp	2014-01-22 15:16:38 +0000
@@ -84,6 +84,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 DownloadsDb::DownloadsDb(QObject* parent)
     : QObject(parent) {
     _fileManager = FileManager::instance();
@@ -262,6 +264,7 @@
     return success;
 }
 
+}  // Daemon
 
 }  // DownloadManager
 

=== modified file 'ubuntu-download-manager-priv/downloads/downloads_db.h'
--- ubuntu-download-manager-priv/downloads/downloads_db.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-priv/downloads/downloads_db.h	2014-01-22 15:16:38 +0000
@@ -28,6 +28,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 class DownloadsDb : public QObject {
     Q_OBJECT
 
@@ -53,6 +55,8 @@
     QSqlDatabase _db;
 };
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/factory.cpp'
--- ubuntu-download-manager-priv/downloads/factory.cpp	2013-11-28 15:31:10 +0000
+++ ubuntu-download-manager-priv/downloads/factory.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -30,10 +30,7 @@
 
 namespace DownloadManager {
 
-/*
- * PRIVATE IMPLEMENTATION
- */
-
+namespace Daemon {
 
 Factory::Factory(QObject* parent)
     : QObject(parent) {
@@ -179,6 +176,8 @@
     RequestFactory::instance()->setAcceptedCertificates(certs);
 }
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/factory.h'
--- ubuntu-download-manager-priv/downloads/factory.h	2013-12-02 12:03:18 +0000
+++ ubuntu-download-manager-priv/downloads/factory.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -30,6 +30,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 class Factory : public QObject {
     Q_OBJECT
 
@@ -93,6 +95,8 @@
     AppArmor* _apparmor;
 };
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/file_download.cpp'
--- ubuntu-download-manager-priv/downloads/file_download.cpp	2014-01-16 17:26:28 +0000
+++ ubuntu-download-manager-priv/downloads/file_download.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -44,6 +44,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 FileDownload::FileDownload(const QString& id,
                    const QString& path,
                    bool isConfined,
@@ -571,6 +573,8 @@
     Download::emitError(error);
 }
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/file_download.h'
--- ubuntu-download-manager-priv/downloads/file_download.h	2014-01-16 15:22:06 +0000
+++ ubuntu-download-manager-priv/downloads/file_download.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -34,6 +34,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 class FileDownload : public Download {
     Q_OBJECT
 
@@ -123,6 +125,8 @@
     RequestFactory* _requestFactory;
 };
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/group_download.cpp'
--- ubuntu-download-manager-priv/downloads/group_download.cpp	2013-12-02 12:03:18 +0000
+++ ubuntu-download-manager-priv/downloads/group_download.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * copyright 2013 2013 canonical ltd.
+ * copyright 2013-2014 canonical ltd.
  *
  * this library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the gnu lesser general public
@@ -28,6 +28,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 GroupDownload::GroupDownload(const QString& id,
                   const QString& path,
                   bool isConfined,
@@ -296,6 +298,8 @@
     }
 }
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/group_download.h'
--- ubuntu-download-manager-priv/downloads/group_download.h	2013-12-02 12:03:18 +0000
+++ ubuntu-download-manager-priv/downloads/group_download.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -33,6 +33,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 class GroupDownload : public Download {
     Q_OBJECT
 
@@ -82,6 +84,8 @@
     FileManager* _fileManager = NULL;
 };
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/group_download_adaptor.cpp'
--- ubuntu-download-manager-priv/downloads/group_download_adaptor.cpp	2013-10-25 11:44:53 +0000
+++ ubuntu-download-manager-priv/downloads/group_download_adaptor.cpp	2014-01-22 15:16:38 +0000
@@ -22,6 +22,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 /*
  * Implementation of adaptor class GroupDownloadAdaptor
  */
@@ -112,6 +114,8 @@
     return total;
 }
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/group_download_adaptor.h'
--- ubuntu-download-manager-priv/downloads/group_download_adaptor.h	2013-11-12 12:30:18 +0000
+++ ubuntu-download-manager-priv/downloads/group_download_adaptor.h	2014-01-22 15:16:38 +0000
@@ -28,6 +28,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 /*
  * Adaptor class for interface com.canonical.applications.Download
  */
@@ -121,6 +123,8 @@
     void started(bool success);
 };
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/manager.cpp'
--- ubuntu-download-manager-priv/downloads/manager.cpp	2013-11-29 11:44:07 +0000
+++ ubuntu-download-manager-priv/downloads/manager.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -27,6 +27,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 Manager::Manager(Application* app,
                  DBusConnection* connection,
                  bool stoppable,
@@ -239,6 +241,7 @@
     }
 }
 
+}  // Daemon
 
 }  // DownloadManager
 

=== modified file 'ubuntu-download-manager-priv/downloads/manager.h'
--- ubuntu-download-manager-priv/downloads/manager.h	2013-12-02 12:03:18 +0000
+++ ubuntu-download-manager-priv/downloads/manager.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -25,16 +25,18 @@
 #include <QtDBus/QDBusContext>
 #include <QSslCertificate>
 #include <ubuntu/download_manager/metatypes.h>
+#include <ubuntu/download_manager/system/dbus_connection.h>
 #include "downloads/download.h"
 #include "downloads/queue.h"
 #include "downloads/factory.h"
 #include "system/application.h"
-#include "system/dbus_connection.h"
 
 namespace Ubuntu {
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 class Manager : public QObject, public QDBusContext {
     Q_OBJECT
 
@@ -103,6 +105,8 @@
     bool _stoppable;
 };
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Manager

=== modified file 'ubuntu-download-manager-priv/downloads/queue.cpp'
--- ubuntu-download-manager-priv/downloads/queue.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-priv/downloads/queue.cpp	2014-01-22 15:16:38 +0000
@@ -26,6 +26,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 Queue::Queue(QObject* parent)
     : QObject(parent),
       _current("") {
@@ -176,6 +178,7 @@
     emit currentChanged(_current);
 }
 
+}  // Daemon
 
 }  // DownloadManager
 

=== modified file 'ubuntu-download-manager-priv/downloads/queue.h'
--- ubuntu-download-manager-priv/downloads/queue.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-priv/downloads/queue.h	2014-01-22 15:16:38 +0000
@@ -31,6 +31,8 @@
 
 using namespace System;
 
+namespace Daemon {
+
 class Queue : public QObject {
     Q_OBJECT
 
@@ -63,6 +65,8 @@
     QStringList _sortedPaths;  // keep the order
 };
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/sm_file_download.cpp'
--- ubuntu-download-manager-priv/downloads/sm_file_download.cpp	2013-11-11 16:12:38 +0000
+++ ubuntu-download-manager-priv/downloads/sm_file_download.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -22,6 +22,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 SMFileDownload::SMFileDownload(QObject *parent)
     : QObject(parent) {
 }
@@ -65,6 +67,8 @@
     // TODO: perform the cancel
 }
 
+}  // Daemon
+
 }  // Ubuntu
 
 }  // DownloadManager

=== modified file 'ubuntu-download-manager-priv/downloads/sm_file_download.h'
--- ubuntu-download-manager-priv/downloads/sm_file_download.h	2013-11-11 16:12:38 +0000
+++ ubuntu-download-manager-priv/downloads/sm_file_download.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -28,6 +28,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 class SMFileDownload : public QObject {
     Q_OBJECT
 
@@ -73,6 +75,8 @@
 
 };
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/state_machines/download_sm.cpp'
--- ubuntu-download-manager-priv/downloads/state_machines/download_sm.cpp	2013-11-18 12:13:13 +0000
+++ ubuntu-download-manager-priv/downloads/state_machines/download_sm.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -30,6 +30,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 namespace StateMachines {
 
 
@@ -451,6 +453,8 @@
 
 }  // StateMachines
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/state_machines/download_sm.h'
--- ubuntu-download-manager-priv/downloads/state_machines/download_sm.h	2013-11-11 16:14:46 +0000
+++ ubuntu-download-manager-priv/downloads/state_machines/download_sm.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -30,6 +30,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 namespace StateMachines {
 
 class DownloadSMTransition : public QSignalTransition {
@@ -170,6 +172,8 @@
 
 }  // StateMachines
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/state_machines/final_state.cpp'
--- ubuntu-download-manager-priv/downloads/state_machines/final_state.cpp	2013-11-05 20:55:59 +0000
+++ ubuntu-download-manager-priv/downloads/state_machines/final_state.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -23,6 +23,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 namespace StateMachines {
 
 FinalState::FinalState(QState* parent)
@@ -68,6 +70,8 @@
 
 }  // StateMachines
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/state_machines/final_state.h'
--- ubuntu-download-manager-priv/downloads/state_machines/final_state.h	2013-11-05 20:55:59 +0000
+++ ubuntu-download-manager-priv/downloads/state_machines/final_state.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -28,6 +28,8 @@
 
 namespace DownloadManager {
 
+namespace Daemon {
+
 namespace StateMachines {
 
 struct PropertyAssignment {
@@ -68,6 +70,8 @@
 
 }  // StateMachines
 
+}  // Daemon
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/state_machines/state.cpp'
--- ubuntu-download-manager-priv/downloads/state_machines/state.cpp	2013-11-05 20:55:59 +0000
+++ ubuntu-download-manager-priv/downloads/state_machines/state.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -18,6 +18,14 @@
 
 #include "state.h"
 
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+namespace Daemon {
+
+namespace StateMachines {
+
 State::State(QObject* obj,
              const char* property,
              QVariant value,
@@ -26,3 +34,11 @@
     // simply add the property
     assignProperty(obj, property, value);
 }
+
+}  // StateMachines
+
+}  // Daemon
+
+}  // DownloadManager
+
+}  // Ubuntu

=== modified file 'ubuntu-download-manager-priv/downloads/state_machines/state.h'
--- ubuntu-download-manager-priv/downloads/state_machines/state.h	2013-11-05 20:55:59 +0000
+++ ubuntu-download-manager-priv/downloads/state_machines/state.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -22,6 +22,14 @@
 #include <QState>
 #include <QVariant>
 
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+namespace Daemon {
+
+namespace StateMachines {
+
 class State : public QState {
     Q_OBJECT
  public:
@@ -29,4 +37,12 @@
     
 };
 
+}  // StateMachines
+
+}  // Daemon
+
+}  // DownloadManager
+
+}  // Ubuntu
+
 #endif  // DOWNLOADER_LIB_STATE_H

=== modified file 'ubuntu-download-manager-priv/system/apparmor.h'
--- ubuntu-download-manager-priv/system/apparmor.h	2013-11-13 20:02:15 +0000
+++ ubuntu-download-manager-priv/system/apparmor.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -23,7 +23,7 @@
 #include <QPair>
 #include <QString>
 #include <QSharedPointer>
-#include "dbus_connection.h"
+#include <ubuntu/download_manager/system/dbus_connection.h>
 #include "dbus_proxy.h"
 #include "uuid_factory.h"
 

=== modified file 'ubuntu-download-manager-priv/ubuntu-download-manager-priv.pro'
--- ubuntu-download-manager-priv/ubuntu-download-manager-priv.pro	2013-12-03 12:25:56 +0000
+++ ubuntu-download-manager-priv/ubuntu-download-manager-priv.pro	2014-01-22 15:16:38 +0000
@@ -34,7 +34,6 @@
     system/process.cpp \
     system/logger.cpp \
     system/file_manager.cpp \
-    system/dbus_connection.cpp \
     system/application.cpp \
     system/apparmor.cpp \
     system/network_reply.cpp \
@@ -66,7 +65,6 @@
     system/process.h \
     system/logger.h \
     system/file_manager.h \
-    system/dbus_connection.h \
     system/application.h \
     system/apparmor.h \
     system/network_reply.h \

=== added directory 'ubuntu-download-manager-test-lib'
=== added directory 'ubuntu-download-manager-test-lib/ubuntu'
=== added file 'ubuntu-download-manager-test-lib/ubuntu-download-manager-test-lib.pro'
--- ubuntu-download-manager-test-lib/ubuntu-download-manager-test-lib.pro	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-test-lib/ubuntu-download-manager-test-lib.pro	2014-01-22 15:16:38 +0000
@@ -0,0 +1,63 @@
+include( ../common-project-config.pri )
+include( ../common-vars.pri )
+
+QT       += network core testlib dbus systeminfo sql
+QT       -= gui
+
+TARGET = ubuntu-download-manager-test-lib
+TEMPLATE = lib
+
+DEFINES += UBUNTUDOWNLOADMANAGERTESTLIB_LIBRARY
+
+SOURCES += ubuntu/download_manager/tests/base_testcase.cpp \
+           ubuntu/download_manager/tests/fake.cpp \
+           ubuntu/download_manager/tests/client/daemon_testcase.cpp \
+           ubuntu/download_manager/tests/server/apparmor.cpp \
+           ubuntu/download_manager/tests/server/application.cpp \
+           ubuntu/download_manager/tests/server/dbus_connection.cpp \
+           ubuntu/download_manager/tests/server/download.cpp \
+           ubuntu/download_manager/tests/server/factory.cpp \
+           ubuntu/download_manager/tests/server/file_manager.cpp \
+           ubuntu/download_manager/tests/server/manager.cpp \
+           ubuntu/download_manager/tests/server/network_reply.cpp \
+           ubuntu/download_manager/tests/server/process.cpp \
+           ubuntu/download_manager/tests/server/process_factory.cpp \
+           ubuntu/download_manager/tests/server/qnetwork_reply.cpp \
+           ubuntu/download_manager/tests/server/queue.cpp \
+           ubuntu/download_manager/tests/server/request_factory.cpp \
+           ubuntu/download_manager/tests/server/sm_file_download.cpp \
+           ubuntu/download_manager/tests/server/system_network_info.cpp \
+           ubuntu/download_manager/tests/server/timer.cpp \
+           ubuntu/download_manager/tests/server/uuid_factory.cpp
+
+HEADERS += ubuntu/download_manager/tests/base_testcase.h \
+           ubuntu/download_manager/tests/fake.h\
+           ubuntu/download_manager/tests/test_runner.h \
+           ubuntu/download_manager/tests/client/daemon_testcase.h \
+           ubuntu/download_manager/tests/server/apparmor.h \
+           ubuntu/download_manager/tests/server/application.h \
+           ubuntu/download_manager/tests/server/dbus_connection.h \
+           ubuntu/download_manager/tests/server/download.h \
+           ubuntu/download_manager/tests/server/factory.h \
+           ubuntu/download_manager/tests/server/file_manager.h \
+           ubuntu/download_manager/tests/server/manager.h \
+           ubuntu/download_manager/tests/server/network_reply.h \
+           ubuntu/download_manager/tests/server/process.h \
+           ubuntu/download_manager/tests/server/process_factory.h \
+           ubuntu/download_manager/tests/server/qnetwork_reply.h \
+           ubuntu/download_manager/tests/server/queue.h \
+           ubuntu/download_manager/tests/server/request_factory.h \
+           ubuntu/download_manager/tests/server/sm_file_download.h \
+           ubuntu/download_manager/tests/server/system_network_info.h \
+           ubuntu/download_manager/tests/server/timer.h \
+           ubuntu/download_manager/tests/server/uuid_factory.h
+
+LIBS += -L$$OUT_PWD/../ubuntu-download-manager-common/ -lubuntu-download-manager-common
+
+INCLUDEPATH += $$PWD/../ubuntu-download-manager-common
+DEPENDPATH += $$PWD/../ubuntu-download-manager-common
+
+LIBS += -L$$OUT_PWD/../ubuntu-download-manager-priv/ -lubuntu-download-manager-priv
+
+INCLUDEPATH += $$PWD/../ubuntu-download-manager-priv
+DEPENDPATH += $$PWD/../ubuntu-download-manager-priv

=== added file 'ubuntu-download-manager-test-lib/ubuntu-download-manager-test-lib_global.h'
--- ubuntu-download-manager-test-lib/ubuntu-download-manager-test-lib_global.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-test-lib/ubuntu-download-manager-test-lib_global.h	2014-01-22 15:16:38 +0000
@@ -0,0 +1,12 @@
+#ifndef UBUNTUDOWNLOADMANAGERTESTLIB_GLOBAL_H
+#define UBUNTUDOWNLOADMANAGERTESTLIB_GLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(UBUNTUDOWNLOADMANAGERTESTLIB_LIBRARY)
+#  define UBUNTUDOWNLOADMANAGERTESTLIBSHARED_EXPORT Q_DECL_EXPORT
+#else
+#  define UBUNTUDOWNLOADMANAGERTESTLIBSHARED_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // UBUNTUDOWNLOADMANAGERTESTLIB_GLOBAL_H

=== added directory 'ubuntu-download-manager-test-lib/ubuntu/download_manager'
=== added directory 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests'
=== renamed file 'ubuntu-download-manager-tests/base_testcase.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/base_testcase.cpp'
=== renamed file 'ubuntu-download-manager-tests/base_testcase.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/base_testcase.h'
--- ubuntu-download-manager-tests/base_testcase.h	2013-11-08 17:46:32 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/base_testcase.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -21,9 +21,9 @@
 
 #include <QObject>
 
-class BaseTestCase : public QObject
-{
+class BaseTestCase : public QObject {
     Q_OBJECT
+
  public:
     BaseTestCase(const QString& testName, QObject *parent = 0);
     

=== added directory 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client'
=== added file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/daemon_testcase.cpp'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/daemon_testcase.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/daemon_testcase.cpp	2014-01-22 15:16:38 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "daemon_testcase.h"
+
+DaemonTestCase::DaemonTestCase(const QString& testName, QObject* parent)
+    : BaseTestCase(testName, parent) {
+}
+
+
+QString
+DaemonTestCase::daemonPath() {
+    return _daemonPath;
+}
+
+void
+DaemonTestCase::init() {
+    // WARNING: create a path for this exact test.. we might have
+    // issues if we have to two object with the same name
+    _daemonPath = "com.canonical.applications.testing.Downloader."
+        + objectName();
+    _daemon = new Daemon::Daemon(this);
+
+    BaseTestCase::init();
+    _daemon->enableTimeout(false);
+    _daemon->start(_daemonPath);
+}
+
+void
+DaemonTestCase::cleanup() {
+    _daemon->stop();  // unregisters the service although the delete should do
+                      // the same.. but I like to be explicit
+    delete _daemon;
+    BaseTestCase::cleanup();
+}

=== added file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/daemon_testcase.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/daemon_testcase.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/daemon_testcase.h	2014-01-22 15:16:38 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef DAEMON_TESTCASE_H
+#define DAEMON_TESTCASE_H
+
+#include <QObject>
+#include <downloads/daemon.h>  // comes from the priv lib, just for testing!!!!
+#include "ubuntu/download_manager/tests/base_testcase.h"
+
+using namespace Ubuntu::DownloadManager;
+
+class DaemonTestCase : public BaseTestCase {
+    Q_OBJECT
+
+ public:
+    DaemonTestCase(const QString& testName, QObject *parent = 0);
+
+    QString daemonPath();
+
+ protected slots:  // NOLINT(whitespace/indent)
+
+    void init() override;
+    void cleanup() override;
+
+ private:
+    QString _daemonPath;
+    Daemon::Daemon* _daemon;
+};
+
+#endif // DAEMON_TESTCASE_H

=== renamed file 'ubuntu-download-manager-tests/fakes/fake.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/fake.cpp'
=== renamed file 'ubuntu-download-manager-tests/fakes/fake.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/fake.h'
=== added directory 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server'
=== renamed file 'ubuntu-download-manager-tests/fakes/fake_apparmor.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apparmor.cpp'
--- ubuntu-download-manager-tests/fakes/fake_apparmor.cpp	2013-11-27 15:50:02 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apparmor.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -17,7 +17,7 @@
  */
 
 #include <system/uuid_utils.h>
-#include "fake_apparmor.h"
+#include "apparmor.h"
 
 FakeAppArmor::FakeAppArmor(QSharedPointer<UuidFactory> uuidFactory,
                            QObject *parent)

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_apparmor.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apparmor.h'
--- ubuntu-download-manager-tests/fakes/fake_apparmor.h	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apparmor.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -23,7 +23,7 @@
 #include <QSharedPointer>
 #include <system/apparmor.h>
 #include <system/uuid_factory.h>
-#include "fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;
 

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_application.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/application.cpp'
--- ubuntu-download-manager-tests/fakes/fake_application.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/application.cpp	2014-01-22 15:16:38 +0000
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "./fake_application.h"
+#include "application.h"
 
 FakeApplication::FakeApplication(QObject *parent)
     : Application(parent),

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_application.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/application.h'
--- ubuntu-download-manager-tests/fakes/fake_application.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/application.h	2014-01-22 15:16:38 +0000
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <system/application.h>
-#include "fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;
 

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_dbus_connection.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/dbus_connection.cpp'
--- ubuntu-download-manager-tests/fakes/fake_dbus_connection.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/dbus_connection.cpp	2014-01-22 15:16:38 +0000
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "./fake_dbus_connection.h"
+#include "dbus_connection.h"
 
 /*
  * REGISTER OPTIONS WRAPPER

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_dbus_connection.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/dbus_connection.h'
--- ubuntu-download-manager-tests/fakes/fake_dbus_connection.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/dbus_connection.h	2014-01-22 15:16:38 +0000
@@ -18,8 +18,8 @@
 
 #ifndef FAKE_DBUS_CONNECTION_H
 #define FAKE_DBUS_CONNECTION_H
-#include <system/dbus_connection.h>
-#include "fake.h"
+#include <ubuntu/download_manager/system/dbus_connection.h>
+#include "ubuntu/download_manager/tests/fake.h"
 
 
 using namespace Ubuntu::DownloadManager::System;

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_download.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/download.cpp'
--- ubuntu-download-manager-tests/fakes/fake_download.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/download.cpp	2014-01-22 15:16:38 +0000
@@ -17,7 +17,7 @@
  */
 
 #include <QDebug>
-#include "fake_download.h"
+#include "download.h"
 
 FakeDownload::FakeDownload(const QString& id,
                            const QString& path,

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_download.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/download.h'
--- ubuntu-download-manager-tests/fakes/fake_download.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/download.h	2014-01-22 15:16:38 +0000
@@ -22,9 +22,9 @@
 #include <downloads/file_download.h>
 #include <system/system_network_info.h>
 #include <ubuntu/download_manager/metatypes.h>
-#include "fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
-using namespace Ubuntu::DownloadManager;
+using namespace Ubuntu::DownloadManager::Daemon;
 
 class FakeDownload : public FileDownload, public Fake {
     Q_OBJECT

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_download_factory.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/factory.cpp'
--- ubuntu-download-manager-tests/fakes/fake_download_factory.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/factory.cpp	2014-01-22 15:16:38 +0000
@@ -16,8 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "fake_download.h"
-#include "fake_download_factory.h"
+#include "download.h"
+#include "factory.h"
 
 FakeDownloadFactory::FakeDownloadFactory(
                                  AppArmor* apparmor,

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_download_factory.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/factory.h'
--- ubuntu-download-manager-tests/fakes/fake_download_factory.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/factory.h	2014-01-22 15:16:38 +0000
@@ -22,9 +22,10 @@
 #include <QObject>
 #include <QSharedPointer>
 #include <downloads/factory.h>
-#include "fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
-using namespace Ubuntu::DownloadManager;
+using namespace Ubuntu::DownloadManager::System;
+using namespace Ubuntu::DownloadManager::Daemon;
 
 class FakeDownloadFactory : public Factory, public Fake {
     Q_OBJECT

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_file_manager.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/file_manager.cpp'
--- ubuntu-download-manager-tests/fakes/fake_file_manager.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/file_manager.cpp	2014-01-22 15:16:38 +0000
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "./fake_file_manager.h"
+#include "file_manager.h"
 
 FakeFile::FakeFile(const QString& name)
     : File(name) {

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_file_manager.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/file_manager.h'
--- ubuntu-download-manager-tests/fakes/fake_file_manager.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/file_manager.h	2014-01-22 15:16:38 +0000
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <system/file_manager.h>
-#include "fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;
 

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_download_manager.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/manager.cpp'
--- ubuntu-download-manager-tests/fakes/fake_download_manager.cpp	2013-11-28 16:01:44 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/manager.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "./fake_download_manager.h"
+#include "manager.h"
 
 FakeDownloadManager::FakeDownloadManager(Application* app,
                                          DBusConnection* connection,

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_download_manager.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/manager.h'
--- ubuntu-download-manager-tests/fakes/fake_download_manager.h	2013-11-28 16:01:44 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/manager.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -21,9 +21,10 @@
 
 #include <QObject>
 #include <downloads/manager.h>
-#include "fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
-using namespace Ubuntu::DownloadManager;
+using namespace Ubuntu::DownloadManager::System;
+using namespace Ubuntu::DownloadManager::Daemon;
 
 class FakeDownloadManager : public Manager, public Fake {
     Q_OBJECT

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_network_reply.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/network_reply.cpp'
--- ubuntu-download-manager-tests/fakes/fake_network_reply.cpp	2013-12-02 11:05:31 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/network_reply.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -16,8 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "./fake_qnetwork_reply.h"
-#include "./fake_network_reply.h"
+#include "qnetwork_reply.h"
+#include "network_reply.h"
 
 
 SslErrorsListWrapper::SslErrorsListWrapper(QList<QSslError> value,

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_network_reply.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/network_reply.h'
--- ubuntu-download-manager-tests/fakes/fake_network_reply.h	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/network_reply.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <system/network_reply.h>
-#include "fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;
 

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_process.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process.cpp'
--- ubuntu-download-manager-tests/fakes/fake_process.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process.cpp	2014-01-22 15:16:38 +0000
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "./fake_process.h"
+#include "process.h"
 
 OpenModeWrapper::OpenModeWrapper(QProcess::OpenMode mode, QObject* parent)
     : QObject(parent) {

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_process.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process.h'
--- ubuntu-download-manager-tests/fakes/fake_process.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process.h	2014-01-22 15:16:38 +0000
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <system/process.h>
-#include "fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;
 

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_process_factory.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process_factory.cpp'
--- ubuntu-download-manager-tests/fakes/fake_process_factory.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process_factory.cpp	2014-01-22 15:16:38 +0000
@@ -16,8 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "./fake_process_factory.h"
-#include "./fake_process.h"
+#include "process_factory.h"
+#include "process.h"
 
 FakeProcessFactory::FakeProcessFactory(QObject *parent)
     : ProcessFactory(parent),

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_process_factory.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process_factory.h'
--- ubuntu-download-manager-tests/fakes/fake_process_factory.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process_factory.h	2014-01-22 15:16:38 +0000
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <system/process_factory.h>
-#include "./fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;
 

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_qnetwork_reply.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/qnetwork_reply.cpp'
--- ubuntu-download-manager-tests/fakes/fake_qnetwork_reply.cpp	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/qnetwork_reply.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "fake_qnetwork_reply.h"
+#include "qnetwork_reply.h"
 
 FakeQNetworkReply::FakeQNetworkReply(QObject* parent)
     : QNetworkReply(parent),

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_qnetwork_reply.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/qnetwork_reply.h'
--- ubuntu-download-manager-tests/fakes/fake_qnetwork_reply.h	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/qnetwork_reply.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 #define FAKE_QNETWORK_REPLY_H
 
 #include <QNetworkReply>
-#include "./fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
 
 class FakeQNetworkReply : public QNetworkReply, public Fake {

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_download_queue.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/queue.cpp'
--- ubuntu-download-manager-tests/fakes/fake_download_queue.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/queue.cpp	2014-01-22 15:16:38 +0000
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "./fake_download_queue.h"
+#include "queue.h"
 
 FakeDownloadQueue::FakeDownloadQueue(QObject *parent)
     : Queue(parent),

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_download_queue.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/queue.h'
--- ubuntu-download-manager-tests/fakes/fake_download_queue.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/queue.h	2014-01-22 15:16:38 +0000
@@ -21,9 +21,9 @@
 #include <QSharedPointer>
 #include <downloads/queue.h>
 #include <system/system_network_info.h>
-#include "fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
-using namespace Ubuntu::DownloadManager;
+using namespace Ubuntu::DownloadManager::Daemon;
 
 class FakeDownloadQueue : public Queue, public Fake {
     Q_OBJECT

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_request_factory.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/request_factory.cpp'
--- ubuntu-download-manager-tests/fakes/fake_request_factory.cpp	2013-11-27 15:50:02 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/request_factory.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -17,8 +17,8 @@
  */
 
 #include <QDebug>
-#include "./fake_network_reply.h"
-#include "./fake_request_factory.h"
+#include "network_reply.h"
+#include "request_factory.h"
 
 RequestWrapper::RequestWrapper(const QNetworkRequest& request, QObject* parent)
     : QObject(parent),

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_request_factory.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/request_factory.h'
--- ubuntu-download-manager-tests/fakes/fake_request_factory.h	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/request_factory.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -24,7 +24,7 @@
 #include <QNetworkReply>
 #include <QPair>
 #include <system/request_factory.h>
-#include "./fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;
 

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_sm_file_download.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/sm_file_download.cpp'
--- ubuntu-download-manager-tests/fakes/fake_sm_file_download.cpp	2013-11-27 15:50:02 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/sm_file_download.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "fake_sm_file_download.h"
+#include "sm_file_download.h"
 
 NetworkErrorWrapper::NetworkErrorWrapper(QNetworkReply::NetworkError value,
                                          QObject* parent)

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_sm_file_download.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/sm_file_download.h'
--- ubuntu-download-manager-tests/fakes/fake_sm_file_download.h	2013-11-11 16:14:46 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/sm_file_download.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -22,9 +22,9 @@
 #include <QObject>
 #include <QSslError>
 #include <downloads/sm_file_download.h>
-#include "fakes/fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
-using namespace Ubuntu::DownloadManager;
+using namespace Ubuntu::DownloadManager::Daemon;
 
 class NetworkErrorWrapper : public QObject {
     Q_OBJECT

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_system_network_info.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/system_network_info.cpp'
--- ubuntu-download-manager-tests/fakes/fake_system_network_info.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/system_network_info.cpp	2014-01-22 15:16:38 +0000
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "./fake_system_network_info.h"
+#include "system_network_info.h"
 
 NetworkModeWrapper::NetworkModeWrapper(QNetworkInfo::NetworkMode mode,
                                        QObject *parent)

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_system_network_info.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/system_network_info.h'
--- ubuntu-download-manager-tests/fakes/fake_system_network_info.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/system_network_info.h	2014-01-22 15:16:38 +0000
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <system/system_network_info.h>
-#include "fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;
 

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_timer.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/timer.cpp'
--- ubuntu-download-manager-tests/fakes/fake_timer.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/timer.cpp	2014-01-22 15:16:38 +0000
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "./fake_timer.h"
+#include "timer.h"
 
 FakeTimer::FakeTimer(QObject *parent)
     : Timer(parent),

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_timer.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/timer.h'
--- ubuntu-download-manager-tests/fakes/fake_timer.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/timer.h	2014-01-22 15:16:38 +0000
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <system/timer.h>
-#include "fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;
 

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_uuid_factory.cpp' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/uuid_factory.cpp'
--- ubuntu-download-manager-tests/fakes/fake_uuid_factory.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/uuid_factory.cpp	2014-01-22 15:16:38 +0000
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "./fake_uuid_factory.h"
+#include "uuid_factory.h"
 
 FakeUuidFactory::FakeUuidFactory(QObject *parent)
     : UuidFactory(parent) {

=== renamed file 'ubuntu-download-manager-tests/fakes/fake_uuid_factory.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/uuid_factory.h'
--- ubuntu-download-manager-tests/fakes/fake_uuid_factory.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/uuid_factory.h	2014-01-22 15:16:38 +0000
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <system/uuid_factory.h>
-#include "./fake.h"
+#include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;
 

=== renamed file 'ubuntu-download-manager-tests/test_runner.h' => 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/test_runner.h'
=== added file 'ubuntu-download-manager-test-lib/ubuntudownloadmanagertestlib.cpp'
--- ubuntu-download-manager-test-lib/ubuntudownloadmanagertestlib.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-test-lib/ubuntudownloadmanagertestlib.cpp	2014-01-22 15:16:38 +0000
@@ -0,0 +1,6 @@
+#include "ubuntudownloadmanagertestlib.h"
+
+
+Ubuntudownloadmanagertestlib::Ubuntudownloadmanagertestlib()
+{
+}

=== added file 'ubuntu-download-manager-test-lib/ubuntudownloadmanagertestlib.h'
--- ubuntu-download-manager-test-lib/ubuntudownloadmanagertestlib.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-test-lib/ubuntudownloadmanagertestlib.h	2014-01-22 15:16:38 +0000
@@ -0,0 +1,13 @@
+#ifndef UBUNTUDOWNLOADMANAGERTESTLIB_H
+#define UBUNTUDOWNLOADMANAGERTESTLIB_H
+
+#include "ubuntu-download-manager-test-lib_global.h"
+
+class UBUNTUDOWNLOADMANAGERTESTLIBSHARED_EXPORT Ubuntudownloadmanagertestlib
+{
+    
+public:
+    Ubuntudownloadmanagertestlib();
+};
+
+#endif // UBUNTUDOWNLOADMANAGERTESTLIB_H

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_cancel_download_transition.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_cancel_download_transition.h	2013-10-31 20:58:34 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_cancel_download_transition.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -24,12 +24,12 @@
 #include <QState>
 #include <QStateMachine>
 #include <downloads/state_machines/download_sm.h>
-#include "base_testcase.h"
-#include "test_runner.h"
-#include "fakes/fake_sm_file_download.h"
-
-
-using namespace Ubuntu::DownloadManager::StateMachines;
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+#include <ubuntu/download_manager/tests/server/sm_file_download.h>
+
+
+using namespace Ubuntu::DownloadManager::Daemon::StateMachines;
 
 class TestCancelDownloadTransition : public BaseTestCase {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_file_download_sm.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_file_download_sm.h	2013-11-05 19:24:01 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_file_download_sm.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -24,11 +24,11 @@
 #include <QStateMachine>
 #include <QSignalTransition>
 #include <downloads/state_machines/download_sm.h>
-#include "base_testcase.h"
-#include "test_runner.h"
-#include "fakes/fake_sm_file_download.h"
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+#include <ubuntu/download_manager/tests/server/sm_file_download.h>
 
-using namespace Ubuntu::DownloadManager::StateMachines;
+using namespace Ubuntu::DownloadManager::Daemon::StateMachines;
 
 class TestFileDownloadSM : public BaseTestCase {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_final_state.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_final_state.h	2013-11-04 20:04:53 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_final_state.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -24,11 +24,11 @@
 #include <QStateMachine>
 #include <QSignalTransition>
 #include <downloads/state_machines/final_state.h>
-#include "base_testcase.h"
-#include "test_runner.h"
-
-
-using namespace Ubuntu::DownloadManager::StateMachines;
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+
+
+using namespace Ubuntu::DownloadManager::Daemon::StateMachines;
 
 class TestFinalStateHelperObject : public QObject {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_network_error_transition.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_network_error_transition.h	2013-10-31 15:50:44 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_network_error_transition.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -24,11 +24,11 @@
 #include <QStateMachine>
 #include <QObject>
 #include <downloads/state_machines/download_sm.h>
-#include "base_testcase.h"
-#include "test_runner.h"
-#include "fakes/fake_sm_file_download.h"
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+#include <ubuntu/download_manager/tests/server/sm_file_download.h>
 
-using namespace Ubuntu::DownloadManager::StateMachines;
+using namespace Ubuntu::DownloadManager::Daemon::StateMachines;
 
 class TestNetworkErrorTransition : public BaseTestCase {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_resume_download_transition.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_resume_download_transition.h	2013-11-01 11:06:34 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_resume_download_transition.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -24,11 +24,11 @@
 #include <QState>
 #include <QStateMachine>
 #include <downloads/state_machines/download_sm.h>
-#include "base_testcase.h"
-#include "test_runner.h"
-#include "fakes/fake_sm_file_download.h"
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+#include <ubuntu/download_manager/tests/server/sm_file_download.h>
 
-using namespace Ubuntu::DownloadManager::StateMachines;
+using namespace Ubuntu::DownloadManager::Daemon::StateMachines;
 
 class TestResumeDownloadTransition : public BaseTestCase {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_ssl_error_transition.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_ssl_error_transition.h	2013-11-11 10:06:15 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_ssl_error_transition.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -24,11 +24,11 @@
 #include <QState>
 #include <QStateMachine>
 #include <downloads/state_machines/download_sm.h>
-#include "base_testcase.h"
-#include "test_runner.h"
-#include "fakes/fake_sm_file_download.h"
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+#include <ubuntu/download_manager/tests/server/sm_file_download.h>
 
-using namespace Ubuntu::DownloadManager::StateMachines;
+using namespace Ubuntu::DownloadManager::Daemon::StateMachines;
 
 class TestSslErrorTransition : public BaseTestCase {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_start_download_transition.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_start_download_transition.h	2013-10-31 18:26:02 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_start_download_transition.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -24,11 +24,11 @@
 #include <QState>
 #include <QStateMachine>
 #include <downloads/state_machines/download_sm.h>
-#include "base_testcase.h"
-#include "test_runner.h"
-#include "fakes/fake_sm_file_download.h"
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+#include <ubuntu/download_manager/tests/server/sm_file_download.h>
 
-using namespace Ubuntu::DownloadManager::StateMachines;
+using namespace Ubuntu::DownloadManager::Daemon::StateMachines;
 
 class TestStartDownloadTransition : public BaseTestCase {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_stop_request_transition.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_stop_request_transition.h	2013-11-11 16:12:38 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_stop_request_transition.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -24,12 +24,11 @@
 #include <QState>
 #include <QStateMachine>
 #include <downloads/state_machines/download_sm.h>
-#include "base_testcase.h"
-#include "test_runner.h"
-#include "fakes/fake_sm_file_download.h"
-
-
-using namespace Ubuntu::DownloadManager::StateMachines;
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+#include <ubuntu/download_manager/tests/server/sm_file_download.h>
+
+using namespace Ubuntu::DownloadManager::Daemon::StateMachines;
 
 class TestStopRequestTransition : public BaseTestCase {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/test_daemon.cpp'
--- ubuntu-download-manager-tests/downloads/test_daemon.cpp	2013-12-17 13:48:29 +0000
+++ ubuntu-download-manager-tests/downloads/test_daemon.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -19,6 +19,8 @@
 #include <QDebug>
 #include "test_daemon.h"
 
+using namespace Ubuntu::DownloadManager;
+
 TestDaemon::TestDaemon(QObject *parent)
     : BaseTestCase("TestDaemon", parent) {
 }
@@ -46,7 +48,7 @@
     app->record();
     FakeDownloadManager* man = new FakeDownloadManager(app, conn);
 
-    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QScopedPointer<Daemon::Daemon> daemon(new Daemon::Daemon(app, conn, timer, man, this));
     daemon->start();
 
     QList<MethodData> calledMethods = conn->calledMethods();
@@ -79,7 +81,7 @@
     app->record();
     FakeDownloadManager* man = new FakeDownloadManager(app, conn);
 
-    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QScopedPointer<Daemon::Daemon> daemon(new Daemon::Daemon(app, conn, timer, man, this));
     daemon->start(myPath);
 
     QList<MethodData> calledMethods = conn->calledMethods();
@@ -110,7 +112,7 @@
     app->record();
     FakeDownloadManager* man = new FakeDownloadManager(app, conn);
 
-    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QScopedPointer<Daemon::Daemon> daemon(new Daemon::Daemon(app, conn, timer, man, this));
     daemon->start();
 
     QList<MethodData> calledMethods = conn->calledMethods();
@@ -135,7 +137,7 @@
     app->record();
     FakeDownloadManager* man = new FakeDownloadManager(app, conn);
 
-    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QScopedPointer<Daemon::Daemon> daemon(new Daemon::Daemon(app, conn, timer, man, this));
     daemon->start();
 
     QList<MethodData> calledMethods = conn->calledMethods();
@@ -158,7 +160,7 @@
     FakeDBusConnection* conn = new FakeDBusConnection();
     FakeApplication* app = new FakeApplication();
     FakeDownloadManager* man = new FakeDownloadManager(app, conn);
-    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QScopedPointer<Daemon::Daemon> daemon(new Daemon::Daemon(app, conn, timer, man, this));
 
     man->emitSizeChaged(1);
 
@@ -176,7 +178,7 @@
     FakeDBusConnection* conn = new FakeDBusConnection();
     FakeApplication* app = new FakeApplication();
     FakeDownloadManager* man = new FakeDownloadManager(app, conn);
-    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QScopedPointer<Daemon::Daemon> daemon(new Daemon::Daemon(app, conn, timer, man, this));
 
     man->emitSizeChaged(0);
 
@@ -192,7 +194,7 @@
     FakeDBusConnection* conn = new FakeDBusConnection();
     FakeApplication* app = new FakeApplication();
     FakeDownloadManager* man = new FakeDownloadManager(app, conn);
-    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QScopedPointer<Daemon::Daemon> daemon(new Daemon::Daemon(app, conn, timer, man, this));
     app->record();
 
     // emit the timeout signal and assert that exit was called
@@ -217,7 +219,7 @@
     app->setArguments(args);
 
     // assert that start is never called
-    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QScopedPointer<Daemon::Daemon> daemon(new Daemon::Daemon(app, conn, timer, man, this));
     QList<MethodData> calledMethods = timer->calledMethods();
     QCOMPARE(0, calledMethods.count());
 }
@@ -235,7 +237,7 @@
     app->setArguments(args);
 
     // assert that we set the certs
-    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QScopedPointer<Daemon::Daemon> daemon(new Daemon::Daemon(app, conn, timer, man, this));
     QList<MethodData> calledMethods = man->calledMethods();
     QCOMPARE(1, calledMethods.count());
     QCOMPARE(QString("setAcceptedCertificates"), calledMethods[0].methodName());
@@ -253,7 +255,7 @@
     app->setArguments(args);
 
     // assert that we do not crash
-    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QScopedPointer<Daemon::Daemon> daemon(new Daemon::Daemon(app, conn, timer, man, this));
     QList<MethodData> calledMethods = man->calledMethods();
     QCOMPARE(1, calledMethods.count());
 }
@@ -274,7 +276,7 @@
     FakeDownloadManager* man = new FakeDownloadManager(app, conn);
 
     QFETCH(bool, enabled);
-    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QScopedPointer<Daemon::Daemon> daemon(new Daemon::Daemon(app, conn, timer, man, this));
     daemon->setStoppable(enabled);
     QCOMPARE(daemon->isStoppable(), enabled);
 }
@@ -295,7 +297,7 @@
     FakeDownloadManager* man = new FakeDownloadManager(app, conn);
 
     QFETCH(bool, enabled);
-    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QScopedPointer<Daemon::Daemon> daemon(new Daemon::Daemon(app, conn, timer, man, this));
     daemon->enableTimeout(enabled);
     QCOMPARE(enabled, daemon->isTimeoutEnabled());
 }
@@ -309,7 +311,7 @@
 
     QList<QSslCertificate> certs = QSslCertificate::fromPath(
         dataDirectory() + "/*.pem");
-    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QScopedPointer<Daemon::Daemon> daemon(new Daemon::Daemon(app, conn, timer, man, this));
     daemon->setSelfSignedCerts(certs);
     QList<QSslCertificate> daemonCerts = daemon->selfSignedCerts();
     QCOMPARE(certs.count(), daemonCerts.count());

=== modified file 'ubuntu-download-manager-tests/downloads/test_daemon.h'
--- ubuntu-download-manager-tests/downloads/test_daemon.h	2013-11-29 16:18:38 +0000
+++ ubuntu-download-manager-tests/downloads/test_daemon.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -21,12 +21,12 @@
 
 #include <QObject>
 #include <downloads/daemon.h>
-#include "fakes/fake_application.h"
-#include "fakes/fake_dbus_connection.h"
-#include "fakes/fake_download_manager.h"
-#include "fakes/fake_timer.h"
-#include "base_testcase.h"
-#include "test_runner.h"
+#include <ubuntu/download_manager/tests/server/application.h>
+#include <ubuntu/download_manager/tests/server/dbus_connection.h>
+#include <ubuntu/download_manager/tests/server/manager.h>
+#include <ubuntu/download_manager/tests/server/timer.h>
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
 
 class TestDaemon : public BaseTestCase {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/test_download.cpp'
--- ubuntu-download-manager-tests/downloads/test_download.cpp	2014-01-16 13:34:17 +0000
+++ ubuntu-download-manager-tests/downloads/test_download.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -22,11 +22,11 @@
 #include <QSslError>
 #include <ubuntu/download_manager/system/hash_algorithm.h>
 #include <system/uuid_utils.h>
-#include "fakes/fake_network_reply.h"
-#include "fakes/fake_process.h"
+#include <ubuntu/download_manager/tests/server/network_reply.h>
+#include <ubuntu/download_manager/tests/server/process.h>
 #include "test_download.h"
 
-using namespace Ubuntu::DownloadManager;
+using namespace Ubuntu::DownloadManager::Daemon;
 
 TestDownload::TestDownload(QObject* parent)
     : BaseTestCase("TestDownload", parent) {

=== modified file 'ubuntu-download-manager-tests/downloads/test_download.h'
--- ubuntu-download-manager-tests/downloads/test_download.h	2014-01-16 13:34:17 +0000
+++ ubuntu-download-manager-tests/downloads/test_download.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -23,12 +23,12 @@
 #include <QObject>
 #include <downloads/file_download.h>
 #include <ubuntu/download_manager/metatypes.h>
-#include "fakes/fake_system_network_info.h"
-#include "fakes/fake_request_factory.h"
-#include "fakes/fake_process_factory.h"
-#include "fakes/fake_file_manager.h"
-#include "base_testcase.h"
-#include "test_runner.h"
+#include <ubuntu/download_manager/tests/server/file_manager.h>
+#include <ubuntu/download_manager/tests/server/system_network_info.h>
+#include <ubuntu/download_manager/tests/server/request_factory.h>
+#include <ubuntu/download_manager/tests/server/process_factory.h>
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
 
 class TestDownload: public BaseTestCase {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_factory.h'
--- ubuntu-download-manager-tests/downloads/test_download_factory.h	2013-11-27 13:06:46 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_factory.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -21,15 +21,16 @@
 
 #include <QObject>
 #include <downloads/factory.h>
-#include "fakes/fake_apparmor.h"
-#include "fakes/fake_system_network_info.h"
-#include "fakes/fake_request_factory.h"
-#include "fakes/fake_process_factory.h"
-#include "fakes/fake_uuid_factory.h"
-#include "base_testcase.h"
-#include "test_runner.h"
+#include <ubuntu/download_manager/tests/server/apparmor.h>
+#include <ubuntu/download_manager/tests/server/system_network_info.h>
+#include <ubuntu/download_manager/tests/server/request_factory.h>
+#include <ubuntu/download_manager/tests/server//process_factory.h>
+#include <ubuntu/download_manager/tests/server/uuid_factory.h>
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
 
 using namespace Ubuntu::DownloadManager;
+using namespace Ubuntu::DownloadManager::Daemon;
 
 class TestDownloadFactory : public BaseTestCase {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_manager.cpp'
--- ubuntu-download-manager-tests/downloads/test_download_manager.cpp	2013-12-02 12:03:18 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_manager.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -20,8 +20,8 @@
 #include <downloads/factory.h>
 #include <ubuntu/download_manager/download_struct.h>
 #include <system/uuid_utils.h>
-#include "fakes/fake_process_factory.h"
-#include "fakes/fake_system_network_info.h"
+#include <ubuntu/download_manager/tests/server/process_factory.h>
+#include <ubuntu/download_manager/tests/server/system_network_info.h>
 #include "test_download_manager.h"
 
 TestDownloadManager::TestDownloadManager(QObject *parent)

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_manager.h'
--- ubuntu-download-manager-tests/downloads/test_download_manager.h	2013-11-28 16:01:44 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_manager.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -23,16 +23,19 @@
 #include <QSharedPointer>
 #include <downloads/manager.h>
 #include <downloads/file_download.h>
-#include "fakes/fake_application.h"
-#include "fakes/fake_apparmor.h"
-#include "fakes/fake_dbus_connection.h"
-#include "fakes/fake_download_queue.h"
-#include "fakes/fake_download_factory.h"
-#include "fakes/fake_request_factory.h"
-#include "fakes/fake_uuid_factory.h"
-#include "fakes/fake_system_network_info.h"
-#include "test_runner.h"
-#include "base_testcase.h"
+#include <ubuntu/download_manager/tests/server/application.h>
+#include <ubuntu/download_manager/tests/server/apparmor.h>
+#include <ubuntu/download_manager/tests/server/dbus_connection.h>
+#include <ubuntu/download_manager/tests/server/queue.h>
+#include <ubuntu/download_manager/tests/server/factory.h>
+#include <ubuntu/download_manager/tests/server/request_factory.h>
+#include <ubuntu/download_manager/tests/server/uuid_factory.h>
+#include <ubuntu/download_manager/tests/server/system_network_info.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+#include <ubuntu/download_manager/tests/base_testcase.h>
+
+using namespace Ubuntu::DownloadManager;
+using namespace Ubuntu::DownloadManager::Daemon;
 
 class TestDownloadManager : public BaseTestCase {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_queue.h'
--- ubuntu-download-manager-tests/downloads/test_download_queue.h	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_queue.h	2014-01-22 15:16:38 +0000
@@ -22,12 +22,12 @@
 #include <QObject>
 #include <downloads/download_adaptor.h>
 #include <downloads/queue.h>
-#include "fakes/fake_download.h"
-#include "fakes/fake_request_factory.h"
-#include "fakes/fake_process_factory.h"
-#include "fakes/fake_system_network_info.h"
-#include "test_runner.h"
-#include "base_testcase.h"
+#include <ubuntu/download_manager/tests/server/download.h>
+#include <ubuntu/download_manager/tests/server/request_factory.h>
+#include <ubuntu/download_manager/tests/server/process_factory.h>
+#include <ubuntu/download_manager/tests/server/system_network_info.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+#include <ubuntu/download_manager/tests/base_testcase.h>
 
 class TestDownloadQueue : public BaseTestCase {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/test_downloads_db.cpp'
--- ubuntu-download-manager-tests/downloads/test_downloads_db.cpp	2014-01-16 15:42:53 +0000
+++ ubuntu-download-manager-tests/downloads/test_downloads_db.cpp	2014-01-22 15:16:38 +0000
@@ -25,10 +25,10 @@
 #include <ubuntu/download_manager/metatypes.h>
 #include <ubuntu/download_manager/system/hash_algorithm.h>
 #include <system/uuid_utils.h>
-#include "fakes/fake_download.h"
-#include "fakes/fake_system_network_info.h"
-#include "fakes/fake_request_factory.h"
-#include "fakes/fake_process_factory.h"
+#include <ubuntu/download_manager/tests/server/download.h>
+#include <ubuntu/download_manager/tests/server/system_network_info.h>
+#include <ubuntu/download_manager/tests/server/request_factory.h>
+#include <ubuntu/download_manager/tests/server/process_factory.h>
 #include "test_downloads_db.h"
 
 #define TABLE_EXISTS "SELECT count(name) FROM sqlite_master "\

=== modified file 'ubuntu-download-manager-tests/downloads/test_downloads_db.h'
--- ubuntu-download-manager-tests/downloads/test_downloads_db.h	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/downloads/test_downloads_db.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -22,10 +22,10 @@
 #include <QObject>
 #include <QSqlDatabase>
 #include <downloads/downloads_db.h>
-#include "base_testcase.h"
-#include "test_runner.h"
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
 
-using namespace Ubuntu::DownloadManager;
+using namespace Ubuntu::DownloadManager::Daemon;
 
 class TestDownloadsDb : public BaseTestCase {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/downloads/test_group_download.cpp'
--- ubuntu-download-manager-tests/downloads/test_group_download.cpp	2013-11-28 15:04:52 +0000
+++ ubuntu-download-manager-tests/downloads/test_group_download.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 #include <QSignalSpy>
 #include <downloads/group_download.h>
 #include <system/uuid_utils.h>
-#include "fakes/fake_download.h"
+#include <ubuntu/download_manager/tests/server/download.h>
 #include "test_group_download.h"
 
 TestGroupDownload::TestGroupDownload(QObject *parent)

=== modified file 'ubuntu-download-manager-tests/downloads/test_group_download.h'
--- ubuntu-download-manager-tests/downloads/test_group_download.h	2013-11-28 11:48:02 +0000
+++ ubuntu-download-manager-tests/downloads/test_group_download.h	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -22,14 +22,17 @@
 #include <QObject>
 #include <system/uuid_factory.h>
 #include <downloads/group_download.h>
-#include "fakes/fake_apparmor.h"
-#include "fakes/fake_file_manager.h"
-#include "fakes/fake_system_network_info.h"
-#include "fakes/fake_request_factory.h"
-#include "fakes/fake_process_factory.h"
-#include "fakes/fake_download_factory.h"
-#include "base_testcase.h"
-#include "test_runner.h"
+#include <ubuntu/download_manager/tests/server/apparmor.h>
+#include <ubuntu/download_manager/tests/server/file_manager.h>
+#include <ubuntu/download_manager/tests/server/system_network_info.h>
+#include <ubuntu/download_manager/tests/server/request_factory.h>
+#include <ubuntu/download_manager/tests/server/process_factory.h>
+#include <ubuntu/download_manager/tests/server/factory.h>
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+
+using namespace Ubuntu::DownloadManager;
+using namespace Ubuntu::DownloadManager::Daemon;
 
 class TestGroupDownload : public BaseTestCase {
     Q_OBJECT

=== removed directory 'ubuntu-download-manager-tests/fakes'
=== modified file 'ubuntu-download-manager-tests/main.cpp'
--- ubuntu-download-manager-tests/main.cpp	2013-07-23 18:03:37 +0000
+++ ubuntu-download-manager-tests/main.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -17,7 +17,7 @@
  */
 
 #include <QCoreApplication>
-#include "./test_runner.h"
+#include <ubuntu/download_manager/tests/test_runner.h>
 
 int main(int argc, char *argv[]) {
     QCoreApplication a(argc, argv);

=== modified file 'ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro'
--- ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2013-12-04 11:14:36 +0000
+++ ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2014-01-22 15:16:38 +0000
@@ -17,28 +17,9 @@
     downloads/test_group_download.cpp \
     downloads/test_downloads_db.cpp \
     downloads/test_download_factory.cpp \
-    fakes/fake.cpp \
-    fakes/fake_dbus_connection.cpp \
-    fakes/fake_download.cpp \
-    fakes/fake_network_reply.cpp \
-    fakes/fake_qnetwork_reply.cpp \
-    fakes/fake_request_factory.cpp \
-    fakes/fake_download_queue.cpp \
-    fakes/fake_uuid_factory.cpp \
-    fakes/fake_system_network_info.cpp \
-    fakes/fake_process.cpp \
-    fakes/fake_process_factory.cpp \
-    fakes/fake_application.cpp \
-    fakes/fake_timer.cpp \
-    fakes/fake_download_manager.cpp \
-    fakes/fake_download_factory.cpp \
-    fakes/fake_file_manager.cpp \
-    fakes/fake_apparmor.cpp \
     main.cpp \
-    base_testcase.cpp \
     downloads/state_machines/test_network_error_transition.cpp \
     downloads/state_machines/test_ssl_error_transition.cpp \
-    fakes/fake_sm_file_download.cpp \
     downloads/state_machines/test_start_download_transition.cpp \
     downloads/state_machines/test_stop_request_transition.cpp \
     downloads/state_machines/test_cancel_download_transition.cpp \
@@ -54,28 +35,8 @@
     downloads/test_group_download.h \
     downloads/test_downloads_db.h \
     downloads/test_download_factory.h \
-    fakes/fake.h \
-    fakes/fake_dbus_connection.h \
-    fakes/fake_download.h \
-    fakes/fake_network_reply.h \
-    fakes/fake_qnetwork_reply.h \
-    fakes/fake_request_factory.h \
-    fakes/fake_download_queue.h \
-    fakes/fake_uuid_factory.h \
-    fakes/fake_system_network_info.h \
-    fakes/fake_process.h \
-    fakes/fake_process_factory.h \
-    fakes/fake_application.h \
-    fakes/fake_timer.h \
-    fakes/fake_download_manager.h \
-    fakes/fake_download_factory.h \
-    fakes/fake_file_manager.h \
-    fakes/fake_apparmor.h \
-    test_runner.h \
-    base_testcase.h \
     downloads/state_machines/test_network_error_transition.h \
     downloads/state_machines/test_ssl_error_transition.h \
-    fakes/fake_sm_file_download.h \
     downloads/state_machines/test_start_download_transition.h \
     downloads/state_machines/test_stop_request_transition.h \
     downloads/state_machines/test_cancel_download_transition.h \
@@ -93,6 +54,11 @@
 INCLUDEPATH += $$PWD/../ubuntu-download-manager-common
 DEPENDPATH += $$PWD/../ubuntu-udownload-manager-common
 
+LIBS += -L$$OUT_PWD/../ubuntu-download-manager-test-lib/ -lubuntu-download-manager-test-lib
+
+INCLUDEPATH += $$PWD/../ubuntu-download-manager-test-lib
+DEPENDPATH += $$PWD/../ubuntu-download-manager-test-lib
+
 check.depends = $${TARGET}
-check.commands = LD_LIBRARY_PATH=$$OUT_PWD/../ubuntu-download-manager-common:$$OUT_PWD/../ubuntu-download-manager-priv ./$${TARGET}
+check.commands = LD_LIBRARY_PATH=$$OUT_PWD/../ubuntu-download-manager-common:$$OUT_PWD/../ubuntu-download-manager-priv:$$OUT_PWD/../ubuntu-download-manager-test-lib ./$${TARGET}
 QMAKE_EXTRA_TARGETS += check

=== modified file 'ubuntu-download-manager/main.cpp'
--- ubuntu-download-manager/main.cpp	2013-10-25 11:44:53 +0000
+++ ubuntu-download-manager/main.cpp	2014-01-22 15:16:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -20,11 +20,12 @@
 #include <QCoreApplication>
 #include <downloads/daemon.h>
 
+using namespace Ubuntu::DownloadManager::Daemon;
+
 int main(int argc, char *argv[]) {
     QCoreApplication a(argc, argv);
 
-    Ubuntu::DownloadManager::Daemon* daemon =
-        new Ubuntu::DownloadManager::Daemon();
+    Daemon* daemon = new Daemon();
     // use a singleShot timer so that we start after exec so that exit works
     QTimer::singleShot(0, daemon, SLOT(start()));