Merge lp:~michael-sheldon/ubuntu-download-manager/qml-api-improvements into lp:ubuntu-download-manager

[Michael Sheldon]

Expose post-processing command to unconfined clients via QML, expose hashing support via QML and allow clients to set custom metadata.

Expose post-processing command to unconfined clients via QML, expose hashing support via QML and allow clients to set custom metadata.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:362
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/803/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-amd64-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-armhf-ci/33/console

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

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/ubuntu-download-manager/qml-api-improvements]

363. By Michael Sheldon on 2016-04-14

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:363
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/804/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-armhf-ci/34/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~michael-sheldon/ubuntu-download-manager/qml-api-improvements]

364. By Michael Sheldon on 2016-04-15

Add tests for new QML API and custom metadata

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:364
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/805/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-armhf-ci/35/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Jonas G. Drange (jonas-drange)]

I've encountered a couple of issues in using this new qml feature that might be caused by ignorance on my part, please bear with me.

First, when I create a SingleDownload and add a Metadata object to it, no matter what values I set on the Metadata object, it is ignored. E.g., I do:

    Component { id: sdl; SingleDownload {} }
    Component { id: mdt; Metadata {} }

    var singleDownloadObj = sdl.createObject(UpdateManager, {
        "autoStart": false,
        "hash": hash,
        "algorithm": algorithm,
        "headers": headers // A QVariantMap of headers
    });

    var metadataObj = mdt.createObject(UpdateManager, metadata); // QVariantMap of metadata
    singleDownloadObj.metadata = metadataObj;
    singleDownloadObj.download(url);

What I get in the downloads.sql database is:

    sqlite> select * from SingleDownload;
    a634b6f8888d48309f51f2d9d3b960d4|unconfined|http://localhost:9009/download|/com/canonical/applications/download/a634b6f8888d48309f51f2d9d3b960d4|/home/jonas/.local/share/ubuntu-download-manager/Downloads/download (11)|1232223sdfdsffs|sha512|idle|0|0|{
        "app-id": "/usr/bin/system-settings"
    }
    |{
    }

This seems to happen because in qml/single_download.cpp:232 we have:
    SingleDownload::download(QString url)
    …
    Metadata metadata;
    QMap<QString, QString> headers;
    DownloadStruct dstruct(url, m_hash, m_algorithm, metadata.map(), headers);
    m_manager->createDownload(dstruct);

I.e. m_metadata and m_headers are ignored. Am I not supposed to call SingleDownload.download?

Secondly, even though the sqlite output from above have “app-id” set to “/usr/bin/system-settings”, the sqlite “appId” field is set to “unconfined”. For the QML plugin to returned unconfined downloads (not using u-a-l), I have to specifically set APP_ID=unconfined. Is this expected?

review: Needs Information

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:364
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-download-manager-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/627/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/627
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/596
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/596
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/589/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/589/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/589/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/589/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/589/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/589/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-download-manager-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/ubuntu-download-manager/qml-api-improvements]

365. By Michael Sheldon on 2016-07-12

Invalidate internal download object when an error occurs as the remote end will have removed the download, and always keep a copy of metadata available for reading after an error or when a download has finished

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:365
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-download-manager-ci/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/945/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/945
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/850
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/850
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/850
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/847/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/847/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/847/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/847/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/847/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/847/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/847/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/847/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/847/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-download-manager-ci/5/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/common/public/ubuntu/transfers/metadata.cpp'
--- src/common/public/ubuntu/transfers/metadata.cpp	2015-12-10 20:39:48 +0000
+++ src/common/public/ubuntu/transfers/metadata.cpp	2016-07-12 13:11:29 +0000
@@ -18,7 +18,6 @@
 
 #include <QProcessEnvironment>
 #include <QCoreApplication>
-#include <QDebug>
 
 #include "metadata.h"
 
@@ -35,6 +34,7 @@
 const QString Metadata::CLICK_PACKAGE_KEY = "click-package";
 const QString Metadata::DEFLATE_KEY = "deflate";
 const QString Metadata::EXTRACT_KEY = "extract";
+const QString Metadata::CUSTOM_PREFIX = "custom_";
 const QString Metadata::APP_ID = "app-id";
 
 namespace {
@@ -63,14 +63,14 @@
     }
 }
 
-QString
+QStringList
 Metadata::command() const {
     return (contains(Metadata::COMMAND_KEY))?
-        value(Metadata::COMMAND_KEY).toString():"";
+        value(Metadata::COMMAND_KEY).toStringList():QStringList();
 }
 
 void
