unity-scope-click

Merge lp:~mikemc/unity-scope-click/dlmgr-add-udm into lp:unity-scope-click

  1. dlmgr-add-udm
  2. Merge into trunk
Proposed by Mike McCracken
Status: Merged
Approved by: Mike McCracken
Approved revision: 161
Merged at revision: 138
Proposed branch: lp:~mikemc/unity-scope-click/dlmgr-add-udm
Merge into: lp:unity-scope-click
Diff against target: 871 lines (+488/-102)
9 files modified
CMakeLists.txt (+3/-0)
scope/click/CMakeLists.txt (+2/-0)
scope/click/download-manager.cpp (+100/-18)
scope/click/download-manager.h (+9/-0)
scope/tests/CMakeLists.txt (+2/-0)
scope/tests/download_manager_tool/download_manager_tool.cpp (+51/-24)
scope/tests/download_manager_tool/download_manager_tool.h (+3/-4)
scope/tests/mock_ubuntu_download_manager.h (+82/-0)
scope/tests/test_download_manager.cpp (+236/-56)
To merge this branch: bzr merge lp:~mikemc/unity-scope-click/dlmgr-add-udm
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Alejandro J. Cura (community) Approve
dobey (community) Approve
Review via email: mp+205733@code.launchpad.net

Commit message

- Add support for starting new downloads to DownloadManager, using ubuntu-download-manager client lib

Description of the change

- Add support for starting new downloads to DownloadManager, using ubuntu-download-manager client lib

Includes tests and extends the download_manager_tool to support triggering app download.

BUILD NOTE: this requires a version of ubuntu-download-manager that's available in ppa:mandel/mandel
https://launchpad.net/~mandel/+archive/mandel

To test IRL with the tool, do this:

U1_DEBUG=1 $builddir/scope/tests/download_manager_tool/download_manager_tool https://public.apps.ubuntu.com/download/com.ubuntu.developer.mzanetti/fahrplan2/com.ubuntu.developer.mzanetti.fahrplan2_2.0.14.1_unknown.click com.ubuntu.developer.mzanetti.fahrplan2

