1
=== modified file 'bin/CMakeLists.txt'
2
--- bin/CMakeLists.txt	2014-08-14 14:59:57 +0000
3
+++ bin/CMakeLists.txt	2016-09-21 14:55:05 +0000
4
@@ -1,1 +1,4 @@
6
1
install(PROGRAMS install-helper enable-purchases DESTINATION lib/unity-scope-click/)
1
install(
7
2
  PROGRAMS install-helper install-snap enable-purchases
8
3
  DESTINATION lib/unity-scope-click/
9
4
)
10
2
5
11
=== modified file 'bin/install-helper'
12
--- bin/install-helper	2014-06-20 05:09:01 +0000
13
+++ bin/install-helper	2016-09-21 14:55:05 +0000
14
@@ -1,6 +1,6 @@
15
1
#!/bin/bash
1
#!/bin/bash
16
2
#
2
#
18
3
# Copyright (C) 2014 Canonical Ltd.
3
# Copyright (C) 2014-2016 Canonical Ltd.
19
4
# 
4
# 
20
5
# This program is free software: you can redistribute it and/or modify it
5
# This program is free software: you can redistribute it and/or modify it
21
6
# under the terms of the GNU General Public License version 3, as published
6
# under the terms of the GNU General Public License version 3, as published
22
@@ -47,7 +47,14 @@
23
47
47
24
48
function install-package {
48
function install-package {
25
49
    FILE_NAME="$1"
49
    FILE_NAME="$1"
27
50
    pkcon -p install-local "$FILE_NAME"
50
    FILE_TYPE="${FILE_NAME##*.}"
28
51
    if [ ${FILE_TYPE} = "click" ]; then
29
52
        pkcon -p install-local "${FILE_NAME}"
30
53
    else
31
54
        SCRIPT_PATH=`dirname $0`
32
55
        SNAP_SCRIPT="${SCRIPT_PATH}/install-snap"
33
56
        pkexec ${SNAP_SCRIPT} "${FILE_NAME}"
34
57
    fi
35
51
}
58
}
36
52
59
37
53
function app_id-from-package_name {
60
function app_id-from-package_name {
38
54
61
39
=== added file 'bin/install-snap'
40
--- bin/install-snap	1970-01-01 00:00:00 +0000
41
+++ bin/install-snap	2016-09-21 14:55:05 +0000
42
@@ -0,0 +1,73 @@
43
1
#!/bin/bash
44
2
#
45
3
# Copyright (C) 2016 Canonical Ltd.
46
4
# 
47
5
# This program is free software: you can redistribute it and/or modify it
48
6
# under the terms of the GNU General Public License version 3, as published
49
7
# by the Free Software Foundation.
50
8
# 
51
9
# This program is distributed in the hope that it will be useful, but
52
10
# WITHOUT ANY WARRANTY; without even the implied warranties of
53
11
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
54
12
# PURPOSE.  See the GNU General Public License for more details.
55
13
# 
56
14
# You should have received a copy of the GNU General Public License along
57
15
# with this program.  If not, see <http://www.gnu.org/licenses/>.
58
16
# 
59
17
# In addition, as a special exception, the copyright holders give
60
18
# permission to link the code of portions of this program with the
61
19
# OpenSSL library under certain conditions as described in each
62
20
# individual source file, and distribute linked combinations
63
21
# including the two.
64
22
# You must obey the GNU General Public License in all respects
65
23
# for all of the code used other than OpenSSL.  If you modify
66
24
# file(s) with this exception, you may extend this exception to your
67
25
# version of the file(s), but you are not obligated to do so.  If you
68
26
# do not wish to do so, delete this exception statement from your
69
27
# version.  If you delete this exception statement from all source
70
28
# files in the program, then also delete it here.
71
29
#
72
30
73
31
set -ex
74
32
75
33
if [ -z "$1" ]; then
76
34
    echo "usage: install-snap <filename.snap>"
77
35
    exit -10
78
36
fi
79
37
80
38
SNAP_FILE_NAME="$1"
81
39
SNAP_FILE=$(basename ${SNAP_FILE_NAME})
82
40
SNAP_REVID=${SNAP_FILE%%.*}
83
41
SNAP_ID=${SNAP_REVID%%_*}
84
42
SNAP_REV=${SNAP_REVID##*_}
85
43
86
44
# We have to get not just the 384 hash, but a "snap-digest" for the snap.
87
45
# This is a base64-encoded binary hex of the sha3 384 hash
88
46
SNAP_SHA3SUM=$(sha3sum -a 384 ${SNAP_FILE_NAME} | cut -d ' ' -f1)
89
47
SNAP_B64SHA=$(echo ${SNAP_SHA3SUM} | python3 -c 'import sys, binascii, base64; print(base64.urlsafe_b64encode(binascii.a2b_hex((sys.stdin.readline().strip().encode("ASCII")))).decode("ASCII").rstrip("="))')
90
48
91
49
92
50
# Need to get the assertions to add to snapd
93
51
ASSERTIONS_BASE_URL="https://assertions.ubuntu.com/v1/assertions"
94
52
function download {
95
53
    wget --header "Accept: application/x.ubuntu.assertion" -O - $1 > $2
96
54
}
97
55
98
56
# The '16' is hard-coded here for series. By the time it changes again, we
99
57
# should have switched to using snapd for everything anyway.
100
58
download "${ASSERTIONS_BASE_URL}/snap-declaration/16/${SNAP_ID}" "${SNAP_FILE_NAME}.snap-declaration"
101
59
download "${ASSERTIONS_BASE_URL}/snap-revision/${SNAP_B64SHA}" "${SNAP_FILE_NAME}.snap-revision"
102
60
103
61
# We have to get the publisher-id to get the account assertion for install
104
62
AUTHOR_ID=$(grep "publisher-id:" ${SNAP_FILE_NAME}.snap-declaration | cut -d ' ' -f2)
105
63
download "${ASSERTIONS_BASE_URL}/account/${AUTHOR_ID}" "${SNAP_FILE_NAME}.account"
106
64
107
65
# snap exits with error if assertion already exists, so must ignore errors :-/
108
66
snap ack "${SNAP_FILE_NAME}.account" || true
109
67
snap ack "${SNAP_FILE_NAME}.snap-declaration" || true
110
68
snap ack "${SNAP_FILE_NAME}.snap-revision" || true
111
69
112
70
# Delete the assertions files after importing them
113
71
rm -f "${SNAP_FILE_NAME}.*"
114
72
115
73
snap install ${SNAP_FILE_NAME}
116
0
74
117
=== modified file 'debian/control'
118
--- debian/control	2016-09-21 14:55:05 +0000
119
+++ debian/control	2016-09-21 14:55:05 +0000
120
@@ -40,16 +40,19 @@
121
40
Package: unity-scope-click
40
Package: unity-scope-click
122
41
Architecture: armhf arm64 i386 amd64
41
Architecture: armhf arm64 i386 amd64
123
42
Depends: account-plugin-ubuntuone,
42
Depends: account-plugin-ubuntuone,
124
43
         grep,
125
44
         libdigest-sha3-perl,
126
43
         libglib2.0-bin,
45
         libglib2.0-bin,
127
44
         libsqlite3-0 (>= 3.8.5),
46
         libsqlite3-0 (>= 3.8.5),
130
45
         packagekit,
47
         snapd | packagekit,
131
46
         packagekit-tools,
48
         snapd | packagekit-tools,
132
47
         pay-service,
49
         pay-service,
133
48
         ubuntu-app-launch-tools,
50
         ubuntu-app-launch-tools,
134
49
         ubuntu-download-manager,
51
         ubuntu-download-manager,
136
50
         ubuntu-sdk-libs,
52
         snapd | ubuntu-sdk-libs,
137
51
         unity-scope-click-departmentsdb (= ${binary:Version}),
53
         unity-scope-click-departmentsdb (= ${binary:Version}),
138
52
         upstart,
54
         upstart,
139
55
         wget,
140
53
         ${misc:Depends},
56
         ${misc:Depends},
141
54
         ${shlibs:Depends},
57
         ${shlibs:Depends},
142
55
Breaks: unity (<< 7.0),
58
Breaks: unity (<< 7.0),
143
56
59
144
=== modified file 'libclickscope/click/configuration.cpp'
145
--- libclickscope/click/configuration.cpp	2016-02-19 03:35:43 +0000
146
+++ libclickscope/click/configuration.cpp	2016-09-21 14:55:05 +0000
147
@@ -1,5 +1,5 @@
148
1
/*
1
/*
150
2
 * Copyright (C) 2014-2015 Canonical Ltd.
2
 * Copyright (C) 2014-2016 Canonical Ltd.
151
3
 *
3
 *
152
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
153
5
 * under the terms of the GNU General Public License version 3, as published
5
 * under the terms of the GNU General Public License version 3, as published
154
@@ -27,6 +27,8 @@
155
27
 * files in the program, then also delete it here.
27
 * files in the program, then also delete it here.
156
28
 */
28
 */
157
29
29
158
30
#include "configuration.h"
159
31
160
30
#include <string>
32
#include <string>
161
31
#include <vector>
33
#include <vector>
162
32
34
163
@@ -43,8 +45,9 @@
164
43
45
165
44
#include <boost/algorithm/string.hpp>
46
#include <boost/algorithm/string.hpp>
166
45
#include <boost/algorithm/string/replace.hpp>
47
#include <boost/algorithm/string/replace.hpp>
169
46
48
#include <sys/stat.h>
170
47
#include "configuration.h"
49
#include <sys/types.h>
171
50
#include <unistd.h>
172
48
51
173
49
namespace click {
52
namespace click {
174
50
53
175
@@ -121,6 +124,13 @@
176
121
    return arch;
124
    return arch;
177
122
}
125
}
178
123
126
179
127
bool Configuration::is_snapd_running() const
180
128
{
181
129
    struct stat sb;
182
130
    int retval = stat("/run/snapd.socket", &sb);
183
131
    return retval == 0 && (sb.st_mode & S_IFMT) == S_IFSOCK;
184
132
}
185
133
186
124
bool Configuration::get_purchases_enabled()
134
bool Configuration::get_purchases_enabled()
187
125
{
135
{
188
126
    const char* env_value = std::getenv(PURCHASES_ENVVAR);
136
    const char* env_value = std::getenv(PURCHASES_ENVVAR);
189
127
137
190
=== modified file 'libclickscope/click/configuration.h'
191
--- libclickscope/click/configuration.h	2016-09-21 14:55:05 +0000
192
+++ libclickscope/click/configuration.h	2016-09-21 14:55:05 +0000
193
@@ -54,6 +54,7 @@
194
54
54
195
55
    virtual std::vector<std::string> get_available_frameworks();
55
    virtual std::vector<std::string> get_available_frameworks();
196
56
    virtual std::string get_architecture();
56
    virtual std::string get_architecture();
197
57
    virtual bool is_snapd_running() const;
198
57
    static bool get_purchases_enabled();
58
    static bool get_purchases_enabled();
199
58
    static std::string get_currency(const std::string& fallback = CURRENCY_DEFAULT);
59
    static std::string get_currency(const std::string& fallback = CURRENCY_DEFAULT);
200
59
60
201
60
61
202
=== modified file 'libclickscope/click/download-manager.cpp'
203
--- libclickscope/click/download-manager.cpp	2016-05-10 13:42:12 +0000
204
+++ libclickscope/click/download-manager.cpp	2016-09-21 14:55:05 +0000
205
@@ -57,12 +57,6 @@
206
57
57
207
58
static const QString DOWNLOAD_MANAGER_SHA512 = "sha512";
58
static const QString DOWNLOAD_MANAGER_SHA512 = "sha512";
208
59
59
209
60
const QByteArray& CLICK_TOKEN_HEADER()
210
61
{
211
62
    static const QByteArray result("X-Click-Token");
212
63
    return result;
213
64
}
214
65
215
66
DownloadManager::DownloadManager(const QSharedPointer<click::web::Client>& client,
60
DownloadManager::DownloadManager(const QSharedPointer<click::web::Client>& client,
216
67
                                 const QSharedPointer<udm::Manager>& manager) :
61
                                 const QSharedPointer<udm::Manager>& manager) :
217
68
    client(client),
62
    client(client),
218
@@ -86,11 +80,8 @@
219
86
        if (downloads.size() > 0) {
80
        if (downloads.size() > 0) {
220
87
            auto download = downloads.at(0);
81
            auto download = downloads.at(0);
221
88
            object_path = download->id().toStdString();
82
            object_path = download->id().toStdString();
227
89
        }
83
            qDebug() << "Found object path" << QString::fromStdString(object_path)
228
90
        qDebug() << "Found object path" << QString::fromStdString(object_path)
84
                     << "for package" << QString::fromStdString(package_name);
224
91
                 << "for package" << QString::fromStdString(package_name);
225
92
        if (downloads.size() > 1) {
226
93
            qWarning() << "More than one download with the same object path";
229
94
        }
85
        }
230
95
        callback(object_path);
86
        callback(object_path);
231
96
    }, [callback, package_name](const QString& /*key*/, const QString& /*value*/, DownloadsList* /*downloads_list*/){
87
    }, [callback, package_name](const QString& /*key*/, const QString& /*value*/, DownloadsList* /*downloads_list*/){
232
@@ -100,78 +91,57 @@
233
100
    });
91
    });
234
101
}
92
}
235
102
93
308
103
click::web::Cancellable DownloadManager::start(const std::string& url,
94
void DownloadManager::start(const std::string& url,
309
104
                                               const std::string& download_sha512,
95
                            const std::string& download_sha512,
310
105
                                               const std::string& package_name,
96
                            const std::string& package_name,
311
106
                                               const std::function<void (std::string, Error)>& callback)
97
                            const std::function<void (std::string, Error)>& callback)