-Metadata::setCommand(const QString& command) {
+Metadata::setCommand(const QStringList& command) {
     insert(Metadata::COMMAND_KEY, command);
 }
 
@@ -207,6 +207,37 @@
     return contains(Metadata::APP_ID);
 }
 
+QVariantMap
+Metadata::custom() const {
+    QVariantMap custom;
+    foreach(QString key, keys()) {
+        if (key.startsWith(CUSTOM_PREFIX)) {
+            QString customKey = key;
+            customKey.replace(CUSTOM_PREFIX, "");
+            custom.insert(customKey, values(key)[0]);
+        }
+    }
+    return custom;
+}
+
+void
+Metadata::setCustom(QVariantMap custom) {
+    // We can't send nested QVariantMaps over dbus, so flatten to one map
+    foreach(QString key, custom.keys()) {
+        insert(Metadata::CUSTOM_PREFIX + key, custom[key]);
+    }
+}
+
+bool
+Metadata::hasCustom() const {
+    foreach(QString key, keys()) {
+        if (key.startsWith(CUSTOM_PREFIX)) {
+            return true;
+        }
+    }
+    return false;
+}
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'src/common/public/ubuntu/transfers/metadata.h'
--- src/common/public/ubuntu/transfers/metadata.h	2015-12-10 20:47:34 +0000
+++ src/common/public/ubuntu/transfers/metadata.h	2016-07-12 13:11:29 +0000
@@ -41,11 +41,12 @@
     static const QString CLICK_PACKAGE_KEY;
     static const QString DEFLATE_KEY;
     static const QString EXTRACT_KEY;
+    static const QString CUSTOM_PREFIX;
     static const QString APP_ID;
 
     // accessors to simplify the use of the metadata
-    QString command() const;
-    void setCommand(const QString& command);
+    QStringList command() const;
+    void setCommand(const QStringList& command);
     bool hasCommand() const;
 
     QString localPath() const;
@@ -79,6 +80,10 @@
     QString destinationApp() const;
     void setOwner(const QString &id);
     bool hasOwner() const;
+
+    QVariantMap custom() const;
+    void setCustom(const QVariantMap custom);
+    bool hasCustom() const;
 };
 
 }  // DownloadManager

=== modified file 'src/downloads/qml/metadata.cpp'
--- src/downloads/qml/metadata.cpp	2016-03-16 16:03:39 +0000
+++ src/downloads/qml/metadata.cpp	2016-07-12 13:11:29 +0000
@@ -153,6 +153,31 @@
     }
 }
 
+QStringList
+Metadata::command() const {
+    return _metadata.command();
+}
+
+void
+Metadata::setCommand(QStringList command) {
+    if (command != _metadata.command()) {
+        _metadata.setCommand(command);
+        emit commandChanged();
+    }
+}
+
+QVariantMap
+Metadata::custom() const {
+    return _metadata.custom();
+}
+
+void Metadata::setCustom(QVariantMap custom) {
+    if (custom != _metadata.custom()) {
+        _metadata.setCustom(custom);
+        emit customChanged();
+    }
+}
+
 QVariantMap
 Metadata::map() const {
     return QVariantMap(_metadata);
@@ -182,6 +207,20 @@
     to False.
 */
 
+/*!
+    \qmlproperty list Metadata::command
+    \internal
+
+    A command to run on the file immediately following completion of the
+    download.
+*/
+
+/*!
+    \qmlproperty array Metadata::custom
+
+    Metadata specific to your application that you wish to associate with
+    this download. This metadata will persist across application restarts.
+*/
 }
 
 }

=== modified file 'src/downloads/qml/metadata.h'
--- src/downloads/qml/metadata.h	2014-10-09 09:52:34 +0000
+++ src/downloads/qml/metadata.h	2016-07-12 13:11:29 +0000
@@ -30,6 +30,8 @@
     Q_PROPERTY(bool showInIndicator READ showInIndicator WRITE setShowInIndicator NOTIFY showIndicatorChanged)
     Q_PROPERTY(bool deflate READ deflate WRITE setDeflate NOTIFY deflateChanged)
     Q_PROPERTY(bool extract READ extract WRITE setExtract NOTIFY extractChanged)
+    Q_PROPERTY(QStringList command READ command WRITE setCommand NOTIFY commandChanged)
+    Q_PROPERTY(QVariantMap custom READ custom WRITE setCustom NOTIFY customChanged)
 
  public:
     explicit Metadata(QObject* parent=0);
