Merge lp:~mandel/ubuntu-download-manager/set-download-dir into lp:ubuntu-download-manager

[Manuel de la Peña]

Allow the clients to change the destination directory of the download.

[lp:~mandel/ubuntu-download-manager/set-download-dir]

335. By Manuel de la Peña on 2014-04-03

Link bug.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/set-download-dir]

336. By Manuel de la Peña on 2014-04-03

Merged second-reorg into set-download-dir.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:336
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/501/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/391
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/390/console

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

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/set-download-dir]

337. By Manuel de la Peña on 2014-04-03

Merged second-reorg into set-download-dir.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:337
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/506/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/396
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/395/console

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

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/set-download-dir]

338. By Manuel de la Peña on 2014-04-07

Merged second-reorg into set-download-dir.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:338
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/519/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/409
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/408/console

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

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/set-download-dir]

339. By Manuel de la Peña on 2014-04-07

Merged second-reorg into set-download-dir.

340. By Manuel de la Peña on 2014-04-07

Merged second-reorg into set-download-dir.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:340
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/531/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/421
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/420/console

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

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/set-download-dir]

341. By Manuel de la Peña on 2014-04-07

Merged second-reorg into set-download-dir.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:341
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/540/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/430
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/429/console

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

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/set-download-dir]

342. By Manuel de la Peña on 2014-04-08

Merged second-reorg into set-download-dir.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:342
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/552/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/442
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/441/console

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

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/set-download-dir]

343. By Manuel de la Peña on 2014-04-08

Fixed merge issues.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:343
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/566/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/456
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/455/console

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

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/set-download-dir]

344. By Manuel de la Peña on 2014-04-09

Merged second-reorg into set-download-dir.

345. By Manuel de la Peña on 2014-04-09

Merged second-reorg into set-download-dir.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:344
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/581/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/471
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/470

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:345
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/594/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/484
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/483

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/set-download-dir]

346. By Manuel de la Peña on 2014-04-09

Merged second-reorg into set-download-dir.

347. By Manuel de la Peña on 2014-04-09

Merged second-reorg into set-download-dir.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:347
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/606/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/496
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/495

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/set-download-dir]

348. By Manuel de la Peña on 2014-04-15

Merged second-reorg into set-download-dir.

349. By Manuel de la Peña on 2014-04-15

Merged second-reorg into set-download-dir.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:349
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/624/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/514
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/513

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

review: Approve (continuous-integration)

=== modified file 'docs/com.canonical.applications.download.xml'
--- docs/com.canonical.applications.download.xml	2014-02-11 15:35:52 +0000
+++ docs/com.canonical.applications.download.xml	2014-04-15 15:31:42 +0000
@@ -22,6 +22,10 @@
         <arg name="speed" type="t" direction="out"/>
     </method>
 
+    <method name="setDestinationDir">
+        <arg name="path" type="s" direction="in"/>
+    </method>
+
     <method name="allowGSMDownload">
         <arg name="allowed" type="b" direction="in"/>
     </method>