312
107
{
98
{
313
108
    QSharedPointer<click::web::Response> response = client->call
99
    auto signature = client->signUrl(url, "GET");
314
109
        (url, "HEAD", true);
100
315
110
101
    QVariantMap metadata;
316
111
    QObject::connect(response.data(), &click::web::Response::finished,
102
317
112
                     [this, callback, url, download_sha512, package_name,
103
    auto commandline = QVariant(QStringList() << DOWNLOAD_COMMAND << "$file" << package_name.c_str());
318
113
                      response](QString) {
104
    metadata[DOWNLOAD_COMMAND_KEY] = commandline;
319
114
                    auto status = response->get_status_code();
105
    metadata[DOWNLOAD_APP_ID_KEY] = package_name.c_str();
320
115
                    if (status == 200) {
106
    metadata["package_name"] = package_name.c_str();
321
116
                        auto clickToken = response->get_header(CLICK_TOKEN_HEADER().data());
107
322
117
                        qDebug() << "Received click token:" << clickToken.c_str();
108
    QMap<QString, QString> headers;
323
118
                        QVariantMap metadata;
109
    headers[click::web::AUTHORIZATION_HEADER.c_str()] = signature.c_str();
324
119
110
325
120
                        QVariant commandline = QVariant(QStringList() << DOWNLOAD_COMMAND << "$file" << package_name.c_str());
111
    udm::DownloadStruct downloadStruct(url.c_str(),
326
121
                        metadata[DOWNLOAD_COMMAND_KEY] = commandline;
112
                                       download_sha512.c_str(),
327
122
                        metadata[DOWNLOAD_APP_ID_KEY] = package_name.c_str();
113
                                       DOWNLOAD_MANAGER_SHA512,
328
123
                        metadata["package_name"] = package_name.c_str();
114
                                       metadata,
329
124
115
                                       headers);
330
125
                        QMap<QString, QString> headers;
116
331
126
                        headers[CLICK_TOKEN_HEADER()] = clickToken.c_str();
117
    dm->createDownload(downloadStruct,
332
127
118
                       [callback](Download* download) {
333
128
                        udm::DownloadStruct downloadStruct(url.c_str(),
119
                           if (download != nullptr) {
334
129
                                                           download_sha512.c_str(),
120
                               if (download->isError()) {
335
130
                                                           DOWNLOAD_MANAGER_SHA512,
121
                                   auto errorstr = download->error()->errorString();
336
131
                                                           metadata,
122
                                   auto error = errorstr.toStdString();
337
132
                                                           headers);
123
                                   qDebug() << "Received error from ubuntu-download-manager:" << errorstr;
338
133
124
                                   callback(error, Error::DownloadInstallError);
339
134
                        dm->createDownload(downloadStruct,
125
                               } else {
340
135
                                           [callback](Download* download) {
126
                                   download->start();
341
136
                                               if (download->isError()) {
127
                                   callback(download->id().toStdString(),
342
137
                                                   auto error = download->error()->errorString().toUtf8().data();
128
                                            Error::NoError);
343
138
                                                   qDebug() << "Received error from ubuntu-download-manager:" << error;
129
                               }
344
139
                                                   callback(error, Error::DownloadInstallError);
130
                           } else {
345
140
                                               } else {
131
                               callback("Received nullptr for download.",
346
141
                                                   download->start();
132
                                        Error::DownloadInstallError);
347
142
                                                   callback(download->id().toUtf8().data(), Error::NoError);
133
                           }
348
143
                                               }
134
                       },
349
144
                                           },
135
                       [callback](Download* download) {
350
145
                                           [callback](Download* download) {
136
                           if (download != nullptr) {
351
146
                                               callback(download->error()->errorString().toUtf8().data(),
137
                               auto errorstr = download->error()->errorString();
352
147
                                                        Error::DownloadInstallError);
138
                               auto error = errorstr.toStdString();
353
148
                                           });
139
                               callback(error, Error::DownloadInstallError);
354
149
                    } else {
140
                           } else {
355
150
                        std::string error{"Unhandled HTTP response code: "};
141
                               callback("Received nullptr for download.",
356
151
                        error += status;
142
                                        Error::DownloadInstallError);
357
152
                        callback(error, Error::DownloadInstallError);
143
                           }
358
153
                    }
144
                       });
287
154
                });
288
155
    QObject::connect(response.data(), &click::web::Response::error,
289
156
                     [this, callback, package_name](QString error, int error_code) {
290
157
                         qWarning() << QStringLiteral("Network error (%1) fetching click token for:").arg(error_code) << package_name.c_str();
291
158
                         switch(error_code) {
292
159
                         case 401:
293
160
                         case 403:
294
161
                             client->invalidateCredentials();
295
162
                             callback(error.toUtf8().data(), Error::CredentialsError);
296
163
                             break;
297
164
                         default:
298
165
                             callback(error.toUtf8().data(), Error::DownloadInstallError);
299
166
                         }
300
167
                     });
301
168
302
169
    return click::web::Cancellable(response);
303
170
}
304
171
305
172
void DownloadManager::setCredentialsService(const QSharedPointer<click::CredentialsService>& credentialsService)
306
173
{
307
174
    sso = credentialsService;
359
175
}
145
}
360
176
146
361
177
} // namespace click
147
} // namespace click
362
178
148
363
=== modified file 'libclickscope/click/download-manager.h'
364
--- libclickscope/click/download-manager.h	2016-02-26 18:51:22 +0000
365
+++ libclickscope/click/download-manager.h	2016-09-21 14:55:05 +0000
366
@@ -68,18 +68,14 @@
367
68
68
368
69
    virtual void get_progress(const std::string& package_name,
69
    virtual void get_progress(const std::string& package_name,
369
70
                              const std::function<void (std::string)>& callback);
70
                              const std::function<void (std::string)>& callback);
377
71
    virtual click::web::Cancellable start(const std::string& url,
71
    virtual void start(const std::string& url,
378
72
                                          const std::string& download_sha512,
72
                       const std::string& download_sha512,
379
73
                                          const std::string& package_name,
73
                       const std::string& package_name,
380
74
                                          const std::function<void (std::string,
74
                       const std::function<void (std::string, Error)>& callback);
374
75
                                                                    Error)>& callback);
375
76
376
77
    virtual void setCredentialsService(const QSharedPointer<click::CredentialsService>& credentialsService);
381
78
75
382
79
protected:
76
protected:
383
80
    QSharedPointer<click::web::Client> client;
77
    QSharedPointer<click::web::Client> client;
384
81
    QSharedPointer<Ubuntu::DownloadManager::Manager> dm;
78
    QSharedPointer<Ubuntu::DownloadManager::Manager> dm;
385
82
    QSharedPointer<click::CredentialsService> sso;
386
83
};
79
};
387
84
80
388
85
}
81
}
389
86
82
390
=== modified file 'libclickscope/click/index.cpp'
391
--- libclickscope/click/index.cpp	2016-04-26 10:56:47 +0000
392
+++ libclickscope/click/index.cpp	2016-09-21 14:55:05 +0000
393
@@ -112,8 +112,13 @@
394
112
std::map<std::string, std::string> Index::build_headers()
112
std::map<std::string, std::string> Index::build_headers()
395
113
{
113
{
396
114
    std::stringstream frameworks;
114
    std::stringstream frameworks;
399
115
    for (auto f: configuration->get_available_frameworks()) {
115
    const auto frameworklist = configuration->get_available_frameworks();
400
116
        frameworks << "," << f;
116
    if (frameworklist.empty()) {
401
117
        frameworks << "none";
402
118
    } else {
403
119
        for (const auto& f: frameworklist) {
404
120
            frameworks << "," << f;
405
121
        }
406
117
    }
122
    }
407
118
123
408
119
    return std::map<std::string, std::string> {
124
    return std::map<std::string, std::string> {
409
@@ -123,6 +128,15 @@
410
123
    };
128
    };
411
124
}
129
}
412
125
130
413
131
std::map<std::string, std::string> Index::add_snap_headers(const std::map<std::string, std::string>& headers) const
414
132
{
415
133
    std::map<std::string, std::string> new_headers{headers};
416
134
    new_headers["X-Ubuntu-Series"] = "16"; // Need to get from snapd
417
135
    new_headers["X-Ubuntu-Slots"] = "unity8"; // Only want unity8-using snaps
418
136
419
137
    return new_headers;
420
138
}
421
139
422
126
std::pair<Packages, Packages> Index::package_lists_from_json(const std::string& json)
140
std::pair<Packages, Packages> Index::package_lists_from_json(const std::string& json)
423
127
{
141
{
424
128
    Json::Reader reader;
142
    Json::Reader reader;
425
@@ -147,6 +161,35 @@
426
147
    return std::pair<Packages, Packages>(pl, recommends);
161
    return std::pair<Packages, Packages>(pl, recommends);
427
148
}
162
}
428
149
163
429
164
click::web::Cancellable Index::search_snaps(const std::string& query,
430
165
                                            std::function<void(click::Packages search_results, click::Packages recommendations)> callback,
431
166
                                            bool force_cache)
432
167
{
433
168
    click::web::CallParams params;
434
169
    auto built_query = build_index_query(query, "" /* No dept for snaps */);
435
170
    params.add(click::QUERY_ARGNAME, built_query.c_str());
436
171
437
172
    auto headers = add_snap_headers(build_headers());
438
173
    
439
174
    QSharedPointer<click::web::Response> response
440
175
        (client->call(get_base_url() + click::SNAP_SEARCH_PATH,
441
176
                      "GET", true, headers, "", params, force_cache));
442
177
443
178
    QObject::connect(response.data(), &click::web::Response::finished, [=](QString reply) {
444
179
            auto package_lists = package_lists_from_json(reply.toUtf8().constData());
445
180
            callback(package_lists.first, package_lists.second);
446
181
    });
447
182
    QObject::connect(response.data(), &click::web::Response::error, [=](QString description) {
448
183
        qWarning() << "No packages found due to network error:" << description;
449
184
        click::Packages pl;
450
185
        click::Packages recommends;
451
186
        qDebug() << "calling callback";
452
187
        callback(pl, recommends);
453
188
        qDebug() << "                ...Done!";
454
189
    });
455
190
    return click::web::Cancellable(response);
456
191
}
457
192
458
150
click::web::Cancellable Index::search (const std::string& query, const std::string& department,
193
click::web::Cancellable Index::search (const std::string& query, const std::string& department,
459
151
                                       std::function<void(click::Packages search_results, click::Packages recommendations)> callback,
194
                                       std::function<void(click::Packages search_results, click::Packages recommendations)> callback,
460
152
                                       bool force_cache)
195
                                       bool force_cache)
461
@@ -162,8 +205,8 @@
462
162
            package_lists = package_lists_from_json(reply.toUtf8().constData());
205
            package_lists = package_lists_from_json(reply.toUtf8().constData());
463
163
            callback(package_lists.first, package_lists.second);
206
            callback(package_lists.first, package_lists.second);
464
164
    });
207
    });
