Merge lp:~mandel/ubuntu-download-manager/expose-logger into lp:ubuntu-download-manager

[Manuel de la Peña]

Expose the logger object so that qml developer can provide the logging level and path used by the plugin.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:327
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/681/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/40/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/expose-logger]

328. By Manuel de la Peña on 2014-06-30

Added missing logger files.

329. By Manuel de la Peña on 2014-06-30

Merged expose-property into expose-logger.

330. By Manuel de la Peña on 2014-06-30

Merged expose-property into expose-logger.

331. By Manuel de la Peña on 2014-07-01

Update docs.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/686/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/45/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/expose-logger]

332. By Manuel de la Peña on 2014-07-01

Improve docs.

333. By Manuel de la Peña on 2014-07-01

Style.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:333
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/688/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/47/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/expose-logger]

334. By Manuel de la Peña on 2014-07-02

Merged expose-property into expose-logger.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:334
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/690/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/49/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/expose-logger]

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

Merged expose-property into expose-logger.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:335
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/693/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/52/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/expose-logger]

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

Merged expose-property into expose-logger.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:336
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/695/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/54/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/expose-logger]

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

Merged with previous branch.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:337
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/698/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/57/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Unmerged revisions

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

Merged with previous branch.

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

Merged expose-property into expose-logger.

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

Merged expose-property into expose-logger.

334. By Manuel de la Peña on 2014-07-02

Merged expose-property into expose-logger.

333. By Manuel de la Peña on 2014-07-01

Style.

332. By Manuel de la Peña on 2014-07-01

Improve docs.

331. By Manuel de la Peña on 2014-07-01

Update docs.

330. By Manuel de la Peña on 2014-06-30

Merged expose-property into expose-logger.

329. By Manuel de la Peña on 2014-06-30

Merged expose-property into expose-logger.

328. By Manuel de la Peña on 2014-06-30

Added missing logger files.

=== modified file 'docs/qml/pages/mainpage.qdoc'
--- docs/qml/pages/mainpage.qdoc	2014-06-20 10:10:50 +0000
+++ docs/qml/pages/mainpage.qdoc	2014-07-04 15:21:46 +0000
@@ -41,6 +41,7 @@
 \list
     \li \l {DownloadManager}
     \li \l {SingleDownload}
+    \li \l {Logger}
 \endlist
 
 \section1 Example usage - Downloading a file

=== modified file 'src/downloads/qml/CMakeLists.txt'
--- src/downloads/qml/CMakeLists.txt	2014-07-04 15:21:46 +0000
+++ src/downloads/qml/CMakeLists.txt	2014-07-04 15:21:46 +0000
@@ -4,6 +4,7 @@
 set(plugin_SRCS
     backend.cpp
     download_error.cpp
+    logger.cpp
     single_download.cpp
     ubuntu_download_manager.cpp
 )
@@ -11,6 +12,7 @@
 set(plugin_HDRS
     backend.h
     download_error.h
+    logger.h
     single_download.h
     ubuntu_download_manager.h
 )

=== added file 'src/downloads/qml/logger.cpp'
--- src/downloads/qml/logger.cpp	1970-01-01 00:00:00 +0000
+++ src/downloads/qml/logger.cpp	2014-07-04 15:21:46 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright 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
+ * 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 <ubuntu/download_manager/logging/logger.h>
+
+#include "logger.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+/*!
+    \qmltype Logger
+    \instantiates Logger
+    \inqmlmodule Ubuntu.DownloadManager 0.1
+    \ingroup download
+    \brief Allows to set the logging level used by the plugin.
+
+    The logger object allows to set the logging level that will be used
+    by the plugin to allow better debugging. All logging performed by the 
+    library is thread safe and can be used to determine the different operations
+    that are taken per download using the download id to indentify them.
+*/
+
+Logger::Logger(QObject* parent)
+    : QObject(parent) {
+}
+
+/*!
+    \qmlmethod void Logger::init(Logger::Level lvl, QString path)
+
+    Initializes the logging service of the plugin with the given level and will
+    write the logs in the passed full path. If the path does not exist it will
+    be created.
+*/
+void
+Logger::init(Logger::Level lvl, QString path) {
+    // cast the level to the logging level and init
+    auto lgLvl = static_cast<Ubuntu::DownloadManager::Logging::Logger::Level>(lvl);
+    Ubuntu::DownloadManager::Logging::Logger::init(lgLvl, path);
+}
+
+/*!
+    \enum Logger::Level
+
+    The level to be used when writing the logs.
+*/
+
+}  // DownloadManager
+
+}  // Ubuntu 
+