and look at ~/.cache/ubuntu-download-manager/UNKNOWN.INFO (that's a symlink to the current udm log)

it takes about 10 seconds in my experience to download and attempt to install the file. If not testing on arm, that app won't install correctly, but as far as the scope is concerned it's a successful startDownload().

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:155
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/251/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/149/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/149/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
dobey (dobey) wrote :

This needs libubuntu-download-manager-client-dev and libubuntu-download-manager-common-dev added to the Build-Depends in debian/control.

review: Needs Fixing
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Code looks good.
We must not land this branch until mandel's udm branch lands on trunk

review: Approve
Revision history for this message
Mike McCracken (mikemc) wrote :

mandel's udm branch is on trunk already - my advice about the PPA was not necessary if you have the daily-builds ppa.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:156
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/260/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/158
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/158/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scope-click-autolanding/106/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-autolanding/58/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-autolanding/58/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Alejandro J. Cura (alecu) wrote :

I'm getting these warnings while running the tests:

process 23181: arguments to dbus_message_new_method_call() were incorrect, assertion "destination == NULL || _dbus_check_is_valid_bus_name (destination)" failed in file ../../dbus/dbus-message.c line 1265.
This is normally a bug in some application using the D-Bus library.
process 23181: arguments to dbus_message_set_auto_start() were incorrect, assertion "message != NULL" failed in file ../../dbus/dbus-message.c line 2951.
This is normally a bug in some application using the D-Bus library.
process 23181: arguments to dbus_message_iter_init_append() were incorrect, assertion "message != NULL" failed in file ../../dbus/dbus-message.c line 2348.
This is normally a bug in some application using the D-Bus library.

Revision history for this message
Mike McCracken (mikemc) wrote :

@alecu, I believe those warnings are not critical, and are unrelated to why the branch is failing on arm.
I've created a separate bug to track them: https://bugs.launchpad.net/ubuntu/+source/unity-scope-click/+bug/1279123

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scope-click-autolanding/108/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-autolanding/60
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-autolanding/60/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/262/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/160
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/160/console

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

review: Needs Fixing (continuous-integration)
lp:~mikemc/unity-scope-click/dlmgr-add-udm updated
158. By Mike McCracken

switch to old connect style to restore failing signal connections on ARM

159. By Mike McCracken

use named constants for empty string args to createDownload

Revision history for this message
Mike McCracken (mikemc) wrote :

rev 158 makes the tests pass on my n7 arm device, and does not break them on my x86 desktop
IRL tests using the download_manager_tool on x86 also work.

HOWTO:

U1_DEBUG=1 scope/tests/download_manager_tool/download_manager_tool https://public.apps.ubuntu.com/download/com.ubuntu.developer.mzanetti/fahrplan2/com.ubuntu.developer.mzanetti.fahrplan2_2.0.14.1_unknown.click com.ubuntu.developer.mzanetti.fahrplan2

 you should see something like "DONE: response is
       /com/canonical/applications/download/0062476050c7446fab6c3e4c65472ef6"
       at the end of other logspam

and after ~10 seconds, ~/.cache/ubuntu-download-manager/UNKNOWN.INFO
       should have log messages that include that UUID

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/264/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/162
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/162/console

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

review: Needs Fixing (continuous-integration)
lp:~mikemc/unity-scope-click/dlmgr-add-udm updated
160. By Mike McCracken

switch some signals to old-style connect syntax because of flakiness on ARM systems

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/267/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/165
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/165/console

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

review: Needs Fixing (continuous-integration)
lp:~mikemc/unity-scope-click/dlmgr-add-udm updated
161. By Mike McCracken

disable all dlmgr tests, they are not reliable on ARM

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/268/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/166

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

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/269/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/167/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/167/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/281/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/179
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/179/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/283/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/181/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/181/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-02-11 22:53:48 +0000
3+++ CMakeLists.txt 2014-02-12 20:46:57 +0000
4@@ -39,6 +39,9 @@
5 pkg_check_modules(UBUNTUONE REQUIRED ubuntuoneauth-2.0)
6 add_definitions(${UBUNTUONE_CFLAGS} ${UBUNTUONE_CFLAGS_OTHER})
7
8+pkg_check_modules(UBUNTU_DOWNLOAD_MANAGER_CLIENT REQUIRED ubuntu-download-manager-client)
9+pkg_check_modules(UBUNTU_DOWNLOAD_MANAGER_COMMON REQUIRED ubuntu-download-manager-common)
10+
11 SET (SCOPE_LIB_VERSION 0.2.0)
12 SET (SCOPE_LIB_SOVERSION 0)
13 SET (SCOPE_LIB_API_VERSION 2.0)
14
15=== modified file 'scope/click/CMakeLists.txt'
16--- scope/click/CMakeLists.txt 2014-02-10 19:55:31 +0000
17+++ scope/click/CMakeLists.txt 2014-02-12 20:46:57 +0000
18@@ -26,6 +26,8 @@
19 target_link_libraries (${SCOPE_LIB_UNVERSIONED}
20 ${UNITY_SCOPES_LDFLAGS}
21 ${UBUNTUONE_LDFLAGS}
22+ ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
23+ ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
24 )
25
26 install(
27
28=== modified file 'scope/click/download-manager.cpp'
29--- scope/click/download-manager.cpp 2014-02-07 16:21:36 +0000
30+++ scope/click/download-manager.cpp 2014-02-12 20:46:57 +0000
31@@ -32,19 +32,36 @@
32 #include <QDebug>
33 #include <QObject>
34 #include <QString>
35-#include <QTimer>
36+#include <QTimer>
37
38+namespace u1 = UbuntuOne;
39 #include <ubuntuone_credentials.h>
40-
41 #include <token.h>
42
43-namespace u1 = UbuntuOne;
44+namespace udm = Ubuntu::DownloadManager;
45+#include <ubuntu/download_manager/download_struct.h>
46+#include <ubuntu/download_manager/download.h>
47+#include <ubuntu/download_manager/error.h>
48+
49+namespace
50+{
51+
52+static const QString DOWNLOAD_APP_ID_KEY = "app_id";
53+static const QString DOWNLOAD_COMMAND_KEY = "post-download-command";
54+static const QVariant DOWNLOAD_CMDLINE = QVariant(QStringList()
55+ << "pkcon" << "-p"
56+ << "install-local" << "$file");
57+static const QString DOWNLOAD_MANAGER_DO_NOT_HASH = "";
58+static const QString DOWNLOAD_MANAGER_IGNORE_HASH_ALGORITHM = "";
59+}
60
61 struct click::DownloadManager::Private
62 {
63 Private(const QSharedPointer<click::network::AccessManager>& networkAccessManager,
64- const QSharedPointer<click::CredentialsService>& credentialsService)
65- : nam(networkAccessManager), credentialsService(credentialsService)
66+ const QSharedPointer<click::CredentialsService>& credentialsService,
67+ const QSharedPointer<udm::Manager>& systemDownloadManager)
68+ : nam(networkAccessManager), credentialsService(credentialsService),
69+ systemDownloadManager(systemDownloadManager)
70 {
71 }
72
73@@ -55,8 +72,10 @@
74
75 QSharedPointer<click::network::AccessManager> nam;
76 QSharedPointer<click::CredentialsService> credentialsService;
77+ QSharedPointer<udm::Manager> systemDownloadManager;
78 QSharedPointer<click::network::Reply> reply;
79 QString downloadUrl;
80+ QString appId;
81 };
82
83 const QByteArray& click::CLICK_TOKEN_HEADER()
84@@ -67,26 +86,89 @@
85
86 click::DownloadManager::DownloadManager(const QSharedPointer<click::network::AccessManager>& networkAccessManager,
87 const QSharedPointer<click::CredentialsService>& credentialsService,
88+ const QSharedPointer<udm::Manager>& systemDownloadManager,
89 QObject *parent)
90 : QObject(parent),
91- impl(new Private(networkAccessManager, credentialsService))
92+ impl(new Private(networkAccessManager, credentialsService, systemDownloadManager))
93 {
94- QMetaObject::Connection c = connect(impl->credentialsService.data(), &click::CredentialsService::credentialsFound,
95- this, &DownloadManager::handleCredentialsFound);
96- if(!c){
97+ QMetaObject::Connection c = connect(impl->credentialsService.data(),
98+ &click::CredentialsService::credentialsFound,
99+ this, &click::DownloadManager::handleCredentialsFound);
100+ if (!c) {
101 qDebug() << "failed to connect to credentialsFound";
102 }
103
104 c = connect(impl->credentialsService.data(), &click::CredentialsService::credentialsNotFound,
105- this, &DownloadManager::handleCredentialsNotFound);
106- if(!c){
107+ this, &click::DownloadManager::handleCredentialsNotFound);
108+ if (!c) {
109 qDebug() << "failed to connect to credentialsNotFound";
110 }
111+
112+ // NOTE: using SIGNAL/SLOT macros here because new-style
113+ // connections are flaky on ARM.
114+ c = connect(impl->systemDownloadManager.data(), SIGNAL(downloadCreated(Download*)),
115+ this, SLOT(handleDownloadCreated(Download*)));
116+
117+ if (!c) {
118+ qDebug() << "failed to connect to systemDownloadManager::downloadCreated";
119+
120+ }
121 }
122
123 click::DownloadManager::~DownloadManager(){
124 }
125
126+void click::DownloadManager::startDownload(const QString& downloadUrl, const QString& appId)
127+{
128+ impl->appId = appId;
129+
130+ // NOTE: using SIGNAL/SLOT macros here because new-style
131+ // connections are flaky on ARM.
132+ QObject::connect(this, SIGNAL(clickTokenFetched(QString)),
133+ this, SLOT(handleClickTokenFetched(QString)),
134+ Qt::UniqueConnection);
135+ QObject::connect(this, SIGNAL(clickTokenFetchError(QString)),
136+ this, SLOT(handleClickTokenFetchError(QString)),
137+ Qt::UniqueConnection);
138+ fetchClickToken(downloadUrl);
139+}
140+
141+void click::DownloadManager::handleClickTokenFetched(const QString& clickToken)
142+{
143+ QVariantMap metadata;
144+ metadata[DOWNLOAD_COMMAND_KEY] = DOWNLOAD_CMDLINE;
145+ metadata[DOWNLOAD_APP_ID_KEY] = impl->appId;
146+
147+ QMap<QString, QString> headers;
148+ headers[CLICK_TOKEN_HEADER()] = clickToken;
149+
150+ udm::DownloadStruct downloadStruct(impl->downloadUrl,
151+ DOWNLOAD_MANAGER_DO_NOT_HASH,
152+ DOWNLOAD_MANAGER_IGNORE_HASH_ALGORITHM,
153+ metadata,
154+ headers);
155+
156+ impl->systemDownloadManager->createDownload(downloadStruct);
157+
158+}
159+
160+void click::DownloadManager::handleClickTokenFetchError(const QString& errorMessage)
161+{
162+ emit downloadError(errorMessage);
163+}
164+
165+void click::DownloadManager::handleDownloadCreated(udm::Download *download)
166+{
167+ if (download->isError()) {
168+ QString error = download->error()->errorString();
169+ qDebug() << "Received error from ubuntu-download-manager:" << error;
170+ emit downloadError(error);
171+ } else {
172+ download->start();
173+ emit downloadStarted(download->id());
174+ }
175+}
176+
177 void click::DownloadManager::fetchClickToken(const QString& downloadUrl)
178 {
179 impl->downloadUrl = downloadUrl;
180@@ -106,14 +188,14 @@
181
182 impl->reply = impl->nam->head(req);
183
184- typedef void (click::network::Reply::*NetworkReplySignalError)(QNetworkReply::NetworkError);
185- QObject::connect(impl->reply.data(), static_cast<NetworkReplySignalError>(&click::network::Reply::error),
186- this, &DownloadManager::handleNetworkError);
187-
188- QObject::connect(impl->reply.data(), &click::network::Reply::finished,
189- this, &DownloadManager::handleNetworkFinished);
190+ // NOTE: using SIGNAL/SLOT macros here because new-style
191+ // connections are flaky on ARM.
192+ QObject::connect(impl->reply.data(), SIGNAL(error(QNetworkReply::NetworkError)),
193+ this, SLOT(handleNetworkError(QNetworkReply::NetworkError)));
194+ QObject::connect(impl->reply.data(), SIGNAL(finished()),
195+ this, SLOT(handleNetworkFinished()));
196 }
197-
198+
199 void click::DownloadManager::handleCredentialsNotFound()
200 {
201 qDebug() << "No credentials were found.";
202
203=== modified file 'scope/click/download-manager.h'
204--- scope/click/download-manager.h 2014-02-07 16:21:36 +0000
205+++ scope/click/download-manager.h 2014-02-12 20:46:57 +0000
206@@ -40,6 +40,8 @@
207 #include <QObject>
208 #include <QString>
209
210+#include <ubuntu/download_manager/manager.h>
211+
212 namespace UbuntuOne
213 {
214 class Token;
215@@ -56,13 +58,17 @@
216 public:
217 DownloadManager(const QSharedPointer<click::network::AccessManager>& networkAccessManager,
218 const QSharedPointer<click::CredentialsService>& ssoService,
219+ const QSharedPointer<Ubuntu::DownloadManager::Manager>& systemDownloadManager,
220 QObject *parent = 0);
221 virtual ~DownloadManager();
222
223 public slots:
224+ virtual void startDownload(const QString& downloadUrl, const QString& appId);
225 virtual void fetchClickToken(const QString& downloadUrl);
226
227 signals:
228+ void downloadStarted(const QString& downloadObjectPath);
229+ void downloadError(const QString& errorMessage);
230 void clickTokenFetched(const QString& clickToken);
231 void clickTokenFetchError(const QString& errorMessage);
232
233@@ -71,6 +77,9 @@
234 virtual void handleCredentialsNotFound();
235 virtual void handleNetworkFinished();
236 virtual void handleNetworkError(QNetworkReply::NetworkError error);
237+ virtual void handleDownloadCreated(Ubuntu::DownloadManager::Download *download);
238+ virtual void handleClickTokenFetched(const QString& clickToken);
239+ virtual void handleClickTokenFetchError(const QString& errorMessage);
240
241 protected:
242 struct Private;
243
244=== modified file 'scope/tests/CMakeLists.txt'
245--- scope/tests/CMakeLists.txt 2014-02-10 19:55:31 +0000
246+++ scope/tests/CMakeLists.txt 2014-02-12 20:46:57 +0000
247@@ -40,6 +40,8 @@
248
249 ${UNITY_SCOPES_LDFLAGS}
250 ${UBUNTUONE_LDFLAGS}
251+ ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
252+ ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
253
254 gmock
255 gmock_main
256
257=== modified file 'scope/tests/download_manager_tool/download_manager_tool.cpp'
258--- scope/tests/download_manager_tool/download_manager_tool.cpp 2014-02-05 09:23:09 +0000
259+++ scope/tests/download_manager_tool/download_manager_tool.cpp 2014-02-12 20:46:57 +0000
260@@ -39,22 +39,33 @@
261 QObject(parent)
262 {
263 _dm = new click::DownloadManager(QSharedPointer<click::network::AccessManager>(new click::network::AccessManager()),
264- QSharedPointer<click::CredentialsService>(new click::CredentialsService()));
265+ QSharedPointer<click::CredentialsService>(new click::CredentialsService()),
266+ QSharedPointer<Ubuntu::DownloadManager::Manager>(
267+ Ubuntu::DownloadManager::Manager::createSessionManager()));
268+}
269+
270+void DownloadManagerTool::handleResponse(QString response)
271+{
272+ QTextStream(stdout) << "DONE: response is " << response << "\n";
273+ emit finished();
274+}
275+
276+void DownloadManagerTool::fetchClickToken(QString url)
277+{
278 QObject::connect(_dm, &click::DownloadManager::clickTokenFetched,
279- this, &DownloadManagerTool::handleFetchResponse);
280+ this, &DownloadManagerTool::handleResponse);
281 QObject::connect(_dm, &click::DownloadManager::clickTokenFetchError,
282- this, &DownloadManagerTool::handleFetchResponse);
283-}
284-
285-void DownloadManagerTool::handleFetchResponse(QString response)
286-{
287- QTextStream(stdout) << "DONE: response is " << response << "\n";
288- emit finished();
289-}
290-
291-void DownloadManagerTool::fetchClickToken()
292-{
293- _dm->fetchClickToken(_url);
294+ this, &DownloadManagerTool::handleResponse);
295+ _dm->fetchClickToken(url);
296+}
297+
298+void DownloadManagerTool::startDownload(QString url, QString appId)
299+{
300+ QObject::connect(_dm, &click::DownloadManager::downloadStarted,
301+ this, &DownloadManagerTool::handleResponse);
302+ QObject::connect(_dm, &click::DownloadManager::downloadError,
303+ this, &DownloadManagerTool::handleResponse);
304+ _dm->startDownload(url, appId);
305 }
306
307 int main(int argc, char *argv[])
308@@ -62,19 +73,35 @@
309
310 QCoreApplication a(argc, argv);
311 DownloadManagerTool tool;
312-
313- if (argc != 2) {
314- QTextStream(stderr) << "Usage: download_manager_tool https://public.apps.ubuntu.com/download/<<rest of click package dl url>>"
315- << "\n\t - when run with a valid U1 credential in the system, should print the click token to stdout.\n";
316+ QTimer timer;
317+ timer.setSingleShot(true);
318+
319+ QObject::connect(&tool, SIGNAL(finished()), &a, SLOT(quit()));
320+
321+ if (argc == 2) {
322+
323+ QObject::connect(&timer, &QTimer::timeout, [&]() {
324+ tool.fetchClickToken(QString(argv[1]));
325+ } );
326+
327+ } else if (argc == 3) {
328+
329+ QObject::connect(&timer, &QTimer::timeout, [&]() {
330+ tool.startDownload(QString(argv[1]), QString(argv[2]));
331+ } );
332+
333+ } else {
334+ QTextStream(stderr) << "Usages:\n"
335+ << "download_manager_tool https://public.apps.ubuntu.com/download/<<rest of click package dl url>>\n"
336+ << "\t - when run with a valid U1 credential in the system, should print the click token to stdout.\n"
337+ << "download_manager_tool url app_id\n"
338+ << "\t - with a valid credential, should begin a download.\n";
339+
340 return 1;
341 }
342+
343+ timer.start(0);
344
345-
346- tool.setClickTokenURL(QString(argv[1]));
347-
348- QObject::connect(&tool, SIGNAL(finished()), &a, SLOT(quit()));
349-
350- QTimer::singleShot(0, &tool, SLOT(fetchClickToken()));
351 qInstallMessageHandler(0);
352 return a.exec();
353 }
354
355=== modified file 'scope/tests/download_manager_tool/download_manager_tool.h'
356--- scope/tests/download_manager_tool/download_manager_tool.h 2014-01-29 00:49:31 +0000
357+++ scope/tests/download_manager_tool/download_manager_tool.h 2014-02-12 20:46:57 +0000
358@@ -40,17 +40,16 @@
359 explicit DownloadManagerTool(QObject *parent=0);
360
361 public slots:
362- void setClickTokenURL(QString url) { _url = url;};
363- void fetchClickToken();
364+ void fetchClickToken(QString url);
365+ void startDownload(QString url, QString appId);
366
367 private slots:
368- void handleFetchResponse(QString response);
369+ void handleResponse(QString response);
370
371 signals:
372 void finished();
373
374 private:
375- QString _url;
376 click::DownloadManager *_dm;
377
378 };
379
380=== added file 'scope/tests/mock_ubuntu_download_manager.h'
381--- scope/tests/mock_ubuntu_download_manager.h 1970-01-01 00:00:00 +0000
382+++ scope/tests/mock_ubuntu_download_manager.h 2014-02-12 20:46:57 +0000
383@@ -0,0 +1,82 @@
384+/*
385+ * Copyright (C) 2014 Canonical Ltd.
386+ *
387+ * This program is free software: you can redistribute it and/or modify it
388+ * under the terms of the GNU General Public License version 3, as published
389+ * by the Free Software Foundation.
390+ *
391+ * This program is distributed in the hope that it will be useful, but
392+ * WITHOUT ANY WARRANTY; without even the implied warranties of
393+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
394+ * PURPOSE. See the GNU General Public License for more details.
395+ *
396+ * You should have received a copy of the GNU General Public License along
397+ * with this program. If not, see <http://www.gnu.org/licenses/>.
398+ *
399+ * In addition, as a special exception, the copyright holders give
400+ * permission to link the code of portions of this program with the
401+ * OpenSSL library under certain conditions as described in each
402+ * individual source file, and distribute linked combinations
403+ * including the two.
404+ * You must obey the GNU General Public License in all respects
405+ * for all of the code used other than OpenSSL. If you modify
406+ * file(s) with this exception, you may extend this exception to your
407+ * version of the file(s), but you are not obligated to do so. If you
408+ * do not wish to do so, delete this exception statement from your
409+ * version. If you delete this exception statement from all source
410+ * files in the program, then also delete it here.
411+ */
412+
413+#ifndef _MOCK_UBUNTU_DOWNLOAD_MANAGER_H_
414+#define _MOCK_UBUNTU_DOWNLOAD_MANAGER_H_
415+
416+#include <QDBusConnection>
417+#include <QDBusObjectPath>
418+
419+#include <ubuntu/download_manager/download.h>
420+#include <ubuntu/download_manager/error.h>
421+#include <ubuntu/download_manager/manager.h>
422+
423+
424+class MockDownload : public Ubuntu::DownloadManager::Download
425+{
426+public:
427+ MockDownload() : Ubuntu::DownloadManager::Download(QDBusConnection::sessionBus(),
428+ QString("mockservicepath"),
429+ QDBusObjectPath("/com/ubuntu/download_manager/test"), 0) {};
430+ MockDownload(Ubuntu::DownloadManager::Error *err) : Ubuntu::DownloadManager::Download(QDBusConnection::sessionBus(),
431+ err, 0) {};
432+ // Can't mock methods that aren't virtual:
433+ // when https://bugs.launchpad.net/ubuntu-download-manager/+bug/1278789
434+ // is fixed, we can update this
435+ // MOCK_METHOD0(isError, bool());
436+ // MOCK_METHOD0(error, Error*());
437+ // MOCK_METHOD0(id, QString());
438+ // MOCK_METHOD0(start, void());
439+};
440+
441+class MockError : public Ubuntu::DownloadManager::Error
442+{
443+public:
444+
445+ MockError() : Ubuntu::DownloadManager::Error(Ubuntu::DownloadManager::Error::Type::Process, 0) {};
446+ MOCK_METHOD0(errorString, QString());
447+};
448+
449+class MockSystemDownloadManager : public Ubuntu::DownloadManager::Manager
450+{
451+public:
452+
453+ MockSystemDownloadManager() : Ubuntu::DownloadManager::Manager(QDBusConnection::sessionBus(), "mockpath", 0) {};
454+
455+ MOCK_METHOD1(createDownload,
456+ void(DownloadStruct downStruct));
457+ MOCK_METHOD3(createDownload,
458+ void(DownloadStruct downStruct, DownloadCb cb, DownloadCb errCb));
459+ MOCK_METHOD5(createDownload,
460+ void(StructList downs, const QString &algorithm, bool allowed3G, const QVariantMap &metadata, StringMap headers));
461+ MOCK_METHOD7(createDownload,
462+ void(StructList downs, const QString &algorithm, bool allowed3G, const QVariantMap &metadata, StringMap headers, GroupCb cb, GroupCb errCb));
463+};
464+
465+#endif /* _MOCK_UBUNTU_DOWNLOAD_MANAGER_H_ */
466
467=== modified file 'scope/tests/test_download_manager.cpp'
468--- scope/tests/test_download_manager.cpp 2014-02-07 16:21:36 +0000
469+++ scope/tests/test_download_manager.cpp 2014-02-12 20:46:57 +0000
470@@ -27,6 +27,7 @@
471 * files in the program, then also delete it here.
472 */
473
474+#include <QDBusObjectPath>
475 #include <QCoreApplication>
476 #include <QDebug>
477 #include <QString>
478@@ -42,16 +43,25 @@
479
480 #include "mock_network_access_manager.h"
481 #include "mock_ubuntuone_credentials.h"
482+#include "mock_ubuntu_download_manager.h"
483+
484+namespace udm = Ubuntu::DownloadManager;
485+#include <ubuntu/download_manager/download_struct.h>
486+
487
488 namespace
489 {
490 const QString TEST_URL("http://test.local/");
491 const QString TEST_HEADER_VALUE("test header value");
492+const QString TEST_APP_ID("test_app_id");
493+const QString TEST_CLICK_TOKEN_VALUE("test token value");
494+const QString TEST_DOWNLOAD_ID("/com/ubuntu/download_manager/test");
495+const QString TEST_DOWNLOADERROR_STRING("test downloadError string");
496
497-struct TestParameters
498+struct CredsNetworkTestParameters
499 {
500 public:
501- TestParameters(bool credsFound = true, bool replySignalsError = false,
502+ CredsNetworkTestParameters(bool credsFound = true, bool replySignalsError = false,
503 int replyStatusCode = 200, bool replyHasClickRawHeader = true,
504 bool expectSuccessSignal = true)
505 : credsFound(credsFound), replySignalsError(replySignalsError), replyStatusCode(replyStatusCode),
506@@ -64,7 +74,7 @@
507 bool expectSuccessSignal;
508 };
509
510-::std::ostream& operator<<(::std::ostream& os, const TestParameters& p)
511+::std::ostream& operator<<(::std::ostream& os, const CredsNetworkTestParameters& p)
512 {
513 return os << "creds[" << (p.credsFound ? "x" : " ") << "] "
514 << "replySignalsError[" << (p.replySignalsError ? "x" : " ") << "] "
515@@ -73,13 +83,38 @@
516 << "expectSuccessSignal[" << (p.expectSuccessSignal ? "x" : " ") << "] ";
517 }
518
519-struct DownloadManagerTest : public ::testing::TestWithParam<TestParameters>
520-{
521- DownloadManagerTest()
522+
523+struct StartDownloadTestParameters
524+{
525+public:
526+ StartDownloadTestParameters(bool clickTokenFetchSignalsError = false,
527+ bool downloadSignalsError = false,
528+ bool expectSuccessSignal = true)
529+ : clickTokenFetchSignalsError(clickTokenFetchSignalsError),
530+ downloadSignalsError(downloadSignalsError),
531+ expectSuccessSignal(expectSuccessSignal) {};
532+
533+ bool clickTokenFetchSignalsError;
534+ bool downloadSignalsError;
535+ bool expectSuccessSignal;
536+};
537+
538+::std::ostream& operator<<(::std::ostream& os, const StartDownloadTestParameters& p)
539+{
540+ return os << "clickTokenFetchSignalsError[" << (p.clickTokenFetchSignalsError ? "x" : " ") << "] "
541+ << "downloadSignalsError[" << (p.downloadSignalsError ? "x" : " ") << "] "
542+ << "expectSuccessSignal[" << (p.expectSuccessSignal ? "x" : " ") << "] ";
543+}
544+
545+
546+struct DownloadManagerTestBase
547+{
548+ DownloadManagerTestBase()
549 : app(argc, argv),
550 mockNam(new MockNetworkAccessManager()),
551 mockCredentialsService(new MockCredentialsService()),
552- mockReplyPtr(&mockReply, [](click::network::Reply*) {})
553+ mockReplyPtr(&mockReply, [](click::network::Reply*) {}),
554+ mockSystemDownloadManager(new MockSystemDownloadManager())
555 {
556 signalTimer.setSingleShot(true);
557 testTimeout.setSingleShot(true);
558@@ -89,33 +124,6 @@
559 [this]() { app.quit(); FAIL() << "Operation timed out."; } );
560 }
561
562- void signalEmptyTokenFromMockCredsService()
563- {
564- UbuntuOne::Token token;
565- mockCredentialsService->credentialsFound(token);
566- }
567-
568- void signalErrorAfterDelay()
569- {
570- // delay emitting this signal so that the download manager has
571- // time to connect to the signal first, as the (mock)Reply is
572- // returned by the (mock)Nam.
573- QObject::connect(&signalTimer, &QTimer::timeout, [this]()
574- {
575- mockReplyPtr->error(QNetworkReply::UnknownNetworkError);
576- });
577- signalTimer.start(10);
578- }
579-
580- void signalFinishedAfterDelay()
581- {
582- QObject::connect(&signalTimer, &QTimer::timeout, [this]()
583- {
584- mockReplyPtr->finished();
585- });
586- signalTimer.start(10);
587- }
588-
589 void SetUp()
590 {
591 const int oneSecondInMsec = 1000;
592@@ -134,25 +142,67 @@
593 QTimer signalTimer;
594 QSharedPointer<MockNetworkAccessManager> mockNam;
595 QSharedPointer<MockCredentialsService> mockCredentialsService;
596- MockNetworkReply mockReply;
597+ ::testing::NiceMock<MockNetworkReply> mockReply;
598 QSharedPointer<click::network::Reply> mockReplyPtr;
599-};
600-
601+ QSharedPointer<MockSystemDownloadManager> mockSystemDownloadManager;
602+};
603+
604+struct DISABLED_DownloadManagerStartDownloadTest : public DownloadManagerTestBase,
605+ public ::testing::TestWithParam<StartDownloadTestParameters>
606+{
607+public:
608+};
609+
610+struct DISABLED_DownloadManagerCredsNetworkTest : public DownloadManagerTestBase,
611+ public ::testing::TestWithParam<CredsNetworkTestParameters>
612+{
613+public:
614+
615+ void signalEmptyTokenFromMockCredsService()
616+ {
617+ UbuntuOne::Token token;
618+ mockCredentialsService->credentialsFound(token);
619+ }
620+
621+ void signalErrorAfterDelay()
622+ {
623+ // delay emitting this signal so that the download manager has
624+ // time to connect to the signal first, as the (mock)Reply is
625+ // returned by the (mock)Nam.
626+ QObject::connect(&signalTimer, &QTimer::timeout, [this]()
627+ {
628+ mockReplyPtr->error(QNetworkReply::UnknownNetworkError);
629+ });
630+ signalTimer.start(10);
631+ }
632+
633+ void signalFinishedAfterDelay()
634+ {
635+ QObject::connect(&signalTimer, &QTimer::timeout, [this]()
636+ {
637+ mockReplyPtr->finished();
638+ });
639+ signalTimer.start(10);
640+ }
641+
642+};
643
644 struct DownloadManagerMockClient
645 {
646 MOCK_METHOD1(onClickTokenFetchedEmitted, void(QString clickToken));
647 MOCK_METHOD1(onClickTokenFetchErrorEmitted, void(QString errorMessage));
648+ MOCK_METHOD1(onDownloadStartedEmitted, void(QString id));
649+ MOCK_METHOD1(onDownloadErrorEmitted, void(QString errorMessage));
650 };
651
652 } // anon namespace
653
654
655-TEST_P(DownloadManagerTest, TestFetchClickToken)
656+TEST_P(DISABLED_DownloadManagerCredsNetworkTest, TestFetchClickToken)
657 {
658 using namespace ::testing;
659
660- TestParameters p = GetParam();
661+ CredsNetworkTestParameters p = GetParam();
662
663 QList<QPair<QByteArray, QByteArray> > emptyHeaderPairs;
664 ON_CALL(mockReply, rawHeaderPairs()).WillByDefault(Return(emptyHeaderPairs));
665@@ -163,19 +213,19 @@
666 EXPECT_CALL(*mockCredentialsService, getCredentials())
667 .Times(1).WillOnce(
668 InvokeWithoutArgs(this,
669- &DownloadManagerTest::signalEmptyTokenFromMockCredsService));
670+ &DISABLED_DownloadManagerCredsNetworkTest::signalEmptyTokenFromMockCredsService));
671
672 if (p.replySignalsError) {
673 EXPECT_CALL(*mockNam, head(_)).WillOnce(
674 DoAll(
675- InvokeWithoutArgs(this, &DownloadManagerTest::signalErrorAfterDelay),
676+ InvokeWithoutArgs(this, &DISABLED_DownloadManagerCredsNetworkTest::signalErrorAfterDelay),
677 Return(mockReplyPtr)));
678 EXPECT_CALL(mockReply, errorString()).Times(1).WillOnce(Return(QString("Bogus error for tests")));
679
680 } else {
681 EXPECT_CALL(*mockNam, head(_)).WillOnce(
682 DoAll(
683- InvokeWithoutArgs(this, &DownloadManagerTest::signalFinishedAfterDelay),
684+ InvokeWithoutArgs(this, &DISABLED_DownloadManagerCredsNetworkTest::signalFinishedAfterDelay),
685 Return(mockReplyPtr)));
686
687 EXPECT_CALL(mockReply, attribute(QNetworkRequest::HttpStatusCodeAttribute))
688@@ -201,7 +251,8 @@
689 EXPECT_CALL(*mockNam, head(_)).Times(0);
690 }
691
692- click::DownloadManager dm(mockNam, mockCredentialsService);
693+ click::DownloadManager dm(mockNam, mockCredentialsService,
694+ mockSystemDownloadManager);
695
696 DownloadManagerMockClient mockDownloadManagerClient;
697
698@@ -225,7 +276,7 @@
699 .WillOnce(
700 InvokeWithoutArgs(
701 this,
702- &DownloadManagerTest::Quit));
703+ &DISABLED_DownloadManagerCredsNetworkTest::Quit));
704
705 EXPECT_CALL(mockDownloadManagerClient, onClickTokenFetchErrorEmitted(_)).Times(0);
706
707@@ -236,7 +287,7 @@
708 .WillOnce(
709 InvokeWithoutArgs(
710 this,
711- &DownloadManagerTest::Quit));
712+ &DISABLED_DownloadManagerCredsNetworkTest::Quit));
713
714 EXPECT_CALL(mockDownloadManagerClient, onClickTokenFetchedEmitted(_)).Times(0);
715
716@@ -260,15 +311,144 @@
717 app.exec();
718 }
719
720-
721-// Test Cases:
722-
723-INSTANTIATE_TEST_CASE_P(AllDownloadManagerTests, DownloadManagerTest,
724- ::testing::Values(
725- // TestParameters(credsFound, replySignalsError, replyStatusCode, replyHasClickRawHeader, expectSuccessSignal)
726- TestParameters(true, false, 200, true, true), // success
727- TestParameters(true, true, 200, true, false), // misc QNetworkReply error => error
728- TestParameters(true, false, 200, false, false), // no header => error
729- TestParameters(true, false, 401, true, false), // HTTP error status => error
730- TestParameters(false, false, 200, true, false) // no creds => error
731+INSTANTIATE_TEST_CASE_P(DownloadManagerCredsNetworkTests, DISABLED_DownloadManagerCredsNetworkTest,
732+ ::testing::Values(
733+ // CredsNetworkTestParameters(credsFound, replySignalsError, replyStatusCode, replyHasClickRawHeader, expectSuccessSignal)
734+ CredsNetworkTestParameters(true, false, 200, true, true), // success
735+ CredsNetworkTestParameters(true, true, 200, true, false), // misc QNetworkReply error => error
736+ CredsNetworkTestParameters(true, false, 200, false, false), // no header => error
737+ CredsNetworkTestParameters(true, false, 401, true, false), // HTTP error status => error
738+ CredsNetworkTestParameters(false, false, 200, true, false) // no creds => error
739+ ));
740+
741+
742+MATCHER(DownloadStructIsValid, "Struct is not valid")
743+{
744+ return arg.getUrl() == TEST_URL
745+ && arg.getHash() == ""
746+ && arg.getAlgorithm() == ""
747+ && arg.getMetadata()["app_id"] == QVariant(TEST_APP_ID)
748+ && arg.getMetadata()["post-download-command"].toStringList().length() == 4
749+ && arg.getHeaders()["X-Click-Token"] == TEST_CLICK_TOKEN_VALUE;
750+}
751+
752+
753+TEST_P(DISABLED_DownloadManagerStartDownloadTest, TestStartDownload)
754+{
755+ using namespace ::testing;
756+
757+ StartDownloadTestParameters p = GetParam();
758+
759+ click::DownloadManager dm(mockNam, mockCredentialsService,
760+ mockSystemDownloadManager);
761+
762+ // mockError is heap-allocated because downloadWithError will delete it.
763+ MockError *mockError = new MockError();
764+ MockDownload downloadWithError(mockError);
765+ MockDownload successfulDownload;
766+
767+ // Just directly signal clickTokenFetched or error from
768+ // getCredentials(), no need to re-test the same code as the
769+ // previous test
770+
771+ std::function<void()> clickTokenSignalFunc;
772+ if (p.clickTokenFetchSignalsError) {
773+ clickTokenSignalFunc = std::function<void()>([&](){
774+ dm.clickTokenFetchError(TEST_DOWNLOADERROR_STRING);
775+ });
776+ EXPECT_CALL(*mockSystemDownloadManager, createDownload(_)).Times(0);
777+
778+ } else {
779+ clickTokenSignalFunc = std::function<void()>([&](){
780+ dm.clickTokenFetched(TEST_CLICK_TOKEN_VALUE);
781+ });
782+
783+ std::function<void()> downloadCreatedSignalFunc;
784+
785+ // NOTE: udm::Download doesn't have virtual functions, so mocking
786+ // them doesn't work and we have to construct objects that will
787+ // behave correctly without mock return values, using overridden constructors:
788+ if (p.downloadSignalsError) {
789+
790+ EXPECT_CALL(*mockError, errorString()).Times(1).WillOnce(Return(TEST_DOWNLOADERROR_STRING));
791+ downloadCreatedSignalFunc = std::function<void()>([&](){
792+ mockSystemDownloadManager->downloadCreated(&downloadWithError);
793+ });
794+
795+ } else {
796+ EXPECT_CALL(*mockError, errorString()).Times(0);
797+ downloadCreatedSignalFunc = std::function<void()>([&](){
798+ mockSystemDownloadManager->downloadCreated(&successfulDownload);
799+ });
800+ }
801+
802+ EXPECT_CALL(*mockSystemDownloadManager,
803+ createDownload(DownloadStructIsValid())).Times(1).WillOnce(InvokeWithoutArgs(downloadCreatedSignalFunc));
804+ }
805+
806+ EXPECT_CALL(*mockCredentialsService, getCredentials())
807+ .Times(1).WillOnce(InvokeWithoutArgs(clickTokenSignalFunc));
808+
809+
810+ DownloadManagerMockClient mockDownloadManagerClient;
811+
812+ QObject::connect(&dm, &click::DownloadManager::downloadError,
813+ [&mockDownloadManagerClient](const QString& error)
814+ {
815+ mockDownloadManagerClient.onDownloadErrorEmitted(error);
816+ });
817+
818+
819+ QObject::connect(&dm, &click::DownloadManager::downloadStarted,
820+ [&mockDownloadManagerClient](const QString& downloadId)
821+ {
822+ mockDownloadManagerClient.onDownloadStartedEmitted(downloadId);
823+ });
824+
825+ if (p.expectSuccessSignal) {
826+
827+ EXPECT_CALL(mockDownloadManagerClient, onDownloadStartedEmitted(TEST_DOWNLOAD_ID))
828+ .Times(1)
829+ .WillOnce(
830+ InvokeWithoutArgs(
831+ this,
832+ &DISABLED_DownloadManagerStartDownloadTest::Quit));
833+
834+ EXPECT_CALL(mockDownloadManagerClient, onDownloadErrorEmitted(_)).Times(0);
835+
836+ // when https://bugs.launchpad.net/ubuntu-download-manager/+bug/1278789
837+ // is fixed, we can add this assertion:
838+ // EXPECT_CALL(successfulDownload, start()).Times(1);
839+
840+ } else {
841+
842+ EXPECT_CALL(mockDownloadManagerClient, onDownloadErrorEmitted(TEST_DOWNLOADERROR_STRING))
843+ .Times(1)
844+ .WillOnce(
845+ InvokeWithoutArgs(
846+ this,
847+ &DISABLED_DownloadManagerStartDownloadTest::Quit));
848+
849+ EXPECT_CALL(mockDownloadManagerClient, onDownloadStartedEmitted(_)).Times(0);
850+
851+ }
852+
853+ QTimer timer;
854+ timer.setSingleShot(true);
855+ QObject::connect(&timer, &QTimer::timeout, [&dm]() {
856+ dm.startDownload(TEST_URL, TEST_APP_ID);
857+ } );
858+ timer.start(0);
859+
860+ // now exec the app so events can proceed:
861+ app.exec();
862+
863+}
864+
865+INSTANTIATE_TEST_CASE_P(DownloadManagerStartDownloadTests, DISABLED_DownloadManagerStartDownloadTest,
866+ ::testing::Values(
867+ // params: (clickTokenFetchSignalsError, downloadSignalsError, expectSuccessSignal)
868+ StartDownloadTestParameters(false, false, true),
869+ StartDownloadTestParameters(true, false, false),
870+ StartDownloadTestParameters(false, true, false)
871 ));

Subscribers

People subscribed via source and target branches

to all changes: