Merge lp:~mandel/ubuntu-download-manager/finished-download-in-queue into lp:ubuntu-download-manager

[Manuel de la Peña]

Ensure that the q is correctly update when we have a finished download.

Ensure that the q is correctly update when we have a finished download.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Alejandro J. Cura (alecu)]

This branch actually downloads more than one file. Good work!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:76
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/2
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armfh-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/2/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'libubuntudownloadmanager/download.cpp'
--- libubuntudownloadmanager/download.cpp	2013-07-18 15:52:55 +0000
+++ libubuntudownloadmanager/download.cpp	2013-07-20 15:56:29 +0000
@@ -64,6 +64,7 @@
     QString path() const;
     QUrl url() const;
     Download::State state();
+    void setState(Download::State state);
     QString filePath();
     QString hash() const;
     QCryptographicHash::Algorithm hashAlgorithm() const;
@@ -347,6 +348,11 @@
     return _state;
 }
 
+void DownloadPrivate::setState(Download::State state)
+{
+    _state = state;
+}
+
 QString DownloadPrivate::filePath()
 {
     if (_currentData)
@@ -688,6 +694,12 @@
     return d->state();
 }
 
+void Download::setState(Download::State state)
+{
+    Q_D(Download);
+    d->setState(state);
+}
+
 QString Download::filePath()
 {
     Q_D(Download);

=== modified file 'libubuntudownloadmanager/download.h'
--- libubuntudownloadmanager/download.h	2013-07-18 15:52:55 +0000
+++ libubuntudownloadmanager/download.h	2013-07-20 15:56:29 +0000
@@ -58,6 +58,7 @@
     QString path();
     QUrl url();
     Download::State state();
+    void setState(Download::State state);
     QString filePath();
     QString hash();
     QCryptographicHash::Algorithm hashAlgorithm();

=== modified file 'libubuntudownloadmanager/download_queue.cpp'
--- libubuntudownloadmanager/download_queue.cpp	2013-07-12 10:45:37 +0000
+++ libubuntudownloadmanager/download_queue.cpp	2013-07-20 15:56:29 +0000
@@ -145,7 +145,7 @@
             break;
         case Download::FINISHED:
             // remove the registered object in dbus, remove the download and the adapter from the list
-            if (_current.isEmpty() && _current == sender->path())
+            if (!_current.isEmpty() && _current == sender->path())
                 updateCurrentDownload();
             break;
         default:

=== modified file 'ubuntu-download-manager-tests/fake_download.cpp'
--- ubuntu-download-manager-tests/fake_download.cpp	2013-07-18 15:52:55 +0000
+++ ubuntu-download-manager-tests/fake_download.cpp	2013-07-20 15:56:29 +0000
@@ -114,3 +114,10 @@
     }
 }
 
+void FakeDownload::emitFinished(const QString& path)
+{
+    setState(Download::FINISHED);
+    emit stateChanged();
+    emit finished(path);
+}
+

=== modified file 'ubuntu-download-manager-tests/fake_download.h'
--- ubuntu-download-manager-tests/fake_download.h	2013-07-20 14:08:52 +0000
+++ ubuntu-download-manager-tests/fake_download.h	2013-07-20 15:56:29 +0000
@@ -41,6 +41,9 @@
     void pauseDownload() override;
     void resumeDownload() override;
     void startDownload() override;
+
+    // useful methods to emit signals
+    void emitFinished(const QString& path);
     
 private:
     bool _canDownload;

=== modified file 'ubuntu-download-manager-tests/test_download_queue.cpp'
--- ubuntu-download-manager-tests/test_download_queue.cpp	2013-07-18 16:20:34 +0000
+++ ubuntu-download-manager-tests/test_download_queue.cpp	2013-07-20 15:56:29 +0000
@@ -478,3 +478,26 @@
     QCOMPARE(downloads[_first->path()], _first);
     QCOMPARE(downloads[_second->path()], _second);
 }
+
+void TestDownloadQueue::testDownloadFinishedOtherReady()
+{
+    _first->record();
+    _second->record();
+
+    _q->add(_first, _firstAdaptor);
+    _q->add(_second, _firstAdaptor);
+
+    _first->start();
+    _second->start();
+    _first->emitFinished("");
+
+    QList<MethodData> calledMethods = _first->calledMethods();
+    QCOMPARE(2, calledMethods.count());
+    QCOMPARE(QString("canDownload"), calledMethods[0].methodName());
+    QCOMPARE(QString("startDownload"), calledMethods[1].methodName());
+
+    calledMethods = _second->calledMethods();
+    QCOMPARE(2, calledMethods.count());
+    QCOMPARE(QString("canDownload"), calledMethods[0].methodName());
+    QCOMPARE(QString("startDownload"), calledMethods[1].methodName());
+}

=== modified file 'ubuntu-download-manager-tests/test_download_queue.h'
--- ubuntu-download-manager-tests/test_download_queue.h	2013-07-12 10:45:37 +0000
+++ ubuntu-download-manager-tests/test_download_queue.h	2013-07-20 15:56:29 +0000
@@ -52,6 +52,7 @@
     void testCancelDownloadOtherReadyCannotDownload();
     void testCancelDownloadNotStarted();
     void testDownloads();
+    void testDownloadFinishedOtherReady();
 
 private:
     FakeSystemNetworkInfo* _networkInfo;