=== added file 'src/downloads/qml/logger.h'
--- src/downloads/qml/logger.h	1970-01-01 00:00:00 +0000
+++ src/downloads/qml/logger.h	2014-07-04 15:21:46 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 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
+ * 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 DOWNLOAD_QML_LOGGER_H
+#define DOWNLOAD_QML_LOGGER_H
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+class Logger : public QObject {
+    Q_OBJECT
+    Q_ENUMS(Level)
+
+ public:
+
+    enum Level {
+        Debug,
+        Normal,
+        Notification,
+        Warning,
+        Error,
+        Critical
+    };
+
+    explicit Logger(QObject* parent=0);
+
+    Q_INVOKABLE void init(Level lvl, QString path);
+
+ private:
+    QString m_path;  // path used to log
+};
+
+}  // DownloadManager
+
+}  // Ubuntu 
+
+#endif // DOWNLOAD_QML_LOGGER_H 

=== modified file 'src/downloads/qml/single_download.cpp'
--- src/downloads/qml/single_download.cpp	2014-07-04 15:21:46 +0000
+++ src/downloads/qml/single_download.cpp	2014-07-04 15:21:46 +0000
@@ -1,7 +1,26 @@
-#include "single_download.h"
+/*
+ * Copyright 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
+ * 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 <glog/logging.h>
 #include <ubuntu/download_manager/download_struct.h>
 
+#include "single_download.h"
+
 namespace Ubuntu {
 
 namespace DownloadManager {
@@ -69,17 +88,31 @@
     \sa {DownloadManager}
 */
 
-SingleDownload::SingleDownload(QObject *parent) :
-    QObject(parent),
-    m_autoStart(true),
-    m_completed(false),
-    m_downloading(false),
-    m_downloadInProgress(false),
-    m_progress(0),
-    m_error(this),
-    m_download(nullptr),
-    m_manager(nullptr)
-{
+SingleDownload::SingleDownload(QObject *parent)
+    : QObject(parent),
+      m_autoStart(true),
+      m_completed(false),
+      m_downloading(false),
+      m_downloadInProgress(false),
+      m_progress(0),
+      m_error(this),
+      m_download(nullptr),
+      m_manager(nullptr) {
+}
+
+// constructor that is simple provided for testing purposes
+SingleDownload::SingleDownload(Download* down, Manager* man, QObject *parent)
+    : QObject(parent),
+      m_autoStart(false),
+      m_completed(false),
+      m_downloading(false),
+      m_downloadInProgress(false),
+      m_progress(0),
+      m_error(this),
+      m_download(down),
+      m_manager(man) {
+    if (m_download != nullptr)
+        bindDownload(m_download);
 }
 
 void
@@ -108,6 +141,9 @@
          &SingleDownload::onPaused))
             << "Could not connect to signal";
 
+    CHECK(connect(m_download, &Download::processing, this,
+        &SingleDownload::processing)) << "Could not connect to signal";
+
     CHECK(connect(m_download, &Download::resumed, this,
          &SingleDownload::onResumed))
             << "Could not connect to signal";
@@ -157,6 +193,9 @@
          &SingleDownload::onPaused))
             << "Could not connect to signal";
 
+    CHECK(disconnect(m_download, &Download::processing, this,
+        &SingleDownload::processing)) << "Could not connect to signal";
+
     CHECK(disconnect(download, &Download::resumed, this,
          &SingleDownload::onResumed))
             << "Could not connect to signal";
@@ -294,7 +333,7 @@
 SingleDownload::onStarted(bool wasStarted)
 {
     m_downloading = true;
-    emit resumed(wasStarted);
+    emit started(wasStarted);
 }
 
 void
@@ -349,7 +388,7 @@
     }
 }
 
-void 
+void
 SingleDownload::setThrottle(qulonglong value) {
     if (m_download == nullptr) {
         m_dirty = true;
@@ -416,7 +455,7 @@
                 return;
             }
         }