467
165
    QObject::connect(response.data(), &click::web::Response::error, [=](QString /*description*/) {
208
    QObject::connect(response.data(), &click::web::Response::error, [=](QString description) {
468
166
        qDebug() << "No packages found due to network error";
209
        qWarning() << "No packages found due to network error:" << description;
469
167
        click::Packages pl;
210
        click::Packages pl;
470
168
        click::Packages recommends;
211
        click::Packages recommends;
471
169
        qDebug() << "calling callback";
212
        qDebug() << "calling callback";
472
@@ -215,10 +258,21 @@
473
215
    return click::web::Cancellable(response);
258
    return click::web::Cancellable(response);
474
216
}
259
}
475
217
260
477
218
click::web::Cancellable Index::get_details (const std::string& package_name, std::function<void(PackageDetails, click::Index::Error)> callback, bool force_cache)
261
click::web::Cancellable Index::get_details (const std::string& package_name,
478
262
                                            std::function<void(PackageDetails,
479
263
 click::Index::Error)> callback,
480
264
                                            bool is_snap,
481
265
                                            bool force_cache)
482
219
{
266
{
483
267
    std::string details_path{click::DETAILS_PATH};
484
268
    auto headers = build_headers();
485
269
    if (is_snap) {
486
270
        details_path = click::SNAP_DETAILS_PATH;
487
271
        headers = add_snap_headers(headers);
488
272
    }
489
220
    QSharedPointer<click::web::Response> response = client->call
273
    QSharedPointer<click::web::Response> response = client->call
491
221
        (get_base_url() + click::DETAILS_PATH + package_name,
274
        (get_base_url() + details_path + package_name,
492
275
         "GET", true, headers, "",
493
222
         click::web::CallParams(),
276
         click::web::CallParams(),
494
223
         force_cache);
277
         force_cache);
495
224
    qDebug() << "getting details for" << package_name.c_str();
278
    qDebug() << "getting details for" << package_name.c_str();
496
225
279
497
=== modified file 'libclickscope/click/index.h'
498
--- libclickscope/click/index.h	2016-04-26 10:56:47 +0000
499
+++ libclickscope/click/index.h	2016-09-21 14:55:05 +0000
500
@@ -1,5 +1,5 @@
501
1
/*
1
/*
503
2
 * Copyright (C) 2014 Canonical Ltd.
2
 * Copyright (C) 2014-2016 Canonical Ltd.
504
3
 *
3
 *
505
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
506
5
 * under the terms of the GNU General Public License version 3, as published
5
 * under the terms of the GNU General Public License version 3, as published
507
@@ -49,11 +49,13 @@
508
49
const std::string SEARCH_BASE_URL_ENVVAR = "U1_SEARCH_BASE_URL";
49
const std::string SEARCH_BASE_URL_ENVVAR = "U1_SEARCH_BASE_URL";
509
50
const std::string SEARCH_BASE_URL = "https://search.apps.ubuntu.com/";
50
const std::string SEARCH_BASE_URL = "https://search.apps.ubuntu.com/";
510
51
const std::string SEARCH_PATH = "api/v1/search";
51
const std::string SEARCH_PATH = "api/v1/search";
511
52
const std::string SNAP_SEARCH_PATH = "api/v1/snaps/search";
512
52
const std::string BOOTSTRAP_PATH = "api/v1";
53
const std::string BOOTSTRAP_PATH = "api/v1";
513
53
const std::string SUPPORTED_FRAMEWORKS = "framework:ubuntu-sdk-13.10";
54
const std::string SUPPORTED_FRAMEWORKS = "framework:ubuntu-sdk-13.10";
514
54
const std::string QUERY_ARGNAME = "q";
55
const std::string QUERY_ARGNAME = "q";
515
55
const std::string ARCHITECTURE = "architecture:";
56
const std::string ARCHITECTURE = "architecture:";
516
56
const std::string DETAILS_PATH = "api/v1/package/";
57
const std::string DETAILS_PATH = "api/v1/package/";
517
58
const std::string SNAP_DETAILS_PATH = "api/v1/snaps/details/";
518
57
const std::string CURRENCY_HEADER = "X-Suggested-Currency";
59
const std::string CURRENCY_HEADER = "X-Suggested-Currency";
519
58
60
520
59
class PackageManager
61
class PackageManager
521
@@ -72,6 +74,7 @@
522
72
    std::string m_suggested_currency;
74
    std::string m_suggested_currency;
523
73
    virtual std::string build_index_query(const std::string& query, const std::string& department);
75
    virtual std::string build_index_query(const std::string& query, const std::string& department);
524
74
    virtual std::map<std::string, std::string> build_headers();
76
    virtual std::map<std::string, std::string> build_headers();
525
77
    virtual std::map<std::string, std::string> add_snap_headers(const std::map<std::string, std::string>& headers) const;
526
75
78
527
76
public:
79
public:
528
77
    enum class Error {NoError, CredentialsError, NetworkError};
80
    enum class Error {NoError, CredentialsError, NetworkError};
529
@@ -79,9 +82,15 @@
530
79
    Index(const QSharedPointer<click::web::Client>& client,
82
    Index(const QSharedPointer<click::web::Client>& client,
531
80
          const QSharedPointer<Configuration> configuration=QSharedPointer<Configuration>(new Configuration()));
83
          const QSharedPointer<Configuration> configuration=QSharedPointer<Configuration>(new Configuration()));
532
81
    virtual std::pair<Packages, Packages> package_lists_from_json(const std::string& json);
84
    virtual std::pair<Packages, Packages> package_lists_from_json(const std::string& json);
533
85
    virtual click::web::Cancellable search_snaps(const std::string& query,
534
86
                                                 std::function<void(click::Packages search_results, click::Packages recommendations)> callback,
535
87
                                                 bool force_cache = false);
536
82
    virtual click::web::Cancellable search (const std::string& query, const std::string& department, std::function<void(Packages, Packages)> callback, bool
88
    virtual click::web::Cancellable search (const std::string& query, const std::string& department, std::function<void(Packages, Packages)> callback, bool
537
83
            force_cache = false);
89
            force_cache = false);
539
84
    virtual click::web::Cancellable get_details(const std::string& package_name, std::function<void(PackageDetails, Error)> callback, bool force_cache = false);
90
    virtual click::web::Cancellable get_details(const std::string& package_name,
540
91
                                                std::function<void(PackageDetails, Error)> callback,
541
92
                                                bool is_snap = false,
542
93
                                                bool force_cache = false);
543
85
    virtual click::web::Cancellable bootstrap(std::function<void(const DepartmentList&, const HighlightList&, Error, int)> callback, bool force_cache = false);
94
    virtual click::web::Cancellable bootstrap(std::function<void(const DepartmentList&, const HighlightList&, Error, int)> callback, bool force_cache = false);
544
86
    virtual click::web::Cancellable departments(const std::string& department_href, std::function<void(const DepartmentList&, const HighlightList&, Error, int)>
95
    virtual click::web::Cancellable departments(const std::string& department_href, std::function<void(const DepartmentList&, const HighlightList&, Error, int)>
545
87
            callback, bool force_cache = false);
96
            callback, bool force_cache = false);
546
88
97
547
=== modified file 'libclickscope/click/package.cpp'
548
--- libclickscope/click/package.cpp	2015-11-24 18:23:23 +0000
549
+++ libclickscope/click/package.cpp	2016-09-21 14:55:05 +0000
550
@@ -95,6 +95,10 @@
551
95
    p.publisher = item[Package::JsonKeys::publisher].asString();
95
    p.publisher = item[Package::JsonKeys::publisher].asString();
552
96
    p.rating = item[Package::JsonKeys::rating].asDouble();
96
    p.rating = item[Package::JsonKeys::rating].asDouble();
553
97
    p.version = item[Package::JsonKeys::version].asString();
97
    p.version = item[Package::JsonKeys::version].asString();
554
98
555
99
    p.snap_id = item[Package::JsonKeys::snap_id].asString();
556
100
    p.alias = item[Package::JsonKeys::alias].asString();
557
101
558
98
    return p;
102
    return p;
559
99
}
103
}
560
100
104
561
101
105
562
=== modified file 'libclickscope/click/package.h'
563
--- libclickscope/click/package.h	2015-11-24 18:23:23 +0000
564
+++ libclickscope/click/package.h	2016-09-21 14:55:05 +0000
565
@@ -64,6 +64,8 @@
566
64
        constexpr static const char* publisher{"publisher"};
64
        constexpr static const char* publisher{"publisher"};
567
65
        constexpr static const char* rating{"ratings_average"};
65
        constexpr static const char* rating{"ratings_average"};
568
66
        constexpr static const char* version{"version"};
66
        constexpr static const char* version{"version"};
569
67
        constexpr static const char* snap_id{"snap_id"};
570
68
        constexpr static const char* alias{"alias"};
571
67
69
572
68
        // NOTE: The "price" field is deprecated in favor of "prices"
70
        // NOTE: The "price" field is deprecated in favor of "prices"
573
69
        constexpr static const char* prices{"prices"};
71
        constexpr static const char* prices{"prices"};
574
@@ -107,6 +109,8 @@
575
107
    void matches (std::string query, std::function<bool> callback);
109
    void matches (std::string query, std::function<bool> callback);
576
108
    std::string content;
110
    std::string content;
577
109
    std::map<std::string, double> prices;
111
    std::map<std::string, double> prices;
578
112
    std::string snap_id;
579
113
    std::string alias;
580
110
114
581
111
    struct hash_name {
115
    struct hash_name {
582
112
    public :
116
    public :
583
113
117
584
=== modified file 'libclickscope/click/preview.cpp'
585
--- libclickscope/click/preview.cpp	2016-09-21 14:55:05 +0000
586
+++ libclickscope/click/preview.cpp	2016-09-21 14:55:05 +0000
587
@@ -442,7 +442,11 @@
588
442
        // and code using it does not need to worry about threading/event loop topics.
442
        // and code using it does not need to worry about threading/event loop topics.
589
443
        run_under_qt([this, details_callback, reviews_callback, app_name, force_cache]()
443
        run_under_qt([this, details_callback, reviews_callback, app_name, force_cache]()
590
444
            {
444
            {
592
445
                index_operation = index->get_details(app_name, [this, app_name, details_callback, reviews_callback, force_cache](PackageDetails details, click::Index::Error error){
445
                index_operation = index->get_details(app_name,
593
446
                                                     [this, app_name,
594
447
                                                      details_callback,
595
448
                                                      reviews_callback,
596
449
                                                      force_cache](PackageDetails details, click::Index::Error error){
597
446
                    if(error == click::Index::Error::NoError) {
450
                    if(error == click::Index::Error::NoError) {
598
447
                        qDebug() << "Got details:" << app_name.c_str();
451
                        qDebug() << "Got details:" << app_name.c_str();
599
448
                        details_callback(details);
452
                        details_callback(details);
600
@@ -455,10 +459,17 @@
601
455
                        details.main_screenshot_url = get_string_maybe_null(result["main_screenshot"]);
459
                        details.main_screenshot_url = get_string_maybe_null(result["main_screenshot"]);
602
456
                        details_callback(details);
460
                        details_callback(details);
603
457
                    }
461
                    }
608
458
                    reviews_operation = reviews->fetch_reviews(app_name,
462
                    // FIXME: No RNR support for v2 snaps yet, so avoid the
609
459
                                                               reviews_callback,
463
                    // network hit if we're showing a snap preview
610
460
                                                               force_cache);
464
                    if (app_name.rfind(".") != std::string::npos) {
611
461
                }, force_cache);
465
                        reviews_operation = reviews->fetch_reviews(app_name,
612
466
                                                                   reviews_callback,
613
467
                                                                   force_cache);
614
468
                    } else {
615
469
                        reviews_callback(click::ReviewList{},
616
470
                                         click::Reviews::Error::NoError);
617
471
                    }
618
472
                }, app_name.rfind(".") == std::string::npos, force_cache);
619
462
            });
473
            });
620
463
    }
474
    }
621
464
}
475
}
622
465
476
623
=== modified file 'libclickscope/click/webclient.cpp'
624
--- libclickscope/click/webclient.cpp	2016-05-25 16:19:51 +0000
625
+++ libclickscope/click/webclient.cpp	2016-09-21 14:55:05 +0000
626
@@ -78,6 +78,26 @@
627
78
{
78
{
628
79
}
79
}
629
80
80
630
81
std::string click::web::Client::signUrl(const std::string& url,
631
82
                                        const std::string& method)
632
83
{
633
84
    QString signature;
634
85
635
86
    if (impl->sso.isNull()) {
636
87
        qCritical() << "Unable to sign request without SSO object.";
637
88
    } else {
638
89
        auto token = impl->sso->getToken();
639
90
        if (token.isValid()) {
640
91
            signature = token.signUrl(QString::fromStdString(url),
641
92
                                      QString::fromStdString(method));
642
93
            qDebug() << "Signed URL:" << QString::fromStdString(url);
643
94
        } else {
644
95
            qWarning() << "Signing requested but returned token is invalid.";
645
96
        }
646
97
    }
647
98
    return signature.toStdString();
648
99
}
649
100
650
81
QSharedPointer<click::web::Response> click::web::Client::call(
101
QSharedPointer<click::web::Response> click::web::Client::call(
651
82
    const std::string& iri,
102
    const std::string& iri,
652
83
    const click::web::CallParams& params,
103
    const click::web::CallParams& params,
653
@@ -137,25 +157,14 @@
654
137
    auto deviceId = Configuration().get_device_id();
157
    auto deviceId = Configuration().get_device_id();
655
138
    request->setRawHeader(DEVICE_ID_HEADER.c_str(), deviceId.data());
158
    request->setRawHeader(DEVICE_ID_HEADER.c_str(), deviceId.data());
656
139
159
674
140
    if (sign && !impl->sso.isNull()) {
160
    if (sign) {
675
141
        auto token = impl->sso->getToken();
161
        auto auth_header = signUrl(url.toString().toStdString(), method);
676
142
        if (token.isValid()) {
162
        if (!auth_header.empty())
677
143
            QString auth_header = token.signUrl(url.toString(),
163
            request->setRawHeader(AUTHORIZATION_HEADER.c_str(),
678
144
                                                method.c_str());
164
                                  auth_header.c_str());
662
145
            qDebug() << "Signed URL:" << request->url().toString();
663
146
            request->setRawHeader(AUTHORIZATION_HEADER.c_str(), auth_header.toUtf8());
664
147
        } else {
665
148
            qWarning() << "Signing reuested but returned token is invalid.";
666
149
        }
667
150
668
151
        doConnect();
669
152
    } else {
670
153
        if (sign && impl->sso.isNull()) {
671
154
            qCritical() << "Unable to sign request without SSO object.";
672
155
        }
673
156
        doConnect();
679
157
    }
165
    }
680
158
166
681
167
    doConnect();
682
159
168
683
160
    return responsePtr;
169
    return responsePtr;
684
161
}
170
}
685
162
171
686
=== modified file 'libclickscope/click/webclient.h'
687
--- libclickscope/click/webclient.h	2016-05-25 16:19:51 +0000
688
+++ libclickscope/click/webclient.h	2016-09-21 14:55:05 +0000
689
@@ -115,6 +115,8 @@
690
115
    Client(const QSharedPointer<click::network::AccessManager>& networkAccessManager);
115
    Client(const QSharedPointer<click::network::AccessManager>& networkAccessManager);
691
116
    virtual ~Client();
116
    virtual ~Client();
692
117
117
693
118
    virtual std::string signUrl(const std::string& url,
694
119
                                const std::string& method);
695
118
    virtual QSharedPointer<Response> call(
120
    virtual QSharedPointer<Response> call(
696
119
        const std::string& iri,
121
        const std::string& iri,
697
120
        const CallParams& params = CallParams(), bool force_cache = false);
122
        const CallParams& params = CallParams(), bool force_cache = false);
698
121
123
699
=== modified file 'libclickscope/tests/mock_webclient.h'
700
--- libclickscope/tests/mock_webclient.h	2016-05-25 16:19:51 +0000
701
+++ libclickscope/tests/mock_webclient.h	2016-09-21 14:55:05 +0000
702
@@ -61,13 +61,6 @@
703
61
    Mock instance;
61
    Mock instance;
704
62
};
62
};
705
63
63
706
64
QSharedPointer<click::web::Response> responseForReply(const QSharedPointer<click::network::Reply>& reply)
707
65
{
708
66
    auto response = QSharedPointer<click::web::Response>(new click::web::Response(QSharedPointer<QNetworkRequest>(new QNetworkRequest()), QSharedPointer<QBuffer>(new QBuffer())));
709
67
    response->setReply(reply);
710
68
    return response;
711
69
}
712
70
713
71
class MockClient : public click::web::Client
64
class MockClient : public click::web::Client
714
72
{
65
{
715
73
public:
66
public:
716
@@ -76,6 +69,7 @@
717
76
    {
69
    {
718
77
    }
70
    }
719
78
71
720
72
    MOCK_METHOD2(signUrl, std::string(const std::string&, const std::string&));
721
79
    // Mocking default arguments: https://groups.google.com/forum/#!topic/googlemock/XrabW20vV7o
73
    // Mocking default arguments: https://groups.google.com/forum/#!topic/googlemock/XrabW20vV7o
722
80
    MOCK_METHOD6(callImpl, QSharedPointer<click::web::Response>(
74
    MOCK_METHOD6(callImpl, QSharedPointer<click::web::Response>(
723
81
        const std::string& iri,
75
        const std::string& iri,
724
@@ -102,6 +96,16 @@
725
102
96
726
103
    MOCK_METHOD1(has_header, bool(const std::string& header));
97
    MOCK_METHOD1(has_header, bool(const std::string& header));
727
104
    MOCK_METHOD1(get_header, std::string(const std::string&header));
98
    MOCK_METHOD1(get_header, std::string(const std::string&header));
728
99
729
100
    static QSharedPointer<click::web::Response> responseForReply(const QSharedPointer<click::network::Reply>& reply)
730
101
    {
731
102
        auto response = QSharedPointer<click::web::Response>
732
103
            (new click::web::Response(QSharedPointer<QNetworkRequest>(new QNetworkRequest()),
733
104
                                      QSharedPointer<QBuffer>(new QBuffer())));
734
105
        response->setReply(reply);
735
106
        return response;
736
107
    }
737
108
738
105
};
109
};
739
106
110
740
107
}
111
}
741
108
112
742
=== modified file 'libclickscope/tests/test_bootstrap.cpp'
743
--- libclickscope/tests/test_bootstrap.cpp	2016-06-30 20:42:56 +0000
744
+++ libclickscope/tests/test_bootstrap.cpp	2016-09-21 14:55:05 +0000
745
@@ -70,7 +70,7 @@
746
70
TEST_F(BootstrapTest, testBootstrapCallsWebservice)
70
TEST_F(BootstrapTest, testBootstrapCallsWebservice)
747
71
{
71
{
748
72
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
72
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
750
73
    auto response = responseForReply(reply.asSharedPtr());
73
    auto response = MockClient::responseForReply(reply.asSharedPtr());
751
74
74
752
75
    EXPECT_CALL(*clientPtr, callImpl(EndsWith(click::BOOTSTRAP_PATH), "GET", _, _, _, _))
75
    EXPECT_CALL(*clientPtr, callImpl(EndsWith(click::BOOTSTRAP_PATH), "GET", _, _, _, _))
753
76
            .Times(1)
76
            .Times(1)
754
@@ -81,7 +81,7 @@
755
81
TEST_F(BootstrapTest, testBootstrapJsonIsParsed)
81
TEST_F(BootstrapTest, testBootstrapJsonIsParsed)
756
82
{
82
{
757
83
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
83
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
759
84
    auto response = responseForReply(reply.asSharedPtr());
84
    auto response = MockClient::responseForReply(reply.asSharedPtr());
760
85
85
761
86
    QByteArray fake_json(FAKE_JSON_BOOTSTRAP.c_str());
86
    QByteArray fake_json(FAKE_JSON_BOOTSTRAP.c_str());
762
87
    EXPECT_CALL(reply.instance, readAll())
87
    EXPECT_CALL(reply.instance, readAll())
763
88
88
764
=== modified file 'libclickscope/tests/test_download_manager.cpp'
765
--- libclickscope/tests/test_download_manager.cpp	2016-05-10 13:42:12 +0000
766
+++ libclickscope/tests/test_download_manager.cpp	2016-09-21 14:55:05 +0000
767
@@ -63,6 +63,7 @@
768
63
63
769
64
    virtual void SetUp()
64
    virtual void SetUp()
770
65
    {
65
    {
771
66
        sdmPtr.reset(new MockSystemDownloadManager());
772
66
        ssoPtr.reset(new MockCredentialsService());
67
        ssoPtr.reset(new MockCredentialsService());
773
67
        namPtr.reset(new MockNetworkAccessManager());
68
        namPtr.reset(new MockNetworkAccessManager());
774
68
        clientPtr.reset(new NiceMock<MockClient>(namPtr));
69
        clientPtr.reset(new NiceMock<MockClient>(namPtr));
775
@@ -76,138 +77,165 @@
776
76
77
777
77
}
78
}
778
78
79
780
79
TEST_F(DownloadManagerTest, testStartCallsWebservice)
80
TEST_F(DownloadManagerTest, testStartCallsSignUrl)
781
80
{
81
{
789
81
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
82
    EXPECT_CALL(*clientPtr, signUrl(_, "GET")).Times(1);
790
82
    auto response = responseForReply(reply.asSharedPtr());
83
    EXPECT_CALL(*sdmPtr, createDownload(_, _, _)).Times(1);
784
83
785
84
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
786
85
            .Times(1)
787
86
            .WillOnce(Return(response));
788
87
791
88
    dmPtr->start("", "", "",
84
    dmPtr->start("", "", "",
792
89
                 [](std::string, click::DownloadManager::Error) {});
85
                 [](std::string, click::DownloadManager::Error) {});
793
90
}
86
}
794
91
87
914
92
TEST_F(DownloadManagerTest, testStartCallbackCalled)
88
TEST_F(DownloadManagerTest, testStartDownloadSuccssIsError)
915
93
{
89
{
916
94
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
90
    auto mockDownload = new MockDownload();
917
95
    auto response = responseForReply(reply.asSharedPtr());
91
    auto mockError = new MockError();
918
96
92
    EXPECT_CALL(*mockDownload, isError())
919
97
    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(0)));
93
        .Times(1)
920
98
    EXPECT_CALL(reply.instance, readAll())
94
        .WillOnce(Return(true));
921
99
            .Times(1)
95
    EXPECT_CALL(*mockDownload, error())
922
100
            .WillOnce(Return(""));
96
        .Times(1)
923
101
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
97
        .WillOnce(Return(mockError));
924
102
            .Times(1)
98
    EXPECT_CALL(*mockError, errorString())
925
103
            .WillOnce(Return(response));
99
        .Times(1)
926
104
    EXPECT_CALL(*this, start_callback(_, _)).Times(1);
100
        .WillOnce(Return(QStringLiteral("")));
927
105
101
928
106
    dmPtr->start("", "", "",
102
    EXPECT_CALL(*clientPtr, signUrl(_, "GET")).Times(1);
929
107
                 [this](std::string msg, click::DownloadManager::Error err) {
103
    EXPECT_CALL(*sdmPtr, createDownload(_, _, _))
930
108
                     start_callback(msg, err);
104
        .Times(1)
931
109
                 });
105
        .WillOnce(InvokeArgument<1>(mockDownload));
932
110
    response->replyFinished();
106
    EXPECT_CALL(*this, start_callback(_, _)).Times(1);
933
111
}
107
934
112
108
    dmPtr->start("", "", "",
935
113
TEST_F(DownloadManagerTest, testStartHTTPForbidden)
109
                 [this](std::string msg, click::DownloadManager::Error err) {
936
114
{
110
                     start_callback(msg, err);
937
115
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
111
                 });
938
116
    auto response = responseForReply(reply.asSharedPtr());
112
939
117
113
    delete mockError;
940
118
    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(403)));
114
    delete mockDownload;
941
119
    EXPECT_CALL(reply.instance, readAll())
115
}
942
120
            .Times(1)
116
943
121
            .WillOnce(Return(""));
117
TEST_F(DownloadManagerTest, testStartDownloadSuccssCallsStart)
944
122
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
118
{
945
123
            .Times(1)
119
    auto mockDownload = new MockDownload();
946
124
            .WillOnce(Return(response));
120
    EXPECT_CALL(*mockDownload, isError())
947
125
    EXPECT_CALL(*this, start_callback(StartsWith("Unhandled HTTP response code:"),
121
        .Times(1)
948
126
                                      click::DownloadManager::Error::DownloadInstallError)).Times(1);
122
        .WillOnce(Return(false));
949
127
123
    EXPECT_CALL(*mockDownload, start()).Times(1);
950
128
    dmPtr->start("", "", "",
124
    EXPECT_CALL(*mockDownload, id())
951
129
                 [this](std::string msg, click::DownloadManager::Error err) {
125
        .Times(1)
952
130
                     start_callback(msg, err);
126
        .WillOnce(Return(QStringLiteral("download")));
953
131
                 });
127
954
132
    response->replyFinished();
128
    EXPECT_CALL(*clientPtr, signUrl(_, "GET")).Times(1);
955
133
}
129
    EXPECT_CALL(*sdmPtr, createDownload(_, _, _))
956
134
130
        .Times(1)
957
135
TEST_F(DownloadManagerTest, testStartHTTPError)
131
        .WillOnce(InvokeArgument<1>(mockDownload));
958
136
{
132
    EXPECT_CALL(*this, start_callback(_, _)).Times(1);
959
137
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
133
960
138
    auto response = responseForReply(reply.asSharedPtr());
134
    dmPtr->start("", "", "",
961
139
135
                 [this](std::string msg, click::DownloadManager::Error err) {
962
140
    EXPECT_CALL(reply.instance, errorString())
136
                     start_callback(msg, err);
963
141
        .WillOnce(Return(QString("ERROR")));
137
                 });
964
142
    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(404)));
138
965
143
    EXPECT_CALL(reply.instance, readAll())
139
    delete mockDownload;
966
144
            .Times(1)
140
}
967
145
            .WillOnce(Return(""));
141
968
146
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
142
TEST_F(DownloadManagerTest, testStartErrorCallback)
969
147
            .Times(1)
143
{
970
148
            .WillOnce(Return(response));
144
    auto mockDownload = new MockDownload();
971
149
    EXPECT_CALL(*this, start_callback("ERROR (203)",
145
    auto mockError = new MockError();
972
150
                                      click::DownloadManager::Error::DownloadInstallError)).Times(1);
146
    EXPECT_CALL(*mockDownload, error())
973
151
147
        .Times(1)
974
152
    dmPtr->start("", "", "",
148
        .WillOnce(Return(mockError));
975
153
                 [this](std::string msg, click::DownloadManager::Error err) {
149
    EXPECT_CALL(*mockError, errorString())
976
154
                     start_callback(msg, err);
150
        .Times(1)
977
155
                 });
151
        .WillOnce(Return(QStringLiteral("")));
978
156
    response->errorHandler(QNetworkReply::ContentNotFoundError);
152
979
157
}
153
    EXPECT_CALL(*clientPtr, signUrl(_, "GET")).Times(1);
980
158
154
    EXPECT_CALL(*sdmPtr, createDownload(_, _, _))
981
159
TEST_F(DownloadManagerTest, testStartCredentialsError)
155
        .Times(1)
982
160
{
156
        .WillOnce(InvokeArgument<2>(mockDownload));
983
161
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
157
    EXPECT_CALL(*this, start_callback(_, _)).Times(1);
984
162
    auto response = responseForReply(reply.asSharedPtr());
158
985
163
159
    dmPtr->start("", "", "",
986
164
    EXPECT_CALL(reply.instance, errorString())
160
                 [this](std::string msg, click::DownloadManager::Error err) {
987
165
        .WillOnce(Return(QString("ERROR")));
161
                     start_callback(msg, err);
988
166
    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(401)));
162
                 });
989
167
    EXPECT_CALL(reply.instance, readAll())
163
990
168
            .Times(1)
164
    delete mockError;
991
169
            .WillOnce(Return(""));
165
    delete mockDownload;
992
170
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
166
}
993
171
            .Times(1)
167
994
172
            .WillOnce(Return(response));
168
TEST_F(DownloadManagerTest, testGetProgressDownloadFound)
995
173
    EXPECT_CALL(*ssoPtr, invalidateCredentials());
169
{
996
174
    EXPECT_CALL(*this, start_callback("ERROR (201)",
170
    auto mockDownloadsList = new MockDownloadsList();
997
175
                                      click::DownloadManager::Error::CredentialsError)).Times(1);
171
    auto mockDownload = QSharedPointer<MockDownload>(new MockDownload());
998
176
172
999
177
    dmPtr->start("", "", "test.package",
173
    QList<QSharedPointer<Ubuntu::DownloadManager::Download>> downloads{mockDownload};
1000
178
                 [this](std::string msg, click::DownloadManager::Error err) {
174
1001
179
                     start_callback(msg, err);
175
    EXPECT_CALL(*mockDownload, id())
1002
180
                 });
176
        .Times(1)
1003
181
    response->errorHandler(QNetworkReply::ContentAccessDenied);
177
        .WillOnce(Return("download"));
1004
182
}
178
    EXPECT_CALL(*mockDownloadsList, downloads())
1005
183
179
        .Times(1)
1006
184
// FIXME: createDownload() SEGV under tests
180
        .WillOnce(Return(downloads));
1007
185
TEST_F(DownloadManagerTest, DISABLED_testStartDownloadCreated)
181
    EXPECT_CALL(*sdmPtr, getAllDownloadsWithMetadata(_, _, _, _))
1008
186
{
182
        .Times(1)
1009
187
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
183
        .WillOnce(InvokeArgument<2>(QStringLiteral(""), QStringLiteral(""),
1010
188
    auto response = responseForReply(reply.asSharedPtr());
184
                                    mockDownloadsList));
1011
189
185
    dmPtr->get_progress("com.example.test",
1012
190
    EXPECT_CALL(reply.instance, rawHeader(QByteArray("X-Click-Token")))
186
                        [this](std::string object_path) {
1013
191
        .Times(1)
187
                            progress_callback(object_path);
1014
192
        .WillOnce(Return(QString("clicktoken")));
188
                        });
1015
193
    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(200)));
189
1016
194
    EXPECT_CALL(reply.instance, readAll())
190
    delete mockDownloadsList;
1017
195
            .Times(1)
191
}
1018
196
            .WillOnce(Return(""));
192
1019
197
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
193
TEST_F(DownloadManagerTest, testGetProgressMultipleDownloadsFound)
1020
198
            .Times(1)
194
{
1021
199
            .WillOnce(Return(response));
195
    auto mockDownloadsList = new MockDownloadsList();
1022
200
196
    auto mockDownload = QSharedPointer<MockDownload>(new MockDownload());
1023
201
    EXPECT_CALL(*sdmPtr, createDownload(_, _, _));
197
    auto mockDownload2 = QSharedPointer<MockDownload>(new MockDownload());
1024
202
    dmPtr->start("", "", "test.package",
198
1025
203
                 [this](std::string msg, click::DownloadManager::Error err) {
199
    QList<QSharedPointer<Ubuntu::DownloadManager::Download>> downloads{mockDownload, mockDownload2};
1026
204
                     start_callback(msg, err);
200
1027
205
                 });
201
    EXPECT_CALL(*mockDownload, id())
1028
206
    response->replyFinished();
202
        .Times(1)
1029
207
}
203
        .WillOnce(Return("download"));
1030
208
204
    EXPECT_CALL(*mockDownloadsList, downloads())
1031
209
// FIXME: getAllDownloadsWithMetadata() SEGV under tests
205
        .Times(1)
1032
210
TEST_F(DownloadManagerTest, DISABLED_testGetProgressNoDownloads)
206
        .WillOnce(Return(downloads));
1033
207
    EXPECT_CALL(*sdmPtr, getAllDownloadsWithMetadata(_, _, _, _))
1034
208
        .Times(1)
1035
209
        .WillOnce(InvokeArgument<2>(QStringLiteral(""), QStringLiteral(""),
1036
210
                                    mockDownloadsList));
1037
211
    dmPtr->get_progress("com.example.test",
1038
212
                        [this](std::string object_path) {
1039
213
                            progress_callback(object_path);
1040
214
                        });
1041
215
1042
216
    delete mockDownloadsList;
1043
217
}
1044
218
1045
219
TEST_F(DownloadManagerTest, testGetProgressNoDownloadsFound)
1046
220
{
1047
221
    auto mockDownloadsList = new MockDownloadsList();
1048
222
    QList<QSharedPointer<Ubuntu::DownloadManager::Download>> emptyDownloads{};
1049
223
    EXPECT_CALL(*mockDownloadsList, downloads())
1050
224
        .Times(1)
1051
225
        .WillOnce(Return(emptyDownloads));
1052
226
    EXPECT_CALL(*sdmPtr, getAllDownloadsWithMetadata(_, _, _, _))
1053
227
        .Times(1)
1054
228
        .WillOnce(InvokeArgument<2>(QStringLiteral(""), QStringLiteral(""),
1055
229
                                    mockDownloadsList));
1056
230
    dmPtr->get_progress("com.example.test",
1057
231
                        [this](std::string object_path) {
1058
232
                            progress_callback(object_path);
1059
233
                        });
1060
234
1061
235
    delete mockDownloadsList;
1062
236
}
1063
237
1064
238
TEST_F(DownloadManagerTest, testGetProgressErrorCallback)
1065
211
{
239
{
1066
212
    EXPECT_CALL(*sdmPtr, getAllDownloadsWithMetadata(_, _, _, _))
240
    EXPECT_CALL(*sdmPtr, getAllDownloadsWithMetadata(_, _, _, _))
1067
213
        .Times(1)
241
        .Times(1)
1068
214
242
1069
=== modified file 'libclickscope/tests/test_index.cpp'
1070
--- libclickscope/tests/test_index.cpp	2016-05-10 13:42:12 +0000
1071
+++ libclickscope/tests/test_index.cpp	2016-09-21 14:55:05 +0000
1072
@@ -66,7 +66,7 @@
1073
66
};
66
};
1074
67
67
1075
68
68
1077
69
class IndexTest : public ::testing::Test {
69
class SimpleIndexTest : public ::testing::Test {
1078
70
protected:
70
protected:
1079
71
    QSharedPointer<MockClient> clientPtr;
71
    QSharedPointer<MockClient> clientPtr;
1080
72
    QSharedPointer<MockNetworkAccessManager> namPtr;
72
    QSharedPointer<MockNetworkAccessManager> namPtr;
1081
@@ -86,6 +86,18 @@
1082
86
    MOCK_METHOD2(details_callback, void(click::PackageDetails, click::Index::Error));
86
    MOCK_METHOD2(details_callback, void(click::PackageDetails, click::Index::Error));
1083
87
};
87
};
1084
88
88
1085
89
class IndexTest : public SimpleIndexTest {
1086
90
    virtual void SetUp() {
1087
91
        SimpleIndexTest::SetUp();
1088
92
        EXPECT_CALL(*configPtr, get_architecture())
1089
93
            .Times(1)
1090
94
            .WillOnce(Return(fake_arch));
1091
95
        EXPECT_CALL(*configPtr, get_available_frameworks())
1092
96
            .Times(1)
1093
97
            .WillOnce(Return(fake_frameworks));
1094
98
    }
1095
99
};
1096
100
1097
89
class MockPackageManager : public click::PackageManager, public ::testing::Test
101
class MockPackageManager : public click::PackageManager, public ::testing::Test
1098
90
{
102
{
1099
91
public:
103
public:
1100
@@ -97,14 +109,8 @@
1101
97
TEST_F(IndexTest, testSearchCallsWebservice)
109
TEST_F(IndexTest, testSearchCallsWebservice)
1102
98
{
110
{
1103
99
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
111
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1105
100
    auto response = responseForReply(reply.asSharedPtr());
112
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1106
101
113
1107
102
    EXPECT_CALL(*configPtr, get_architecture())
1108
103
        .Times(1)
1109
104
        .WillOnce(Return(fake_arch));
1110
105
    EXPECT_CALL(*configPtr, get_available_frameworks())
1111
106
        .Times(1)
1112
107
        .WillOnce(Return(fake_frameworks));
1113
108
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
114
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1114
109
            .Times(1)
115
            .Times(1)
1115
110
            .WillOnce(Return(response));
116
            .WillOnce(Return(response));
1116
@@ -120,14 +126,8 @@
1117
120
TEST_F(IndexTest, testSearchQueryIsLowercase)
126
TEST_F(IndexTest, testSearchQueryIsLowercase)
1118
121
{
127
{
1119
122
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
128
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1121
123
    auto response = responseForReply(reply.asSharedPtr());
129
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1122
124
130
1123
125
    EXPECT_CALL(*configPtr, get_architecture())
1124
126
        .Times(1)
1125
127
        .WillOnce(Return(fake_arch));
1126
128
    EXPECT_CALL(*configPtr, get_available_frameworks())
1127
129
        .Times(1)
1128
130
        .WillOnce(Return(fake_frameworks));
1129
131
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, QueryContains("foobar")))
131
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, QueryContains("foobar")))
1130
132
            .Times(1)
132
            .Times(1)
1131
133
            .WillOnce(Return(response));
133
            .WillOnce(Return(response));
1132
@@ -139,14 +139,8 @@
1133
139
TEST_F(IndexTest, testSearchSignsCall)
139
TEST_F(IndexTest, testSearchSignsCall)
1134
140
{
140
{
1135
141
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
141
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1137
142
    auto response = responseForReply(reply.asSharedPtr());
142
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1138
143
143
1139
144
    EXPECT_CALL(*configPtr, get_architecture())
1140
145
        .Times(1)
1141
146
        .WillOnce(Return(fake_arch));
1142
147
    EXPECT_CALL(*configPtr, get_available_frameworks())
1143
148
        .Times(1)
1144
149
        .WillOnce(Return(fake_frameworks));
1145
150
    EXPECT_CALL(*clientPtr, callImpl(_, _, true, _, _, _))
144
    EXPECT_CALL(*clientPtr, callImpl(_, _, true, _, _, _))
1146
151
            .Times(1)
145
            .Times(1)
1147
152
            .WillOnce(Return(response));
146
            .WillOnce(Return(response));
1148
@@ -154,17 +148,119 @@
1149
154
    indexPtr->search("", "", [](click::Packages, click::Packages) {});
148
    indexPtr->search("", "", [](click::Packages, click::Packages) {});
1150
155
}
149
}
1151
156
150
1152
151
TEST_F(IndexTest, testSearchSnapsCallsWebservice)
1153
152
{
1154
153
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1155
154
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1156
155
1157
156
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1158
157
        .Times(1)
1159
158
        .WillOnce(Return(response));
1160
159
1161
160
    indexPtr->search_snaps("", [](click::Packages, click::Packages) {});
1162
161
}
1163
162
1164
163
TEST_F(IndexTest, testSearchSnapsSendsRightPath)
1165
164
{
1166
165
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1167
166
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1168
167
1169
168
    EXPECT_CALL(*clientPtr, callImpl(EndsWith(click::SNAP_SEARCH_PATH),
1170
169
                                     _, _, _, _, _))
1171
170
        .Times(1)
1172
171
        .WillOnce(Return(response));
1173
172
1174
173
    indexPtr->search_snaps("", [](click::Packages, click::Packages) {});
1175
174
}
1176
175
1177
176
TEST_F(IndexTest, testSearchSnapsQueryIsLowercase)
1178
177
{
1179
178
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1180
179
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1181
180
1182
181
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, QueryContains("foobar")))
1183
182
        .Times(1)
1184
183
        .WillOnce(Return(response));
1185
184
1186
185
    indexPtr->search_snaps("FooBar", [](click::Packages, click::Packages) {});
1187
186
}
1188
187
1189
188
1190
189
TEST_F(IndexTest, testSearchSnapsSignsCall)
1191
190
{
1192
191
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1193
192
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1194
193
1195
194
    EXPECT_CALL(*clientPtr, callImpl(_, _, true, _, _, _))
1196
195
        .Times(1)
1197
196
        .WillOnce(Return(response));
1198
197
1199
198
    indexPtr->search_snaps("", [](click::Packages, click::Packages) {});
1200
199
}
1201
200
1202
201
TEST_F(IndexTest, testSearchSnapsIsCancellable)
1203
202
{
1204
203
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1205
204
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1206
205
1207
206
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1208
207
        .Times(1)
1209
208
        .WillOnce(Return(response));
1210
209
1211
210
    auto search_operation = indexPtr->search_snaps("", [](click::Packages,
1212
211
                                                          click::Packages) {});
1213
212
    EXPECT_CALL(reply.instance, abort()).Times(1);
1214
213
    search_operation.cancel();
1215
214
}
1216
215
1217
216
TEST_F(IndexTest, testSearchSnapsEmptyJsonIsParsed)
1218
217
{
1219
218
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1220
219
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1221
220
1222
221
    QByteArray fake_json("[]");
1223
222
    EXPECT_CALL(reply.instance, readAll())
1224
223
        .Times(1)
1225
224
        .WillOnce(Return(fake_json));
1226
225
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1227
226
        .Times(1)
1228
227
        .WillOnce(Return(response));
1229
228
    click::Packages empty_package_list;
1230
229
    EXPECT_CALL(*this, search_callback(empty_package_list, _)).Times(1);
1231
230
1232
231
    indexPtr->search_snaps("", [this](click::Packages packages,
1233
232
                                      click::Packages recommends){
1234
233
                               search_callback(packages, recommends);
1235
234
                           });
1236
235
    response->replyFinished();
1237
236
}
1238
237
1239
238
TEST_F(IndexTest, testSearchSnapsNetworkErrorIgnored)
1240
239
{
1241
240
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1242
241
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1243
242
1244
243
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1245
244
        .Times(1)
1246
245
        .WillOnce(Return(response));
1247
246
    EXPECT_CALL(reply.instance, errorString()).Times(1)
1248
247
        .WillOnce(Return("fake error"));
1249
248
    indexPtr->search_snaps("", [this](click::Packages packages,
1250
249
                                      click::Packages recommends){
1251
250
                               search_callback(packages, recommends);
1252
251
                           });
1253
252
1254
253
    click::Packages empty_package_list;
1255
254
    EXPECT_CALL(*this, search_callback(empty_package_list, _)).Times(1);
1256
255
1257
256
    emit reply.instance.error(QNetworkReply::UnknownNetworkError);
1258
257
}
1259
258
1260
157
TEST_F(IndexTest, testBootstrapSignsCall)
259
TEST_F(IndexTest, testBootstrapSignsCall)
1261
158
{
260
{
1262
159
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
261
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1264
160
    auto response = responseForReply(reply.asSharedPtr());
262
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1265
161
263
1266
162
    EXPECT_CALL(*configPtr, get_architecture())
1267
163
        .Times(1)
1268
164
        .WillOnce(Return(fake_arch));
1269
165
    EXPECT_CALL(*configPtr, get_available_frameworks())
1270
166
        .Times(1)
1271
167
        .WillOnce(Return(fake_frameworks));
1272
168
    EXPECT_CALL(*clientPtr, callImpl(_, _, true, _, _, _))
264
    EXPECT_CALL(*clientPtr, callImpl(_, _, true, _, _, _))
1273
169
            .Times(1)
265
            .Times(1)
1274
170
            .WillOnce(Return(response));
266
            .WillOnce(Return(response));
1275
@@ -175,14 +271,8 @@
1276
175
TEST_F(IndexTest, testDepartmentsSignsCall)
271
TEST_F(IndexTest, testDepartmentsSignsCall)
1277
176
{
272
{
1278
177
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
273
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1280
178
    auto response = responseForReply(reply.asSharedPtr());
274
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1281
179
275
1282
180
    EXPECT_CALL(*configPtr, get_architecture())
1283
181
        .Times(1)
1284
182
        .WillOnce(Return(fake_arch));
1285
183
    EXPECT_CALL(*configPtr, get_available_frameworks())
1286
184
        .Times(1)
1287
185
        .WillOnce(Return(fake_frameworks));
1288
186
    EXPECT_CALL(*clientPtr, callImpl(_, _, true, _, _, _))
276
    EXPECT_CALL(*clientPtr, callImpl(_, _, true, _, _, _))
1289
187
            .Times(1)
277
            .Times(1)
1290
188
            .WillOnce(Return(response));
278
            .WillOnce(Return(response));
1291
@@ -193,7 +283,7 @@
1292
193
TEST_F(IndexTest, testDetailsSignsCall)
283
TEST_F(IndexTest, testDetailsSignsCall)
1293
194
{
284
{
1294
195
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
285
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1296
196
    auto response = responseForReply(reply.asSharedPtr());
286
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1297
197
287
1298
198
    EXPECT_CALL(*clientPtr, callImpl(_, _, true, _, _, _))
288
    EXPECT_CALL(*clientPtr, callImpl(_, _, true, _, _, _))
1299
199
            .Times(1)
289
            .Times(1)
1300
@@ -205,14 +295,8 @@
1301
205
TEST_F(IndexTest, testSearchSendsRightPath)
295
TEST_F(IndexTest, testSearchSendsRightPath)
1302
206
{
296
{
1303
207
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
297
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1305
208
    auto response = responseForReply(reply.asSharedPtr());
298
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1306
209
299
1307
210
    EXPECT_CALL(*configPtr, get_architecture())
1308
211
        .Times(1)
1309
212
        .WillOnce(Return(fake_arch));
1310
213
    EXPECT_CALL(*configPtr, get_available_frameworks())
1311
214
        .Times(1)
1312
215
        .WillOnce(Return(fake_frameworks));
1313
216
    EXPECT_CALL(*clientPtr, callImpl(EndsWith(click::SEARCH_PATH),
300
    EXPECT_CALL(*clientPtr, callImpl(EndsWith(click::SEARCH_PATH),
1314
217
                                     _, _, _, _, _))
301
                                     _, _, _, _, _))
1315
218
            .Times(1)
302
            .Times(1)
1316
@@ -224,18 +308,12 @@
1317
224
TEST_F(IndexTest, testSearchCallbackIsCalled)
308
TEST_F(IndexTest, testSearchCallbackIsCalled)
1318
225
{
309
{
1319
226
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
310
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1321
227
    auto response = responseForReply(reply.asSharedPtr());
311
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1322
228
312
1323
229
    QByteArray fake_json("[]");
313
    QByteArray fake_json("[]");
1324
230
    EXPECT_CALL(reply.instance, readAll())
314
    EXPECT_CALL(reply.instance, readAll())
1325
231
            .Times(1)
315
            .Times(1)
1326
232
            .WillOnce(Return(fake_json));
316
            .WillOnce(Return(fake_json));
1327
233
    EXPECT_CALL(*configPtr, get_architecture())
1328
234
        .Times(1)
1329
235
        .WillOnce(Return(fake_arch));
1330
236
    EXPECT_CALL(*configPtr, get_available_frameworks())
1331
237
        .Times(1)
1332
238
        .WillOnce(Return(fake_frameworks));
1333
239
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
317
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1334
240
            .Times(1)
318
            .Times(1)
1335
241
            .WillOnce(Return(response));
319
            .WillOnce(Return(response));
1336
@@ -251,18 +329,12 @@
1337
251
TEST_F(IndexTest, testSearchEmptyJsonIsParsed)
329
TEST_F(IndexTest, testSearchEmptyJsonIsParsed)
1338
252
{
330
{
1339
253
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
331
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1341
254
    auto response = responseForReply(reply.asSharedPtr());
332
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1342
255
333
1343
256
    QByteArray fake_json("[]");
334
    QByteArray fake_json("[]");
1344
257
    EXPECT_CALL(reply.instance, readAll())
335
    EXPECT_CALL(reply.instance, readAll())
1345
258
            .Times(1)
336
            .Times(1)
1346
259
            .WillOnce(Return(fake_json));
337
            .WillOnce(Return(fake_json));
1347
260
    EXPECT_CALL(*configPtr, get_architecture())
1348
261
        .Times(1)
1349
262
        .WillOnce(Return(fake_arch));
1350
263
    EXPECT_CALL(*configPtr, get_available_frameworks())
1351
264
        .Times(1)
1352
265
        .WillOnce(Return(fake_frameworks));
1353
266
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
338
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1354
267
            .Times(1)
339
            .Times(1)
1355
268
            .WillOnce(Return(response));
340
            .WillOnce(Return(response));
1356
@@ -279,18 +351,12 @@
1357
279
TEST_F(IndexTest, testSearchSingleJsonIsParsed)
351
TEST_F(IndexTest, testSearchSingleJsonIsParsed)
1358
280
{
352
{
1359
281
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
353
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1361
282
    auto response = responseForReply(reply.asSharedPtr());
354
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1362
283
355
1363
284
    QByteArray fake_json(FAKE_JSON_SEARCH_RESULT_ONE.c_str());
356
    QByteArray fake_json(FAKE_JSON_SEARCH_RESULT_ONE.c_str());
1364
285
    EXPECT_CALL(reply.instance, readAll())
357
    EXPECT_CALL(reply.instance, readAll())
1365
286
            .Times(1)
358
            .Times(1)
1366
287
            .WillOnce(Return(fake_json));
359
            .WillOnce(Return(fake_json));
1367
288
    EXPECT_CALL(*configPtr, get_architecture())
1368
289
        .Times(1)
1369
290
        .WillOnce(Return(fake_arch));
1370
291
    EXPECT_CALL(*configPtr, get_available_frameworks())
1371
292
        .Times(1)
1372
293
        .WillOnce(Return(fake_frameworks));
1373
294
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
360
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1374
295
            .Times(1)
361
            .Times(1)
1375
296
            .WillOnce(Return(response));
362
            .WillOnce(Return(response));
1376
@@ -315,14 +381,8 @@
1377
315
TEST_F(IndexTest, testSearchIsCancellable)
381
TEST_F(IndexTest, testSearchIsCancellable)
1378
316
{
382
{
1379
317
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
383
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1381
318
    auto response = responseForReply(reply.asSharedPtr());
384
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1382
319
385
1383
320
    EXPECT_CALL(*configPtr, get_architecture())
1384
321
        .Times(1)
1385
322
        .WillOnce(Return(fake_arch));
1386
323
    EXPECT_CALL(*configPtr, get_available_frameworks())
1387
324
        .Times(1)
1388
325
        .WillOnce(Return(fake_frameworks));
1389
326
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
386
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1390
327
            .Times(1)
387
            .Times(1)
1391
328
            .WillOnce(Return(response));
388
            .WillOnce(Return(response));
1392
@@ -341,14 +401,8 @@
1393
341
TEST_F(IndexTest, testSearchNetworkErrorIgnored)
401
TEST_F(IndexTest, testSearchNetworkErrorIgnored)
1394
342
{
402
{
1395
343
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
403
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1397
344
    auto response = responseForReply(reply.asSharedPtr());
404
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1398
345
405
1399
346
    EXPECT_CALL(*configPtr, get_architecture())
1400
347
        .Times(1)
1401
348
        .WillOnce(Return(fake_arch));
1402
349
    EXPECT_CALL(*configPtr, get_available_frameworks())
1403
350
        .Times(1)
1404
351
        .WillOnce(Return(fake_frameworks));
1405
352
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
406
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1406
353
            .Times(1)
407
            .Times(1)
1407
354
            .WillOnce(Return(response));
408
            .WillOnce(Return(response));
1408
@@ -367,7 +421,7 @@
1409
367
TEST_F(IndexTest, testGetDetailsCallsWebservice)
421
TEST_F(IndexTest, testGetDetailsCallsWebservice)
1410
368
{
422
{
1411
369
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
423
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1413
370
    auto response = responseForReply(reply.asSharedPtr());
424
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1414
371
425
1415
372
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
426
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1416
373
            .Times(1)
427
            .Times(1)
1417
@@ -379,7 +433,7 @@
1418
379
TEST_F(IndexTest, testGetDetailsSendsPackagename)
433
TEST_F(IndexTest, testGetDetailsSendsPackagename)
1419
380
{
434
{
1420
381
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
435
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1422
382
    auto response = responseForReply(reply.asSharedPtr());
436
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1423
383
437
1424
384
    EXPECT_CALL(*clientPtr, callImpl(EndsWith(FAKE_PACKAGENAME),
438
    EXPECT_CALL(*clientPtr, callImpl(EndsWith(FAKE_PACKAGENAME),
1425
385
                                     _, _, _, _, _))
439
                                     _, _, _, _, _))
1426
@@ -392,7 +446,7 @@
1427
392
TEST_F(IndexTest, testGetDetailsSendsRightPath)
446
TEST_F(IndexTest, testGetDetailsSendsRightPath)
1428
393
{
447
{
1429
394
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
448
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1431
395
    auto response = responseForReply(reply.asSharedPtr());
449
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1432
396
450
1433
397
    EXPECT_CALL(*clientPtr, callImpl(StartsWith(click::SEARCH_BASE_URL +
451
    EXPECT_CALL(*clientPtr, callImpl(StartsWith(click::SEARCH_BASE_URL +
1434
398
                                                click::DETAILS_PATH),
452
                                                click::DETAILS_PATH),
1435
@@ -406,7 +460,7 @@
1436
406
TEST_F(IndexTest, testGetDetailsCallbackIsCalled)
460
TEST_F(IndexTest, testGetDetailsCallbackIsCalled)
1437
407
{
461
{
1438
408
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
462
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1440
409
    auto response = responseForReply(reply.asSharedPtr());
463
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1441
410
464
1442
411
    QByteArray fake_json(FAKE_JSON_PACKAGE_DETAILS.c_str());
465
    QByteArray fake_json(FAKE_JSON_PACKAGE_DETAILS.c_str());
1443
412
    EXPECT_CALL(reply.instance, readAll())
466
    EXPECT_CALL(reply.instance, readAll())
1444
@@ -425,7 +479,7 @@
1445
425
TEST_F(IndexTest, testGetDetailsJsonIsParsed)
479
TEST_F(IndexTest, testGetDetailsJsonIsParsed)
1446
426
{
480
{
1447
427
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
481
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1449
428
    auto response = responseForReply(reply.asSharedPtr());
482
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1450
429
483
1451
430
    QByteArray fake_json(FAKE_JSON_PACKAGE_DETAILS.c_str());
484
    QByteArray fake_json(FAKE_JSON_PACKAGE_DETAILS.c_str());
1452
431
    EXPECT_CALL(reply.instance, readAll())
485
    EXPECT_CALL(reply.instance, readAll())
1453
@@ -486,7 +540,7 @@
1454
486
TEST_F(IndexTest, testGetDetailsJsonUtf8)
540
TEST_F(IndexTest, testGetDetailsJsonUtf8)
1455
487
{
541
{
1456
488
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
542
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1458
489
    auto response = responseForReply(reply.asSharedPtr());
543
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1459
490
544
1460
491
    QByteArray appname_utf8("\xe5\xb0\x8f\xe6\xb5\xb7");
545
    QByteArray appname_utf8("\xe5\xb0\x8f\xe6\xb5\xb7");
1461
492
    QByteArray appname_json("\\u5c0f\\u6d77");
546
    QByteArray appname_json("\\u5c0f\\u6d77");
1462
@@ -554,7 +608,7 @@
1463
554
TEST_F(IndexTest, testGetDetailsNetworkErrorReported)
608
TEST_F(IndexTest, testGetDetailsNetworkErrorReported)
1464
555
{
609
{
1465
556
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
610
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1467
557
    auto response = responseForReply(reply.asSharedPtr());
611
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1468
558
612
1469
559
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
613
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1470
560
            .Times(1)
614
            .Times(1)
1471
@@ -571,7 +625,7 @@
1472
571
TEST_F(IndexTest, testGetDetailsIsCancellable)
625
TEST_F(IndexTest, testGetDetailsIsCancellable)
1473
572
{
626
{
1474
573
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
627
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1476
574
    auto response = responseForReply(reply.asSharedPtr());
628
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1477
575
629
1478
576
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
630
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1479
577
            .Times(1)
631
            .Times(1)
1480
@@ -582,7 +636,7 @@
1481
582
    get_details_operation.cancel();
636
    get_details_operation.cancel();
1482
583
}
637
}
1483
584
638
1485
585
TEST_F(IndexTest, testGetBaseUrl)
639
TEST_F(SimpleIndexTest, testGetBaseUrl)
1486
586
{
640
{
1487
587
    const char *value = getenv(click::SEARCH_BASE_URL_ENVVAR.c_str());
641
    const char *value = getenv(click::SEARCH_BASE_URL_ENVVAR.c_str());
1488
588
    if (value != NULL) {
642
    if (value != NULL) {
1489
@@ -592,7 +646,7 @@
1490
592
    
646
    
1491
593
}
647
}
1492
594
648
1494
595
TEST_F(IndexTest, testGetBaseUrlFromEnv)
649
TEST_F(SimpleIndexTest, testGetBaseUrlFromEnv)
1495
596
{
650
{
1496
597
    ASSERT_TRUE(setenv(click::SEARCH_BASE_URL_ENVVAR.c_str(),
651
    ASSERT_TRUE(setenv(click::SEARCH_BASE_URL_ENVVAR.c_str(),
1497
598
                       FAKE_SERVER.c_str(), 1) == 0);
652
                       FAKE_SERVER.c_str(), 1) == 0);
1498
@@ -600,14 +654,14 @@
1499
600
    ASSERT_TRUE(unsetenv(click::SEARCH_BASE_URL_ENVVAR.c_str()) == 0);
654
    ASSERT_TRUE(unsetenv(click::SEARCH_BASE_URL_ENVVAR.c_str()) == 0);
1500
601
}
655
}
1501
602
656
1503
603
TEST_F(IndexTest, testPackageListsFromJsonNodeNoRecommends)
657
TEST_F(SimpleIndexTest, testPackageListsFromJsonNodeNoRecommends)
1504
604
{
658
{
1505
605
    auto lists = indexPtr->package_lists_from_json(FAKE_JSON_SEARCH_RESULT_ONE);
659
    auto lists = indexPtr->package_lists_from_json(FAKE_JSON_SEARCH_RESULT_ONE);
1506
606
    EXPECT_EQ(1, lists.first.size());
660
    EXPECT_EQ(1, lists.first.size());
1507
607
    EXPECT_EQ(0, lists.second.size());
661
    EXPECT_EQ(0, lists.second.size());
1508
608
}
662
}
1509
609
663
1511
610
TEST_F(IndexTest, testPackageListsFromJsonNodeHasRecommends)
664
TEST_F(SimpleIndexTest, testPackageListsFromJsonNodeHasRecommends)
1512
611
{
665
{
1513
612
    auto lists = indexPtr->package_lists_from_json(FAKE_JSON_SEARCH_RESULT_RECOMMENDS);
666
    auto lists = indexPtr->package_lists_from_json(FAKE_JSON_SEARCH_RESULT_RECOMMENDS);
1514
613
    EXPECT_EQ(1, lists.second.size());
667
    EXPECT_EQ(1, lists.second.size());
1515
@@ -668,3 +722,15 @@
1516
668
    EXPECT_NE(std::string::npos, hdrs["X-Ubuntu-Frameworks"].find(fake_fwk_1));
722
    EXPECT_NE(std::string::npos, hdrs["X-Ubuntu-Frameworks"].find(fake_fwk_1));
1517
669
    EXPECT_NE(std::string::npos, hdrs["X-Ubuntu-Frameworks"].find(fake_fwk_2));
723
    EXPECT_NE(std::string::npos, hdrs["X-Ubuntu-Frameworks"].find(fake_fwk_2));
1518
670
}
724
}
1519
725
1520
726
TEST_F(QueryStringTest, testBuildHeadersFrameworksEmpty)
1521
727
{
1522
728
    EXPECT_CALL(*configPtr, get_architecture()).Times(1).WillOnce(Return(fake_arch));
1523
729
    EXPECT_CALL(*configPtr, get_available_frameworks())
1524
730
        .Times(1)
1525
731
        .WillOnce(Return(std::vector<std::string>{}));
1526
732
    auto hdrs = indexPtr->build_headers();
1527
733
    EXPECT_EQ(std::string::npos, hdrs["X-Ubuntu-Frameworks"].find(fake_fwk_1));
1528
734
    EXPECT_EQ(std::string::npos, hdrs["X-Ubuntu-Frameworks"].find(fake_fwk_2));
1529
735
    ASSERT_NE(std::string::npos, hdrs["X-Ubuntu-Frameworks"].find("none"));
1530
736
}
1531
671
737
1532
=== modified file 'libclickscope/tests/test_pay.cpp'
1533
--- libclickscope/tests/test_pay.cpp	2016-06-30 20:42:56 +0000
1534
+++ libclickscope/tests/test_pay.cpp	2016-09-21 14:55:05 +0000
1535
@@ -68,7 +68,7 @@
1536
68
TEST_F(PayTest, testPayPackageRefundCalled)
68
TEST_F(PayTest, testPayPackageRefundCalled)
1537
69
{
69
{
1538
70
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
70
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1540
71
    auto response = responseForReply(reply.asSharedPtr());
71
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1541
72
72
1542
73
    EXPECT_CALL(*package, do_pay_package_refund("foo")).Times(1);
73
    EXPECT_CALL(*package, do_pay_package_refund("foo")).Times(1);
1543
74
    EXPECT_FALSE(package->refund("foo"));
74
    EXPECT_FALSE(package->refund("foo"));
1544
@@ -77,7 +77,7 @@
1545
77
TEST_F(PayTest, testPayPackageRefundNotCalledIfCallbackExists)
77
TEST_F(PayTest, testPayPackageRefundNotCalledIfCallbackExists)
1546
78
{
78
{
1547
79
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
79
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1549
80
    auto response = responseForReply(reply.asSharedPtr());
80
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1550
81
81
1551
82
    std::string callback_id = std::string{"foo"} + pay::APPENDAGE_REFUND;
82
    std::string callback_id = std::string{"foo"} + pay::APPENDAGE_REFUND;
1552
83
    package->callbacks[callback_id] = [](const std::string&, bool) {};
83
    package->callbacks[callback_id] = [](const std::string&, bool) {};
1553
@@ -88,7 +88,7 @@
1554
88
TEST_F(PayTest, testRefundReturnsTrueForPurchasedItem)
88
TEST_F(PayTest, testRefundReturnsTrueForPurchasedItem)
1555
89
{
89
{
1556
90
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
90
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1558
91
    auto response = responseForReply(reply.asSharedPtr());
91
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1559
92
92
1560
93
    package->success = true;
93
    package->success = true;
1561
94
    EXPECT_CALL(*package, do_pay_package_refund("foo")).Times(1);
94
    EXPECT_CALL(*package, do_pay_package_refund("foo")).Times(1);
1562
@@ -98,7 +98,7 @@
1563
98
TEST_F(PayTest, testPayPackageVerifyCalled)
98
TEST_F(PayTest, testPayPackageVerifyCalled)
1564
99
{
99
{
1565
100
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
100
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1567
101
    auto response = responseForReply(reply.asSharedPtr());
101
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1568
102
102
1569
103
    EXPECT_CALL(*package, do_pay_package_verify("foo")).Times(1);
103
    EXPECT_CALL(*package, do_pay_package_verify("foo")).Times(1);
1570
104
    EXPECT_FALSE(package->verify("foo"));
104
    EXPECT_FALSE(package->verify("foo"));
1571
@@ -107,7 +107,7 @@
1572
107
TEST_F(PayTest, testPayPackageVerifyNotCalledIfCallbackExists)
107
TEST_F(PayTest, testPayPackageVerifyNotCalledIfCallbackExists)
1573
108
{
108
{
1574
109
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
109
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1576
110
    auto response = responseForReply(reply.asSharedPtr());
110
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1577
111
111
1578
112
    std::string callback_id = std::string{"foo"} + pay::APPENDAGE_VERIFY;
112
    std::string callback_id = std::string{"foo"} + pay::APPENDAGE_VERIFY;
1579
113
    package->callbacks[callback_id] = [](const std::string&, bool) {};
113
    package->callbacks[callback_id] = [](const std::string&, bool) {};
1580
@@ -118,7 +118,7 @@
1581
118
TEST_F(PayTest, testVerifyReturnsTrueForPurchasedItem)
118
TEST_F(PayTest, testVerifyReturnsTrueForPurchasedItem)
1582
119
{
119
{
1583
120
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
120
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1585
121
    auto response = responseForReply(reply.asSharedPtr());
121
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1586
122
122
1587
123
    package->success = true;
123
    package->success = true;
1588
124
    EXPECT_CALL(*package, do_pay_package_verify("foo")).Times(1);
124
    EXPECT_CALL(*package, do_pay_package_verify("foo")).Times(1);
1589
@@ -128,7 +128,7 @@
1590
128
TEST_F(PayTest, testGetPurchasesCallsWebservice)
128
TEST_F(PayTest, testGetPurchasesCallsWebservice)
1591
129
{
129
{
1592
130
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
130
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1594
131
    auto response = responseForReply(reply.asSharedPtr());
131
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1595
132
132
1596
133
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
133
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1597
134
            .Times(1)
134
            .Times(1)
1598
@@ -140,7 +140,7 @@
1599
140
TEST_F(PayTest, testGetPurchasesSendsCorrectPath)
140
TEST_F(PayTest, testGetPurchasesSendsCorrectPath)
1600
141
{
141
{
1601
142
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
142
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1603
143
    auto response = responseForReply(reply.asSharedPtr());
143
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1604
144
144
1605
145
    EXPECT_CALL(*clientPtr, callImpl(EndsWith(pay::PURCHASES_API_PATH),
145
    EXPECT_CALL(*clientPtr, callImpl(EndsWith(pay::PURCHASES_API_PATH),
1606
146
                                     _, _, _, _, _))
146
                                     _, _, _, _, _))
1607
@@ -153,7 +153,7 @@
1608
153
TEST_F(PayTest, testGetPurchasesCallbackCalled)
153
TEST_F(PayTest, testGetPurchasesCallbackCalled)
1609
154
{
154
{
1610
155
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
155
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1612
156
    auto response = responseForReply(reply.asSharedPtr());
156
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1613
157
157
1614
158
    QByteArray fake_json("[]");
158
    QByteArray fake_json("[]");
1615
159
    EXPECT_CALL(reply.instance, readAll())
159
    EXPECT_CALL(reply.instance, readAll())
1616
@@ -173,7 +173,7 @@
1617
173
TEST_F(PayTest, testGetPurchasesEmptyJsonIsParsed)
173
TEST_F(PayTest, testGetPurchasesEmptyJsonIsParsed)
1618
174
{
174
{
1619
175
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
175
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1621
176
    auto response = responseForReply(reply.asSharedPtr());
176
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1622
177
177
1623
178
    QByteArray fake_json("[]");
178
    QByteArray fake_json("[]");
1624
179
    EXPECT_CALL(reply.instance, readAll())
179
    EXPECT_CALL(reply.instance, readAll())
1625
@@ -194,7 +194,7 @@
1626
194
TEST_F(PayTest, testGetPurchasesSingleJsonIsParsedNullTimestamp)
194
TEST_F(PayTest, testGetPurchasesSingleJsonIsParsedNullTimestamp)
1627
195
{
195
{
1628
196
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
196
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1630
197
    auto response = responseForReply(reply.asSharedPtr());
197
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1631
198
198
1632
199
    QByteArray fake_json(FAKE_PURCHASES_LIST_JSON_NULL_TIMESTAMP);
199
    QByteArray fake_json(FAKE_PURCHASES_LIST_JSON_NULL_TIMESTAMP);
1633
200
    EXPECT_CALL(reply.instance, readAll())
200
    EXPECT_CALL(reply.instance, readAll())
1634
@@ -215,7 +215,7 @@
1635
215
TEST_F(PayTest, testGetPurchasesTimestampIsParsed)
215
TEST_F(PayTest, testGetPurchasesTimestampIsParsed)
1636
216
{
216
{
1637
217
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
217
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1639
218
    auto response = responseForReply(reply.asSharedPtr());
218
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1640
219
219
1641
220
    QByteArray fake_json(FAKE_PURCHASES_LIST_JSON);
220
    QByteArray fake_json(FAKE_PURCHASES_LIST_JSON);
1642
221
    EXPECT_CALL(reply.instance, readAll())
221
    EXPECT_CALL(reply.instance, readAll())
1643
@@ -237,7 +237,7 @@
1644
237
TEST_F(PayTest, testGetPurchasesIsCancellable)
237
TEST_F(PayTest, testGetPurchasesIsCancellable)
1645
238
{
238
{
1646
239
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
239
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1648
240
    auto response = responseForReply(reply.asSharedPtr());
240
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1649
241
241
1650
242
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
242
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1651
243
            .Times(1)
243
            .Times(1)
1652
244
244
1653
=== modified file 'libclickscope/tests/test_preview.cpp'
1654
--- libclickscope/tests/test_preview.cpp	2016-07-13 20:30:09 +0000
1655
+++ libclickscope/tests/test_preview.cpp	2016-09-21 14:55:05 +0000
1656
@@ -1,5 +1,5 @@
1657
1
/*
1
/*
1659
2
 * Copyright (C) 2014 Canonical Ltd.
2
 * Copyright (C) 2014-2016 Canonical Ltd.
1660
3
 *
3
 *
1661
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
1662
5
 * under the terms of the GNU General Public License version 3, as published
5
 * under the terms of the GNU General Public License version 3, as published
1663
@@ -64,7 +64,7 @@
1664
64
    FakeIndex() {
64
    FakeIndex() {
1665
65
65
1666
66
    }
66
    }
1668
67
    click::web::Cancellable get_details(const std::string& /*package_name*/, std::function<void(click::PackageDetails, Error)> callback, bool) override {
67
    click::web::Cancellable get_details(const std::string& /*package_name*/, std::function<void(click::PackageDetails, Error)> callback, bool, bool) override {
1669
68
        callback(click::PackageDetails(), Error::NetworkError);
68
        callback(click::PackageDetails(), Error::NetworkError);
1670
69
        return click::web::Cancellable();
69
        return click::web::Cancellable();
1671
70
    }
70
    }
1672
71
71
1673
=== modified file 'libclickscope/tests/test_reviews.cpp'
1674
--- libclickscope/tests/test_reviews.cpp	2016-05-10 13:42:12 +0000
1675
+++ libclickscope/tests/test_reviews.cpp	2016-09-21 14:55:05 +0000
1676
@@ -140,7 +140,7 @@
1677
140
TEST_F(ReviewsTest, testFetchReviewsCallsWebservice)
140
TEST_F(ReviewsTest, testFetchReviewsCallsWebservice)
1678
141
{
141
{
1679
142
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
142
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1681
143
    auto response = responseForReply(reply.asSharedPtr());
143
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1682
144
144
1683
145
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
145
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1684
146
            .Times(1)
146
            .Times(1)
1685
@@ -153,7 +153,7 @@
1686
153
TEST_F(ReviewsTest, testFetchReviewsDoesNotSignCall)
153
TEST_F(ReviewsTest, testFetchReviewsDoesNotSignCall)
1687
154
{
154
{
1688
155
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
155
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1690
156
    auto response = responseForReply(reply.asSharedPtr());
156
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1691
157
157
1692
158
    EXPECT_CALL(*clientPtr, callImpl(_, _, false, _, _, _))
158
    EXPECT_CALL(*clientPtr, callImpl(_, _, false, _, _, _))
1693
159
            .Times(1)
159
            .Times(1)
1694
@@ -166,7 +166,7 @@
1695
166
TEST_F(ReviewsTest, testFetchReviewsSendsQueryAsParam)
166
TEST_F(ReviewsTest, testFetchReviewsSendsQueryAsParam)
1696
167
{
167
{
1697
168
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
168
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1699
169
    auto response = responseForReply(reply.asSharedPtr());
169
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1700
170
170
1701
171
    click::web::CallParams params;
171
    click::web::CallParams params;
1702
172
    params.add(click::REVIEWS_QUERY_ARGNAME, FAKE_PACKAGENAME);
172
    params.add(click::REVIEWS_QUERY_ARGNAME, FAKE_PACKAGENAME);
1703
@@ -181,7 +181,7 @@
1704
181
TEST_F(ReviewsTest, testFetchReviewsSendsCorrectPath)
181
TEST_F(ReviewsTest, testFetchReviewsSendsCorrectPath)
1705
182
{
182
{
1706
183
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
183
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1708
184
    auto response = responseForReply(reply.asSharedPtr());
184
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1709
185
185
1710
186
    EXPECT_CALL(*clientPtr, callImpl(EndsWith(click::REVIEWS_API_PATH),
186
    EXPECT_CALL(*clientPtr, callImpl(EndsWith(click::REVIEWS_API_PATH),
1711
187
                                     _, _, _, _, _))
187
                                     _, _, _, _, _))
1712
@@ -195,7 +195,7 @@
1713
195
TEST_F(ReviewsTest, testFetchReviewsCallbackCalled)
195
TEST_F(ReviewsTest, testFetchReviewsCallbackCalled)
1714
196
{
196
{
1715
197
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
197
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1717
198
    auto response = responseForReply(reply.asSharedPtr());
198
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1718
199
199
1719
200
    QByteArray fake_json("[]");
200
    QByteArray fake_json("[]");
1720
201
    EXPECT_CALL(reply.instance, readAll())
201
    EXPECT_CALL(reply.instance, readAll())
1721
@@ -216,7 +216,7 @@
1722
216
TEST_F(ReviewsTest, testFetchReviewsNot200)
216
TEST_F(ReviewsTest, testFetchReviewsNot200)
1723
217
{
217
{
1724
218
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
218
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1726
219
    auto response = responseForReply(reply.asSharedPtr());
219
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1727
220
220
1728
221
    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(301)));
221
    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(301)));
1729
222
    EXPECT_CALL(reply.instance, readAll())
222
    EXPECT_CALL(reply.instance, readAll())
1730
@@ -238,7 +238,7 @@
1731
238
TEST_F(ReviewsTest, testFetchReviewsEmptyJsonIsParsed)
238
TEST_F(ReviewsTest, testFetchReviewsEmptyJsonIsParsed)
1732
239
{
239
{
1733
240
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
240
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1735
241
    auto response = responseForReply(reply.asSharedPtr());
241
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1736
242
242
1737
243
    QByteArray fake_json("[]");
243
    QByteArray fake_json("[]");
1738
244
    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(200)));
244
    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(200)));
1739
@@ -261,7 +261,7 @@
1740
261
TEST_F(ReviewsTest, testFetchReviewsSingleJsonIsParsed)
261
TEST_F(ReviewsTest, testFetchReviewsSingleJsonIsParsed)
1741
262
{
262
{
1742
263
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
263
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1744
264
    auto response = responseForReply(reply.asSharedPtr());
264
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1745
265
265
1746
266
    QByteArray fake_json(FAKE_JSON_REVIEWS_RESULT_ONE.c_str());
266
    QByteArray fake_json(FAKE_JSON_REVIEWS_RESULT_ONE.c_str());
1747
267
    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(200)));
267
    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(200)));
1748
@@ -295,7 +295,7 @@
1749
295
TEST_F(ReviewsTest, testFetchReviewsNetworkErrorReported)
295
TEST_F(ReviewsTest, testFetchReviewsNetworkErrorReported)
1750
296
{
296
{
1751
297
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
297
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1753
298
    auto response = responseForReply(reply.asSharedPtr());
298
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1754
299
299
1755
300
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
300
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1756
301
            .Times(1)
301
            .Times(1)
1757
@@ -318,7 +318,7 @@
1758
318
TEST_F(ReviewsTest, testFetchReviewsIsCancellable)
318
TEST_F(ReviewsTest, testFetchReviewsIsCancellable)
1759
319
{
319
{
1760
320
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
320
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1762
321
    auto response = responseForReply(reply.asSharedPtr());
321
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1763
322
322
1764
323
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
323
    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
1765
324
            .Times(1)
324
            .Times(1)
1766
@@ -333,7 +333,7 @@
1767
333
TEST_F(ReviewsTest, testSubmitReviewIsCancellable)
333
TEST_F(ReviewsTest, testSubmitReviewIsCancellable)
1768
334
{
334
{
1769
335
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
335
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1771
336
    auto response = responseForReply(reply.asSharedPtr());
336
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1772
337
337
1773
338
    click::Review review;
338
    click::Review review;
1774
339
    review.rating = 3;
339
    review.rating = 3;
1775
@@ -354,7 +354,7 @@
1776
354
TEST_F(ReviewsTest, testSubmitReviewUtf8)
354
TEST_F(ReviewsTest, testSubmitReviewUtf8)
1777
355
{
355
{
1778
356
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
356
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1780
357
    auto response = responseForReply(reply.asSharedPtr());
357
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1781
358
358
1782
359
    click::Review review;
359
    click::Review review;
1783
360
    review.rating = 3;
360
    review.rating = 3;
1784
@@ -378,7 +378,7 @@
1785
378
TEST_F(ReviewsTest, testSubmitReviewLanguageCorrect)
378
TEST_F(ReviewsTest, testSubmitReviewLanguageCorrect)
1786
379
{
379
{
1787
380
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
380
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1789
381
    auto response = responseForReply(reply.asSharedPtr());
381
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1790
382
382
1791
383
    click::Review review;
383
    click::Review review;
1792
384
    review.rating = 3;
384
    review.rating = 3;
1793
@@ -402,7 +402,7 @@
1794
402
TEST_F(ReviewsTest, testSubmitReviewLanguageCorrectForFullLangCodes)
402
TEST_F(ReviewsTest, testSubmitReviewLanguageCorrectForFullLangCodes)
1795
403
{
403
{
1796
404
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
404
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1798
405
    auto response = responseForReply(reply.asSharedPtr());
405
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1799
406
406
1800
407
    click::Review review;
407
    click::Review review;
1801
408
    review.rating = 3;
408
    review.rating = 3;
1802
@@ -428,7 +428,7 @@
1803
428
TEST_F(ReviewsTest, testEditReviewUrlHasReviewId)
428
TEST_F(ReviewsTest, testEditReviewUrlHasReviewId)
1804
429
{
429
{
1805
430
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
430
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1807
431
    auto response = responseForReply(reply.asSharedPtr());
431
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1808
432
432
1809
433
    click::Review review;
433
    click::Review review;
1810
434
    review.id = 1234;
434
    review.id = 1234;
1811
@@ -448,7 +448,7 @@
1812
448
TEST_F(ReviewsTest, testEditReviewIsCancellable)
448
TEST_F(ReviewsTest, testEditReviewIsCancellable)
1813
449
{
449
{
1814
450
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
450
    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
1816
451
    auto response = responseForReply(reply.asSharedPtr());
451
    auto response = MockClient::responseForReply(reply.asSharedPtr());
1817
452
452
1818
453
    click::Review review;
453
    click::Review review;
1819
454
    review.id = 1234;
454
    review.id = 1234;
1820
455
455
1821
=== modified file 'scope/clickstore/store-query.cpp'
1822
--- scope/clickstore/store-query.cpp	2016-09-21 14:55:05 +0000
1823
+++ scope/clickstore/store-query.cpp	2016-09-21 14:55:05 +0000
1824
@@ -169,6 +169,7 @@
1825
169
    click::HighlightList& highlights;
169
    click::HighlightList& highlights;
1826
170
    scopes::SearchMetadata meta;
170
    scopes::SearchMetadata meta;
1827
171
    click::web::Cancellable search_operation;
171
    click::web::Cancellable search_operation;
1828
172
    click::web::Cancellable search_snaps_operation;
1829
172
    click::web::Cancellable purchases_operation;
173
    click::web::Cancellable purchases_operation;
1830
173
    pay::Package& pay_package;
174
    pay::Package& pay_package;
1831
174
    std::shared_future<void> qt_ready_;
175
    std::shared_future<void> qt_ready_;
1832
@@ -196,6 +197,7 @@
1833
196
{
197
{
1834
197
    qDebug() << "cancelling search of" << QString::fromStdString(query().query_string());
198
    qDebug() << "cancelling search of" << QString::fromStdString(query().query_string());
1835
198
    impl->search_operation.cancel();
199
    impl->search_operation.cancel();
1836
200
    impl->search_snaps_operation.cancel();
1837
199
}
201
}
1838
200
202
1839
201
click::Interface& click::Query::clickInterfaceInstance()
203
click::Interface& click::Query::clickInterfaceInstance()
1840
@@ -290,7 +292,12 @@
1841
290
        res.set_title(pkg.title);
292
        res.set_title(pkg.title);
1842
291
        res.set_art(pkg.icon_url);
293
        res.set_art(pkg.icon_url);
1843
292
        res.set_uri(pkg.url);
294
        res.set_uri(pkg.url);
1845
293
        res[click::Query::ResultKeys::NAME] = pkg.name;
295
        res["snap_id"] = pkg.snap_id;
1846
296
        if (pkg.snap_id.empty()) {
1847
297
            res[click::Query::ResultKeys::NAME] = pkg.name;
1848
298
        } else {
1849
299
            res[click::Query::ResultKeys::NAME] = pkg.alias;
1850
300
        }
1851
294
        res["subtitle"] = pkg.publisher;
301
        res["subtitle"] = pkg.publisher;
1852
295
        auto installed = installedPackages.find(pkg);
302
        auto installed = installedPackages.find(pkg);
1853
296
303
1854
@@ -533,6 +540,7 @@
1855
533
                    push_package(searchReply, recommendsCategory,
540
                    push_package(searchReply, recommendsCategory,
1856
534
                                 installedPackages, r);
541
                                 installedPackages, r);
1857
535
                }
542
                }
1858
543
1859
536
                qDebug() << "search completed";
544
                qDebug() << "search completed";
1860
537
                this->finished(searchReply); //FIXME: this shouldn't be needed
545
                this->finished(searchReply); //FIXME: this shouldn't be needed
1861
538
            };
546
            };
1862
@@ -596,7 +604,37 @@
1863
596
            {
604
            {
1864
597
                qDebug() << "starting search of" << QString::fromStdString(query().query_string());
605
                qDebug() << "starting search of" << QString::fromStdString(query().query_string());
1865
598
                push_departments(searchReply);
606
                push_departments(searchReply);
1867
599
                impl->search_operation = impl->index.search(query().query_string(), query().department_id(), search_cb, force_cache);
607
                impl->search_operation = impl->index.search
1868
608
                    (query().query_string(), query().department_id(),
1869
609
                     [this, search_cb, force_cache](Packages packages,
1870
610
                                                    Packages recommends) {
1871
611
                        if (Configuration().is_snapd_running()) {
1872
612
                            qDebug() << "Searching for snaps too.";
1873
613
                            impl->search_snaps_operation = impl->index.search_snaps
1874
614
                            (query().query_string(),
1875
615
                             [this, packages, recommends, search_cb](Packages snap_packages,
1876
616
                                                                     Packages snap_recommends) {
1877
617
                                qDebug() << "In the callback.";
1878
618
                                Packages new_packages, new_recommends;
1879
619
                                for (const auto& p: packages) {
1880
620
                                    new_packages.push_back(p);
1881
621
                                }
1882
622
                                for (const auto& p: snap_packages) {
1883
623
                                    new_packages.push_back(p);
1884
624
                                }
1885
625
                                for (const auto& r: recommends) {
1886
626
                                    new_recommends.push_back(r);
1887
627
                                }
1888
628
                                for (const auto& r: snap_recommends) {
1889
629
                                    new_recommends.push_back(r);
1890
630
                                }
1891
631
                                qDebug() << "Snaps appended.";
1892
632
                                search_cb(new_packages, new_recommends);
1893
633
                            }, force_cache);
1894
634
                        } else {
1895
635
                            search_cb(packages, recommends);
1896
636
                        }
1897
637
                    }, force_cache);
1898
600
            }
638
            }
1899
601
        }
639
        }
1900
602
    });
640
    });
Status:	Rejected
Rejected by:	dobey on 2016-11-29
Proposed branch:	lp:~dobey/unity-scope-click/clicksnap
Merge into:	lp:unity-scope-click
Prerequisite:	lp:~dobey/unity-scope-click/ual-apps
Diff against target:	1900 lines (+682/-390) 23 files modified bin/CMakeLists.txt (+4/-1) bin/install-helper (+9/-2) bin/install-snap (+73/-0) debian/control (+6/-3) libclickscope/click/configuration.cpp (+13/-3) libclickscope/click/configuration.h (+1/-0) libclickscope/click/download-manager.cpp (+53/-83) libclickscope/click/download-manager.h (+4/-8) libclickscope/click/index.cpp (+60/-6) libclickscope/click/index.h (+11/-2) libclickscope/click/package.cpp (+4/-0) libclickscope/click/package.h (+4/-0) libclickscope/click/preview.cpp (+16/-5) libclickscope/click/webclient.cpp (+26/-17) libclickscope/click/webclient.h (+2/-0) libclickscope/tests/mock_webclient.h (+11/-7) libclickscope/tests/test_bootstrap.cpp (+2/-2) libclickscope/tests/test_download_manager.cpp (+155/-127) libclickscope/tests/test_index.cpp (+157/-91) libclickscope/tests/test_pay.cpp (+13/-13) libclickscope/tests/test_preview.cpp (+2/-2) libclickscope/tests/test_reviews.cpp (+16/-16) scope/clickstore/store-query.cpp (+40/-2)
To merge this branch:	bzr merge lp:~dobey/unity-scope-click/clicksnap
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
unity-api-1-bot	continuous-integration	2016-08-25	Approve on 2016-09-12
Charles Kerr (community)		2016-08-25	Approve on 2016-09-12
Review via email: mp+303974@code.launchpad.net