@@ -47,6 +49,12 @@
     bool extract() const;
     void setExtract(bool extract);
 
+    QStringList command() const;
+    void setCommand(QStringList command);
+
+    QVariantMap custom() const;
+    void setCustom(QVariantMap custom);
+
     QVariantMap map() const;
 
  signals:
@@ -54,6 +62,8 @@
     void showIndicatorChanged();
     void deflateChanged();
     void extractChanged();
+    void commandChanged();
+    void customChanged();
 
  private:
     Transfers::Metadata _metadata;

=== modified file 'src/downloads/qml/single_download.cpp'
--- src/downloads/qml/single_download.cpp	2016-03-17 16:32:25 +0000
+++ src/downloads/qml/single_download.cpp	2016-07-12 13:11:29 +0000
@@ -231,7 +231,7 @@
         }
         Metadata metadata;
         QMap<QString, QString> headers;
-        DownloadStruct dstruct(url, metadata.map(), headers);
+        DownloadStruct dstruct(url, m_hash, m_algorithm, metadata.map(), headers);
         m_manager->createDownload(dstruct);
     } else if (url.isEmpty()) {
         m_error.setMessage("No URL specified");
@@ -306,6 +306,7 @@
 SingleDownload::registerError(Error* error)
 {
     m_error.setMessage(error->errorString());
+    m_download = nullptr;
     emit errorFound(m_error);
     emit errorChanged();
 }
@@ -459,6 +460,16 @@
     }
 }
 
+QString
+SingleDownload::hash() const {
+    return m_hash;
+}
+
+QString
+SingleDownload::algorithm() const {
+    return m_algorithm;
+}
+
 void
 SingleDownload::setHeaders(QVariantMap headers) {
     if (m_download == nullptr) {
@@ -504,9 +515,9 @@
         return;
     }
 
+    m_metadata = metadata;
     if (m_download == nullptr) {
         m_dirty = true;
-        m_metadata = metadata;
     } else {
         m_download->setMetadata(metadata->map());
         if (m_download->isError()) {
@@ -522,6 +533,16 @@
     }
 }
 
+void
+SingleDownload::setHash(QString hash) {
+    m_hash = hash;
+}
+
+void
+SingleDownload::setAlgorithm(QString algorithm) {
+    m_algorithm = algorithm;
+}
+
 /*!
     \qmlproperty bool SingleDownload::autoStart
 
@@ -598,6 +619,32 @@
 */
 
 /*!
+    \qmlproperty string SingleDownload::hash
+    \since Ubuntu.DownloadManager 1.3
+
+    This property specifies a hash to check against the downloaded file.
+    If used, this should be set prior to calling the download() method.
+*/
+
+/*!
+    \qmlproperty string SingleDownload::algorithm
+    \since Ubuntu.DownloadManager 1.3
+
+    This property indicates the algorithm to use when verifying a hash.
+    The algorithm can be of one of the following string values:
+
+         - "md5"
+         - "sha1"
+         - "sha224"
+         - "sha256"
+         - "sha384"
+         - "sha512"
+
+    If no value is specified md5 will be used.
+    If used, this should be set prior to calling the download() method.
+*/
+
+/*!
     \qmlsignal SingleDownload::finished(QString path)
 
     This signal is emitted when a download has finished. The downloaded file 
@@ -605,6 +652,5 @@
     \c onFinished
 */
 
-
 }
 }

=== modified file 'src/downloads/qml/single_download.h'
--- src/downloads/qml/single_download.h	2015-10-23 16:09:48 +0000
+++ src/downloads/qml/single_download.h	2016-07-12 13:11:29 +0000
@@ -44,6 +44,8 @@
     Q_PROPERTY(QString downloadId READ downloadId NOTIFY downloadIdChanged)
     Q_PROPERTY(QVariantMap headers READ headers WRITE setHeaders NOTIFY headersChanged)
     Q_PROPERTY(Ubuntu::DownloadManager::Metadata* metadata READ metadata WRITE setMetadata NOTIFY metadataChanged)
+    Q_PROPERTY(QString hash READ hash WRITE setHash NOTIFY hashChanged)
+    Q_PROPERTY(QString algorithm READ algorithm WRITE setAlgorithm NOTIFY algorithmChanged)
 
  public:
     explicit SingleDownload(QObject *parent = 0);
@@ -92,12 +94,16 @@
     QString downloadId() const;
     QVariantMap headers() const;
     Metadata* metadata() const;