-    
+
         m_download->setHeaders(stringMap);
         if (m_download->isError()) {
             // set the error details and emit the signals

=== modified file 'src/downloads/qml/single_download.h'
--- src/downloads/qml/single_download.h	2014-07-04 15:21:46 +0000
+++ src/downloads/qml/single_download.h	2014-07-04 15:21:46 +0000
@@ -43,7 +43,7 @@
     Q_PROPERTY(QString downloadId READ downloadId NOTIFY downloadIdChanged)
     Q_PROPERTY(QVariantMap headers READ headers WRITE setHeaders NOTIFY headersChanged)
 
-public:
+ public:
     explicit SingleDownload(QObject *parent = 0);
 
     Q_INVOKABLE void start();
@@ -100,7 +100,10 @@
         m_autoStart = value;
     }
 
-signals:
+ protected:
+    SingleDownload(Download* down, Manager* man, QObject *parent = 0);
+
+ signals:
     void isCompletedChanged();
     void allowMobileDownloadChanged();
     void throttleChanged();

=== modified file 'tests/downloads/CMakeLists.txt'
--- tests/downloads/CMakeLists.txt	2014-07-04 15:21:46 +0000
+++ tests/downloads/CMakeLists.txt	2014-07-04 15:21:46 +0000
@@ -16,4 +16,4 @@
 
 add_subdirectory(client)
 add_subdirectory(daemon)
-#add_subdirectory(qml)
+add_subdirectory(qml)

=== modified file 'tests/downloads/daemon/CMakeLists.txt'
--- tests/downloads/daemon/CMakeLists.txt	2014-07-04 15:21:46 +0000
+++ tests/downloads/daemon/CMakeLists.txt	2014-07-04 15:21:46 +0000
@@ -124,6 +124,6 @@
         )
 
 
-        ADD_TEST(NAME daemon_${test} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${test}_daemon)
+ADD_TEST(NAME daemon_${test} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${test}_daemon)
 endforeach(test)
 

=== modified file 'tests/downloads/daemon/test_download.cpp'
--- tests/downloads/daemon/test_download.cpp	2014-04-15 12:37:16 +0000
+++ tests/downloads/daemon/test_download.cpp	2014-07-04 15:21:46 +0000
@@ -32,7 +32,6 @@
 using ::testing::Mock;
 using ::testing::AnyNumber;
 using ::testing::Return;
-using ::testing::Return;
 using ::testing::AnyOf;
 
 using namespace Ubuntu::Transfers::Tests;

=== modified file 'tests/downloads/qml/CMakeLists.txt'
--- tests/downloads/qml/CMakeLists.txt	2014-07-04 15:21:46 +0000
+++ tests/downloads/qml/CMakeLists.txt	2014-07-04 15:21:46 +0000
@@ -1,14 +1,86 @@
+# Copyright © 2014 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Manuel de la Peña <[e-mail]>
+
 set(QML_TESTS
+	test_single_download
 )
 
-foreach(test ${DAEMON_TESTS})
+foreach(test ${QML_TESTS})
         # set the sources per test
         set(${test}_QML_SOURCES
                 ${test}.cpp
         )
 
         set(${test}_QML_HEADERS
+		download.h
+		error.h
+		manager.h
+		testable_single_download.h
                 ${test}.h
         )
 
 endforeach(test)
