Merge lp:~michael-sheldon/unity-scope-click/update-udm-tests into lp:unity-scope-click

[Michael Sheldon]

Update UDM test mocks to match new API

Update UDM test mocks to match new API

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:396
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/684/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/88/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/84/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/684/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/unity-scope-click/update-udm-tests]

397. By Michael Sheldon on 2015-12-11

Fix UDM mock definitions

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:397
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/685/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/85/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/685/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/unity-scope-click/update-udm-tests]

398. By Michael Sheldon on 2015-12-11

Fix UDM mock definitions

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:398
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/686/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/90/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/86/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/686/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

It is very unfortunate that we must keep breaking C++ APIs.

review: Approve

=== modified file 'libclickscope/tests/mock_ubuntu_download_manager.h'
--- libclickscope/tests/mock_ubuntu_download_manager.h	2015-09-21 14:04:46 +0000
+++ libclickscope/tests/mock_ubuntu_download_manager.h	2015-12-11 15:38:21 +0000
@@ -73,6 +73,10 @@
     MOCK_METHOD0(headers, QMap<QString, QString>());
     MOCK_METHOD1(setHeaders, void(QMap<QString, QString>));
     MOCK_CONST_METHOD0(destinationApp, QString());
+
+    MOCK_METHOD0(collected, void());
+    MOCK_METHOD0(filePath, QString());
+    MOCK_METHOD0(state, Download::State());
 };
 
 class MockError : public Ubuntu::DownloadManager::Error
@@ -99,8 +103,10 @@
     MOCK_METHOD7(createDownload,
                  void(StructList downs, const QString &algorithm, bool allowed3G, const QVariantMap &metadata, StringMap headers, GroupCb cb, GroupCb errCb));
 
-    MOCK_METHOD0(getAllDownloads, void());
-    MOCK_METHOD2(getAllDownloads, void(DownloadsListCb cb,
+    MOCK_METHOD2(getAllDownloads, void(const QString &appId, bool uncompleted));
+    MOCK_METHOD4(getAllDownloads, void(const QString &appId,
+                 bool uncompleted,
+                 DownloadsListCb cb,
                  DownloadsListCb errCb));
     MOCK_METHOD2(getAllDownloadsWithMetadata, void(const QString &name,
                  const QString &value));