Merge lp:~mikemc/unity-scope-click/fix-dlmgr-tests into lp:unity-scope-click

[Mike McCracken]

- Fix broken tests for download manager.

- Fix broken tests for download manager. Still disabled.

bzr branch lp:~mikemc/unity-scope-click/fix-dlmgr-tests
cd fix-dlmgr-tests
mkdir build
cmake .. -DCMAKE_BUILD_TYPE=debug
make -j
GTEST_ALSO_RUN_DISABLED_TESTS=1 make test

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'scope/tests/test_download_manager.cpp'
--- scope/tests/test_download_manager.cpp	2014-02-19 22:35:42 +0000
+++ scope/tests/test_download_manager.cpp	2014-02-26 17:17:40 +0000
@@ -363,9 +363,12 @@
                               mockSystemDownloadManager);
 
     // mockError is heap-allocated because downloadWithError will delete it.
-    MockError *mockError = new MockError();
-    MockDownload downloadWithError(mockError);
-    MockDownload successfulDownload;
+    MockError mockError; // = new MockError();
+    NiceMock<MockDownload> downloadWithError(&mockError);
+    ON_CALL(downloadWithError, isError()).WillByDefault(Return(true));
+    ON_CALL(downloadWithError, error()).WillByDefault(Return(&mockError));
+    NiceMock<MockDownload> successfulDownload;
+    ON_CALL(successfulDownload, isError()).WillByDefault(Return(false));
 
     // Just directly signal clickTokenFetched or error from
     // getCredentials(), no need to re-test the same code as the
@@ -390,13 +393,13 @@
         // behave correctly without mock return values, using overridden constructors:
         if (p.downloadSignalsError) {
 
-            EXPECT_CALL(*mockError, errorString()).Times(1).WillOnce(Return(TEST_DOWNLOADERROR_STRING));
+            EXPECT_CALL(mockError, errorString()).Times(1).WillOnce(Return(TEST_DOWNLOADERROR_STRING));
             downloadCreatedSignalFunc = std::function<void()>([&](){
                     mockSystemDownloadManager->downloadCreated(&downloadWithError);
                 });
 
         } else {
-            EXPECT_CALL(*mockError, errorString()).Times(0);
+            EXPECT_CALL(mockError, errorString()).Times(0);
             downloadCreatedSignalFunc = std::function<void()>([&](){
                     mockSystemDownloadManager->downloadCreated(&successfulDownload);
                 });
@@ -422,6 +425,8 @@
     QObject::connect(&dm, &click::DownloadManager::downloadStarted,
                      [&mockDownloadManagerClient](const QString& downloadId)
                      {
+                         qDebug() << "in lambda connected to click::dm::downloadstarted";
+
                          mockDownloadManagerClient.onDownloadStartedEmitted(downloadId);
                      });
 
@@ -435,10 +440,9 @@
                     &DISABLED_DownloadManagerStartDownloadTest::Quit));
 
         EXPECT_CALL(mockDownloadManagerClient, onDownloadErrorEmitted(_)).Times(0);
-
-        // when https://bugs.launchpad.net/ubuntu-download-manager/+bug/1278789
-        // is fixed, we can add this assertion:
-        // EXPECT_CALL(successfulDownload, start()).Times(1);
+        EXPECT_CALL(successfulDownload, id()).Times(1).WillOnce(Return(TEST_DOWNLOAD_ID));
+        EXPECT_CALL(successfulDownload, start()).Times(1);
+    
 
     } else {