+
+include_directories(${Qt5Core_INCLUDE_DIRS})
+include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
+include_directories(${Qt5DBus_INCLUDE_DIRS})
+include_directories(${Qt5Network_INCLUDE_DIRS})
+include_directories(${Qt5Test_INCLUDE_DIRS})
+include_directories(${Qt5Sql_INCLUDE_DIRS})
+include_directories(${DBUS_INCLUDE_DIRS})
+include_directories(${GTEST_INCLUDE_DIRS})
+include_directories(${GMOCK_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/client)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/qml)
+include_directories(${CMAKE_SOURCE_DIR}/tests/common)
+
+link_directories(${NIH_DBUS_LIBDIR})
+link_directories(${GLOG_DBUS_LIBDIR})
+
+set(QML_TESTS_LIBS
+	${NIH_DBUS_LIBRARIES}
+	${GLOG_LIBRARIES}
+        ${Qt5Core_LIBRARIES}
+        ${Qt5Sql_LIBRARIES}
+        ${Qt5DBus_LIBRARIES}
+	${Qt5Test_LIBRARIES}
+        ${GMOCK_LIBRARY}
+        ${GTEST_BOTH_LIBRARIES}
+	udm-common
+	ubuntu-download-manager-common
+        ubuntu-download-manager-test-lib
+        UbuntuDownloadManager
+)
+
+foreach(test ${QML_TESTS})
+        # set targets, linked libs and test
+        add_executable(${test}_qml
+                ${${test}_QML_SOURCES}
+                ${${test}_QML_HEADERS}
+        )
+
+        target_link_libraries(${test}_qml
+                ${QML_TESTS_LIBS}
+        )
+
+
+        ADD_TEST(NAME qml_${test} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${test}_qml)
+endforeach(test)
+

=== modified file 'tests/downloads/qml/download.h'
--- tests/downloads/qml/download.h	2014-07-04 15:21:46 +0000
+++ tests/downloads/qml/download.h	2014-07-04 15:21:46 +0000
@@ -48,6 +48,17 @@
     MOCK_METHOD0(totalSize, qulonglong());
     MOCK_CONST_METHOD0(isError, bool());
     MOCK_CONST_METHOD0(error, Error*());
+
+    // expose the signals so that they can  emitted by external objects
+
+    using Download::canceled;
+    using Download::error;
+    using Download::finished;
+    using Download::paused;
+    using Download::processing;
+    using Download::progress;
+    using Download::resumed;
+    using Download::started;
 };
 
 #endif

=== added file 'tests/downloads/qml/error.h'
--- tests/downloads/qml/error.h	1970-01-01 00:00:00 +0000
+++ tests/downloads/qml/error.h	2014-07-04 15:21:46 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 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
+ * 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 FAKE_CLIENT_ERROR_H
+#define FAKE_CLIENT_ERROR_H
+
+#include <ubuntu/download_manager/error.h>
+#include <gmock/gmock.h>
+
+using namespace Ubuntu::DownloadManager;
+
+class MockError : public Error {
+ public:
+    MockError(Type type, QObject* parent = 0)
+        : Error(type, parent) {}
+
+    MOCK_METHOD0(errorString, QString());
+};
+
+#endif

=== modified file 'tests/downloads/qml/manager.h'
--- tests/downloads/qml/manager.h	2014-07-04 15:21:46 +0000
+++ tests/downloads/qml/manager.h	2014-07-04 15:21:46 +0000
@@ -33,7 +33,7 @@
     MOCK_METHOD1(getDownloadForId, Download*(const QString&));
     MOCK_METHOD1(createDownload, void(DownloadStruct));
     MOCK_METHOD3(createDownload, void(DownloadStruct, DownloadCb, DownloadCb));
