Merge lp:~mandel/ubuntu-download-manager/empty-group into lp:ubuntu-download-manager

[Manuel de la Peña]

Ensure that finished is raised when the group download is empty.

Ensure that finished is raised when the group download is empty.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Ying-Chun Liu (paulliu)]

LGTM +1

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/200/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/89

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-download-manager-ci/200/rebuild

review: Approve (continuous-integration)

=== modified file 'libubuntudownloadmanager/downloads/group_download.cpp'
--- libubuntudownloadmanager/downloads/group_download.cpp	2013-10-25 11:44:53 +0000
+++ libubuntudownloadmanager/downloads/group_download.cpp	2013-11-06 15:17:05 +0000
@@ -174,14 +174,19 @@
 
     void startDownload() {
         Q_Q(GroupDownload);
-        foreach(FileDownload* download, _downloads) {
-            Download::State state = download->state();
-            if (state == Download::IDLE) {
-                download->start();
-                download->startDownload();
+        if (_downloads.count() > 0) {
+            foreach(FileDownload* download, _downloads) {
+                Download::State state = download->state();
+                if (state == Download::IDLE) {
+                    download->start();
+                    download->startDownload();
+                }
             }
+            emit q->started(true);
+        } else {
+            emit q->started(true);
+            emit q->finished(_finishedDownloads);
         }
-        emit q->started(true);
     }
 
     qulonglong progress() {

=== modified file 'ubuntu-download-manager-tests/downloads/test_group_download.cpp'
--- ubuntu-download-manager-tests/downloads/test_group_download.cpp	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/downloads/test_group_download.cpp	2013-11-06 15:17:05 +0000
@@ -16,6 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QScopedPointer>
 #include <QSignalSpy>
 #include <downloads/group_download.h>
 #include <system/uuid_utils.h>
@@ -903,3 +904,20 @@
 
     QVERIFY(group->isValid());
 }
+
+void
+TestGroupDownload::testEmptyGroupRaisesFinish() {
+    QList<GroupDownloadStruct> downloadsStruct;
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, false, _rootPath,
+        downloadsStruct, "md5", _isGSMDownloadAllowed, _metadata, _headers,
+        QSharedPointer<SystemNetworkInfo>(_networkInfo),
+        QSharedPointer<Factory>(_downloadFactory),
+        QSharedPointer<FileManager>(_fileManager)));
+
+    QSignalSpy startedSpy(group.data(), SIGNAL(started(bool)));
+    QSignalSpy finishedSpy(group.data(), SIGNAL(finished(QStringList)));
+
+    group->startDownload();
+    QCOMPARE(startedSpy.count(), 1);
+    QCOMPARE(finishedSpy.count(), 1);
+}

=== modified file 'ubuntu-download-manager-tests/downloads/test_group_download.h'
--- ubuntu-download-manager-tests/downloads/test_group_download.h	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/downloads/test_group_download.h	2013-11-06 15:17:05 +0000
@@ -78,6 +78,9 @@
     void testInvalidFilePresent();
     void testValidFileNotPresent();
 
+    // empty group tests
+    void testEmptyGroupRaisesFinish();
+
  private:
     QString _id;
     QString _path;