+    QString hash() const;
+    QString algorithm() const;
 
     // setters
     void setAllowMobileDownload(bool value);
     void setThrottle(qulonglong value);
     void setHeaders(QVariantMap headers);
     void setMetadata(Metadata* metadata);
+    void setHash(QString hash);
+    void setAlgorithm(QString algorithm);
 
     // only property that does not access the download obj
     void setAutoStart(bool value) {
@@ -127,6 +133,8 @@
     void started(bool success);
     void errorFound(DownloadError& error);
     void errorChanged();
+    void hashChanged();
+    void algorithmChanged();
 
 public slots:
     void registerError(Error* error);
@@ -172,6 +180,8 @@
     Download* m_download = nullptr;
     Manager* m_manager = nullptr;
     QString m_downloadId;
+    QString m_hash;
+    QString m_algorithm;
 
 };
 

=== modified file 'tests/downloads/daemon/test_metadata.cpp'
--- tests/downloads/daemon/test_metadata.cpp	2015-09-21 08:24:55 +0000
+++ tests/downloads/daemon/test_metadata.cpp	2016-07-12 13:11:29 +0000
@@ -19,23 +19,24 @@
 #include <stdlib.h>
 
 #include <QProcessEnvironment>
+#include <QStringList>
 
 #include "test_metadata.h"
 
 using namespace Ubuntu::Transfers;
 
 void