-    MOCK_METHOD4(createDownload, void(StructList downs, const QString&, bool,
+    MOCK_METHOD5(createDownload, void(StructList, const QString&, bool,
         const QVariantMap&, StringMap));
     MOCK_METHOD7(createDownload, void(StructList, const QString&, bool,
         const QVariantMap&, StringMap, GroupCb, GroupCb));
@@ -41,7 +41,7 @@
     MOCK_METHOD2(getAllDownloads, void(DownloadsListCb, DownloadsListCb));
     MOCK_METHOD2(getAllDownloadsWithMetadata, void(const QString&,
         const QString&));
-    MOCK_METHOD2(getAllDownloadsWithMetadata, void(const QString&,
+    MOCK_METHOD4(getAllDownloadsWithMetadata, void(const QString&,
         const QString&, MetadataDownloadsListCb, MetadataDownloadsListCb));
     MOCK_CONST_METHOD0(isError, bool());
     MOCK_CONST_METHOD0(lastError, Error*());

=== modified file 'tests/downloads/qml/test_single_download.cpp'
--- tests/downloads/qml/test_single_download.cpp	2014-07-04 15:21:46 +0000
+++ tests/downloads/qml/test_single_download.cpp	2014-07-04 15:21:46 +0000
@@ -16,16 +16,340 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QScopedPointer>
+
+#include <gmock/gmock.h>
+
+#include <matchers.h>
+#include "error.h"
+#include "test_single_download.h"
+
+using ::testing::_;
+using ::testing::Mock;
+using ::testing::Return;
+
 TestSingleDownload::TestSingleDownload(QObject *parent)
-    : LocalTreeTestCase("TestSingleDownload", parent) {
+    : BaseTestCase("TestSingleDownload", parent) {
 }
 
 void
 TestSingleDownload::init() {
-    LocalTreeTestCase::init();
+    BaseTestCase::init();
+
+    _metadata["my-string"] = "canonical";
+    _metadata["your-string"] = "developer";
+    _headers["test"] = "test";
+    _headers["my test"] = "my test";
+    _url = "http://example.com";
+
+    _down = new MockDownload();
+    _man = new MockManager();
 }
 
 void
 TestSingleDownload::cleanup() {
-    LocalTreeTestCase::cleanup();
-}
+    BaseTestCase::cleanup();
+    delete _down;
+    delete _man;
+}
+
+void
+TestSingleDownload::verifyMocks() {
+    QVERIFY(Mock::VerifyAndClearExpectations(_down));
+    QVERIFY(Mock::VerifyAndClearExpectations(_man));
+}
+
+void
+TestSingleDownload::testCanceledSignalFwd() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    SignalBarrier spy(singleDownload.data(), SIGNAL(canceled(bool)));
+    _down->canceled(true);
+
+    QVERIFY(spy.ensureSignalEmitted());
+
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testFinishedSingalFwd() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    SignalBarrier spy(singleDownload.data(), SIGNAL(finished(const QString&)));
+    _down->finished(QString("TEST"));
+
+    QVERIFY(spy.ensureSignalEmitted());
+
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testPausedSignalFwd() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    SignalBarrier spy(singleDownload.data(), SIGNAL(paused(bool)));
+    _down->paused(true);
+
+    QVERIFY(spy.ensureSignalEmitted());
+
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testProcessingSignalFwd() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    SignalBarrier spy(singleDownload.data(), SIGNAL(processing(const QString&)));
+    _down->processing(QString("TEST"));
+
+    QVERIFY(spy.ensureSignalEmitted());
+
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testProgressSignalFwd() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    SignalBarrier spy(singleDownload.data(),
+        SIGNAL(progressReceived(qulonglong, qulonglong)));
+    _down->progress(30, 700);
+
+    QVERIFY(spy.ensureSignalEmitted());
+
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testResumedSignalFwd() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    SignalBarrier spy(singleDownload.data(), SIGNAL(resumed(bool)));
+    _down->resumed(true);
+
+    QVERIFY(spy.ensureSignalEmitted());
+
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testStartedSignalFwd() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    SignalBarrier spy(singleDownload.data(), SIGNAL(started(bool)));
+    _down->started(true);
+
+    QVERIFY(spy.ensureSignalEmitted());
+
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetAllowMobileDataNullptr() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(nullptr, _man));
+
+    // ensure that the mocks are not called and we do not crash
+    singleDownload->setAllowMobileDownload(true);
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetAllowMobileDataError() {
+    QScopedPointer<MockError> err(new MockError(Error::DBus));
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    EXPECT_CALL(*_down, allowMobileDownload(true))
+        .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->setAllowMobileDownload(true);
+
+    QVERIFY(spy.ensureSignalEmitted());
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetAllowMobileDataSuccess() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    EXPECT_CALL(*_down, allowMobileDownload(true))
+        .Times(1);
+
+    EXPECT_CALL(*_down, isError())
+        .Times(1)
+        .WillOnce(Return(false));
+
+    // ensure that the diff signals are emitted
+    SignalBarrier spy(singleDownload.data(), SIGNAL(allowMobileDownloadChanged()));
+
+    singleDownload->setAllowMobileDownload(true);
+
+    QVERIFY(spy.ensureSignalEmitted());
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetThrottleNullptr() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(nullptr, _man));
+
+    singleDownload->setThrottle(3);
+    // ensure that the mocks are not called and we do not crash
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetThrottleError() {
+    QScopedPointer<MockError> err(new MockError(Error::DBus));
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    EXPECT_CALL(*_down, setThrottle(9))
+        .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->setThrottle(9);
+
+    QVERIFY(spy.ensureSignalEmitted());
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetThrottleSuccess() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    EXPECT_CALL(*_down, setThrottle(9))
+        .Times(1);
+
+    EXPECT_CALL(*_down, isError())
+        .Times(1)
+        .WillOnce(Return(false));
+
+    // ensure that the diff signals are emitted
+    SignalBarrier spy(singleDownload.data(), SIGNAL(throttleChanged()));
+
+    singleDownload->setThrottle(9);
+
+    QVERIFY(spy.ensureSignalEmitted());
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetHeadersNullptr() {
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(nullptr, _man));
+    QVariantMap map;
+
+    // ensure we do not crash
+    singleDownload->setHeaders(map);
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetHeadersError() {
+    QScopedPointer<MockError> err(new MockError(Error::DBus));
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    QVariantMap map;
+
+    EXPECT_CALL(*_down, setHeaders(_))
+        .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->setHeaders(map);
+
+    QVERIFY(spy.ensureSignalEmitted());
+    verifyMocks();
+}
+
+void
+TestSingleDownload::testSetHeadersSuccess() {
+    QString header1, value1, header2, value2;
+    header1 = "my-first-header";
+    value1 = "first";
+    header2 = "second-header";
+    value2 = "second";
+
+    QVariantMap map;
+    map[header1] = value1;
+    map[header2] = value2;
+
+    QMap<QString, QString> headers;
+    headers[header1] = value1;
+    headers[header2] = value2;
+
+    QScopedPointer<TestableSingleDownload> singleDownload(
+        new TestableSingleDownload(_down, _man));
+
+    EXPECT_CALL(*_down, setHeaders(QStringMapEq(headers)))
+        .Times(1);
+
+    EXPECT_CALL(*_down, isError())
+        .Times(1)
+        .WillOnce(Return(false));
+
+    // ensure that the diff signals are emitted
+    SignalBarrier spy(singleDownload.data(), SIGNAL(headersChanged()));
+
+    singleDownload->setHeaders(map);
+
+    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-07-04 15:21:46 +0000
+++ tests/downloads/qml/test_single_download.h	2014-07-04 15:21:46 +0000
@@ -20,12 +20,14 @@
 #define TEST_DOWNLOAD_H
 
 #include <QObject>
-#include <singled_download.h>
-#include <local_tree_testcase.h>
+#include <base_testcase.h>
+#include "download.h"
+#include "manager.h"
+#include "testable_single_download.h"
 
 using namespace Ubuntu::DownloadManager;
 
-class TestSingleDownload : public LocalTreeTestCase {
+class TestSingleDownload : public BaseTestCase {
     Q_OBJECT
 
  public:
@@ -33,6 +35,34 @@
 
     void init() override;
     void cleanup() override;
+
+ private slots:  // NOLINT(whitespace/indent)
+    void testCanceledSignalFwd();
+    void testFinishedSingalFwd();
+    void testPausedSignalFwd();
+    void testProcessingSignalFwd();
+    void testProgressSignalFwd();
+    void testResumedSignalFwd();
+    void testStartedSignalFwd();
+    void testSetAllowMobileDataNullptr();
+    void testSetAllowMobileDataError();
+    void testSetAllowMobileDataSuccess();
+    void testSetThrottleNullptr();
+    void testSetThrottleError();
+    void testSetThrottleSuccess();
+    void testSetHeadersNullptr();
+    void testSetHeadersError();
+    void testSetHeadersSuccess();
+
+ private:
+    void verifyMocks();
+
+ private:
+    QString _url;
+    QVariantMap _metadata;
+    QMap<QString, QString> _headers;
+    MockDownload* _down; 
+    MockManager* _man; 
 };
 
 #endif

=== added file 'tests/downloads/qml/testable_single_download.h'
--- tests/downloads/qml/testable_single_download.h	1970-01-01 00:00:00 +0000
+++ tests/downloads/qml/testable_single_download.h	2014-07-04 15:21:46 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright 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
+ * 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 <single_download.h>
+
+
+class TestableSingleDownload : public SingleDownload {
+ public:
+    TestableSingleDownload(Download* down, Manager* man, QObject* parent = 0)
+        : SingleDownload(down, man, parent) {
+    }
+
+};