=== modified file 'src/downloads/client/ubuntu/download_manager/download.h'
--- src/downloads/client/ubuntu/download_manager/download.h	2014-04-15 15:31:41 +0000
+++ src/downloads/client/ubuntu/download_manager/download.h	2014-04-15 15:31:42 +0000
@@ -114,6 +114,15 @@
     virtual bool isMobileDownloadAllowed() = 0;
 
     /*!
+        \fn void setDestinationDir(const QString& path);
+
+        Notifies the download manager that the local path of the download
+        must be a different one. This call can only be performed if the
+        download was not started else it will result in an error.
+    */
+    virtual void setDestinationDir(const QString& path) = 0;
+
+    /*!
         \fn void setThrottle(qulonglong speed)
 
         Notifies the download manager that the download represented by this

=== modified file 'src/downloads/client/ubuntu/download_manager/download_impl.cpp'
--- src/downloads/client/ubuntu/download_manager/download_impl.cpp	2014-04-15 15:31:41 +0000
+++ src/downloads/client/ubuntu/download_manager/download_impl.cpp	2014-04-15 15:31:42 +0000
@@ -155,6 +155,17 @@
 }
 
 void
+DownloadImpl::setDestinationDir(const QString& path) {
+    QDBusPendingReply<> reply =
+        _dbusInterface->setDestinationDir(path);
+    // block, the call should be fast enough
+    reply.waitForFinished();
+    if (reply.isError()) {
+        setLastError(reply.error());
+    }
+}
+
+void
 DownloadImpl::setThrottle(qulonglong speed) {
     QDBusPendingReply<> reply =
         _dbusInterface->setThrottle(speed);

=== modified file 'src/downloads/client/ubuntu/download_manager/download_impl.h'
--- src/downloads/client/ubuntu/download_manager/download_impl.h	2014-04-15 15:31:41 +0000
+++ src/downloads/client/ubuntu/download_manager/download_impl.h	2014-04-15 15:31:42 +0000
@@ -43,6 +43,7 @@
     Q_OBJECT
 
     // allow the manager to create downloads
+    friend class ManagerImpl;
     friend class DownloadPendingCallWatcher;
     friend class DownloadManagerPendingCallWatcher;
 
@@ -57,6 +58,7 @@
     void allowMobileDownload(bool allowed);
     bool isMobileDownloadAllowed();
 
+    void setDestinationDir(const QString& path);
     void setThrottle(qulonglong speed);
     qulonglong throttle();
 

=== modified file 'src/downloads/client/ubuntu/download_manager/download_interface.h'
--- src/downloads/client/ubuntu/download_manager/download_interface.h	2014-02-11 19:57:39 +0000
+++ src/downloads/client/ubuntu/download_manager/download_interface.h	2014-04-15 15:31:42 +0000
@@ -80,6 +80,13 @@
         return asyncCallWithArgumentList(QLatin1String("resume"), argumentList);
     }
 
+    inline QDBusPendingReply<> setDestinationDir(const QString &path)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(path);
+        return asyncCallWithArgumentList(QLatin1String("setDestinationDir"), argumentList);
+    }
+
     inline QDBusPendingReply<> setThrottle(qulonglong speed)
     {
         QList<QVariant> argumentList;

=== modified file 'src/downloads/client/ubuntu/download_manager/manager.h'
--- src/downloads/client/ubuntu/download_manager/manager.h	2014-04-15 15:31:41 +0000
+++ src/downloads/client/ubuntu/download_manager/manager.h	2014-04-15 15:31:42 +0000
@@ -74,6 +74,15 @@
         : QObject(parent) {}
 
     /*!
+        \fn void getDownloadForId(const QString& id);
+
+        Returns a download object for the download with the given id. The
+        id most be valid else the returned download will be in an unknown
+        state meaning that most of the download operations will fail.
+    */
+    virtual Download* getDownloadForId(const QString& id) = 0;
+
+    /*!
         \fn void createDownload(DownloadStruct downStruct)
 
         Creates a new download using the data found in the structure.

=== modified file 'src/downloads/client/ubuntu/download_manager/manager_impl.cpp'
--- src/downloads/client/ubuntu/download_manager/manager_impl.cpp	2014-04-15 15:31:41 +0000
+++ src/downloads/client/ubuntu/download_manager/manager_impl.cpp	2014-04-15 15:31:42 +0000
@@ -18,6 +18,7 @@
 
 #include <QDebug>
 #include <glog/logging.h>
+#include "download_impl.h"
 #include "manager_impl.h"
 
 namespace {
@@ -75,6 +76,12 @@
     qDBusRegisterMetaType<ProcessErrorStruct>();
 }
 
+Download*
+ManagerImpl::getDownloadForId(const QString& id) {
+    auto down = new DownloadImpl(_conn, _servicePath, QDBusObjectPath(id));
+    return down;
+}
+
 void
 ManagerImpl::createDownload(DownloadStruct downStruct) {
     QDBusPendingCall call =

=== modified file 'src/downloads/client/ubuntu/download_manager/manager_impl.h'
--- src/downloads/client/ubuntu/download_manager/manager_impl.h	2014-04-15 15:31:41 +0000
+++ src/downloads/client/ubuntu/download_manager/manager_impl.h	2014-04-15 15:31:42 +0000
@@ -51,6 +51,7 @@
 
  public:
     virtual ~ManagerImpl();
+    virtual Download* getDownloadForId(const QString& id);
     virtual void createDownload(DownloadStruct downStruct);
     virtual void createDownload(DownloadStruct downStruct,
                                 DownloadCb cb,

=== modified file 'src/downloads/priv/ubuntu/downloads/download_adaptor.cpp'
--- src/downloads/priv/ubuntu/downloads/download_adaptor.cpp	2014-04-15 15:31:41 +0000
+++ src/downloads/priv/ubuntu/downloads/download_adaptor.cpp	2014-04-15 15:31:42 +0000
@@ -81,6 +81,12 @@
     QMetaObject::invokeMethod(parent(), "resume");
 }
 
+void DownloadAdaptor::setDestinationDir(const QString &path)
+{
+    // handle method call com.canonical.applications.Download.setDestinationDir
+    QMetaObject::invokeMethod(parent(), "setDestinationDir", Q_ARG(QString, path));
+}
+
 void DownloadAdaptor::setThrottle(qulonglong speed)
 {
     // handle method call com.canonical.applications.Download.setThrottle

=== modified file 'src/downloads/priv/ubuntu/downloads/download_adaptor.h'
--- src/downloads/priv/ubuntu/downloads/download_adaptor.h	2014-02-11 15:35:52 +0000
+++ src/downloads/priv/ubuntu/downloads/download_adaptor.h	2014-04-15 15:31:42 +0000
@@ -50,6 +50,9 @@
 "    <method name=\"throttle\">\n"
 "      <arg direction=\"out\" type=\"t\" name=\"speed\"/>\n"
 "    </method>\n"
+"    <method name=\"setDestinationDir\">\n"
+"      <arg direction=\"in\" type=\"s\" name=\"path\"/>\n"
+"    </method>\n"
 "    <method name=\"allowGSMDownload\">\n"
 "      <arg direction=\"in\" type=\"b\" name=\"allowed\"/>\n"
 "    </method>\n"
@@ -116,6 +119,7 @@
     void pause();
     qulonglong progress();
     void resume();
+    void setDestinationDir(const QString &path);
     void setThrottle(qulonglong speed);
     void start();
     qulonglong throttle();

=== modified file 'src/downloads/priv/ubuntu/downloads/file_download.cpp'
--- src/downloads/priv/ubuntu/downloads/file_download.cpp	2014-04-15 15:31:41 +0000
+++ src/downloads/priv/ubuntu/downloads/file_download.cpp	2014-04-15 15:31:42 +0000
@@ -29,6 +29,8 @@
 #include <ubuntu/transfers/system/logger.h>
 #include <ubuntu/transfers/system/network_reply.h>
 #include <ubuntu/transfers/system/filename_mutex.h>
+#include <ubuntu/transfers/system/uuid_factory.h>
+#include <ubuntu/transfers/system/uuid_utils.h>
 #include "file_download.h"
 
 #define DOWN_LOG(LEVEL) LOG(LEVEL) << ((parent() != nullptr)?"GroupDownload {" + parent()->objectName() + " } ":"") << "Download ID{" << objectName() << " } "
@@ -63,6 +65,7 @@
                    const QMap<QString, QString>& headers,
                    QObject* parent)
     : Download(id, path, isConfined, rootPath, metadata, headers, parent),
+      QDBusContext(),
       _totalSize(0),
       _url(url),
       _hash(""),
@@ -81,6 +84,7 @@
                    const QMap<QString, QString> &headers,
                    QObject* parent)
     : Download(id, path, isConfined, rootPath, metadata, headers, parent),
+      QDBusContext(),
       _totalSize(0),
       _url(url),
       _hash(hash) {
@@ -237,6 +241,66 @@
 }
 
 void
+FileDownload::setDestinationDir(const QString& path) {
+    // we have to perform several checks to ensure the integrity
+    // of the download
+    // 1. Trust apparmor that it will bock the call of this method
+    //    from not confined apps
+    // 2. Ensure that the path is an absolute path.
+    // 3. Ensure that the path does exist.
+    // 4. Ensure that the path is a dir.
+    // 5. Ensure that the download was not started
+    QFileInfo info(path);
+    if (!info.isAbsolute()) {
+        DOWN_LOG(WARNING) << "Trying to set destination dir to '"
+            << path << "' when the path is not absolute.";
+        if (calledFromDBus()) {
+            sendErrorReply(QDBusError::InvalidArgs,
+                "The destination dir must be an absolute path.");
+        }
+        return;
+    }
+
+    if (!info.exists()) {
+        DOWN_LOG(WARNING) << "Trying to set destination dir to '"
+            << path << "' when the path does not exists.";
+        if (calledFromDBus()) {
+            sendErrorReply(QDBusError::InvalidArgs,
+                "The destination dir must be already present in the system.");
+        }
+        return;
+    }
+
+    if (!info.isDir()) {
+        DOWN_LOG(WARNING) << "Trying to set destination dir to '"
+            << path << "' when the path is not a dir.";
+        if (calledFromDBus()) {
+            sendErrorReply(QDBusError::InvalidArgs,
+                "The destination dir must be a dir and a file was found.");
+        }
+        return;
+    }
+
+    if (state() == Download::IDLE) {
+        // calculate the new path before we unlock the old one
+        auto desiredPath = path;
+        if (!desiredPath.endsWith(QDir::separator())) {
+            desiredPath += QDir::separator();
+        }
+        desiredPath += _basename;
+        desiredPath = _fileNameMutex->lockFileName(desiredPath);
+        _tempFilePath = desiredPath + TEMP_EXTENSION;
+        _fileNameMutex->unlockFileName(_filePath);
+        _filePath = desiredPath;
+    } else {
+        if (calledFromDBus()) {
+            sendErrorReply(QDBusError::NotSupported,
+                "The path cannot be changed in a started download.");
+        }
+    }
+}
+
+void
 FileDownload::onDownloadProgress(qint64 currentProgress, qint64 bytesTotal) {
     TRACE << _url << currentProgress << bytesTotal;
 
@@ -603,10 +667,12 @@
     // the mutex will ensure that we do not have race conditions about
     // the file names in the download manager
     QString path = _url.path();
-    QString basename = QFileInfo(path).fileName();
+    _basename = QFileInfo(path).fileName();
 
-    if (basename.isEmpty())
-        basename = DATA_FILE_NAME;
+    if (_basename.isEmpty()) {
+        QScopedPointer<UuidFactory> uuidFactory(new UuidFactory());
+        _basename = UuidUtils::getDBusString(uuidFactory->createUuid());
+    }
 
     auto metadataMap = metadata();
 
@@ -624,7 +690,7 @@
                 _filePath));
         }
     } else {
-        auto desiredPath = rootPath() + QDir::separator() + basename;
+        auto desiredPath = rootPath() + QDir::separator() + _basename;
         _filePath = _fileNameMutex->lockFileName(desiredPath);
         _tempFilePath = _filePath + TEMP_EXTENSION;
     }

=== modified file 'src/downloads/priv/ubuntu/downloads/file_download.h'
--- src/downloads/priv/ubuntu/downloads/file_download.h	2014-04-15 15:31:41 +0000
+++ src/downloads/priv/ubuntu/downloads/file_download.h	2014-04-15 15:31:42 +0000
@@ -19,6 +19,7 @@
 #ifndef DOWNLOADER_LIB_SINGLE_DOWNLOAD_H
 #define DOWNLOADER_LIB_SINGLE_DOWNLOAD_H
 
+#include <QtDBus/QDBusContext>
 #include <QFile>
 #include <QNetworkReply>
 #include <QProcess>
@@ -41,7 +42,7 @@
 
 namespace Daemon {
 
-class FileDownload : public Download {
+class FileDownload : public Download, public QDBusContext {
     Q_OBJECT
 
  public:
@@ -92,6 +93,7 @@
     qulonglong progress() override;
     qulonglong totalSize() override;
     virtual void setThrottle(qulonglong speed) override;
+    virtual void setDestinationDir(const QString& path);
 
  signals:
     void finished(const QString& path);
@@ -132,6 +134,7 @@
     bool _connected = false;
     qulonglong _totalSize = 0;
     QUrl _url;
+    QString _basename;
     QString _filePath;
     QString _tempFilePath;
     QString _hash;

=== modified file 'src/downloads/test-daemon/testing_file_download.h'
--- src/downloads/test-daemon/testing_file_download.h	2014-04-15 15:31:41 +0000
+++ src/downloads/test-daemon/testing_file_download.h	2014-04-15 15:31:42 +0000
@@ -26,7 +26,7 @@
 
 using namespace Ubuntu::DownloadManager::Daemon;
 
-class TestingFileDownload : public FileDownload, public QDBusContext {
+class TestingFileDownload : public FileDownload {
     Q_OBJECT
 
  public:

=== modified file 'tests/test_client_download.cpp'
--- tests/test_client_download.cpp	2014-04-15 15:31:41 +0000
+++ tests/test_client_download.cpp	2014-04-15 15:31:42 +0000
@@ -16,6 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QDir>
 #include <QNetworkReply>
 #include <ubuntu/download_manager/error.h>
 #include "test_client_download.h"
@@ -252,11 +253,11 @@
     QTest::addColumn<QString>("standardError");
 
     QTest::newRow("Failed To Start") << 0 << "Failed To Start"
-        << -1 << "" << ""; 
+        << -1 << "" << "";
     QTest::newRow("Crashed") << 1 << "Crashed" << -1 << "Calculating.."
-        << "NULL pointer"; 
+        << "NULL pointer";
     QTest::newRow("Timedout") << 2 << "Timedout" << -1 << "stdout"
-        << ""; 
+        << "";
 }
 
 void
@@ -289,4 +290,51 @@
     QCOMPARE(standardError, processError->standardError());
 }
 
+void
+TestDownload::testSetLocalDirectory() {
+    auto path = testDirectory();
+    _down->setDestinationDir(path);
+    QVERIFY(!_down->isError());
+    QVERIFY(_down->error() == nullptr);
+}
+
+void
+TestDownload::testSetLocalDirectoryNotAbsolute() {
+    _down->setDestinationDir("./test");
+    QVERIFY(_down->isError());
+    QVERIFY(_down->error() != nullptr);
+    QCOMPARE(Error::DBus, _down->error()->type());
+}
+
+void
+TestDownload::testSetLocalDirectoryNotPresent() {
+    _down->setDestinationDir("/etc/test");
+    QVERIFY(_down->isError());
+    QVERIFY(_down->error() != nullptr);
+    QCOMPARE(Error::DBus, _down->error()->type());
+}
+
+void
+TestDownload::testSetLocalDirectoryNotDir() {
+    auto path = testDirectory() + QDir::separator() + "test";
+    QFile file(path);
+    file.open(QIODevice::ReadWrite | QFile::Append);
+    file.write(QByteArray(100, 'w'));
+    file.close();
+    _down->setDestinationDir(path);
+    QVERIFY(_down->isError());
+    QVERIFY(_down->error() != nullptr);
+    QCOMPARE(Error::DBus, _down->error()->type());
+}
+
+void
+TestDownload::testSetLocalDirectoryStarted() {
+    auto path = testDirectory();
+    _down->start();
+    _down->setDestinationDir(path);
+    QVERIFY(_down->isError());
+    QVERIFY(_down->error() != nullptr);
+    QCOMPARE(Error::DBus, _down->error()->type());
+}
+
 QTEST_MAIN(TestDownload)

=== modified file 'tests/test_client_download.h'
--- tests/test_client_download.h	2014-04-15 15:31:41 +0000
+++ tests/test_client_download.h	2014-04-15 15:31:42 +0000
@@ -55,6 +55,13 @@
     void testProcessErrorRaised_data();
     void testProcessErrorRaised();
 
+    // set local dir tests
+    void testSetLocalDirectory();
+    void testSetLocalDirectoryNotAbsolute();
+    void testSetLocalDirectoryNotPresent();
+    void testSetLocalDirectoryNotDir();
+    void testSetLocalDirectoryStarted();
+
  private:
     QString _url;
     QVariantMap _metadata;

=== modified file 'tests/test_download.cpp'
--- tests/test_download.cpp	2014-04-15 15:31:41 +0000
+++ tests/test_download.cpp	2014-04-15 15:31:42 +0000
@@ -16,6 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QDir>
 #include <QNetworkRequest>
 #include <QSslError>
 #include <ubuntu/download_manager/metatypes.h>
@@ -46,7 +47,7 @@
     _isConfined = false;
     _rootPath = testDirectory();
     _path = "random path to dbus";
-    _url = QUrl("http://ubuntu.com");
+    _url = QUrl("http://ubuntu.com/data.txt");
     _algo = "Sha256";
     _networkInfo = new MockSystemNetworkInfo();
     SystemNetworkInfo::setInstance(_networkInfo);
@@ -3691,4 +3692,89 @@
     FileNameMutex::deleteInstance();
 }
 
+void
+TestDownload::testSetLocalDirectory() {
+    auto path = testDirectory() + QDir::separator() + "test";
+    QDir().mkpath(path);
+
+    EXPECT_CALL(*_networkInfo, isOnline())
+        .WillRepeatedly(Return(true));
+
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path,
+        _isConfined, _rootPath, _url, _metadata, _headers));
+    auto original = download->filePath();
+    download->setDestinationDir(path);
+    QVERIFY(original != download->filePath());
+    QVERIFY(download->filePath().startsWith(path));
+    verifyMocks();
+}
+
+void
+TestDownload::testSetLocalDirectoryNotAbsolute() {
+    auto path = QString("./path");
+    EXPECT_CALL(*_networkInfo, isOnline())
+        .WillRepeatedly(Return(true));
+
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path,
+        _isConfined, _rootPath, _url, _metadata, _headers));
+    
+    auto original = download->filePath();
+    download->setDestinationDir(path);
+    QCOMPARE(original, download->filePath());
+    verifyMocks();
+}
+
+void
+TestDownload::testSetLocalDirectoryNotPresent() {
+    auto path = QString("/not/present/path");
+    EXPECT_CALL(*_networkInfo, isOnline())
+        .WillRepeatedly(Return(true));
+
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path,
+        _isConfined, _rootPath, _url, _metadata, _headers));
+    
+    auto original = download->filePath();
+    download->setDestinationDir(path);
+    QCOMPARE(original, download->filePath());
+    verifyMocks();
+}
+
+void
+TestDownload::testSetLocalDirectoryNotDir() {
+    auto path = testDirectory() + QDir::separator() + "test";
+    QFile file(path);
+    file.open(QIODevice::ReadWrite | QFile::Append);
+    file.write(QByteArray(100, 'w'));
+    file.close();
+
+    EXPECT_CALL(*_networkInfo, isOnline())
+        .WillRepeatedly(Return(true));
+
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path,
+        _isConfined, _rootPath, _url, _metadata, _headers));
+    
+    auto original = download->filePath();
+    download->setDestinationDir(path);
+    QCOMPARE(original, download->filePath());
+    verifyMocks();
+}
+
+void
+TestDownload::testSetLocalDirectoryStarted() {
+    auto path = testDirectory() + QDir::separator() + "test";
+    QDir().mkpath(path);
+
+    EXPECT_CALL(*_networkInfo, isOnline())
+        .WillRepeatedly(Return(true));
+
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path,
+        _isConfined, _rootPath, _url, _metadata, _headers));
+    
+    auto original = download->filePath();
+    download->start();  // change state
+    download->setDestinationDir(path);
+    QCOMPARE(original, download->filePath());
+    verifyMocks();
+}
+
 QTEST_MAIN(TestDownload)

=== modified file 'tests/test_download.h'
--- tests/test_download.h	2014-04-15 15:31:41 +0000
+++ tests/test_download.h	2014-04-15 15:31:42 +0000
@@ -171,6 +171,13 @@
     void testErrorUnlocksPath();
     void testLockCustomLocalPath();
 
+    // tests related to setting the dir
+    void testSetLocalDirectory();
+    void testSetLocalDirectoryNotAbsolute();
+    void testSetLocalDirectoryNotPresent();
+    void testSetLocalDirectoryNotDir();
+    void testSetLocalDirectoryStarted();
+
  private:
     QString _id;
     bool _isConfined;