-TestMetadata::testCommnad_data() {
-    QTest::addColumn<QString>("command");
+TestMetadata::testCommand_data() {
+    QTest::addColumn<QStringList>("command");
 
-    QTest::newRow("mkdir") << "mkdir test";
-    QTest::newRow("cd") << "cd test";
-    QTest::newRow("ls") << "ls -la";
+    QTest::newRow("mkdir") << (QStringList() << "mkdir" << "test");
+    QTest::newRow("cd") << (QStringList() << "cd" << "test");
+    QTest::newRow("ls") << (QStringList() << "ls" << "-la");
 }
 
 void
-TestMetadata::testCommnad() {
-    QFETCH(QString, command);
+TestMetadata::testCommand() {
+    QFETCH(QStringList, command);
 
     Metadata metadata;
     metadata[Metadata::COMMAND_KEY] = command;
@@ -43,33 +44,33 @@
 }
 
 void
-TestMetadata::testSetCommnad_data() {
-    QTest::addColumn<QString>("command");
+TestMetadata::testSetCommand_data() {
+    QTest::addColumn<QStringList>("command");
 
-    QTest::newRow("mkdir") << "mkdir test";
-    QTest::newRow("cd") << "cd test";
-    QTest::newRow("ls") << "ls -la";
+    QTest::newRow("mkdir") << (QStringList() << "mkdir" << "test");
+    QTest::newRow("cd") << (QStringList() << "cd" << "test");
+    QTest::newRow("ls") << (QStringList() << "ls" << "-la");
 }
 
 void
-TestMetadata::testSetCommnad() {
-    QFETCH(QString, command);
+TestMetadata::testSetCommand() {
+    QFETCH(QStringList, command);
 
     Metadata metadata;
     metadata.setCommand(command);
-    QCOMPARE(metadata[Metadata::COMMAND_KEY].toString(), command);
+    QCOMPARE(metadata[Metadata::COMMAND_KEY].toStringList(), command);
 }
 
 void
-TestMetadata::testHasCommnadTrue() {
+TestMetadata::testHasCommandTrue() {
     Metadata metadata;
-    metadata.setCommand("command");
+    metadata.setCommand(QStringList("command"));
 
     QVERIFY(metadata.hasCommand());
 }
 
 void
-TestMetadata::testHasCommnadFalse() {
+TestMetadata::testHasCommandFalse() {
     Metadata metadata;
     QVERIFY(!metadata.hasCommand());
 }
@@ -438,5 +439,45 @@
     QCOMPARE(metadata.destinationApp(), appid);
 }
 
+void
+TestMetadata::testCustom_data() {
+    QTest::addColumn<QVariantMap>("custom");
+
+    QVariantMap first;
+    QVariantMap second;
+    first.insert("test1", "Test");
+    second.insert("test2", "Testing");
+    second.insert("test3", "Further testing");
+
+    QTest::newRow("first") << first;
+    QTest::newRow("second") << second;
+}
+
+void
+TestMetadata::testCustom() {
+    QFETCH(QVariantMap, custom);
+
+    Metadata metadata;
+    metadata.setCustom(custom);
+    QCOMPARE(custom, metadata.custom());
+}
+
+void
+TestMetadata::testHasCustomTrue() {
+    Metadata metadata;
+    QVariantMap custom;
+    custom.insert("test1", "Test");
+    custom.insert("test2", "Test");
+    metadata.setCustom(custom);
+
+    QVERIFY(metadata.hasCustom());
+}
+
+void
+TestMetadata::testHasCustomFalse() {
+    Metadata metadata;
+    QVERIFY(!metadata.hasCustom());
+}
+
 QTEST_MAIN(TestMetadata)
 #include "moc_test_metadata.cpp"

=== modified file 'tests/downloads/daemon/test_metadata.h'
--- tests/downloads/daemon/test_metadata.h	2015-12-10 20:47:34 +0000
+++ tests/downloads/daemon/test_metadata.h	2016-07-12 13:11:29 +0000
@@ -31,12 +31,12 @@
         : BaseTestCase("TestMetadata", parent) { }
 
  private slots:  // NOLINT(whitespace/indent)
-    void testCommnad_data();
-    void testCommnad();
-    void testSetCommnad_data();
-    void testSetCommnad();
-    void testHasCommnadTrue();
-    void testHasCommnadFalse();
+    void testCommand_data();
+    void testCommand();
+    void testSetCommand_data();
+    void testSetCommand();
+    void testHasCommandTrue();
+    void testHasCommandFalse();
     void testLocalPath_data();
     void testLocalPath();
     void testSetLocalPath_data();
@@ -80,6 +80,10 @@
     void testDestinationAppIsPickedFromEnv_data();
     void testDestinationAppIsPickedFromEnv();
     void testDestinationAppIsAlreadyPresent();
+    void testCustom_data();
+    void testCustom();
+    void testHasCustomTrue();
+    void testHasCustomFalse();
 };
 
 #endif

=== modified file 'tests/downloads/qml/test_metadata.cpp'
--- tests/downloads/qml/test_metadata.cpp	2014-09-18 13:22:31 +0000
+++ tests/downloads/qml/test_metadata.cpp	2016-07-12 13:11:29 +0000
@@ -70,5 +70,56 @@
     QCOMPARE(metadata->showInIndicator(), show);
 }
 
+void
+TestMetadata::testGetCommandEmpty() {
+    QScopedPointer<Metadata> metadata(new Metadata());
+    QVERIFY(metadata->command());
+}
+
+void
+TestMetadata::testGetCommandPresent_data() {
+    QTest::addColumn<QStringList>("command");
+
+    QTest::newRow("First") << QStringList("/bin/ls", "/tmp/");
+    QTest::newRow("Second") << QStringList("/bin/true");
+}
+
+void
+TestMetadata::testGetCommandPresent() {
+    QFETCH(QStringList, command);
+    QScopedPointer<Metadata> metadata(new Metadata());
+    metadata->setCommand(command);
+    QCOMPARE(metadata->command(), command);
+}
+
+void
+TestMetadata::testGetCustomEmpty() {
+    QScopedPointer<Metadata> metadata(new Metadata());
+    QVERIFY(metadata->custom());
+}
+
+void
+TestMetadata::testGetCustomPresent_data() {
+    QTest::addColumn<QVariantMap>("custom");
+
+    QVariantMap first;
+    QVariantMap second;
+
+    first.insert("test1", "Testing");
+    first.insert("test2", "Testing2");
+    second.insert("test", "Test");
+
+    QTest::newRow("First") << first;
+    QTest::newRow("Second") << second;
+}
+
+void
+TestMetadata::testGetCustomPresent() {
+    QFETCH(QVariantMap, custom);
+    QScopedPointer<Metadata> metadata(new Metadata());
+    metadata->setCustom(custom);
+    QCOMPARE(metadata->custom(), custom);
+}
+
 QTEST_MAIN(TestMetadata)
 #include "moc_test_metadata.cpp"

=== modified file 'tests/downloads/qml/test_metadata.h'
--- tests/downloads/qml/test_metadata.h	2014-09-18 13:22:31 +0000
+++ tests/downloads/qml/test_metadata.h	2016-07-12 13:11:29 +0000
@@ -35,6 +35,12 @@
     void testGetShowInIndicatorEmpty();
     void testGetShowInIndicatorPresent_data();
     void testGetShowInIndicatorPresent();
+    void testGetCommandEmpty();
+    void testGetCommandPresent_data();
+    void testGetCommandPresent();
+    void testGetCustomEmpty();
+    void testGetCustomPresent_data();
+    void testGetCustomPresent();
 };
 
 #endif

=== modified file 'tests/downloads/qml/test_single_download.cpp'
--- tests/downloads/qml/test_single_download.cpp	2014-09-18 13:22:31 +0000
+++ tests/downloads/qml/test_single_download.cpp	2016-07-12 13:11:29 +0000
@@ -429,5 +429,127 @@
     verifyMocks();
 }
 
+void
+TestSingleDownload::testSetHashNullptr() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(nullptr, _man));
+
+    singleDownload->setHash("c4e5f7fcbcef75924b2abde2b2e75f3f");
+    // ensure that the mocks are not called and we do not crash
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetHashError() {
+    QScopedPointer<MockError> err(new MockError(Error::DBus));
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    EXPECT_CALL(*_down, setHash("c4e5f7fcbcef75924b2abde2b2e75f3f"))
+        .Times(1);
+
+    EXPECT_CALL(*_down, isError())
+        .Times(1)
+        .WillOnce(Return(true));
+
+    EXPECT_CALL(*_down, error())
+        .Times(1)
+        .WillOnce(Return(err.data()));
+
+    EXPECT_CALL(*err.data(), errorString())
+        .Times(1)
+        .WillOnce(Return(QString("My error")));
+
+    // ensure that the diff signals are emitted
+    SignalBarrier spy(singleDownload.data(), SIGNAL(errorChanged()));
+
+    singleDownload->setHash("c4e5f7fcbcef75924b2abde2b2e75f3f");
+
+    QVERIFY(spy.ensureSignalEmitted());
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetHashSuccess() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    EXPECT_CALL(*_down, setHash("c4e5f7fcbcef75924b2abde2b2e75f3f"))
+        .Times(1);
+
+    EXPECT_CALL(*_down, isError())
+        .Times(1)
+        .WillOnce(Return(false));
+
+    // ensure that the diff signals are emitted
+    SignalBarrier spy(singleDownload.data(), SIGNAL(hashChanged()));
+
+    singleDownload->setHash("c4e5f7fcbcef75924b2abde2b2e75f3f");
+
+    QVERIFY(spy.ensureSignalEmitted());
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetAlgorithmNullptr() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(nullptr, _man));
+
+    singleDownload->setAlgorithm("sha1");
+    // ensure that the mocks are not called and we do not crash
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetAlgorithmError() {
+    QScopedPointer<MockError> err(new MockError(Error::DBus));
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    EXPECT_CALL(*_down, setAlgorithm("sha1"))
+        .Times(1);
+
+    EXPECT_CALL(*_down, isError())
+        .Times(1)
+        .WillOnce(Return(true));
+
+    EXPECT_CALL(*_down, error())
+        .Times(1)
+        .WillOnce(Return(err.data()));
+
+    EXPECT_CALL(*err.data(), errorString())
+        .Times(1)
+        .WillOnce(Return(QString("My error")));
+
+    // ensure that the diff signals are emitted
+    SignalBarrier spy(singleDownload.data(), SIGNAL(errorChanged()));
+
+    singleDownload->setAlgorithm("sha1");
+
+    QVERIFY(spy.ensureSignalEmitted());
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetAlgorithmSuccess() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    EXPECT_CALL(*_down, setAlgorithm("sha1"))
+        .Times(1);
+
+    EXPECT_CALL(*_down, isError())
+        .Times(1)
+        .WillOnce(Return(false));
+
+    // ensure that the diff signals are emitted
+    SignalBarrier spy(singleDownload.data(), SIGNAL(algorithmChanged()));
+
+    singleDownload->setAlgorithm("sha1");
+
+    QVERIFY(spy.ensureSignalEmitted());
+    verifyMocks();
+}
+
 QTEST_MAIN(TestSingleDownload)
 #include "moc_test_single_download.cpp"

=== modified file 'tests/downloads/qml/test_single_download.h'
--- tests/downloads/qml/test_single_download.h	2014-09-18 13:22:31 +0000
+++ tests/downloads/qml/test_single_download.h	2016-07-12 13:11:29 +0000
@@ -78,6 +78,12 @@
     void testSetMetadataToNullptr();
     void testSetMetadataError();
     void testSetMetadataSuccess();
+    void testSetHashNullptr();
+    void testSetHashError();
+    void testSetHashSuccess();
+    void testSetAlgorithmNullptr();
+    void testSetAlgorithmError();
+    void testSetAlgorithmSuccess();
 
  private:
     void verifyMocks();