Merge lp:~diegosarmentero/unity8/app-error-handling into lp:unity8

[Diego Sarmentero]

- Handling error signal from the DownloadTracker plugin (BUG: #1229744).

When the DownloadManager finds an error a signal is emitted to the DownloadTracker, and this one propagate that signal. AppPreview will take the error signal and trigger the proper action in the scope.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:341
http://jenkins.qa.ubuntu.com/job/unity8-ci/1098/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3929
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1508
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1838
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1099
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1099/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1098
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3992
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3992/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1510
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1510/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1287

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1098/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:342
http://jenkins.qa.ubuntu.com/job/unity8-ci/1123/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4010
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1870
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1123
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4102
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1621
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1621/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1360
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1372

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1123/rebuild

review: Approve (continuous-integration)

[Roberto Alsina (ralsina)]

review: Approve

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/492/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4032
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1645
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1881/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-autolanding/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/496
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/496/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/497
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4128
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4128/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1647
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1647/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1392

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Dash/Apps/AppPreview.qml'
--- Dash/Apps/AppPreview.qml	2013-09-05 10:02:00 +0000
+++ Dash/Apps/AppPreview.qml	2013-09-25 19:59:58 +0000
@@ -110,6 +110,10 @@
                 onFinished: {
                     root.previewData.execute(progressBar.model[0].id, { })
                 }
+
+                onError: {
+                    root.previewData.execute(progressBar.model[1].id, { "error": error });
+                }
             }
 
         }

=== modified file 'tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp'
--- tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp	2013-08-13 08:50:50 +0000
+++ tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp	2013-09-25 19:59:58 +0000
@@ -63,5 +63,10 @@
     if(!m_service.isEmpty() && !m_dbusPath.isEmpty()) {
         m_active = true;
         Q_EMIT serviceReadyChanged(m_active);
+        if(m_dbusPath == "finish") {
+            Q_EMIT finished("downloadComplete");
+        }else if(m_dbusPath == "error") {
+            Q_EMIT error("DOWNLOAD ERROR");
+        }
     }
 }

=== modified file 'tests/qmltests/Dash/Apps/tst_AppPreview.qml'
--- tests/qmltests/Dash/Apps/tst_AppPreview.qml	2013-08-19 16:55:28 +0000
+++ tests/qmltests/Dash/Apps/tst_AppPreview.qml	2013-09-25 19:59:58 +0000
@@ -45,6 +45,8 @@
             ["Unity User", 10, "10/02/2013", root.commentary],
         ]
     }
+    QtObject { id: showProgress; property bool value: true }
+    QtObject { id: progressSource; property string value: "service" }
 
     QtObject {
         id: data
@@ -66,8 +68,30 @@
         ]
     }
 
+    QtObject {
+        id: dataProgress
+        property string title: "Unity App"
+        property string appIcon: "fake_image.png"
+        property string description: "This is an Application description"
+        property real rating: rating.value
+        property int numRatings: reviews.value
+        property var execute: root.fake_call
+        property var infoMap: {
+            "show_progressbar": showProgress,
+            "more-screenshots": screenshots,
+            "rated": rated,
+            "comments": comments,
+            "progressbar_source": progressSource
+        }
+        property var actions: [
+            { "id": 123, "displayName": "action1" },
+            { "id": 456, "displayName": "action2" },
+            { "id": 789, "displayName": "action3" },
+        ]
+    }
+
     function fake_call(id, data){
-        root.calls[root.calls.length] = id;
+        root.calls[root.calls.length] = [id, data];
     }
 
     // The component under test
@@ -89,6 +113,7 @@
             reviewField.focus = false;
             reviewField.text = "";
             data.rating = rating.value;
+            dataProgress.infoMap["progressbar_source"].value = "service";
         }
 
         function test_actions() {
@@ -102,7 +127,7 @@
 
             var actions = data.actions;
             for(var i = 0; i < actions.length; i++) {
-                compare(root.calls[i], actions[i].id, "Id of action not found.");
+                compare(root.calls[i][0], actions[i].id, "Id of action not found.");
             }
         }
 
@@ -162,5 +187,31 @@
             verify(buttons.visible == true);
         }
 
+        function test_progress_show() {
+            appPreview.previewData = dataProgress;
+            var progress = findChild(appPreview, "progressBar");
+            verify(progress.visible == true);
+        }
+
+        function test_progress_download_finish() {
+            appPreview.previewData = dataProgress;
+            var progress = findChild(appPreview, "progressBar");
+            dataProgress.infoMap["progressbar_source"].value = "finish";
+
+            var actions = dataProgress.actions;
+            compare(root.calls[0][0], actions[0].id, "Id of action not found.");
+            compare(root.calls[0][1], {}, "Data of action not found.");
+        }
+
+        function test_progress_download_error() {
+            appPreview.previewData = dataProgress;
+            var progress = findChild(appPreview, "progressBar");
+            dataProgress.infoMap["progressbar_source"].value = "error";
+
+            var actions = dataProgress.actions;
+            compare(root.calls[0][0], actions[1].id, "Id of action not found.");
+            compare(root.calls[0][1], {"error": "DOWNLOAD ERROR"}, "Data of action not found.");
+        }
+
     }
 }