Merge lp:~mandel/unity-scope-click/rebuild-with-udm into lp:unity-scope-click

[Manuel de la Peña]

Update the mock of the tests to ensure that the project compiles with the new udm client lib.

Update the mock of the tests to ensure that the project compiles with the new udm client lib.

[Alejandro J. Cura (alecu)]

+1

review: Approve (trivial)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/421/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/319
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/319/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/425/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/326/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/323/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:210
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/426/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/327/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/324/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/429/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/330/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/327/console

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

review: Needs Fixing (continuous-integration)

[Alejandro J. Cura (alecu)]

the changes are no longer trivial, so I want to re-review after jenkins completes a successful run

review: Needs Fixing (re)

[Sergio Schvezov (sergiusens)]

> the changes are no longer trivial, so I want to re-review after jenkins
> completes a successful run

Jenkins will never complete a successful run until the new u-d-m lands into the archives. And this MR is tied to it

[Manuel de la Peña (mandel)]

> the changes are no longer trivial, so I want to re-review after jenkins
> completes a successful run

Jenkins will never complete a successful run for obvious reasons, the new udm is not present in the archieve because it is blocked in silo 11. In the silo 11 both projects are compiled and packaged (which includes tests are ran) and it is the only correct way to ensure that the two projects work correctly.

[Alejandro J. Cura (alecu)]

> > the changes are no longer trivial, so I want to re-review after jenkins
> > completes a successful run
>
> Jenkins will never complete a successful run for obvious reasons, the new udm
> is not present in the archieve because it is blocked in silo 11. In the silo
> 11 both projects are compiled and packaged (which includes tests are ran) and
> it is the only correct way to ensure that the two projects work correctly.

It was not so obvious to me! I see the problem now, so I'm approving.

[Alejandro J. Cura (alecu)]

+1

review: Approve

=== modified file 'scope/tests/mock_ubuntu_download_manager.h'
--- scope/tests/mock_ubuntu_download_manager.h	2014-02-12 12:00:11 +0000
+++ scope/tests/mock_ubuntu_download_manager.h	2014-04-11 15:45:13 +0000
@@ -58,6 +58,7 @@
 
     MOCK_CONST_METHOD0(id, QString());
 
+    MOCK_METHOD1(setDestinationDir, void(const QString& path));
     MOCK_METHOD0(metadata, QVariantMap());
     MOCK_METHOD0(progress, qulonglong());
     MOCK_METHOD0(totalSize, qulonglong());
@@ -80,6 +81,7 @@
 
     MockSystemDownloadManager() : Ubuntu::DownloadManager::Manager() {};
 
+    MOCK_METHOD1(getDownloadForId, Download*(const QString&));
     MOCK_METHOD1(createDownload,
                  void(DownloadStruct downStruct));
     MOCK_METHOD3(createDownload,
@@ -89,6 +91,16 @@
     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,
+                 DownloadsListCb errCb));
+    MOCK_METHOD2(getAllDownloadsWithMetadata, void(const QString &name,
+                 const QString &value));
+
+    MOCK_METHOD4(getAllDownloadsWithMetadata, void(const QString &name,
+                 const QString &value, MetadataDownloadsListCb cb,
+                 MetadataDownloadsListCb errCb));
+
     MOCK_CONST_METHOD0(isError, bool());
     MOCK_CONST_METHOD0(lastError, Error*());
     MOCK_METHOD1(allowMobileDataDownload, void(bool));