unity-scope-click

Merge lp:~dobey/unity-scope-click/rm-store-pay into lp:unity-scope-click

rm-store-pay
Merge into trunk

Proposed by dobey on 2016-10-24

Status:	Merged
Approved by:	Charles Kerr on 2016-10-25
Approved revision:	496
Merged at revision:	493
Proposed branch:	lp:~dobey/unity-scope-click/rm-store-pay
Merge into:	lp:unity-scope-click
Diff against target:	4115 lines (+58/-3259) 34 files modified CMakeLists.txt (+4/-8) bin/CMakeLists.txt (+1/-1) bin/enable-purchases (+0/-44) data/CMakeLists.txt (+0/-5) data/update_schema.sh (+0/-1) debian/control (+0/-2) debian/unity-scope-click.install (+0/-3) libclickscope/click/CMakeLists.txt (+0/-2) libclickscope/click/pay.cpp (+0/-317) libclickscope/click/pay.h (+0/-125) libclickscope/click/preview.cpp (+17/-207) libclickscope/click/preview.h (+2/-46) libclickscope/tests/CMakeLists.txt (+0/-5) libclickscope/tests/integration/CMakeLists.txt (+0/-32) libclickscope/tests/integration/departmentsdb_integration.cpp (+0/-137) libclickscope/tests/integration/webclient_integration.cpp (+0/-128) libclickscope/tests/mock_pay.h (+0/-106) libclickscope/tests/test_pay.cpp (+0/-266) libclickscope/tests/test_preview.cpp (+16/-167) scope/CMakeLists.txt (+0/-1) scope/clickapps/apps-scope.cpp (+1/-2) scope/clickapps/apps-scope.h (+0/-2) scope/clickstore/CMakeLists.txt (+0/-43) scope/clickstore/com.canonical.scopes.clickstore.ini.in.in (+0/-10) scope/clickstore/store-query.cpp (+0/-645) scope/clickstore/store-query.h (+0/-117) scope/clickstore/store-scope.cpp (+0/-237) scope/clickstore/store-scope.h (+0/-91) scope/tests/CMakeLists.txt (+0/-47) scope/tests/fake_launcher/CMakeLists.txt (+0/-14) scope/tests/fake_launcher/fake_launcher.cpp (+0/-118) scope/tests/fake_launcher/fake_launcher.h (+0/-116) scope/tests/test_query.cpp (+17/-36) scope/tests/test_store_scope.cpp (+0/-178)
To merge this branch:	bzr merge lp:~dobey/unity-scope-click/rm-store-pay
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Charles Kerr (community)		2016-10-24	Approve on 2016-10-25
unity-api-1-bot	continuous-integration		Needs Fixing on 2016-10-25
Review via email: mp+309179@code.launchpad.net

Commit message

Remove the store scope code and libpay usage.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-10-24:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/120/rebuild

review: Needs Fixing (continuous-integration)

lp:~dobey/unity-scope-click/rm-store-pay updated on 2016-10-25

495. By dobey on 2016-10-25: No more store data files in the package.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-10-25:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/121/rebuild

review: Approve (continuous-integration)

lp:~dobey/unity-scope-click/rm-store-pay updated on 2016-10-25

496. By dobey on 2016-10-25: Also remove the old enable-purchases script.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-10-25:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/122/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Charles Kerr (charlesk) wrote on 2016-10-25:

LGTM. Goodbye libpay.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Unity API Team

dobey

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-09-29 20:38:00 +0000
 +++ CMakeLists.txt	2016-10-25 13:13:28 +0000
@@ -14,8 +14,6 @@
  include(GNUInstallDirs)
--set(STORE_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/unity-scopes/clickstore/)
--set(STORE_DATA_DIR ${CMAKE_INSTALL_FULL_DATADIR}/unity/scopes/clickstore/)
  set(APPS_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/unity-scopes/clickapps/)
  set(APPS_DATA_DIR ${CMAKE_INSTALL_FULL_DATADIR}/unity/scopes/clickapps/)
@@ -24,7 +22,7 @@
  include(UseGSettings)
  find_package (PkgConfig REQUIRED)
--pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2>=0.9)
++pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2>=0.9 gobject-2.0)
  add_definitions(${UAL_CFLAGS} ${UAL_CFLAGS_OTHER})
  pkg_check_modules(CLICK REQUIRED click-0.4)
@@ -45,9 +43,7 @@
  SET (SCOPE_LIB_VERSION 0.2.0)
  SET (SCOPE_LIB_SOVERSION 0)
  SET (SCOPE_LIB_API_VERSION 2.0)
--SET (STORE_LIB_UNVERSIONED com.canonical.scopes.clickstore)
  SET (SCOPE_LIB_NAME clickscope)
--SET (STORE_LIB_NAME ${STORE_LIB_UNVERSIONED}-${SCOPE_LIB_API_VERSION})
  SET (APPS_LIB_UNVERSIONED scope)
  SET (APPS_LIB_NAME ${APPS_LIB_UNVERSIONED}-${SCOPE_LIB_API_VERSION})
@@ -68,14 +64,14 @@
  add_subdirectory(tools)
  include(EnableCoverageReport)
--ENABLE_COVERAGE_REPORT(TARGETS ${SCOPE_LIB_NAME} ${STORE_LIB_UNVERSIONED} ${APPS_LIB_UNVERSIONED}
--  TESTS click_scope_integration_tests libclick-scope-tests fake_launcher click-scope-tests apps-scope-tests init-departments
++ENABLE_COVERAGE_REPORT(TARGETS ${SCOPE_LIB_NAME} ${APPS_LIB_UNVERSIONED}
++  TESTS libclick-scope-tests apps-scope-tests init-departments
    FILTER /usr/include ${CMAKE_BINARY_DIR}/*
+ )
  # Custom targets for the tests
  add_custom_target (test
--  DEPENDS test-click-scope test-apps-scope test-libclickscope test-integration-harness
++  DEPENDS test-apps-scope test-libclickscope test-integration-harness
+ )
  add_custom_target (test-disabled
 === modified file 'bin/CMakeLists.txt'
 --- bin/CMakeLists.txt	2014-08-14 14:59:57 +0000
 +++ bin/CMakeLists.txt	2016-10-25 13:13:28 +0000
@@ -1,1 +1,1 @@
--install(PROGRAMS install-helper enable-purchases DESTINATION lib/unity-scope-click/)
++install(PROGRAMS install-helper DESTINATION lib/unity-scope-click/)
 === removed file 'bin/enable-purchases'
 --- bin/enable-purchases	2014-08-14 14:59:57 +0000
 +++ bin/enable-purchases	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
--#!/bin/sh
--#
--# Copyright (C) 2014 Canonical Ltd.
--#
--# This program is free software: you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 3, as published
--# by the Free Software Foundation.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranties of
--# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
--# PURPOSE.  See the GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License along
--# with this program.  If not, see <http://www.gnu.org/licenses/>.
--#
--# In addition, as a special exception, the copyright holders give
--# permission to link the code of portions of this program with the
--# OpenSSL library under certain conditions as described in each
--# individual source file, and distribute linked combinations
--# including the two.
--# You must obey the GNU General Public License in all respects
--# for all of the code used other than OpenSSL.  If you modify
--# file(s) with this exception, you may extend this exception to your
--# version of the file(s), but you are not obligated to do so.  If you
--# do not wish to do so, delete this exception statement from your
--# version.  If you delete this exception statement from all source
--# files in the program, then also delete it here.
--#
--set -e
--
--CLICK_STORE_ENABLE_PURCHASES=1
--
--/sbin/initctl set-env --global CLICK_STORE_ENABLE_PURCHASES=$CLICK_STORE_ENABLE_PURCHASES
--
--gdbus call --session \
--  --dest org.freedesktop.DBus \
--  --object-path / \
--  --method org.freedesktop.DBus.UpdateActivationEnvironment \
--  "[{'CLICK_STORE_ENABLE_PURCHASES', '$CLICK_STORE_ENABLE_PURCHASES'}]"
--
--/sbin/restart scope-registry
--
--echo "Purchases enabled and scope-registry restarted."
 === modified file 'data/CMakeLists.txt'
 --- data/CMakeLists.txt	2015-03-31 16:11:35 +0000
 +++ data/CMakeLists.txt	2016-10-25 13:13:28 +0000
@@ -6,11 +6,6 @@
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEPARTMENTS_UPSTART_JOB} DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
  install(
--  FILES clickscope-screenshot.jpg ubuntu-store-scope.png store-scope-icon.svg
--  DESTINATION "${STORE_DATA_DIR}"
--)
--
--install(
    FILES clickscope-screenshot.jpg apps-scope.png ubuntu-logo.png
    DESTINATION "${APPS_DATA_DIR}"
+ )
 === modified file 'data/update_schema.sh'
 --- data/update_schema.sh	2015-01-23 01:37:54 +0000
 +++ data/update_schema.sh	2016-10-25 13:13:28 +0000
@@ -299,7 +299,6 @@
      INSERT INTO "pkgmap" VALUES('com.zeptolab.cuttherope.free','games');
      INSERT INTO "pkgmap" VALUES('com.ubuntu.weather','weather');
      INSERT INTO "pkgmap" VALUES('com.ubuntu.clock','accessories');
--    INSERT INTO "pkgmap" VALUES('com.canonical.payui','accessories');
      INSERT INTO "pkgmap" VALUES('com.ubuntu.music','music-audio');
      INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-ebay','shopping');
      INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-gmail','communication');
 === modified file 'debian/control'
 --- debian/control	2016-09-29 20:38:00 +0000
 +++ debian/control	2016-10-25 13:13:28 +0000
@@ -15,7 +15,6 @@
                 libclick-0.4-dev,
                 libglib2.0-dev (>= 2.32),
                 libjsoncpp-dev,
--               libpay2-dev (>= 2.0.0+15.04.20150701),
                 libubuntu-app-launch2-dev (>= 0.9),
                 libubuntu-download-manager-client-dev (>= 0.3+14.10.20140430-0ubuntu1),
                 libubuntu-download-manager-common-dev (>= 0.3+14.10.20140430-0ubuntu1),
@@ -45,7 +44,6 @@
           libsqlite3-0 (>= 3.8.5),
           packagekit,
           packagekit-tools,
--         pay-service,
           ubuntu-app-launch-tools,
           ubuntu-download-manager,
           upstart,
 === modified file 'debian/unity-scope-click.install'
 --- debian/unity-scope-click.install	2014-08-19 15:56:29 +0000
 +++ debian/unity-scope-click.install	2016-10-25 13:13:28 +0000
@@ -1,8 +1,5 @@
  usr/lib/*/unity-scopes/*
  usr/lib/unity-scope-click/*
--usr/share/unity/scopes/clickstore/*jpg
--usr/share/unity/scopes/clickstore/*png
--usr/share/unity/scopes/clickstore/*svg
  usr/share/unity/scopes/clickapps/*jpg
  usr/share/unity/scopes/clickapps/*png
  usr/share/glib-2.0/schemas/*
 === modified file 'libclickscope/click/CMakeLists.txt'
 --- libclickscope/click/CMakeLists.txt	2016-08-12 15:09:24 +0000
 +++ libclickscope/click/CMakeLists.txt	2016-10-25 13:13:28 +0000
@@ -4,7 +4,6 @@
  find_package (Qt5Sql REQUIRED)
  pkg_check_modules(JSON_CPP REQUIRED jsoncpp)
  pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
--pkg_check_modules(LIBPAY REQUIRED pay-2)
  add_definitions(
    -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
@@ -25,7 +24,6 @@
    launcher.cpp
    network_access_manager.cpp
    package.cpp
--  pay.cpp
    preview.cpp
    reviews.cpp
    qtbridge.cpp
 === removed file 'libclickscope/click/pay.cpp'
 --- libclickscope/click/pay.cpp	2016-05-10 13:42:12 +0000
 +++ libclickscope/click/pay.cpp	1970-01-01 00:00:00 +0000
@@ -1,317 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * In addition, as a special exception, the copyright holders give
-- * permission to link the code of portions of this program with the
-- * OpenSSL library under certain conditions as described in each
-- * individual source file, and distribute linked combinations
-- * including the two.
-- * You must obey the GNU General Public License in all respects
-- * for all of the code used other than OpenSSL.  If you modify
-- * file(s) with this exception, you may extend this exception to your
-- * version of the file(s), but you are not obligated to do so.  If you
-- * do not wish to do so, delete this exception statement from your
-- * version.  If you delete this exception statement from all source
-- * files in the program, then also delete it here.
-- */
--
--#include "pay.h"
--
--#include <future>
--
--#include <json/reader.h>
--#include <json/value.h>
--
--#include <glib.h>
--#include <libpay/pay-package.h>
--#include <unistd.h>
--
--#include <QDebug>
--
--namespace json = Json;
--
--
--struct pay::Package::Private
--{
--    Private()
--    {
--    }
--
--    virtual ~Private()
--    {
--    }
--
--    PayPackage *pay_package;
--};
--
--
--static void pay_verification_observer(PayPackage*,
--                                      const char* item_id,
--                                      PayPackageItemStatus status,
--                                      void* user_data)
--{
--    pay::Package* p = static_cast<pay::Package*>(user_data);
--    std::string callback_id = std::string{item_id} + pay::APPENDAGE_VERIFY;
--    if (p->callbacks.count(callback_id) == 0) {
--        qDebug() << "Verify observer called with no callback:" << item_id;
--        return;
--    }
--
--    switch (status) {
--    case PAY_PACKAGE_ITEM_STATUS_PURCHASED:
--        p->callbacks[callback_id](item_id, true);
--        break;
--    case PAY_PACKAGE_ITEM_STATUS_NOT_PURCHASED:
--        p->callbacks[callback_id](item_id, false);
--        break;
--    default:
--        break;
--    }
--}
--
--static  void pay_refund_observer(PayPackage*,
--                                 const char* item_id,
--                                 PayPackageRefundStatus status,
--                                 void* user_data)
--{
--    pay::Package* p = static_cast<pay::Package*>(user_data);
--    std::string callback_id = std::string{item_id} + pay::APPENDAGE_REFUND;
--    if (p->callbacks.count(callback_id) == 0) {
--        qDebug() << "Refund observer called with no callback:" << item_id;
--        return;
--    }
--
--    switch (status) {
--    case PAY_PACKAGE_REFUND_STATUS_NOT_PURCHASED:
--        p->callbacks[callback_id](item_id, true);
--        break;
--    case PAY_PACKAGE_REFUND_STATUS_NOT_REFUNDABLE:
--        p->callbacks[callback_id](item_id, false);
--    default:
--        break;
--    }
--}
--
--
--namespace pay {
--
--bool operator==(const Purchase& lhs, const Purchase& rhs) {
--    return lhs.name == rhs.name;
--}
--
--Package::Package() : impl(new Private())
--{
--}
--
--Package::Package(const QSharedPointer<click::web::Client>& client) :
--    impl(new Private()),
--    client(client)
--{
--}
--
--Package::~Package()
--{
--    if (running) {
--        pay_package_item_observer_uninstall(impl->pay_package,
--                                            pay_verification_observer,
--                                            this);
--        pay_package_delete(impl->pay_package);
--    }
--}
--
--bool Package::refund(const std::string& pkg_name)
--{
--    std::promise<bool> result_promise;
--    std::future<bool> result_future = result_promise.get_future();
--    bool result;
--
--    std::string callback_id = pkg_name + pay::APPENDAGE_REFUND;
--    if (callbacks.count(callback_id) == 0) {
--        callbacks[callback_id] = [pkg_name,
--                                  this, callback_id,
--                                  &result_promise](const std::string& item_id,
--                                                   bool succeeded) {
--            if (item_id == pkg_name) {
--                try {
--                    result_promise.set_value(succeeded);
--                    callbacks.erase(callback_id);
--                } catch (std::future_error) {
--                    // Just log this to avoid crashing, as it seems that
--                    // sometimes this callback may be called more than once.
--                    qDebug() << "Refund callback called again for:" << item_id.c_str();
--                }
--            }
--        };
--        qDebug() << "Attempting to cancel purchase of " << pkg_name.c_str();
--        pay_package_refund(pkg_name);
--
--        result = result_future.get();
--
--        return result;
--    }
--    return false;
--}
--
--bool Package::verify(const std::string& pkg_name)
--{
--    std::promise<bool> result_promise;
--    std::future<bool> result_future = result_promise.get_future();
--    bool result;
--
--    std::string callback_id = pkg_name + pay::APPENDAGE_VERIFY;
--    if (callbacks.count(callback_id) == 0) {
--        callbacks[callback_id] = [pkg_name,
--                                  &result_promise](const std::string& item_id,
--                                                   bool purchased) {
--            if (item_id == pkg_name) {
--                try {
--                    result_promise.set_value(purchased);
--                } catch (std::future_error) {
--                    // Just log this to avoid crashing, as it seems that
--                    // sometimes this callback may be called more than once.
--                    qDebug() << "Callback called again for:" << item_id.c_str();
--                }
--            }
--        };
--        qDebug() << "Checking if " << pkg_name.c_str() << " was purchased.";
--        pay_package_verify(pkg_name);
--
--        result = result_future.get();
--
--        callbacks.erase(callback_id);
--
--        return result;
--    }
--    return false;
--}
--
--bool Package::is_refundable(const std::string& pkg_name)
--{
--    if (!running) {
--        setup_pay_service();
--    }
--
--    if (verify(pkg_name)) {
--        // No Hondas, why racing? Wait for it…
--        usleep(10000);
--
--        return pay_package_item_is_refundable(impl->pay_package,
--                                              pkg_name.c_str()) == 0 ? false : true;
--    }
--    // If verify() returned false, then it's not purchased.
--    return false;
--}
--
--time_t parse_timestamp(json::Value v)
--{
--    if (v.isNull()) {
--        return 0;
--    }
--
--    QDateTime when = QDateTime::fromString(QString::fromStdString(v.asString()), Qt::ISODate);
--    when.setTimeSpec(Qt::OffsetFromUTC);
--
--    return when.toTime_t();
--}
--
--click::web::Cancellable Package::get_purchases(std::function<void(const PurchaseSet&)> callback)
--{
--    QSharedPointer<click::web::Response> response = client->call
--        (get_base_url() + pay::API_ROOT + pay::PURCHASES_API_PATH, "GET", true);
--
--    QObject::connect(response.data(), &click::web::Response::finished,
--                     [=](QString reply) {
--                         PurchaseSet purchases;
--                         json::Reader reader;
--                         json::Value root;
--
--                         if (reader.parse(reply.toUtf8().constData(), root)) {
--                             for (uint i = 0; i < root.size(); i++) {
--                                 const json::Value item = root[i];
--                                 if (item[JsonKeys::state].asString() == PURCHASE_STATE_COMPLETE) {
--                                     auto package_name = item[JsonKeys::package_name].asString();
--                                     qDebug() << "parsing:" << package_name.c_str();
--                                     auto refundable_until_value = item[JsonKeys::refundable_until];
--                                     qDebug() << "refundable until:" << refundable_until_value.asString().c_str();
--                                     auto refundable_parsed = parse_timestamp(refundable_until_value);
--                                     qDebug() << "parsed:" << refundable_parsed;
--                                     Purchase p(package_name, refundable_parsed);
--                                     purchases.insert(p);
--                                 }
--                             }
--                         }
--                         callback(purchases);
--                     });
--    QObject::connect(response.data(), &click::web::Response::error,
--                     [=](QString) {
--                         qWarning() << "Network error getting purchases.";
--                         callback(PurchaseSet());
--                     });
--
--    return click::web::Cancellable(response);
--}
--
--std::string Package::get_base_url()
--{
--    const char *env_url = getenv(pay::BASE_URL_ENVVAR);
--    if (env_url != NULL) {
--        return env_url;
--    }
--    return pay::BASE_URL;
--}
--
--void Package::setup_pay_service()
--{
--    PayPackage* newpkg = pay_package_new(Package::NAME);
--    impl->pay_package = newpkg;
--
--    qDebug() << "installing observers";
--    pay_package_item_observer_install(impl->pay_package,
--                                      pay_verification_observer,
--                                      this);
--    pay_package_refund_observer_install(impl->pay_package,
--                                        pay_refund_observer,
--                                        this);
--
--    running = true;
--}
--
--void Package::pay_package_refund(const std::string& pkg_name)
--{
--    if (!running) {
--        setup_pay_service();
--    }
--
--    if (callbacks.count(pkg_name + pay::APPENDAGE_REFUND) == 0) {
--        return;
--    }
--
--    pay_package_item_start_refund(impl->pay_package, pkg_name.c_str());
--}
--
--void Package::pay_package_verify(const std::string& pkg_name)
--{
--    if (!running) {
--        setup_pay_service();
--    }
--
--    if (callbacks.count(pkg_name + pay::APPENDAGE_VERIFY) == 0) {
--        return;
--    }
--
--    pay_package_item_start_verification(impl->pay_package, pkg_name.c_str());
--}
--
--} // namespace pay
 === removed file 'libclickscope/click/pay.h'
 --- libclickscope/click/pay.h	2015-11-24 18:23:23 +0000
 +++ libclickscope/click/pay.h	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * In addition, as a special exception, the copyright holders give
-- * permission to link the code of portions of this program with the
-- * OpenSSL library under certain conditions as described in each
-- * individual source file, and distribute linked combinations
-- * including the two.
-- * You must obey the GNU General Public License in all respects
-- * for all of the code used other than OpenSSL.  If you modify
-- * file(s) with this exception, you may extend this exception to your
-- * version of the file(s), but you are not obligated to do so.  If you
-- * do not wish to do so, delete this exception statement from your
-- * version.  If you delete this exception statement from all source
-- * files in the program, then also delete it here.
-- */
--
--#ifndef _PAY_H_
--#define _PAY_H_
--
--#include <click/webclient.h>
--
--#include <ctime>
--#include <map>
--#include <memory>
--#include <unordered_set>
--
--
--namespace pay
--{
--    constexpr static const char* APPENDAGE_VERIFY{":verify"};
--    constexpr static const char* APPENDAGE_REFUND{":refund"};
--
--
--    struct Purchase
--    {
--        std::string name;
--        time_t refundable_until;
--
--        Purchase() = default;
--        Purchase(const std::string &name) : name(name), refundable_until(0)
--        {
--        }
--
--        Purchase(const std::string& name, time_t refundable_until) :
--            name(name), refundable_until(refundable_until)
--        {
--        }
--
--        struct hash_name {
--        public :
--            size_t operator()(const Purchase &purchase ) const
--            {
--                return std::hash<std::string>()(purchase.name);
--            }
--        };
--
--    };
--
--    bool operator==(const Purchase& lhs, const Purchase& rhs);
--
--    typedef std::unordered_set<Purchase, Purchase::hash_name> PurchaseSet;
--
--    typedef std::function<void(const std::string& item_id,
--                               bool status)> StatusFunction;
--
--    constexpr static const char* BASE_URL_ENVVAR{"PAY_BASE_URL"};
--    constexpr static const char* BASE_URL{"https://software-center.ubuntu.com"};
--    constexpr static const char* API_ROOT{"/api/2.0/click/"};
--    constexpr static const char* PURCHASES_API_PATH{"purchases/"};
--    constexpr static const char* PURCHASE_STATE_COMPLETE{"Complete"};
--
--    struct JsonKeys
--    {
--        JsonKeys() = delete;
--
--        constexpr static const char* package_name{"package_name"};
--        constexpr static const char* refundable_until{"refundable_until"};
--        constexpr static const char* state{"state"};
--    };
--
--    class Package
--    {
--    public:
--        constexpr static const char* NAME{"click-scope"};
--
--        Package();
--        Package(const QSharedPointer<click::web::Client>& client);
--        virtual ~Package();
--
--        virtual bool refund(const std::string& pkg_name);
--        virtual bool verify(const std::string& pkg_name);
--        virtual bool is_refundable(const std::string& pkg_name);
--        virtual click::web::Cancellable get_purchases(std::function<void(const PurchaseSet& purchased_apps)> callback);
--        static std::string get_base_url();
--
--    protected:
--        virtual void setup_pay_service();
--        virtual void pay_package_refund(const std::string& pkg_name);
--        virtual void pay_package_verify(const std::string& pkg_name);
--
--        struct Private;
--        QScopedPointer<pay::Package::Private> impl;
--
--        bool running = false;
--        QSharedPointer<click::web::Client> client;
--    public:
--        std::map<std::string, StatusFunction> callbacks;
--    };
--
--} //namespace pay
--
--#endif // _PAY_H_
 === modified file 'libclickscope/click/preview.cpp'
 --- libclickscope/click/preview.cpp	2016-08-15 13:34:03 +0000
 +++ libclickscope/click/preview.cpp	2016-10-25 13:13:28 +0000
@@ -36,7 +36,6 @@
  #include <click/dbus_constants.h>
  #include <click/departments-db.h>
  #include <click/utils.h>
--#include <click/pay.h>
  #include <boost/algorithm/string/replace.hpp>
@@ -173,11 +172,10 @@
+ }
  void Preview::choose_strategy(const QSharedPointer<web::Client> &client,
--                              const QSharedPointer<pay::Package>& ppackage,
                                const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
                                std::shared_ptr<click::DepartmentsDb> depts)
+ {
--    strategy.reset(build_strategy(result, metadata, client, ppackage, manager, depts));
++    strategy.reset(build_strategy(result, metadata, client, manager, depts));
+ }
  PreviewStrategy* Preview::build_installing(const std::string& download_url,
@@ -194,7 +192,6 @@
  PreviewStrategy* Preview::build_strategy(const unity::scopes::Result &result,
                                           const unity::scopes::ActionMetadata &metadata,
                                           const QSharedPointer<web::Client> &client,
--                                         const QSharedPointer<pay::Package>& ppackage,
                                           const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
                                           std::shared_ptr<click::DepartmentsDb> depts)
+ {
@@ -210,7 +207,7 @@
                       << " and close_preview="
                       << metadict.count(click::Preview::Actions::SHOW_INSTALLED);
--            return new InstalledPreview(result, metadata, client, ppackage, depts);
++            return new InstalledPreview(result, metadata, client, depts);
          } else if (metadict.count("action_id") != 0  && metadict.count("download_url") != 0) {
              std::string action_id = metadict["action_id"].get_string();
              std::string download_url = metadict["download_url"].get_string();
@@ -220,27 +217,19 @@
              } else {
                  qWarning() << "unexpected action id " << QString::fromStdString(action_id)
                             << " given with download_url" << QString::fromStdString(download_url);
--                return new UninstalledPreview(result, metadata, client, depts, manager, ppackage);
++                return new UninstalledPreview(result, metadata, client, depts, manager);
+             }
--        } else if (metadict.count(click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED) != 0) {
--            return new CancelPurchasePreview(result, false);
--        } else if (metadict.count(click::Preview::Actions::CANCEL_PURCHASE_INSTALLED) != 0) {
--            return new CancelPurchasePreview(result, true);
          } else if (metadict.count(click::Preview::Actions::UNINSTALL_CLICK) != 0) {
              return new UninstallConfirmationPreview(result);
          } else if (metadict.count(click::Preview::Actions::CONFIRM_UNINSTALL) != 0) {
--            return new UninstallingPreview(result, metadata, client, manager, ppackage);
--        } else if (metadict.count(click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_UNINSTALLED) != 0) {
--            return new CancellingPurchasePreview(result, metadata, client, ppackage, manager, false);
--        } else if (metadict.count(click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_INSTALLED) != 0) {
--            return new CancellingPurchasePreview(result, metadata, client, ppackage, manager, true);
++            return new UninstallingPreview(result, metadata, client, manager);
          } else if (metadict.count(click::Preview::Actions::RATED) != 0) {
--            return new InstalledPreview(result, metadata, client, ppackage, depts);
++            return new InstalledPreview(result, metadata, client, depts);
          } else if (metadict.count(click::Preview::Actions::SHOW_UNINSTALLED) != 0) {
--            return new UninstalledPreview(result, metadata, client, depts, manager, ppackage);
++            return new UninstalledPreview(result, metadata, client, depts, manager);
          } else {
              qWarning() << "preview() called with unexpected metadata. returning uninstalled preview";
--            return new UninstalledPreview(result, metadata, client, depts, manager, ppackage);
++            return new UninstalledPreview(result, metadata, client, depts, manager);
+         }
      } else {
          // metadata.scope_data() is Null, so we return an appropriate "default" preview:
@@ -249,9 +238,9 @@
              return new InstalledScopePreview(result);
+         }
          if (result["installed"].get_bool() == true) {
--            return new InstalledPreview(result, metadata, client, ppackage, depts);
++            return new InstalledPreview(result, metadata, client, depts);
          } else {
--            return new UninstalledPreview(result, metadata, client, depts, manager, ppackage);
++            return new UninstalledPreview(result, metadata, client, depts, manager);
+         }
+     }
@@ -288,19 +277,6 @@
+ {
+ }
--PreviewStrategy::PreviewStrategy(const unity::scopes::Result& result,
--                                 const QSharedPointer<click::web::Client>& client,
--                                 const QSharedPointer<pay::Package>& ppackage)
--    : result(result),
--      client(client),
--      index(new click::Index(client)),
--      reviews(new click::Reviews(client)),
--      oa_client("ubuntuone", "ubuntuone", "ubuntuone",
--                scopes::OnlineAccountClient::MainLoopSelect::CreateInternalMainLoop),
--      pay_package(ppackage)
--{
--}
--
  void PreviewStrategy::pushPackagePreviewWidgets(const unity::scopes::PreviewReplyProxy &reply,
                                                  const PackageDetails &details,
                                                  const scopes::PreviewWidgetList& button_area_widgets)
@@ -663,27 +639,6 @@
      return widgets;
+ }
--bool PreviewStrategy::isRefundable()
--{
--    if (!result.contains("price"))
--    {
--        return false;
--    }
--
--    if (pay_package.isNull())
--    {
--        return false;
--    }
--
--    std::string pkg_name = get_string_maybe_null(result["name"]);
--    if (pkg_name.empty())
--    {
--        return false;
--    }
--
--    return pay_package->is_refundable(pkg_name);
--}
--
  void PreviewStrategy::invalidateScope(const std::string& scope_id)
+ {
      run_under_qt([scope_id]() {
@@ -812,9 +767,8 @@
  InstalledPreview::InstalledPreview(const unity::scopes::Result& result,
                                     const unity::scopes::ActionMetadata& metadata,
                                     const QSharedPointer<click::web::Client>& client,
--                                   const QSharedPointer<pay::Package>& ppackage,
                                     const std::shared_ptr<click::DepartmentsDb>& depts)
--    : PreviewStrategy(result, client, ppackage),
++    : PreviewStrategy(result, client),
        DepartmentUpdater(depts),
        metadata(metadata)
+ {
@@ -1014,12 +968,7 @@
      if (manifest.removable)
+     {
          auto price = result.contains("price") ? result["price"].get_double() : 0.00f;
--        if (price > 0.00f && isRefundable()) {
--            builder.add_tuple({
--                {"id", scopes::Variant(click::Preview::Actions::CANCEL_PURCHASE_INSTALLED)},
--                {"label", scopes::Variant(_("Cancel Purchase"))}
--            });
--        } else {
++        if (price == 0.00f) {
              builder.add_tuple({
                  {"id", scopes::Variant(click::Preview::Actions::UNINSTALL_CLICK)},
                  {"label", scopes::Variant(_("Uninstall"))}
@@ -1111,73 +1060,6 @@
      return widgets;
+ }
--// class CancelPurchasePreview
--
--CancelPurchasePreview::CancelPurchasePreview(const unity::scopes::Result& result, bool installed)
--    : PreviewStrategy(result), installed(installed)
--{
--}
--
--CancelPurchasePreview::~CancelPurchasePreview()
--{
--}
--
--scopes::PreviewWidgetList CancelPurchasePreview::build_widgets()
--{
--    scopes::PreviewWidgetList widgets;
--
--    scopes::PreviewWidget confirmation("confirmation", "text");
--
--    std::string title = result["title"].get_string();
--    // TRANSLATORS: Do NOT translate ${title} here.
--    std::string message =
--        _("Are you sure you want to cancel the purchase of '${title}'? The app will be uninstalled.");
--
--    boost::replace_first(message, "${title}", title);
--    confirmation.add_attribute_value("text", scopes::Variant(message));
--    widgets.push_back(confirmation);
--
--    scopes::PreviewWidget buttons("buttons", "actions");
--    scopes::VariantBuilder builder;
--
--    auto action_no = installed ? click::Preview::Actions::SHOW_INSTALLED
--                               : click::Preview::Actions::SHOW_UNINSTALLED;
--    auto action_yes = installed
--        ? click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_INSTALLED
--        : click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_UNINSTALLED;
--
--    builder.add_tuple({
--       {"id", scopes::Variant(action_no)},
--       {"label", scopes::Variant(_("Go Back"))}
--    });
--    builder.add_tuple({
--       {"id", scopes::Variant(action_yes)},
--       {"label", scopes::Variant(_("Continue"))}
--    });
--
--    buttons.add_attribute_value("actions", builder.end());
--    widgets.push_back(buttons);
--
--    scopes::PreviewWidget policy("policy", "text");
--    policy.add_attribute_value("title", scopes::Variant{_("Returns and cancellation policy")});
--    policy.add_attribute_value("text", scopes::Variant{
--        _("When purchasing an app in the Ubuntu Store, you can cancel the charge within 15 minutes "
--          "after installation. If the cancel period has passed, we recommend contacting the app "
--          "developer directly for a refund.\n"
--          "You can find the developer’s contact information listed on the app’s preview page in the "
--          "Ubuntu Store.\n"
--          "Keep in mind that you cannot cancel the purchasing process of an app more than once.")});
--    widgets.push_back(policy);
--
--    return widgets;
--}
--
--void CancelPurchasePreview::run(unity::scopes::PreviewReplyProxy const& reply)
--{
--    // NOTE: no need to populateDetails() here.
--    reply->push(build_widgets());
--}
--
  // class UninstallConfirmationPreview
  UninstallConfirmationPreview::UninstallConfirmationPreview(const unity::scopes::Result& result)
@@ -1225,9 +1107,8 @@
                                         const unity::scopes::ActionMetadata& metadata,
                                         const QSharedPointer<click::web::Client>& client,
                                         const std::shared_ptr<click::DepartmentsDb>& depts,
--                                       const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
--                                       const QSharedPointer<pay::Package>& ppackage)
--    : PreviewStrategy(result, client, ppackage),
++                                       const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager)
++    : PreviewStrategy(result, client),
        DepartmentUpdater(depts),
        metadata(metadata),
        dm(new DownloadManager(client, manager))
@@ -1285,18 +1166,8 @@
      scopes::PreviewWidgetList widgets;
      auto price = result["price"].get_double();
--    if (price > double(0.00)
--        && result["purchased"].get_bool() == false) {
--        scopes::PreviewWidget payments("purchase", "payments");
--        scopes::VariantMap tuple;
--        tuple["currency"] = result["currency_symbol"].get_string();
--        tuple["price"] = scopes::Variant(price);
--        tuple["store_item_id"] = details.package.name;
--        tuple["download_url"] = details.download_url;
--        tuple["download_sha512"] = details.download_sha512;
--        payments.add_attribute_value("source", scopes::Variant(tuple));
--        widgets.push_back(payments);
--    } else {
++    if (price == double(0.00)
++        || result["purchased"].get_bool() == false) {
          scopes::PreviewWidget buttons("buttons", "actions");
          scopes::VariantBuilder builder;
          builder.add_tuple(
@@ -1306,13 +1177,6 @@
                  {"download_url", scopes::Variant(details.download_url)},
                  {"download_sha512", scopes::Variant(details.download_sha512)},
              });
--        if (isRefundable()) {
--            builder.add_tuple(
--                {
--                    {"id", scopes::Variant(click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED)},
--                    {"label", scopes::Variant(_("Cancel Purchase"))},
--                });
--        }
          buttons.add_attribute_value("actions", builder.end());
          oa_client.register_account_login_item(buttons,
                                                scopes::OnlineAccountClient::PostLoginAction::ContinueActivation,
@@ -1329,9 +1193,8 @@
  UninstallingPreview::UninstallingPreview(const unity::scopes::Result& result,
                                           const unity::scopes::ActionMetadata& metadata,
                                           const QSharedPointer<click::web::Client>& client,
--                                         const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
--                                         const QSharedPointer<pay::Package>& ppackage)
--    : UninstalledPreview(result, metadata, client, nullptr, manager, ppackage)
++                                         const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager)
++    : UninstalledPreview(result, metadata, client, nullptr, manager)
+ {
+ }
@@ -1368,57 +1231,4 @@
+ }
--// class CancellingPurchasePreview : public UninstallingPreview
--
--CancellingPurchasePreview::CancellingPurchasePreview(const unity::scopes::Result& result,
--                                                     const unity::scopes::ActionMetadata& metadata,
--                                                     const QSharedPointer<click::web::Client>& client,
--                                                     const QSharedPointer<pay::Package>& ppackage,
--                                                     const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
--                                                     bool installed)
--    : UninstallingPreview(result, metadata, client, manager, ppackage),
--      installed(installed)
--{
--}
--
--CancellingPurchasePreview::~CancellingPurchasePreview()
--{
--}
--
--void CancellingPurchasePreview::run(unity::scopes::PreviewReplyProxy const& reply)
--{
--    qDebug() << "in CancellingPurchasePreview::run, calling cancel_purchase";
--    cancel_purchase();
--    qDebug() << "in CancellingPurchasePreview::run, calling next ::run()";
--    if (installed) {
--        UninstallingPreview::run(reply);
--    } else {
--        UninstalledPreview::run(reply);
--    }
--}
--
--void CancellingPurchasePreview::cancel_purchase()
--{
--    auto package_name = result["name"].get_string();
--    qDebug() << "Will cancel the purchase of:" << package_name.c_str();
--
--    std::promise<bool> refund_promise;
--    std::future<bool> refund_future = refund_promise.get_future();
--
--    run_under_qt([this, &refund_promise, package_name]() {
--        qDebug() << "Calling refund for:" << package_name.c_str();
--        auto ret = pay_package->refund(package_name);
--        qDebug() << "Refund returned:" << ret;
--        refund_promise.set_value(ret);
--    });
--    bool finished = refund_future.get();
--    qDebug() << "Finished refund:" << finished;
--    if (finished) {
--        // Reset the purchased flag.
--        result["purchased"] = false;
--        invalidateScope(STORE_SCOPE_ID.toUtf8().data());
--    }
--}
--
--
  } // namespace click
 === modified file 'libclickscope/click/preview.h'
 --- libclickscope/click/preview.h	2016-07-12 19:04:31 +0000
 +++ libclickscope/click/preview.h	2016-10-25 13:13:28 +0000
@@ -32,7 +32,6 @@
  #include <click/index.h>
  #include <click/download-manager.h>
--#include <click/pay.h>
  #include <click/qtbridge.h>
  #include "reviews.h"
@@ -106,7 +105,6 @@
      PreviewStrategy* build_strategy(const unity::scopes::Result& result,
                                      const unity::scopes::ActionMetadata& metadata,
                                      const QSharedPointer<web::Client> &client,
--                                    const QSharedPointer<pay::Package>& ppackage,
                                      const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
                                      std::shared_ptr<click::DepartmentsDb> depts);
      virtual PreviewStrategy* build_installing(const std::string& download_url,
@@ -147,7 +145,6 @@
              std::shared_future<void> const& qt_ready = std::future<void>());
      virtual ~Preview();
      void choose_strategy(const QSharedPointer<web::Client> &client,
--                         const QSharedPointer<pay::Package>& ppackage,
                           const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
                           std::shared_ptr<click::DepartmentsDb> depts);
      // From unity::scopes::PreviewQuery
@@ -162,9 +159,6 @@
      PreviewStrategy(const unity::scopes::Result& result);
      PreviewStrategy(const unity::scopes::Result& result,
                      const QSharedPointer<click::web::Client>& client);
--    PreviewStrategy(const unity::scopes::Result& result,
--                    const QSharedPointer<click::web::Client>& client,
--                    const QSharedPointer<pay::Package>& pay_package);
      virtual ~PreviewStrategy();
      virtual void cancelled();
@@ -199,7 +193,6 @@
      virtual scopes::PreviewWidget build_other_metadata(const PackageDetails& details);
      virtual scopes::PreviewWidget build_updates_table(const PackageDetails& details);
      virtual std::string build_whats_new(const PackageDetails& details);
--    virtual bool isRefundable();
      scopes::Result result;
@@ -210,7 +203,6 @@
      click::web::Cancellable reviews_operation;
      click::web::Cancellable submit_operation;
      scopes::OnlineAccountClient oa_client;
--    QSharedPointer<pay::Package> pay_package;
      click::web::Cancellable purchase_operation;
  };
@@ -254,7 +246,6 @@
      InstalledPreview(const unity::scopes::Result& result,
                       const unity::scopes::ActionMetadata& metadata,
                       const QSharedPointer<click::web::Client>& client,
--                     const QSharedPointer<pay::Package>& ppackage,
                       const std::shared_ptr<click::DepartmentsDb>& depts);
      virtual ~InstalledPreview();
@@ -292,20 +283,6 @@
      virtual scopes::PreviewWidgetList purchasingWidgets(const PackageDetails &);
  };
--class CancelPurchasePreview : public PreviewStrategy
--{
--public:
--    CancelPurchasePreview(const unity::scopes::Result& result, bool installed);
--
--    virtual ~CancelPurchasePreview();
--
--    void run(unity::scopes::PreviewReplyProxy const& reply) override;
--
--protected:
--    scopes::PreviewWidgetList build_widgets();
--    bool installed;
--};
--
  class UninstallConfirmationPreview : public PreviewStrategy
+ {
  public:
@@ -323,8 +300,7 @@
                         const unity::scopes::ActionMetadata& metadata,
                         const QSharedPointer<click::web::Client>& client,
                         const std::shared_ptr<click::DepartmentsDb>& depts,
--                       const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
--                       const QSharedPointer<pay::Package>& ppackage);
++                       const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager);
      virtual ~UninstalledPreview();
@@ -348,8 +324,7 @@
      UninstallingPreview(const unity::scopes::Result& result,
                          const unity::scopes::ActionMetadata& metadata,
                          const QSharedPointer<click::web::Client>& client,
--                        const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
--                        const QSharedPointer<pay::Package>& ppackage);
++                        const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager);
      virtual ~UninstallingPreview();
@@ -360,25 +335,6 @@
  };
--class CancellingPurchasePreview : public UninstallingPreview
--{
--public:
--    CancellingPurchasePreview(const unity::scopes::Result& result,
--                              const unity::scopes::ActionMetadata& metadata,
--                              const QSharedPointer<click::web::Client>& client,
--                              const QSharedPointer<pay::Package>& ppackage,
--                              const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
--                              bool installed);
--
--    virtual ~CancellingPurchasePreview();
--
--    void run(unity::scopes::PreviewReplyProxy const& reply) override;
--
--protected:
--    void cancel_purchase();
--    bool installed;
--};
--
  } // namespace click
  #endif
 === modified file 'libclickscope/tests/CMakeLists.txt'
 --- libclickscope/tests/CMakeLists.txt	2016-08-09 21:43:16 +0000
 +++ libclickscope/tests/CMakeLists.txt	2016-10-25 13:13:28 +0000
@@ -19,7 +19,6 @@
  add_executable (${LIBCLICKSCOPE_TESTS_TARGET}
    mock_network_access_manager.h
--  mock_pay.h
    mock_ual.h
    mock_ubuntu_download_manager.h
    mock_ubuntuone_credentials.h
@@ -33,7 +32,6 @@
    test_index.cpp
    test_interface.cpp
    test_package.cpp
--  test_pay.cpp
    test_preview.cpp
    test_reviews.cpp
    test_smartconnect.cpp
@@ -72,6 +70,3 @@
    COMMAND valgrind --tool=memcheck --track-origins=yes --num-callers=40 --leak-resolution=high --leak-check=full ${CMAKE_CURRENT_BINARY_DIR}/${LIBCLICKSCOPE_TESTS_TARGET}
    DEPENDS ${LIBCLICKSCOPE_TESTS_TARGET}
+ )
--
--
--add_subdirectory(integration)
 === removed directory 'libclickscope/tests/integration'
 === removed file 'libclickscope/tests/integration/CMakeLists.txt'
 --- libclickscope/tests/integration/CMakeLists.txt	2015-05-20 19:58:45 +0000
 +++ libclickscope/tests/integration/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
--SET (INTEGRATION_TARGET click_scope_integration_tests)
--
--# Qt5 bits
--SET (CMAKE_INCLUDE_CURRENT_DIR ON)
--SET (CMAKE_AUTOMOC ON)
--find_package(Qt5Core REQUIRED)
--
--include_directories (${CMAKE_SOURCE_DIR}/scope)
--
--FILE (GLOB TEST_SOURCES *.cpp)
--FILE (GLOB TEST_HEADERS *.h)
--
--add_executable (${INTEGRATION_TARGET}
--  departmentsdb_integration.cpp
--  webclient_integration.cpp
--)
--
--qt5_use_modules(${INTEGRATION_TARGET} Core DBus Network Test)
--
--target_link_libraries (${INTEGRATION_TARGET}
--  ${STORE_LIB_UNVERSIONED}
--
--  gmock
--  gmock_main
--
--  ${CMAKE_THREAD_LIBS_INIT}
--)
--
--add_custom_target (test-integration-click-scope
--  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${INTEGRATION_TARGET}
--  DEPENDS ${INTEGRATION_TARGET}
--)
 === removed file 'libclickscope/tests/integration/departmentsdb_integration.cpp'
 --- libclickscope/tests/integration/departmentsdb_integration.cpp	2014-07-22 17:15:14 +0000
 +++ libclickscope/tests/integration/departmentsdb_integration.cpp	1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * In addition, as a special exception, the copyright holders give
-- * permission to link the code of portions of this program with the
-- * OpenSSL library under certain conditions as described in each
-- * individual source file, and distribute linked combinations
-- * including the two.
-- * You must obey the GNU General Public License in all respects
-- * for all of the code used other than OpenSSL.  If you modify
-- * file(s) with this exception, you may extend this exception to your
-- * version of the file(s), but you are not obligated to do so.  If you
-- * do not wish to do so, delete this exception statement from your
-- * version.  If you delete this exception statement from all source
-- * files in the program, then also delete it here.
-- */
--
--#include <gtest/gtest.h>
--
--#include <click/departments-db.h>
--
--#include <memory>
--#include <algorithm>
--#include <unistd.h>
--
--using namespace click;
--
--
--class DepartmentsDbConcurrencyTest: public ::testing::Test
--{
--public:
--    const std::string db_path = TEST_DIR "/departments-db-test2.sqlite";
--
--    void TearDown() override
--    {
--        unlink(db_path.c_str());
--    }
--};
--
--// Keep the numbers below at a reasonable level; it takes around 20 seconds
--// to run this test on a i7-2620M with the default values.
--const int NUM_OF_WRITE_OPS = 50;
--const int NUM_OF_READ_OPS = 100;
--
--void populate_departments(DepartmentsDb *db, int repeat_count)
--{
--    click::DepartmentList depts;
--    // generate departments with one subdepartment
--    for (int i = 0; i < 20; i++)
--    {
--        auto const id = std::to_string(i);
--        auto parent = std::make_shared<click::Department>(id, "Department " + id, "href", true);
--        parent->set_subdepartments({std::make_shared<click::Department>(id + "sub", "Subdepartment of " + id, "href", false)});
--        depts.push_back(parent);
--    }
--
--    for (int i = 0; i < repeat_count; i++)
--    {
--        ASSERT_NO_THROW(db->store_departments(depts, ""));
--
--        // generate apps
--        for (int j = 0; j < 50; j++)
--        {
--            auto const id = std::to_string(j);
--            ASSERT_NO_THROW(db->store_package_mapping("app" + id, id));
--        }
--    }
--}
--
--TEST_F(DepartmentsDbConcurrencyTest, ConcurrentReadWrite)
--{
--    // populate the db initially to make sure reader doesn't fail if it's faster than writer
--    {
--        DepartmentsDb db(db_path, true);
--        populate_departments(&db, 1);
--    }
--
--    pid_t writer_pid = fork();
--    if (writer_pid < 0)
--    {
--        FAIL();
--    }
--    else if (writer_pid == 0) // writer child process
--    {
--        SCOPED_TRACE("writer");
--        std::unique_ptr<DepartmentsDb> db;
--        ASSERT_NO_THROW(db.reset(new DepartmentsDb(db_path, true)));
--
--        populate_departments(db.get(), NUM_OF_WRITE_OPS);
--
--        exit(0);
--    }
--    else // parent process
--    {
--        pid_t reader_pid = fork();
--        if (reader_pid < 0)
--        {
--            FAIL();
--        }
--        else if (reader_pid == 0) // reader child process
--        {
--            SCOPED_TRACE("reader");
--            std::unique_ptr<DepartmentsDb> db;
--            ASSERT_NO_THROW(db.reset(new DepartmentsDb(db_path, false)));
--
--            for (int i = 0; i < NUM_OF_READ_OPS; i++)
--            {
--                ASSERT_NO_THROW(db->get_department_name("1", {""}));
--                ASSERT_NO_THROW(db->get_parent_department_id("1"));
--                ASSERT_NO_THROW(db->get_packages_for_department("1", false));
--                ASSERT_NO_THROW(db->get_packages_for_department("1", true));
--                ASSERT_NO_THROW(db->get_children_departments(""));
--                ASSERT_NO_THROW(db->department_name_count());
--                ASSERT_NO_THROW(db->department_mapping_count());
--                ASSERT_NO_THROW(db->package_count());
--            }
--            exit(0);
--        }
--        else // parent process
--        {
--            wait(nullptr);
--            wait(nullptr);
--        }
--    }
--}
 === removed file 'libclickscope/tests/integration/webclient_integration.cpp'
 --- libclickscope/tests/integration/webclient_integration.cpp	2015-12-01 15:39:41 +0000
 +++ libclickscope/tests/integration/webclient_integration.cpp	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * In addition, as a special exception, the copyright holders give
-- * permission to link the code of portions of this program with the
-- * OpenSSL library under certain conditions as described in each
-- * individual source file, and distribute linked combinations
-- * including the two.
-- * You must obey the GNU General Public License in all respects
-- * for all of the code used other than OpenSSL.  If you modify
-- * file(s) with this exception, you may extend this exception to your
-- * version of the file(s), but you are not obligated to do so.  If you
-- * do not wish to do so, delete this exception statement from your
-- * version.  If you delete this exception statement from all source
-- * files in the program, then also delete it here.
-- */
--
--#include <click/network_access_manager.h>
--#include <click/webclient.h>
--#include <click/index.h>
--#include <click/departments.h>
--
--#include <QCoreApplication>
--#include <QDebug>
--#include <QThread>
--#include <QTimer>
--
--#include <gtest/gtest.h>
--
--namespace
--{
--struct IntegrationTest : public ::testing::Test
--{
--    IntegrationTest() : app(argc, argv)
--    {
--        QObject::connect(
--                    &testTimeout, &QTimer::timeout,
--                    [this]() { Quit(); FAIL() << "Operation timed out."; });
--    }
--
--    void SetUp()
--    {
--        const int tenSeconds = 10 * 1000;
--        testTimeout.start(tenSeconds);
--    }
--
--    void TearDown()
--    {
--        testTimeout.stop();
--    }
--
--    void Quit()
--    {
--        app.quit();
--    }
--
--    int argc = 0;
--    char** argv = nullptr;
--    QCoreApplication app;
--    QTimer testTimeout;
--};
--
--}
--
--TEST_F(IntegrationTest, queryForArmhfPackagesReturnsCorrectResults)
--{
--    click::web::Client ws(QSharedPointer<click::network::AccessManager>(
--                              new click::network::AccessManager()));
--
--    click::web::CallParams params;
--    params.add("q", "qr,architecture:armhf");
--    auto wr = ws.call(click::SEARCH_BASE_URL + click::SEARCH_PATH, params);
--
--    QString content;
--    QObject::connect(
--                wr.data(), &click::web::Response::finished,
--                [&, this](QString found_content) {
--                    content = found_content;
--                    Quit();
--                });
--
--    app.exec();
--    EXPECT_TRUE(content.size() > 0);
--}
--
--TEST_F(IntegrationTest, queryForArmhfPackagesCanBeParsed)
--{
--    QSharedPointer<click::network::AccessManager> namPtr(
--                new click::network::AccessManager());
--    QSharedPointer<click::web::Client> clientPtr(
--                new click::web::Client(namPtr));
--    click::Index index(clientPtr);
--    click::Packages packages;
--    index.search("qr", "", [&, this](click::Packages found_packages,
--                                 click::Packages){
--        packages = found_packages;
--        Quit();
--    });
--    app.exec();
--    EXPECT_TRUE(packages.size() > 0);
--}
--
--TEST_F(IntegrationTest, detailsCanBeParsed)
--{
--    const std::string sample_name("com.ubuntu.developer.alecu.qr-code");
--    QSharedPointer<click::network::AccessManager> namPtr(
--                new click::network::AccessManager());
--    QSharedPointer<click::web::Client> clientPtr(
--                new click::web::Client(namPtr));
--    click::Index index(clientPtr);
--    index.get_details(sample_name, [&](click::PackageDetails details, click::Index::Error){
--        EXPECT_EQ(details.package.name, sample_name);
--        Quit();
--    });
--    app.exec();
--}
 === removed file 'libclickscope/tests/mock_pay.h'
 --- libclickscope/tests/mock_pay.h	2015-11-24 18:23:23 +0000
 +++ libclickscope/tests/mock_pay.h	1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * In addition, as a special exception, the copyright holders give
-- * permission to link the code of portions of this program with the
-- * OpenSSL library under certain conditions as described in each
-- * individual source file, and distribute linked combinations
-- * including the two.
-- * You must obey the GNU General Public License in all respects
-- * for all of the code used other than OpenSSL.  If you modify
-- * file(s) with this exception, you may extend this exception to your
-- * version of the file(s), but you are not obligated to do so.  If you
-- * do not wish to do so, delete this exception statement from your
-- * version.  If you delete this exception statement from all source
-- * files in the program, then also delete it here.
-- */
--
--#include <click/pay.h>
--
--#include <click/webclient.h>
--
--#include <gtest/gtest.h>
--#include <gmock/gmock.h>
--
--
--namespace
--{
--
--    constexpr static const char* FAKE_PURCHASES_LIST_JSON{R"foo(
--            [
--                {
--                    "state": "Complete",
--                    "package_name": "com.example.fake",
--                    "refundable_until": "1970-01-01T00:01:23Z",
--                    "open_id": "https:\/\/login.ubuntu.com/+openid/fakeuser"
--                }
--            ]
--        )foo"};
--
--
--    constexpr static const char* FAKE_PURCHASES_LIST_JSON_NULL_TIMESTAMP{R"foo(
--            [
--                {
--                    "state": "Complete",
--                    "package_name": "com.example.fake",
--                    "refundable_until": null,
--                    "open_id": "https:\/\/login.ubuntu.com/+openid/fakeuser"
--                }
--            ]
--        )foo"};
--
--
--
--    class MockPayPackage : public pay::Package {
--    public:
--        MockPayPackage()
--            : Package(QSharedPointer<click::web::Client>())
--        {
--        }
--
--        MockPayPackage(const QSharedPointer<click::web::Client>& client)
--            : Package(client)
--        {
--        }
--
--        void pay_package_refund(const std::string& pkg_name)
--        {
--            callbacks[pkg_name + pay::APPENDAGE_REFUND](pkg_name, success);
--            do_pay_package_refund(pkg_name);
--        }
--
--        void pay_package_verify(const std::string& pkg_name)
--        {
--            callbacks[pkg_name + pay::APPENDAGE_VERIFY](pkg_name, success);
--            do_pay_package_verify(pkg_name);
--        }
--
--        bool is_refundable(const std::string& pkg_name)
--        {
--            do_is_refundable(pkg_name);
--            return refundable;
--        }
--
--        MOCK_METHOD0(setup_pay_service, void());
--        MOCK_METHOD1(do_pay_package_refund, void(const std::string&));
--        MOCK_METHOD1(do_pay_package_verify, void(const std::string&));
--        MOCK_METHOD1(do_is_refundable, void(const std::string&));
--
--        bool refundable = false;
--        bool success = false;
--        pay::PurchaseSet purchases;
--};
--
--} // namespace
 === removed file 'libclickscope/tests/test_pay.cpp'
 --- libclickscope/tests/test_pay.cpp	2016-06-30 20:42:56 +0000
 +++ libclickscope/tests/test_pay.cpp	1970-01-01 00:00:00 +0000
@@ -1,266 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * In addition, as a special exception, the copyright holders give
-- * permission to link the code of portions of this program with the
-- * OpenSSL library under certain conditions as described in each
-- * individual source file, and distribute linked combinations
-- * including the two.
-- * You must obey the GNU General Public License in all respects
-- * for all of the code used other than OpenSSL.  If you modify
-- * file(s) with this exception, you may extend this exception to your
-- * version of the file(s), but you are not obligated to do so.  If you
-- * do not wish to do so, delete this exception statement from your
-- * version.  If you delete this exception statement from all source
-- * files in the program, then also delete it here.
-- */
--
--#include "mock_pay.h"
--
--#include <click/webclient.h>
--
--#include <tests/mock_network_access_manager.h>
--#include <tests/mock_ubuntuone_credentials.h>
--#include <tests/mock_webclient.h>
--
--#include <gtest/gtest.h>
--#include <gmock/gmock.h>
--
--#include <memory>
--
--using namespace ::testing;
--
--
--namespace
--{
--
--class PayTest : public ::testing::Test
--{
--protected:
--    QSharedPointer<MockNetworkAccessManager> namPtr;
--    QSharedPointer<MockClient> clientPtr;
--    std::shared_ptr<MockPayPackage> package;
--
--    virtual void SetUp()
--    {
--        namPtr.reset(new MockNetworkAccessManager());
--        clientPtr.reset(new NiceMock<MockClient>(namPtr));
--        package.reset(new MockPayPackage(clientPtr));
--    }
--public:
--    MOCK_METHOD1(purchases_callback, void(pay::PurchaseSet));
--};
--
--}
--
--TEST_F(PayTest, testPayPackageRefundCalled)
--{
--    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
--    auto response = responseForReply(reply.asSharedPtr());
--
--    EXPECT_CALL(*package, do_pay_package_refund("foo")).Times(1);
--    EXPECT_FALSE(package->refund("foo"));
--}
--
--TEST_F(PayTest, testPayPackageRefundNotCalledIfCallbackExists)
--{
--    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
--    auto response = responseForReply(reply.asSharedPtr());
--
--    std::string callback_id = std::string{"foo"} + pay::APPENDAGE_REFUND;
--    package->callbacks[callback_id] = [](const std::string&, bool) {};
--    EXPECT_CALL(*package, do_pay_package_refund("foo")).Times(0);
--    EXPECT_FALSE(package->refund("foo"));
--}
--
--TEST_F(PayTest, testRefundReturnsTrueForPurchasedItem)
--{
--    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
--    auto response = responseForReply(reply.asSharedPtr());
--
--    package->success = true;
--    EXPECT_CALL(*package, do_pay_package_refund("foo")).Times(1);
--    EXPECT_TRUE(package->refund("foo"));
--}
--
--TEST_F(PayTest, testPayPackageVerifyCalled)
--{
--    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
--    auto response = responseForReply(reply.asSharedPtr());
--
--    EXPECT_CALL(*package, do_pay_package_verify("foo")).Times(1);
--    EXPECT_FALSE(package->verify("foo"));
--}
--
--TEST_F(PayTest, testPayPackageVerifyNotCalledIfCallbackExists)
--{
--    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
--    auto response = responseForReply(reply.asSharedPtr());
--
--    std::string callback_id = std::string{"foo"} + pay::APPENDAGE_VERIFY;
--    package->callbacks[callback_id] = [](const std::string&, bool) {};
--    EXPECT_CALL(*package, do_pay_package_verify("foo")).Times(0);
--    EXPECT_FALSE(package->verify("foo"));
--}
--
--TEST_F(PayTest, testVerifyReturnsTrueForPurchasedItem)
--{
--    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
--    auto response = responseForReply(reply.asSharedPtr());
--
--    package->success = true;
--    EXPECT_CALL(*package, do_pay_package_verify("foo")).Times(1);
--    EXPECT_TRUE(package->verify("foo"));
--}
--
--TEST_F(PayTest, testGetPurchasesCallsWebservice)
--{
--    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
--    auto response = responseForReply(reply.asSharedPtr());
--
--    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
--            .Times(1)
--            .WillOnce(Return(response));
--
--    package->get_purchases([](pay::PurchaseSet) {});
--}
--
--TEST_F(PayTest, testGetPurchasesSendsCorrectPath)
--{
--    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
--    auto response = responseForReply(reply.asSharedPtr());
--
--    EXPECT_CALL(*clientPtr, callImpl(EndsWith(pay::PURCHASES_API_PATH),
--                                     _, _, _, _, _))
--            .Times(1)
--            .WillOnce(Return(response));
--
--    package->get_purchases([](pay::PurchaseSet) {});
--}
--
--TEST_F(PayTest, testGetPurchasesCallbackCalled)
--{
--    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
--    auto response = responseForReply(reply.asSharedPtr());
--
--    QByteArray fake_json("[]");
--    EXPECT_CALL(reply.instance, readAll())
--            .Times(1)
--            .WillOnce(Return(fake_json));
--    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
--            .Times(1)
--            .WillOnce(Return(response));
--    EXPECT_CALL(*this, purchases_callback(_)).Times(1);
--
--    package->get_purchases([this](pay::PurchaseSet purchases) {
--            purchases_callback(purchases);
--        });
--    response->replyFinished();
--}
--
--TEST_F(PayTest, testGetPurchasesEmptyJsonIsParsed)
--{
--    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
--    auto response = responseForReply(reply.asSharedPtr());
--
--    QByteArray fake_json("[]");
--    EXPECT_CALL(reply.instance, readAll())
--            .Times(1)
--            .WillOnce(Return(fake_json));
--    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
--            .Times(1)
--            .WillOnce(Return(response));
--    pay::PurchaseSet empty_purchases_list;
--    EXPECT_CALL(*this, purchases_callback(empty_purchases_list)).Times(1);
--
--    package->get_purchases([this](pay::PurchaseSet purchases) {
--            purchases_callback(purchases);
--        });
--    response->replyFinished();
--}
--
--TEST_F(PayTest, testGetPurchasesSingleJsonIsParsedNullTimestamp)
--{
--    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
--    auto response = responseForReply(reply.asSharedPtr());
--
--    QByteArray fake_json(FAKE_PURCHASES_LIST_JSON_NULL_TIMESTAMP);
--    EXPECT_CALL(reply.instance, readAll())
--            .Times(1)
--            .WillOnce(Return(fake_json));
--    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
--            .Times(1)
--            .WillOnce(Return(response));
--    pay::PurchaseSet single_purchase_list{{"com.example.fake", 0}};
--    EXPECT_CALL(*this, purchases_callback(single_purchase_list)).Times(1);
--
--    package->get_purchases([this](pay::PurchaseSet purchases) {
--            purchases_callback(purchases);
--        });
--    response->replyFinished();
--}
--
--TEST_F(PayTest, testGetPurchasesTimestampIsParsed)
--{
--    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
--    auto response = responseForReply(reply.asSharedPtr());
--
--    QByteArray fake_json(FAKE_PURCHASES_LIST_JSON);
--    EXPECT_CALL(reply.instance, readAll())
--            .Times(1)
--            .WillOnce(Return(fake_json));
--    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
--            .Times(1)
--            .WillOnce(Return(response));
--    const time_t EIGHTYTHREE_SECONDS_INTO_THE_SEVENTIES=83;
--    pay::PurchaseSet single_purchase_list{{"com.example.fake", EIGHTYTHREE_SECONDS_INTO_THE_SEVENTIES}};
--    EXPECT_CALL(*this, purchases_callback(single_purchase_list)).Times(1);
--
--    package->get_purchases([this](pay::PurchaseSet purchases) {
--            purchases_callback(purchases);
--        });
--    response->replyFinished();
--}
--
--TEST_F(PayTest, testGetPurchasesIsCancellable)
--{
--    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
--    auto response = responseForReply(reply.asSharedPtr());
--
--    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
--            .Times(1)
--            .WillOnce(Return(response));
--
--    auto get_purchases_op = package->get_purchases([](pay::PurchaseSet) {});
--    EXPECT_CALL(reply.instance, abort()).Times(1);
--    get_purchases_op.cancel();
--}
--
--TEST_F(PayTest, testGetBaseUrl)
--{
--    const char *value = getenv(pay::BASE_URL_ENVVAR);
--    if (value != NULL) {
--        ASSERT_TRUE(unsetenv(pay::BASE_URL_ENVVAR) == 0);
--    }
--    ASSERT_TRUE(pay::Package::get_base_url() == pay::BASE_URL);
--
--}
--
--TEST_F(PayTest, testGetBaseUrlFromEnv)
--{
--    ASSERT_TRUE(setenv(pay::BASE_URL_ENVVAR, FAKE_SERVER.c_str(), 1) == 0);
--    ASSERT_TRUE(pay::Package::get_base_url() == FAKE_SERVER);
--    ASSERT_TRUE(unsetenv(pay::BASE_URL_ENVVAR) == 0);
--}
 === modified file 'libclickscope/tests/test_preview.cpp'
 --- libclickscope/tests/test_preview.cpp	2016-07-13 20:30:09 +0000
 +++ libclickscope/tests/test_preview.cpp	2016-10-25 13:13:28 +0000
@@ -33,7 +33,6 @@
  #include <click/interface.h>
  #include <click/reviews.h>
  #include <fake_json.h>
--#include <mock_pay.h>
  #include <mock_ubuntu_download_manager.h>
  #include <QCoreApplication>
@@ -109,7 +108,6 @@
      using click::PreviewStrategy::build_updates_table;
      using click::PreviewStrategy::build_whats_new;
      using click::PreviewStrategy::populateDetails;
--    using click::PreviewStrategy::isRefundable;
  };
  class PreviewsBaseTest : public Test
@@ -350,7 +348,6 @@
      unity::scopes::ActionMetadata metadata;
      unity::scopes::VariantMap metadict;
      QSharedPointer<click::web::Client> client;
--    QSharedPointer<MockPayPackage> pay_package;
      QSharedPointer<MockSystemDownloadManager> dm;
      std::shared_ptr<click::DepartmentsDb> depts;
      const std::string FAKE_SHA512 = "FAKE_SHA512";
@@ -384,7 +381,7 @@
      metadata.set_scope_data(unity::scopes::Variant(metadict));
      MockablePreview preview(result, metadata);
      EXPECT_CALL(preview, build_installing(_, FAKE_SHA512, _, _, _, _));
--    preview.choose_strategy(client, pay_package, dm, depts);
++    preview.choose_strategy(client, dm, depts);
+ }
@@ -394,7 +391,6 @@
      click::PackageDetails details;
      unity::scopes::PreviewWidgetList widgets;
      QSharedPointer<click::web::Client> client;
--    QSharedPointer<MockPayPackage> pay_package;
      QSharedPointer<MockSystemDownloadManager> sdm;
      std::shared_ptr<click::DepartmentsDb> depts;
      unity::scopes::testing::MockPreviewReply reply;
@@ -409,9 +405,8 @@
                                 const unity::scopes::ActionMetadata& metadata,
                                 const QSharedPointer<click::web::Client>& client,
                                 const std::shared_ptr<click::DepartmentsDb>& depts,
--                               const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
--                               const QSharedPointer<pay::Package> pay_package)
--        : click::UninstalledPreview(result, metadata, client, depts, manager, pay_package),
++                               const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager)
++        : click::UninstalledPreview(result, metadata, client, depts, manager),
            object_path(object_path)
+     {
+     }
@@ -433,9 +428,8 @@
                             const unity::scopes::ActionMetadata& metadata,
                             const QSharedPointer<click::web::Client>& client,
                             const std::shared_ptr<click::DepartmentsDb>& depts,
--                           const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
--                           const QSharedPointer<pay::Package> pay_package)
--        : FakeBaseUninstalledPreview(object_path, result, metadata, client, depts, manager, pay_package) {
++                           const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager)
++        : FakeBaseUninstalledPreview(object_path, result, metadata, client, depts, manager) {
+     }
  };
@@ -447,7 +441,7 @@
      result["name"] = "fake_app_name";
      scopes::PreviewWidgetList response;
      unity::scopes::ActionMetadata metadata("en_EN", "desktop");
--    FakeUninstalledPreview preview(fake_object_path, result, metadata, client, depts, sdm, pay_package);
++    FakeUninstalledPreview preview(fake_object_path, result, metadata, client, depts, sdm);
      EXPECT_CALL(preview, progressBarWidget(_))
              .Times(1)
              .WillOnce(Return(response));
@@ -462,7 +456,7 @@
      result["name"] = "fake_app_name";
      scopes::PreviewWidgetList response;
      unity::scopes::ActionMetadata metadata("en_EN", "desktop");
--    FakeUninstalledPreview preview(fake_object_path, result, metadata, client, depts, sdm, pay_package);
++    FakeUninstalledPreview preview(fake_object_path, result, metadata, client, depts, sdm);
      EXPECT_CALL(preview, uninstalledActionButtonWidgets(_))
              .Times(1)
              .WillOnce(Return(response));
@@ -475,12 +469,10 @@
                                       const unity::scopes::ActionMetadata& metadata,
                                       const QSharedPointer<click::web::Client>& client,
                                       const std::shared_ptr<click::DepartmentsDb>& depts,
--                                     const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
--                                     const QSharedPointer<pay::Package> pay_package)
--        : FakeBaseUninstalledPreview(std::string{""}, result, metadata, client, depts, manager, pay_package){
++                                     const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager)
++        : FakeBaseUninstalledPreview(std::string{""}, result, metadata, client, depts, manager){
+     }
      using click::UninstalledPreview::uninstalledActionButtonWidgets;
--    MOCK_METHOD0(isRefundable, bool());
  };
  unity::scopes::VariantArray get_actions_from_widgets(const unity::scopes::PreviewWidgetList& widgets, int widget_number) {
@@ -494,58 +486,12 @@
      return selected_action["id"].get_string();
+ }
--TEST_F(UninstalledPreviewTest, testPaymentsButtonNoAccountsData) {
--    result["name"] = "fake_app_name";
--    result["price"] = 2.99;
--    result["purchased"] = false;
--    result["currency_symbol"] = "USD";
--    unity::scopes::ActionMetadata metadata("en_EN", "desktop");
--    FakeBaseUninstalledPreview preview("", result, metadata, client, depts, sdm, pay_package);
--    click::PackageDetails pkgdetails;
--    pkgdetails.package = click::Package(result["name"].get_string(), "0.1");
--    pkgdetails.download_url = "https://localhost/example/fake_app_name.click";
--    pkgdetails.download_sha512 = "download_sha512";
--    auto widgets = preview.uninstalledActionButtonWidgets(pkgdetails);
--    auto button = *std::next(widgets.begin(), 0);
--    std::cerr << button.data() << std::endl;
--    ASSERT_EQ(button.attribute_values().count("online_account_details"), 0);
--}
--
--TEST_F(UninstalledPreviewTest, testIsRefundableButtonShown) {
--    result["name"] = "fake_app_name";
--    result["price"] = 2.99;
--    result["purchased"] = true;
--    unity::scopes::ActionMetadata metadata("en_EN", "desktop");
--    FakeUninstalledRefundablePreview preview(result, metadata, client, depts, sdm, pay_package);
--
--    click::PackageDetails pkgdetails;
--    EXPECT_CALL(preview, isRefundable()).Times(1)
--            .WillOnce(Return(true));
--    auto widgets = preview.uninstalledActionButtonWidgets(pkgdetails);
--    ASSERT_EQ(get_action_from_widgets(widgets, 0, 1), "cancel_purchase_uninstalled");
--}
--
--TEST_F(UninstalledPreviewTest, testIsRefundableButtonNotShown) {
--    result["name"] = "fake_app_name";
--    result["price"] = 2.99;
--    result["purchased"] = true;
--    unity::scopes::ActionMetadata metadata("en_EN", "desktop");
--    FakeUninstalledRefundablePreview preview(result, metadata, client, depts, sdm, pay_package);
--
--    click::PackageDetails pkgdetails;
--    EXPECT_CALL(preview, isRefundable()).Times(1)
--            .WillOnce(Return(false));
--    auto widgets = preview.uninstalledActionButtonWidgets(pkgdetails);
--    ASSERT_EQ(get_actions_from_widgets(widgets, 0).size(), 1);
--}
--
  class InstalledPreviewTest : public Test {
  protected:
      unity::scopes::testing::Result result;
      unity::scopes::ActionMetadata metadata;
      unity::scopes::VariantMap metadict;
      QSharedPointer<click::web::Client> client;
--    QSharedPointer<MockPayPackage> pay_package;
      std::shared_ptr<click::DepartmentsDb> depts;
  public:
@@ -553,62 +499,8 @@
+     }
  };
--class FakeInstalledRefundablePreview : public click::InstalledPreview  {
--public:
--    FakeInstalledRefundablePreview(const unity::scopes::Result& result,
--                                   const unity::scopes::ActionMetadata& metadata,
--                                   const QSharedPointer<click::web::Client> client,
--                                   const QSharedPointer<pay::Package> pay_package,
--                                   const std::shared_ptr<click::DepartmentsDb> depts)
--        : click::InstalledPreview(result, metadata, client, pay_package, depts) {
--
--    }
--
--    using click::InstalledPreview::createButtons;
--    MOCK_METHOD0(isRefundable, bool());
--};
--
--TEST_F(InstalledPreviewTest, testIsRefundableButtonShownFromStore) {
--    result["price"] = 3.99f;
--    FakeInstalledRefundablePreview preview(result, metadata, client, pay_package, depts);
--    EXPECT_CALL(preview, isRefundable()).Times(1)
--            .WillOnce(Return(true));
--    click::Manifest manifest;
--    manifest.removable = true;
--    manifest.name = "fake";
--    manifest.first_app_name = "fake";
--    auto widgets = preview.createButtons(manifest);
--    ASSERT_EQ(get_actions_from_widgets(widgets, 0).size(), 2);
--    ASSERT_EQ(get_action_from_widgets(widgets, 0, 1), "cancel_purchase_installed");
--}
--
--TEST_F(InstalledPreviewTest, testIsRefundableButtonNotShownFromApps) {
--    FakeInstalledRefundablePreview preview(result, metadata, client, pay_package, depts);
--    EXPECT_CALL(preview, isRefundable()).Times(0);
--    click::Manifest manifest;
--    manifest.removable = true;
--    manifest.name = "fake";
--    manifest.first_app_name = "fake";
--    auto widgets = preview.createButtons(manifest);
--    ASSERT_EQ(get_actions_from_widgets(widgets, 0).size(), 2);
--    ASSERT_EQ(get_action_from_widgets(widgets, 0, 1), "uninstall_click");
--}
--
--TEST_F(InstalledPreviewTest, testIsRefundableButtonNotShown) {
--    FakeInstalledRefundablePreview preview(result, metadata, client, pay_package, depts);
--    EXPECT_CALL(preview, isRefundable()).Times(0);
--    click::Manifest manifest;
--    manifest.removable = true;
--    manifest.name = "fake";
--    manifest.first_app_name = "fake";
--    click::PackageDetails details;
--    auto widgets = preview.createButtons(manifest);
--    ASSERT_EQ(get_actions_from_widgets(widgets, 0).size(), 2);
--    ASSERT_EQ(get_action_from_widgets(widgets, 0, 1), "uninstall_click");
--}
--
  TEST_F(InstalledPreviewTest, testReviewWidgetIsNew) {
--    click::InstalledPreview preview(result, metadata, client, pay_package, depts);
++    click::InstalledPreview preview(result, metadata, client, depts);
      click::Review existing_review;
      existing_review.id = 0;
      auto widget = preview.createRatingWidget(existing_review);
@@ -616,7 +508,7 @@
+ }
  TEST_F(InstalledPreviewTest, testReviewWidgetIsEdit) {
--    click::InstalledPreview preview(result, metadata, client, pay_package, depts);
++    click::InstalledPreview preview(result, metadata, client, depts);
      click::Review existing_review;
      existing_review.id = 123456789;
      existing_review.rating = 2.625f;
@@ -627,7 +519,7 @@
+ }
  TEST_F(InstalledPreviewTest, testGetApplicationURIClick) {
--    click::InstalledPreview preview(result, metadata, client, pay_package, depts);
++    click::InstalledPreview preview(result, metadata, client, depts);
      click::Manifest manifest;
      manifest.name = "com.ubuntu.clock";
      manifest.first_app_name = "clock";
@@ -637,7 +529,7 @@
  TEST_F(InstalledPreviewTest, testGetApplicationURIClickInResult) {
      std::string uri{"appid://com.ubuntu.clock/clock/current-user-version"};
      result.set_uri(uri);
--    click::InstalledPreview preview(result, metadata, client, pay_package, depts);
++    click::InstalledPreview preview(result, metadata, client, depts);
      click::Manifest manifest;
      ASSERT_EQ(preview.getApplicationUri(manifest), uri);
+ }
@@ -645,13 +537,13 @@
  TEST_F(InstalledPreviewTest, testGetApplicationURINonClick) {
      std::string uri{"application:///web-browser.desktop"};
      result.set_uri(uri);
--    click::InstalledPreview preview(result, metadata, client, pay_package, depts);
++    click::InstalledPreview preview(result, metadata, client, depts);
      click::Manifest manifest;
      ASSERT_EQ(preview.getApplicationUri(manifest), uri);
+ }
  TEST_F(InstalledPreviewTest, testGetApplicationURIScope) {
--    click::InstalledPreview preview(result, metadata, client, pay_package, depts);
++    click::InstalledPreview preview(result, metadata, client, depts);
      click::Manifest manifest;
      manifest.name = "com.ubuntu.nearby";
      manifest.first_scope_id = "nearby";
@@ -660,50 +552,7 @@
  TEST_F(InstalledPreviewTest, testGetApplicationURINotAppOrScope) {
      result.set_uri("https://foo.com");
--    click::InstalledPreview preview(result, metadata, client, pay_package, depts);
++    click::InstalledPreview preview(result, metadata, client, depts);
      click::Manifest manifest;
      ASSERT_EQ(preview.getApplicationUri(manifest), "");
+ }
--
--class FakeCancelPurchasePreview : public click::CancelPurchasePreview  {
--public:
--    FakeCancelPurchasePreview(const unity::scopes::Result& result, bool installed)
--        : click::CancelPurchasePreview(result, installed) {
--
--    }
--    using click::CancelPurchasePreview::build_widgets;
--};
--
--class CancelPurchasePreviewTest : public PreviewsBaseTest {
--
--};
--
--TEST_F(CancelPurchasePreviewTest, testNoShowsInstalled)
--{
--    FakeResult result{vm};
--    result["title"] = "fake app";
--    FakeCancelPurchasePreview preview(result, true);
--    auto widgets = preview.build_widgets();
--    auto action = get_action_from_widgets(widgets, 1, 0);
--    ASSERT_EQ(action, "show_installed");
--}
--
--TEST_F(CancelPurchasePreviewTest, testNoShowsUninstalled)
--{
--    FakeResult result{vm};
--    result["title"] = "fake app";
--    FakeCancelPurchasePreview preview(result, false);
--    auto widgets = preview.build_widgets();
--    auto action = get_action_from_widgets(widgets, 1, 0);
--    ASSERT_EQ(action, "show_uninstalled");
--}
--
--TEST_F(CancelPurchasePreviewTest, testYesCancelsPurchase)
--{
--    FakeResult result{vm};
--    result["title"] = "fake app";
--    FakeCancelPurchasePreview preview(result, false);
--    auto widgets = preview.build_widgets();
--    auto action = get_action_from_widgets(widgets, 1, 1);
--    ASSERT_EQ(action, "confirm_cancel_purchase_uninstalled");
--}
 === modified file 'scope/CMakeLists.txt'
 --- scope/CMakeLists.txt	2014-05-27 06:57:52 +0000
 +++ scope/CMakeLists.txt	2016-10-25 13:13:28 +0000
@@ -1,3 +1,2 @@
--add_subdirectory(clickstore)
  add_subdirectory(clickapps)
  add_subdirectory(tests)
 === modified file 'scope/clickapps/apps-scope.cpp'
 --- scope/clickapps/apps-scope.cpp	2016-07-26 19:25:20 +0000
 +++ scope/clickapps/apps-scope.cpp	2016-10-25 13:13:28 +0000
@@ -53,7 +53,6 @@
      nam.reset(new click::network::AccessManager());
      client.reset(new click::web::Client(nam));
      index.reset(new click::Index(client));
--    pay_package.reset(new pay::Package(client));
      try
+     {
@@ -108,7 +107,7 @@
          const unity::scopes::ActionMetadata& metadata) {
      qDebug() << "Scope::preview() called.";
      auto preview = new click::Preview(result, metadata, qt_ready_for_preview_f.share());
--    preview->choose_strategy(client, pay_package, dm, depts_db);
++    preview->choose_strategy(client, dm, depts_db);
      return unity::scopes::PreviewQueryBase::UPtr{preview};
+ }
 === modified file 'scope/clickapps/apps-scope.h'
 --- scope/clickapps/apps-scope.h	2016-05-10 14:56:11 +0000
 +++ scope/clickapps/apps-scope.h	2016-10-25 13:13:28 +0000
@@ -32,7 +32,6 @@
  #include <click/index.h>
  #include <click/network_access_manager.h>
--#include <click/pay.h>
  #include <click/webclient.h>
  #include <ubuntu/download_manager/manager.h>
@@ -74,7 +73,6 @@
      QSharedPointer<click::network::AccessManager> nam;
      QSharedPointer<click::web::Client> client;
      QSharedPointer<click::Index> index;
--    QSharedPointer<pay::Package> pay_package;
      QSharedPointer<Ubuntu::DownloadManager::Manager> dm;
      QSharedPointer<click::CredentialsService> sso;
      std::shared_ptr<click::DepartmentsDb> depts_db;
 === removed directory 'scope/clickstore'
 === removed file 'scope/clickstore/CMakeLists.txt'
 --- scope/clickstore/CMakeLists.txt	2016-09-21 21:27:01 +0000
 +++ scope/clickstore/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
--SET (CMAKE_INCLUDE_CURRENT_DIR ON)
--SET (CMAKE_AUTOMOC ON)
--find_package (Qt5Core REQUIRED)
--find_package (Qt5Sql REQUIRED)
--pkg_check_modules(JSON_CPP REQUIRED jsoncpp)
--
--add_definitions(
--  -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
--  -DGETTEXT_LOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}\"
--)
--
--add_library(${STORE_LIB_UNVERSIONED} SHARED
--  store-query.cpp
--  store-scope.cpp
--)
--set_target_properties(${STORE_LIB_UNVERSIONED} PROPERTIES PREFIX "")
--
--include_directories(
--  ${CMAKE_SOURCE_DIR}/libclickscope
--  ${JSON_CPP_INCLUDE_DIRS}
--)
--
--qt5_use_modules (${STORE_LIB_UNVERSIONED} Network Sql)
--
--target_link_libraries (${STORE_LIB_UNVERSIONED}
--  ${SCOPE_LIB_NAME}
--  ${JSON_CPP_LDFLAGS}
--  ${UNITY_SCOPES_LDFLAGS}
--  ${UBUNTUONE_LDFLAGS}
--  ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
--  ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
--)
--
--set(STORE_INI_TARGET com.canonical.scopes.clickstore.ini)
--configure_file(
--  ${STORE_INI_TARGET}.in.in
--  ${STORE_INI_TARGET}.in
--)
--
--add_custom_target(${STORE_INI_TARGET} ALL
--  COMMENT "Merging translations into ${STORE_INI_TARGET}"
--  COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${STORE_INI_TARGET}.in ${STORE_INI_TARGET} >/dev/null
--)
 === removed file 'scope/clickstore/com.canonical.scopes.clickstore.ini.in.in'
 --- scope/clickstore/com.canonical.scopes.clickstore.ini.in.in	2016-09-08 08:56:21 +0000
 +++ scope/clickstore/com.canonical.scopes.clickstore.ini.in.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
--[ScopeConfig]
--_DisplayName=Ubuntu Store
--_Description=Scope for searching the Ubuntu app store
--Author=Canonical Ltd.
--Art=@STORE_DATA_DIR@/clickscope-screenshot.jpg
--Icon=@STORE_DATA_DIR@/ubuntu-store-scope.png
--_SearchHint=Search store
--
--[Appearance]
--LogoOverlayColor=#26000000
 === removed file 'scope/clickstore/store-query.cpp'
 --- scope/clickstore/store-query.cpp	2016-07-26 19:25:20 +0000
 +++ scope/clickstore/store-query.cpp	1970-01-01 00:00:00 +0000
@@ -1,645 +0,0 @@
--/*
-- * Copyright (C) 2014-2016 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * In addition, as a special exception, the copyright holders give
-- * permission to link the code of portions of this program with the
-- * OpenSSL library under certain conditions as described in each
-- * individual source file, and distribute linked combinations
-- * including the two.
-- * You must obey the GNU General Public License in all respects
-- * for all of the code used other than OpenSSL.  If you modify
-- * file(s) with this exception, you may extend this exception to your
-- * version of the file(s), but you are not obligated to do so.  If you
-- * do not wish to do so, delete this exception statement from your
-- * version.  If you delete this exception statement from all source
-- * files in the program, then also delete it here.
-- */
--
--#include "store-query.h"
--#include "store-scope.h"
--
--#include <click/application.h>
--#include <click/interface.h>
--#include <click/qtbridge.h>
--#include <click/departments-db.h>
--#include <click/utils.h>
--
--#include <unity/scopes/Annotation.h>
--#include <unity/scopes/CategoryRenderer.h>
--#include <unity/scopes/CategorisedResult.h>
--#include <unity/scopes/Department.h>
--#include <unity/scopes/CannedQuery.h>
--#include <unity/scopes/SearchReply.h>
--#include <unity/scopes/SearchMetadata.h>
--#include <unity/scopes/Variant.h>
--#include <unity/scopes/VariantBuilder.h>
--
--#include <cassert>
--#include <iomanip>
--#include <locale>
--#include <memory>
--#include <set>
--#include <sstream>
--#include <vector>
--
--#include <QLocale>
--
--#include <click/click-i18n.h>
--
--using namespace click;
--
--namespace
--{
--
--static const std::string CATEGORY_APPS_DISPLAY = R"(
--    {
--        "schema-version" : 1,
--        "template" : {
--            "category-layout" : "grid",
--            "card-size": "small"
--        },
--        "components" : {
--            "title" : "title",
--            "subtitle": "subtitle",
--            "attributes": { "field": "attributes", "max-count": 4 },
--            "art" : {
--                "field": "art",
--                "aspect-ratio": 1.13,
--                "fallback": "image://theme/placeholder-app-icon"
--            }
--        }
--    }
--)";
--
--static const std::string CATEGORY_SCOPES_DISPLAY = R"(
--    {
--        "schema-version" : 1,
--        "template" : {
--            "overlay": true,
--            "category-layout" : "grid",
--            "card-size": "small"
--        },
--        "components" : {
--            "title" : "title",
--            "attributes": { "field": "attributes", "max-count": 1 },
--            "art" : {
--                "field": "art",
--                "aspect-ratio": 0.55,
--                "fallback": "image://theme/placeholder-app-icon"
--            }
--        }
--    }
--)";
--
--static const std::string CATEGORY_APP_OF_THE_WEEK = R"(
--{
--    "schema-version" : 1,
--    "template": {
--        "category-layout": "grid",
--        "card-size": "large"
--    },
--    "components": {
--        "title": "title",
--        "subtitle": "subtitle",
--        "attributes": { "field": "attributes", "max-count": 4 },
--        "art": {
--            "aspect-ratio": 2.5,
--            "field": "art",
--            "fallback": "image://theme/placeholder-app-icon"
--        }
--    }
--})";
--
--static const std::string CATEGORY_APPS_SEARCH = R"(
--    {
--        "schema-version" : 1,
--        "template" : {
--            "category-layout" : "grid",
--            "card-layout" : "horizontal",
--            "collapsed-rows": 0,
--            "card-size": "large"
--        },
--        "components" : {
--            "title" : "title",
--            "art" : {
--                "field": "art",
--                "aspect-ratio": 1.13,
--                "fallback": "image://theme/placeholder-app-icon"
--            },
--            "subtitle": "subtitle",
--            "attributes": { "field": "attributes", "max-count": 3 }
--        }
--    }
--)";
--
--}
--
--struct click::Query::Private
--{
--    Private(click::Index& index, click::DepartmentLookup& depts,
--            std::shared_ptr<click::DepartmentsDb> depts_db,
--            click::HighlightList& highlights,
--            const scopes::SearchMetadata& metadata,
--            pay::Package& in_package,
--            std::shared_future<void> const& qt_ready)
--        : index(index),
--          department_lookup(depts),
--          depts_db(depts_db),
--          highlights(highlights),
--          meta(metadata),
--          pay_package(in_package),
--          qt_ready_(qt_ready)
--    {
--    }
--    click::Index& index;
--    click::DepartmentLookup& department_lookup;
--    std::shared_ptr<click::DepartmentsDb> depts_db;
--    click::HighlightList& highlights;
--    scopes::SearchMetadata meta;
--    click::web::Cancellable search_operation;
--    click::web::Cancellable purchases_operation;
--    pay::Package& pay_package;
--    std::shared_future<void> qt_ready_;
--};
--
--click::Query::Query(unity::scopes::CannedQuery const& query,
--                    click::Index& index,
--                    click::DepartmentLookup& depts,
--                    std::shared_ptr<click::DepartmentsDb> depts_db,
--                    click::HighlightList& highlights,
--                    scopes::SearchMetadata const& metadata,
--                    pay::Package& in_package,
--                    std::shared_future<void> const& qt_ready)
--    : unity::scopes::SearchQueryBase(query, metadata),
--      impl(new Private(index, depts, depts_db, highlights, metadata, in_package, qt_ready))
--{
--}
--
--click::Query::~Query()
--{
--    qDebug() << "destroying search";
--}
--
--void click::Query::cancelled()
--{
--    qDebug() << "cancelling search of" << QString::fromStdString(query().query_string());
--    impl->search_operation.cancel();
--}
--
--click::Interface& click::Query::clickInterfaceInstance()
--{
--    static click::Interface iface;
--
--    return iface;
--}
--
--bool click::Query::push_result(scopes::SearchReplyProxy const& searchReply, const scopes::CategorisedResult &res)
--{
--    return searchReply->push(res);
--}
--
--void click::Query::finished(const scopes::SearchReplyProxy &searchReply)
--{
--    searchReply->finished();
--}
--
--scopes::Category::SCPtr click::Query::register_category(const scopes::SearchReplyProxy &searchReply,
--                                                        const std::string &id,
--                                                        const std::string &title,
--                                                        const std::string &icon,
--                                                        const scopes::CategoryRenderer &renderer_template)
--{
--    return searchReply->register_category(id, title, icon, renderer_template);
--}
--
--void click::Query::run_under_qt(const std::function<void ()> &task)
--{
--    qt::core::world::enter_with_task([task]() {
--        task();
--    });
--}
--
--unity::scopes::Department::SPtr click::Query::fromClickDepartment(const click::Department::SCPtr click_dept, const std::string& current_dept_id, const click::DepartmentList& subdepts)
--{
--    const std::locale loc("");
--    unity::scopes::Department::SPtr dep = unity::scopes::Department::create(click_dept->id(), query(), click_dept->name());
--    if (click_dept->has_children_flag())
--    {
--        dep->set_has_subdepartments();
--    }
--    unity::scopes::DepartmentList departments;
--
--    // subdepts is a list of subdepartments of current department fetched from the Store for current search; if we encountered current department in the tree,
--    // insert the list from the server rather than the one from internal cache.
--    for (auto click_subdep: (click_dept->id() == current_dept_id ? subdepts : click_dept->sub_departments()))
--    {
--        departments.push_back(fromClickDepartment(click_subdep, current_dept_id, subdepts));
--    }
--    departments.sort([&loc](const unity::scopes::Department::SCPtr &d1, const unity::scopes::Department::SCPtr &d2) -> bool {
--            return loc(d1->label(), d2->label()) > 0;
--    });
--    dep->set_subdepartments(departments);
--
--    return dep;
--}
--
--//
--// creates department menu with narrowed-down list of subdepartments of current department, as
--// returned by server call
--unity::scopes::Department::SPtr click::Query::populate_departments(const click::DepartmentList& subdepts, const std::string& current_dep_id)
--{
--    // Return complete departments tree (starting from 'All') every time, rather than only parent - current - children; this is the only
--    // way we can display siblings corrctly when navigating from Apps scope straight into a subdepartment of Store - see LP #1343242.
--    // For currently visible department include its subdepartments as returned for current search by the server (subdepts) -
--    // all others are constructed from the department lookup.
--    return fromClickDepartment(impl->department_lookup.get_department_info(""), current_dep_id, subdepts);
--}
--
--// recursively store all departments in the departments database
--void click::Query::store_departments(const click::DepartmentList& depts)
--{
--    assert(impl->depts_db);
--
--    try
--    {
--        impl->depts_db->store_departments(depts, search_metadata().locale());
--    }
--    catch (const std::exception &e)
--    {
--        qWarning() << "Failed to update database: " << QString::fromStdString(e.what());
--    }
--}
--
--void click::Query::push_package(const scopes::SearchReplyProxy& searchReply, scopes::Category::SCPtr category, const PackageSet &installedPackages, const Package& pkg)
--{
--    qDebug() << "pushing result" << QString::fromStdString(pkg.name);
--    try {
--        scopes::CategorisedResult res(category);
--        res.set_title(pkg.title);
--        res.set_art(pkg.icon_url);
--        res.set_uri(pkg.url);
--        res[click::Query::ResultKeys::NAME] = pkg.name;
--        res["subtitle"] = pkg.publisher;
--        auto installed = installedPackages.find(pkg);
--
--        std::string price = _("FREE");
--        std::stringstream ss;
--        ss << std::fixed << std::setprecision(1);
--        ss << click::Formatter::render_rating_stars(pkg.rating);
--        ss << " " << pkg.rating;
--        std::string rating{ss.str()};
--
--        bool was_purchased = false;
--        time_t refundable_until = 0;
--        double cur_price{0.00};
--        auto suggested = impl->index.get_suggested_currency();
--        std::string currency = Configuration::get_currency(suggested);
--        if (pkg.prices.count(currency) == 1) {
--            cur_price = pkg.prices.at(currency);
--        } else {
--            // NOTE: This is decprecated. Here for compatibility.
--            currency = Configuration::CURRENCY_DEFAULT;
--            cur_price = pkg.price;
--        }
--        res["price"] = scopes::Variant(cur_price);
--        res[click::Query::ResultKeys::VERSION] = pkg.version;
--
--
--        qDebug() << "App:" << pkg.name.c_str() << ", price:" << cur_price;
--        std::string formatted_price;
--        if (cur_price > 0.00f) {
--            if (!Configuration::get_purchases_enabled()) {
--                // Don't show priced apps if flag not set
--                return;
--            }
--            // Check if the priced app was already purchased.
--            auto purchased = purchased_apps.find({pkg.name});
--            was_purchased = purchased != purchased_apps.end();
--            if (was_purchased) {
--                refundable_until = purchased->refundable_until;
--            }
--            qDebug() << "was purchased?" << was_purchased << ", refundable_until:" << refundable_until;
--
--            // Get the currency symbol to use.
--            QLocale locale;
--            auto symbol = Configuration::CURRENCY_MAP.at(currency);
--            formatted_price = locale.toCurrencyString(cur_price,
--                                                      symbol.c_str()).toUtf8().data();
--            res["currency_symbol"] = symbol;
--        }
--        if (installed != installedPackages.end()) {
--            res[click::Query::ResultKeys::INSTALLED] = true;
--            res[click::Query::ResultKeys::PURCHASED] = was_purchased;
--            price = _("✔ INSTALLED");
--            res[click::Query::ResultKeys::VERSION] = installed->version;
--        } else if (was_purchased) {
--            res[click::Query::ResultKeys::PURCHASED] = true;
--            res[click::Query::ResultKeys::INSTALLED] = false;
--            price = _("✔ PURCHASED");
--        } else {
--            res[click::Query::ResultKeys::INSTALLED] = false;
--            res[click::Query::ResultKeys::PURCHASED] = false;
--            if (cur_price > 0.00f) {
--                price = formatted_price;
--            }
--        }
--
--        res[click::Query::ResultKeys::REFUNDABLE_UNTIL] = unity::scopes::Variant((int64_t)refundable_until);
--        res["formatted_price"] = formatted_price;
--        res["price_area"] = price;
--        res["rating"] = rating;
--
--        // Add the price and rating as attributes.
--        scopes::VariantBuilder builder;
--        builder.add_tuple({
--                {"value", scopes::Variant(price)},
--            });
--        builder.add_tuple({
--                {"value", scopes::Variant("")},
--            });
--        builder.add_tuple({
--                {"value", scopes::Variant(rating)},
--            });
--        builder.add_tuple({
--                {"value", scopes::Variant("")},
--            });
--        res["attributes"] = builder.end();
--
--        this->push_result(searchReply, res);
--    } catch(const std::exception& e){
--        qCritical() << "push_package: Exception: " << e.what() ;
--    } catch(...){
--        qDebug() << "no reason to catch";
--    }
--}
--
--void click::Query::push_highlights(const scopes::SearchReplyProxy& searchReply, const HighlightList& highlights, const PackageSet &locallyInstalledApps)
--{
--    const scopes::CategoryRenderer renderer(CATEGORY_APPS_DISPLAY);
--    const scopes::CategoryRenderer scopes_renderer(CATEGORY_SCOPES_DISPLAY);
--    const scopes::CategoryRenderer aotw_renderer(CATEGORY_APP_OF_THE_WEEK);
--
--    for (auto const& hl: highlights)
--    {
--        scopes::CategoryRenderer const* rdr = &renderer;
--        if (hl.slug() == "app-of-the-week" || hl.packages().size() == 1)
--        {
--            rdr = &aotw_renderer;
--        }
--        if (hl.contains_scopes())
--        {
--            rdr = &scopes_renderer;
--        }
--        auto category = register_category(searchReply, hl.slug(), hl.name(), "", *rdr);
--        for (auto const& pkg: hl.packages())
--        {
--            push_package(searchReply, category, locallyInstalledApps, pkg);
--        }
--    }
--    qDebug() << "Highlights pushed";
--}
--
--void click::Query::push_departments(const scopes::SearchReplyProxy& searchReply, const scopes::Department::SCPtr& root)
--{
--    if (root != nullptr)
--    {
--        try
--        {
--            qDebug() << "pushing departments";
--            searchReply->register_departments(root);
--        }
--        catch (const std::exception& e)
--        {
--            qWarning() << "Failed to register departments for query " << QString::fromStdString(query().query_string()) <<
--                ", current department " << QString::fromStdString(query().department_id()) << ": " << e.what();
--        }
--    }
--    else
--    {
--        qWarning() << "No departments data for query " << QString::fromStdString(query().query_string()) <<
--            "', current department " << QString::fromStdString(query().department_id());
--    }
--}
--
--void click::Query::push_departments(scopes::SearchReplyProxy const& searchReply)
--{
--    auto rootdep = impl->department_lookup.get_department_info("");
--    if (!rootdep)
--    {
--        qWarning() << "No department information available";
--        return;
--    }
--
--    auto subdepts = rootdep->sub_departments();
--    auto root = populate_departments(subdepts, "");
--    push_departments(searchReply, root);
--}
--
--//
--// push highlights and departments
--// use cached highlights for root department, otherwise run an async job for highlights of current department.
--void click::Query::add_highlights(scopes::SearchReplyProxy const& searchReply, const PackageSet& locallyInstalledApps)
--{
--    auto curdep = impl->department_lookup.get_department_info(query().department_id());
--    if (!curdep)
--    {
--        qWarning() << "No department information for current department" << QString::fromStdString(query().department_id());
--        return;
--    }
--
--    if (query().department_id() == "") // top-level departments
--    {
--        auto subdepts = curdep->sub_departments();
--        auto root = populate_departments(subdepts, query().department_id());
--        push_departments(searchReply, root);
--
--        qDebug() << "pushing cached highlights";
--        push_highlights(searchReply, impl->highlights, locallyInstalledApps);
--        this->finished(searchReply); //FIXME: this shouldn't be needed
--    }
--    else
--    {
--        qDebug() << "starting departments call for department" << QString::fromStdString(curdep->id()) << ", href" << QString::fromStdString(curdep->href());
--        impl->search_operation = impl->index.departments(curdep->href(), [this, locallyInstalledApps, searchReply](const DepartmentList& depts,
--                    const HighlightList& highlights, Index::Error error, int)
--                {
--                    if (error == click::Index::Error::NoError)
--                    {
--                        qDebug() << "departments call completed";
--                        auto root = populate_departments(depts, query().department_id());
--                        push_departments(searchReply, root);
--                        push_highlights(searchReply, highlights, locallyInstalledApps);
--                    }
--                    else
--                    {
--                        qWarning() << "departments call failed";
--                    }
--                    this->finished(searchReply); //FIXME: this shouldn't be needed
--                });
--        }
--}
--
--void click::Query::add_available_apps(scopes::SearchReplyProxy const& searchReply,
--                                      const PackageSet& installedPackages,
--                                      const std::string& categoryTemplate)
--{
--    // this assertion is here to ensure unit tests are properly implemented.
--    // this pointer is never null during normal execution.
--    assert(searchReply);
--
--    run_under_qt([=]()
--    {
--        auto search_cb = [this, searchReply, categoryTemplate, installedPackages](Packages packages, Packages recommends) {
--                qDebug("search callback");
--
--                const scopes::CategoryRenderer categoryRenderer(categoryTemplate);
--
--                std::string cat_title(_("Available"));
--                {
--                    char tmp[512];
--                    unsigned int num_results = static_cast<unsigned int>(packages.size());
--                    if (snprintf(tmp, sizeof(tmp),
--                                 dngettext(GETTEXT_PACKAGE,
--                                           "%u result in Ubuntu Store",
--                                           "%u results in Ubuntu Store",
--                                           num_results), num_results) > 0) {
--                        cat_title = tmp;
--                    }
--                }
--                auto category = register_category(searchReply, "appstore", cat_title, "", categoryRenderer);
--
--                const scopes::CategoryRenderer recommendsCatRenderer(categoryTemplate);
--                auto recommendsCategory = register_category(searchReply, "recommends",
--                                                _("Recommended"), "",
--                                                recommendsCatRenderer);
--
--                // handle packages data
--                foreach (auto p, packages) {
--                    push_package(searchReply, category, installedPackages, p);
--                }
--                foreach (auto r, recommends) {
--                    push_package(searchReply, recommendsCategory,
--                                 installedPackages, r);
--                }
--                qDebug() << "search completed";
--                this->finished(searchReply); //FIXME: this shouldn't be needed
--            };
--
--            const bool force_cache = (search_metadata().internet_connectivity() == scopes::QueryMetadata::ConnectivityStatus::Disconnected);
--            qDebug() << "search, force_cache=" << force_cache << ", conn status=" << (int)search_metadata().internet_connectivity();
--
--            // this is the case when we do bootstrap for the first time, or it failed last time
--            if (impl->department_lookup.size() == 0)
--            {
--                qDebug() << "performing bootstrap request";
--                impl->search_operation = impl->index.bootstrap([this, search_cb, searchReply, installedPackages, force_cache](const DepartmentList& deps, const
--                            HighlightList& highlights, click::Index::Error error, int) {
--                if (error == click::Index::Error::NoError)
--                {
--                    qDebug() << "bootstrap request completed";
--                    auto root = std::make_shared<click::Department>("", _("All"), "", true);
--                    root->set_subdepartments(deps);
--                    DepartmentList rdeps { root };
--                    impl->department_lookup.rebuild(rdeps);
--                    impl->highlights = highlights;
--                    qDebug() << "Total number of departments:" << impl->department_lookup.size() << ", highlights:" << highlights.size();
--
--                    if (impl->depts_db)
--                    {
--                        qDebug() << "Storing departments in the database";
--                        store_departments(deps);
--                    }
--                    else
--                    {
--                        qWarning() << "Departments db not available";
--                    }
--                }
--                else
--                {
--                    qWarning() << "bootstrap request failed";
--                }
--
--                if (error == click::Index::Error::NoError)
--                {
--                    if (query().query_string().empty())
--                    {
--                        add_highlights(searchReply, installedPackages);
--                    }
--                    else
--                    {
--                        qDebug() << "starting search of" << QString::fromStdString(query().query_string());
--                        push_departments(searchReply);
--                        impl->search_operation = impl->index.search(query().query_string(), query().department_id(), search_cb, force_cache);
--                    }
--                }
--            }, force_cache);
--        }
--        else
--        {
--            if (query().query_string().empty())
--            {
--                add_highlights(searchReply, installedPackages);
--            }
--            else // normal search
--            {
--                qDebug() << "starting search of" << QString::fromStdString(query().query_string());
--                push_departments(searchReply);
--                impl->search_operation = impl->index.search(query().query_string(), query().department_id(), search_cb, force_cache);
--            }
--        }
--    });
--}
--
--PackageSet click::Query::get_installed_packages()
--{
--    std::promise<PackageSet> installed_promise;
--    std::future<PackageSet> installed_future = installed_promise.get_future();
--
--    run_under_qt([&]()
--    {
--        clickInterfaceInstance().get_installed_packages(
--                    [&installed_promise](PackageSet installedPackages, InterfaceError){
--            installed_promise.set_value(installedPackages);
--        });
--    });
--
--    return installed_future.get();
--}
--
--
--void click::Query::run(scopes::SearchReplyProxy const& searchReply)
--{
--    if (impl->qt_ready_.valid())
--        impl->qt_ready_.wait();
--
--    auto q = query().query_string();
--    std::string categoryTemplate = CATEGORY_APPS_SEARCH;
--    if (q.empty()) {
--        categoryTemplate = CATEGORY_APPS_DISPLAY;
--    }
--    if (Configuration::get_purchases_enabled()) {
--        std::promise<pay::PurchaseSet> purchased_promise;
--        std::future<pay::PurchaseSet> purchased_future = purchased_promise.get_future();
--        qDebug() << "Getting list of purchased apps.";
--        run_under_qt([this, &purchased_promise]() {
--                impl->purchases_operation = impl->pay_package.get_purchases([&purchased_promise](const pay::PurchaseSet& purchases) {
--                        purchased_promise.set_value(purchases);
--                    });
--            });
--        purchased_apps = purchased_future.get();
--    }
--
--    add_available_apps(searchReply, get_installed_packages(), categoryTemplate);
--}
 === removed file 'scope/clickstore/store-query.h'
 --- scope/clickstore/store-query.h	2016-05-10 14:56:11 +0000
 +++ scope/clickstore/store-query.h	1970-01-01 00:00:00 +0000
@@ -1,117 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * In addition, as a special exception, the copyright holders give
-- * permission to link the code of portions of this program with the
-- * OpenSSL library under certain conditions as described in each
-- * individual source file, and distribute linked combinations
-- * including the two.
-- * You must obey the GNU General Public License in all respects
-- * for all of the code used other than OpenSSL.  If you modify
-- * file(s) with this exception, you may extend this exception to your
-- * version of the file(s), but you are not obligated to do so.  If you
-- * do not wish to do so, delete this exception statement from your
-- * version.  If you delete this exception statement from all source
-- * files in the program, then also delete it here.
-- */
--
--#ifndef STORE_QUERY_H
--#define STORE_QUERY_H
--
--#include <unity/scopes/SearchQueryBase.h>
--#include <unity/scopes/Department.h>
--
--namespace scopes = unity::scopes;
--
--#include <QSharedPointer>
--#include <set>
--
--#include <click/department-lookup.h>
--#include <click/package.h>
--#include <click/pay.h>
--#include <click/highlights.h>
--#include <click/interface.h>
--
--#include <future>
--
--namespace click
--{
--
--class Application;
--class Index;
--class DepartmentLookup;
--class DepartmentsDb;
--
--class Query : public scopes::SearchQueryBase
--{
--public:
--    struct ResultKeys
--    {
--        ResultKeys() = delete;
--
--        constexpr static const char* NAME{"name"};
--        constexpr static const char* DESCRIPTION{"description"};
--        constexpr static const char* MAIN_SCREENSHOT{"main_screenshot"};
--        constexpr static const char* INSTALLED{"installed"};
--        constexpr static const char* PURCHASED{"purchased"};
--        constexpr static const char* REFUNDABLE_UNTIL{"refundable_until"};
--        constexpr static const char* VERSION{"version"};
--    };
--
--    Query(unity::scopes::CannedQuery const& query,
--          click::Index& index,
--          click::DepartmentLookup& dept_lookup,
--          std::shared_ptr<click::DepartmentsDb> depts_db,
--          click::HighlightList& highlights,
--          scopes::SearchMetadata const& metadata,
--          pay::Package& in_package,
--          std::shared_future<void> const& qt_ready = std::future<void>());
--    virtual ~Query();
--
--    virtual void cancelled() override;
--
--    virtual void run(scopes::SearchReplyProxy const& reply) override;
--
--    pay::PurchaseSet purchased_apps;
--
--protected:
--    virtual unity::scopes::Department::SPtr fromClickDepartment(const click::Department::SCPtr click_dept, const std::string& current_dept_id, const click::DepartmentList& subdepts);
--    virtual unity::scopes::Department::SPtr populate_departments(const click::DepartmentList& depts, const std::string& current_department_id);
--    virtual void store_departments(const click::DepartmentList& depts);
--    virtual void push_departments(const scopes::SearchReplyProxy& searchReply, const scopes::Department::SCPtr& root);
--    virtual void push_departments(scopes::SearchReplyProxy const& searchReply);
--    virtual void add_highlights(scopes::SearchReplyProxy const& searchReply, const PackageSet& installedPackages);
--    virtual void add_available_apps(const scopes::SearchReplyProxy &searchReply, const PackageSet &installedPackages, const std::string &category);
--    virtual click::Interface& clickInterfaceInstance();
--    virtual PackageSet get_installed_packages();
--    virtual bool push_result(const scopes::SearchReplyProxy &searchReply, scopes::CategorisedResult const& res);
--    virtual void finished(const scopes::SearchReplyProxy &searchReply);
--    virtual scopes::Category::SCPtr register_category(scopes::SearchReplyProxy const& searchReply,
--                                               std::string const& id,
--                                               std::string const& title,
--                                               std::string const& icon,
--                                               scopes::CategoryRenderer const& renderer_template);
--    virtual void push_package(const scopes::SearchReplyProxy& searchReply, scopes::Category::SCPtr category, const PackageSet &locallyInstalledApps,
--            const click::Package& pkg);
--    virtual void push_highlights(const scopes::SearchReplyProxy& searchReply, const HighlightList& highlights, const PackageSet &locallyInstalledApps);
--    virtual void run_under_qt(const std::function<void()> &task);
--
--private:
--    struct Private;
--    QSharedPointer<Private> impl;
--};
--}
--
--#endif // CLICK_QUERY_H
 === removed file 'scope/clickstore/store-scope.cpp'
 --- scope/clickstore/store-scope.cpp	2016-07-26 19:25:20 +0000
 +++ scope/clickstore/store-scope.cpp	1970-01-01 00:00:00 +0000
@@ -1,237 +0,0 @@
--/*
-- * Copyright (C) 2014-2015 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * In addition, as a special exception, the copyright holders give
-- * permission to link the code of portions of this program with the
-- * OpenSSL library under certain conditions as described in each
-- * individual source file, and distribute linked combinations
-- * including the two.
-- * You must obey the GNU General Public License in all respects
-- * for all of the code used other than OpenSSL.  If you modify
-- * file(s) with this exception, you may extend this exception to your
-- * version of the file(s), but you are not obligated to do so.  If you
-- * do not wish to do so, delete this exception statement from your
-- * version.  If you delete this exception statement from all source
-- * files in the program, then also delete it here.
-- */
--
--#include <click/qtbridge.h>
--#include <click/departments-db.h>
--#include <click/department-lookup.h>
--#include "store-scope.h"
--#include "store-query.h"
--#include <click/preview.h>
--#include <click/interface.h>
--#include <click/scope_activation.h>
--
--#include <QSharedPointer>
--
--#include <click/network_access_manager.h>
--#include <click/click-i18n.h>
--
--#include <logging.h>
--#include <iostream>
--
--click::Scope::Scope()
--{
--    qt_ready_for_search_f = qt_ready_for_search_p.get_future();
--    qt_ready_for_preview_f = qt_ready_for_preview_p.get_future();
--    nam.reset(new click::network::AccessManager());
--    client.reset(new click::web::Client(nam));
--    index.reset(new click::Index(client));
--    depts.reset(new click::DepartmentLookup());
--    highlights.reset(new click::HighlightList());
--    pay_package.reset(new pay::Package(client));
--
--    try
--    {
--        depts_db = click::DepartmentsDb::open(true);
--    }
--    catch (const std::runtime_error& e)
--    {
--        std::cerr << "Failed to open departments db: " << e.what() << std::endl;
--    }
--}
--
--click::Scope::~Scope()
--{
--}
--
--void click::Scope::start(std::string const&)
--{
--    setlocale(LC_ALL, "");
--    // FIXME: This is wrong, but needed for json-cpp workaround.
--    setlocale(LC_MONETARY, "C");
--    bindtextdomain(GETTEXT_PACKAGE, GETTEXT_LOCALEDIR);
--    bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
--    click::Date::setup_system_locale();
--}
--
--void click::Scope::run()
--{
--    static const int zero = 0;
--    auto emptyCb = [this]()
--    {
--        dm.reset(Ubuntu::DownloadManager::Manager::createSessionManager());
--        qt_ready_for_search_p.set_value();
--
--        sso.reset(new click::CredentialsService());
--        client->setCredentialsService(sso);
--        qt_ready_for_preview_p.set_value();
--    };
--
--    qt::core::world::build_and_run(zero, nullptr, emptyCb);
--}
--
--void click::Scope::stop()
--{
--    qt::core::world::destroy();
--}
--
--scopes::SearchQueryBase::UPtr click::Scope::search(unity::scopes::CannedQuery const& q, scopes::SearchMetadata const& metadata)
--{
--    return scopes::SearchQueryBase::UPtr(new click::Query(q, *index, *depts, depts_db, *highlights, metadata,
--                                                          *pay_package, qt_ready_for_search_f.share()));
--}
--
--
--unity::scopes::PreviewQueryBase::UPtr click::Scope::preview(const unity::scopes::Result& result,
--        const unity::scopes::ActionMetadata& metadata) {
--    qDebug() << "Scope::preview() called.";
--    auto preview = new click::Preview(result, metadata, qt_ready_for_preview_f.share());
--    preview->choose_strategy(client, pay_package, dm, depts_db);
--    return unity::scopes::PreviewQueryBase::UPtr{preview};
--}
--
--unity::scopes::ActivationQueryBase::UPtr click::Scope::perform_action(unity::scopes::Result const& result, unity::scopes::ActionMetadata const& metadata,
--        std::string const& widget_id, std::string const& _action_id)
--{
--    std::string action_id = _action_id;
--    qDebug() << "perform_action called with widget_id" << QString::fromStdString(widget_id) << "and action_id:" << QString::fromStdString(action_id);
--    auto activation = new ScopeActivation(result, metadata);
--
--    // if the purchase is completed, do the install
--    if (action_id == "purchaseCompleted") {
--        qDebug() << "Yay, got finished signal";
--        qDebug() << "about to get the download_url";
--        std::string download_url = metadata.scope_data().get_dict()["download_url"].get_string();
--        qDebug() << "the download url is: " << QString::fromStdString(download_url);
--        activation->setHint("download_url", unity::scopes::Variant(download_url));
--        std::string download_sha512 = metadata.scope_data().get_dict()["download_sha512"].get_string();
--        activation->setHint("download_sha512", unity::scopes::Variant(download_sha512));
--        activation->setHint("action_id", unity::scopes::Variant(click::Preview::Actions::INSTALL_CLICK));
--        activation->setHint("purchased", unity::scopes::Variant(true));
--        qDebug() << "returning ShowPreview";
--        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
--    } else if (action_id == "purchaseCancelled") {
--        qDebug() << "Purchase was cancelled, refreshing scope results.";
--        click::DownloadErrorPreview strategy{result};
--        strategy.invalidateScope(STORE_SCOPE_ID.toUtf8().data());
--    } else if (action_id == "purchaseError") {
--        activation->setHint(click::Preview::Actions::DOWNLOAD_FAILED, unity::scopes::Variant(true));
--        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
--    } else if (action_id == click::Preview::Actions::INSTALL_CLICK) {
--        qDebug() << "about to get the download_url";
--        std::string download_url = metadata.scope_data().get_dict()["download_url"].get_string();
--        qDebug() << "the download url is: " << QString::fromStdString(download_url);
--        activation->setHint("download_url", unity::scopes::Variant(download_url));
--        std::string download_sha512 = metadata.scope_data().get_dict()["download_sha512"].get_string();
--        activation->setHint("download_sha512", unity::scopes::Variant(download_sha512));
--        activation->setHint("action_id", unity::scopes::Variant(action_id));
--        qDebug() << "returning ShowPreview";
--        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
--    } else if (action_id == click::Preview::Actions::DOWNLOAD_FAILED) {
--        activation->setHint(click::Preview::Actions::DOWNLOAD_FAILED, unity::scopes::Variant(true));
--        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
--    } else if (action_id == click::Preview::Actions::DOWNLOAD_COMPLETED) {
--        activation->setHint(click::Preview::Actions::DOWNLOAD_COMPLETED, unity::scopes::Variant(true));
--        activation->setHint("installed", unity::scopes::Variant(true));
--        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
--    } else if (action_id == click::Preview::Actions::CANCEL_PURCHASE_INSTALLED) {
--        activation->setHint(click::Preview::Actions::CANCEL_PURCHASE_INSTALLED, unity::scopes::Variant(true));
--        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
--    } else if (action_id == click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED) {
--        activation->setHint(click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED, unity::scopes::Variant(true));
--        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
--    } else if (action_id == click::Preview::Actions::UNINSTALL_CLICK) {
--        activation->setHint(click::Preview::Actions::UNINSTALL_CLICK, unity::scopes::Variant(true));
--        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
--    } else if (action_id == click::Preview::Actions::SHOW_UNINSTALLED) {
--        activation->setHint(click::Preview::Actions::SHOW_UNINSTALLED, unity::scopes::Variant(true));
--        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
--    } else if (action_id == click::Preview::Actions::SHOW_INSTALLED) {
--        activation->setHint(click::Preview::Actions::SHOW_INSTALLED, unity::scopes::Variant(true));
--        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
--    } else if (action_id == click::Preview::Actions::CONFIRM_UNINSTALL) {
--        activation->setHint(click::Preview::Actions::CONFIRM_UNINSTALL, unity::scopes::Variant(true));
--        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
--    } else if (action_id == click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_UNINSTALLED) {
--        activation->setHint(click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_UNINSTALLED, unity::scopes::Variant(true));
--        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
--    } else if (action_id == click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_INSTALLED) {
--        activation->setHint(click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_INSTALLED, unity::scopes::Variant(true));
--        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
--    } else if (action_id == click::Preview::Actions::RATED) {
--        scopes::VariantMap rating_info = metadata.scope_data().get_dict();
--        // Cast to int because widget gives us double, which is wrong.
--        int rating = ((int)rating_info["rating"].get_double());
--        std::string review_text = rating_info["review"].get_string();
--
--        // We have to get the values and then set them as hints here, to be
--        // able to pass them on to the Preview, which actually makes the
--        // call to submit.
--        activation->setHint("rating", scopes::Variant(rating));
--        activation->setHint("review", scopes::Variant(review_text));
--        activation->setHint(click::Preview::Actions::RATED,
--                            scopes::Variant(true));
--        activation->setHint("widget_id", scopes::Variant(widget_id));
--        activation->setStatus(scopes::ActivationResponse::Status::ShowPreview);
--    }
--    return scopes::ActivationQueryBase::UPtr(activation);
--}
--
--#define EXPORT __attribute__ ((visibility ("default")))
--
--extern "C"
--{
--
--    EXPORT
--    unity::scopes::ScopeBase*
--    // cppcheck-suppress unusedFunction
--    UNITY_SCOPE_CREATE_FUNCTION()
--    {
--        // Set up logging
--        UbuntuOne::AuthLogger::setupLogging();
--#if ENABLE_DEBUG
--        UbuntuOne::AuthLogger::setLogLevel(QtDebugMsg);
--#else
--        const char* u1_debug = getenv("U1_DEBUG");
--        if (u1_debug != NULL && strcmp(u1_debug, "") != 0) {
--            UbuntuOne::AuthLogger::setLogLevel(QtDebugMsg);
--        }
--#endif
--
--        return new click::Scope();
--    }
--
--    EXPORT
--    void
--    // cppcheck-suppress unusedFunction
--    UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
--    {
--        delete scope_base;
--    }
--
--}
 === removed file 'scope/clickstore/store-scope.h'
 --- scope/clickstore/store-scope.h	2016-05-25 16:19:58 +0000
 +++ scope/clickstore/store-scope.h	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * In addition, as a special exception, the copyright holders give
-- * permission to link the code of portions of this program with the
-- * OpenSSL library under certain conditions as described in each
-- * individual source file, and distribute linked combinations
-- * including the two.
-- * You must obey the GNU General Public License in all respects
-- * for all of the code used other than OpenSSL.  If you modify
-- * file(s) with this exception, you may extend this exception to your
-- * version of the file(s), but you are not obligated to do so.  If you
-- * do not wish to do so, delete this exception statement from your
-- * version.  If you delete this exception statement from all source
-- * files in the program, then also delete it here.
-- */
--
--#ifndef CLICK_SCOPE_H
--#define CLICK_SCOPE_H
--
--#include <click/pay.h>
--
--#include <memory>
--#include <future>
--
--#include <click/network_access_manager.h>
--#include <click/webclient.h>
--
--#include <ubuntu/download_manager/manager.h>
--#include <unity/scopes/ScopeBase.h>
--#include <unity/scopes/QueryBase.h>
--#include <unity/scopes/ActivationQueryBase.h>
--
--#include <click/index.h>
--
--namespace scopes = unity::scopes;
--
--namespace click
--{
--
--class DepartmentLookup;
--class DepartmentsDb;
--
--class Scope : public scopes::ScopeBase
--{
--public:
--    Scope();
--    ~Scope();
--
--    virtual void start(std::string const&) override;
--
--    virtual void run() override;
--    virtual void stop() override;
--
--    virtual scopes::SearchQueryBase::UPtr search(scopes::CannedQuery const& q, scopes::SearchMetadata const& metadata) override;
--    unity::scopes::PreviewQueryBase::UPtr preview(const unity::scopes::Result&,
--            const unity::scopes::ActionMetadata&) override;
--
--    virtual unity::scopes::ActivationQueryBase::UPtr perform_action(unity::scopes::Result const& result, unity::scopes::ActionMetadata const& metadata, std::string const& widget_id, std::string const& action_id) override;
--
--private:
--    std::promise<void> qt_ready_for_search_p;
--    std::future<void> qt_ready_for_search_f;
--    std::promise<void> qt_ready_for_preview_p;
--    std::future<void> qt_ready_for_preview_f;
--    QSharedPointer<click::network::AccessManager> nam;
--    QSharedPointer<click::web::Client> client;
--    QSharedPointer<click::Index> index;
--    QSharedPointer<pay::Package> pay_package;
--    QSharedPointer<Ubuntu::DownloadManager::Manager> dm;
--    QSharedPointer<click::CredentialsService> sso;
--    std::shared_ptr<click::DepartmentLookup> depts;
--    std::shared_ptr<click::HighlightList> highlights;
--    std::shared_ptr<click::DepartmentsDb> depts_db;
--
--    std::string installApplication(unity::scopes::Result const& result);
--};
--}
--#endif // CLICK_SCOPE_H
 === modified file 'scope/tests/CMakeLists.txt'
 --- scope/tests/CMakeLists.txt	2016-07-14 18:37:27 +0000
 +++ scope/tests/CMakeLists.txt	2016-10-25 13:13:28 +0000
@@ -1,4 +1,3 @@
--set (CLICKSCOPE_TESTS_TARGET click-scope-tests)
  set (APPS_SCOPE_TESTS_TARGET apps-scope-tests)
  find_package(Threads)
@@ -17,37 +16,13 @@
    ${GMOCK_INCLUDE_DIR}
+ )
--add_executable (${CLICKSCOPE_TESTS_TARGET}
--  test_query.cpp
--  test_store_scope.cpp
--
--  ${CMAKE_SOURCE_DIR}/libclickscope/tests/fake_json.cpp
--)
--
  add_executable (${APPS_SCOPE_TESTS_TARGET}
    test_apps_query.cpp
    test_apps_scope.cpp
+ )
--qt5_use_modules(${CLICKSCOPE_TESTS_TARGET} Core DBus Network Test Sql)
  qt5_use_modules(${APPS_SCOPE_TESTS_TARGET} Core DBus Network Test Sql)
--target_link_libraries(${CLICKSCOPE_TESTS_TARGET}
--  ${STORE_LIB_UNVERSIONED}
--  ${SCOPE_LIB_NAME}
--
--  ${UNITY_SCOPES_LDFLAGS}
--  ${UBUNTUONE_LDFLAGS}
--  ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
--  ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
--  ${JSON_CPP_LDFLAGS}
--
--  gmock
--  gmock_main
--
--  ${CMAKE_THREAD_LIBS_INIT}
--)
--
  target_link_libraries(${APPS_SCOPE_TESTS_TARGET}
    ${APPS_LIB_UNVERSIONED}
    ${SCOPE_LIB_NAME}
@@ -64,25 +39,6 @@
    ${CMAKE_THREAD_LIBS_INIT}
+ )
--add_custom_target (test-click-scope
--  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${CLICKSCOPE_TESTS_TARGET}
--  DEPENDS ${CLICKSCOPE_TESTS_TARGET}
--)
--
--add_custom_target(test-click-scope-valgrind
--  COMMAND valgrind --tool=memcheck ${CMAKE_CURRENT_BINARY_DIR}/${CLICKSCOPE_TESTS_TARGET}
--  DEPENDS ${CLICKSCOPE_TESTS_TARGET}
--)
--
--add_custom_target(test-click-scope-leaks
--  COMMAND valgrind --tool=memcheck --track-origins=yes --num-callers=40 --leak-resolution=high --leak-check=full ${CMAKE_CURRENT_BINARY_DIR}/${CLICKSCOPE_TESTS_TARGET}
--  DEPENDS ${CLICKSCOPE_TESTS_TARGET}
--)
--add_custom_target (test-click-scope-disabled
--  COMMAND GTEST_ALSO_RUN_DISABLED_TESTS=1 ${CMAKE_CURRENT_BINARY_DIR}/${CLICKSCOPE_TESTS_TARGET}
--  DEPENDS ${CLICKSCOPE_TESTS_TARGET}
--)
--
  # ---
  set(TEST_SCHEMA_DIR ${CMAKE_CURRENT_BINARY_DIR})
@@ -115,6 +71,3 @@
    COMMAND GTEST_ALSO_RUN_DISABLED_TESTS=1 ${CMAKE_CURRENT_BINARY_DIR}/${APPS_SCOPE_TESTS_TARGET}
    DEPENDS ${APPS_SCOPE_TESTS_TARGET}
+ )
--
--
--add_subdirectory(fake_launcher)
 === removed directory 'scope/tests/fake_launcher'
 === removed file 'scope/tests/fake_launcher/CMakeLists.txt'
 --- scope/tests/fake_launcher/CMakeLists.txt	2015-05-20 19:58:45 +0000
 +++ scope/tests/fake_launcher/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
--set(FAKE_LAUNCHER_TARGET fake_launcher)
--
--include_directories (
--  ${CMAKE_SOURCE_DIR}/scope/click
--)
--
--add_executable (${FAKE_LAUNCHER_TARGET}
--  fake_launcher.cpp
--  fake_launcher.h
--)
--
--target_link_libraries (${FAKE_LAUNCHER_TARGET}
--  ${STORE_LIB_UNVERSIONED}
--)
 === removed file 'scope/tests/fake_launcher/fake_launcher.cpp'
 --- scope/tests/fake_launcher/fake_launcher.cpp	2014-06-18 04:39:23 +0000
 +++ scope/tests/fake_launcher/fake_launcher.cpp	1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * In addition, as a special exception, the copyright holders give
-- * permission to link the code of portions of this program with the
-- * OpenSSL library under certain conditions as described in each
-- * individual source file, and distribute linked combinations
-- * including the two.
-- * You must obey the GNU General Public License in all respects
-- * for all of the code used other than OpenSSL.  If you modify
-- * file(s) with this exception, you may extend this exception to your
-- * version of the file(s), but you are not obligated to do so.  If you
-- * do not wish to do so, delete this exception statement from your
-- * version.  If you delete this exception statement from all source
-- * files in the program, then also delete it here.
-- */
--
--#include <ubuntu/download_manager/download.h>
--#include <ubuntu/download_manager/downloads_list.h>
--#include <ubuntu/download_manager/error.h>
--
--#include <QCoreApplication>
--#include <QDBusConnection>
--#include <QDebug>
--#include <QString>
--#include <QTimer>
--#include <QTextStream>
--
--#include <iostream>
--
--#include <boost/optional.hpp>
--
--#include <fake_launcher.h>
--
--void FakeLauncher::startInstallation(QString title, QString icon_url, QString package_name)
--{
--    qDebug() << "startInstallation" << title << icon_url << package_name;
--    installations.insert(package_name, new FakeIcon(title, icon_url, this));
--    manager->getAllDownloadsWithMetadata("package_name", package_name);
--}
--
--void FakeLauncher::handleDownloadsFound(const QString& key, const QString& value, DownloadsList *download_list)
--{
--    Q_UNUSED(key)
--    Q_UNUSED(value)
--    foreach (const QSharedPointer<Download> download, download_list->downloads()) {
--        QString package_name{download->metadata()["package_name"].toString()};
--        qDebug() << "download found for" << package_name;
--        installations[package_name]->downloadFound(*download);
--    }
--}
--
--void FakeLauncher::completeInstallation(QString package_name, QString app_id)
--{
--    qDebug() << "completeInstallation" << package_name << app_id;
--    installations[package_name]->complete(app_id);
--}
--
--void FakeIcon::downloadFound(Download& download)
--{
--    connect(&download, SIGNAL(progress(qulonglong,qulonglong)), this, SLOT(handleProgress(qulonglong,qulonglong)));
--    connect(&download, SIGNAL(error(Error*)), this, SLOT(handleDownloadError(Error*)));
--    qDebug() << title << "starting installation";
--    // TODO: add icon to the launcher
--}
--
--void FakeIcon::handleProgress(qulonglong transferred, qulonglong total)
--{
--    qDebug() << title << "download progress" << double(transferred)/total*80;
--    // TODO: update progress bar
--}
--
--void FakeIcon::handleDownloadError(Error *error)
--{
--    failure(error->errorString());
--}
--
--void FakeIcon::failure(QString message)
--{
--    qDebug() << title << "installation failed" << message;
--    // TODO: remove icon from the launcher
--}
--
--void FakeIcon::complete(QString app_id)
--{
--    if (app_id.isEmpty()) {
--        failure("Failed to install");
--    } else {
--        qDebug() << title << "installation completed" << app_id;
--        // TODO: update icon with proper app_id
--    }
--}
--
--int main(int argc, char *argv[])
--{
--
--    QCoreApplication app(argc, argv);
--    FakeLauncher launcher;
--    new FakeLauncherAdaptor(&launcher);
--    qDebug() << "starting";
--    auto bus = QDBusConnection::sessionBus();
--    bus.registerObject(LAUNCHER_OBJECT_PATH, &launcher);
--    bus.registerService(LAUNCHER_BUSNAME);
--    return app.exec();
--}
--
 === removed file 'scope/tests/fake_launcher/fake_launcher.h'
 --- scope/tests/fake_launcher/fake_launcher.h	2014-06-18 04:39:23 +0000
 +++ scope/tests/fake_launcher/fake_launcher.h	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * In addition, as a special exception, the copyright holders give
-- * permission to link the code of portions of this program with the
-- * OpenSSL library under certain conditions as described in each
-- * individual source file, and distribute linked combinations
-- * including the two.
-- * You must obey the GNU General Public License in all respects
-- * for all of the code used other than OpenSSL.  If you modify
-- * file(s) with this exception, you may extend this exception to your
-- * version of the file(s), but you are not obligated to do so.  If you
-- * do not wish to do so, delete this exception statement from your
-- * version.  If you delete this exception statement from all source
-- * files in the program, then also delete it here.
-- */
--
--#ifndef _FAKE_LAUNCHER_H_
--#define _FAKE_LAUNCHER_H_
--
--#include <QObject>
--#include <QDBusObjectPath>
--#include <QDBusAbstractAdaptor>
--
--#include <click/dbus_constants.h>
--#include <ubuntu/download_manager/manager.h>
--
--class FakeIcon : public QObject {
--    Q_OBJECT
--
--public:
--    explicit FakeIcon(QString title, QString icon_url, QObject *parent=0)
--        : QObject(parent), title(title), icon_url(icon_url)
--    {
--    }
--    void downloadFound(Download& download);
--    void complete(QString app_id);
--
--private slots:
--    void handleProgress(qulonglong transferred, qulonglong total);
--    void handleDownloadError(Error* error);
--
--private:
--    Download* download;
--    QString title;
--    QString icon_url;
--    void failure(QString message);
--};
--
--class FakeLauncher : public QObject {
--    Q_OBJECT
--
--public:
--    explicit FakeLauncher(QObject *parent=0) : QObject(parent)
--    {
--        manager = Ubuntu::DownloadManager::Manager::createSessionManager();
--        connect(manager, SIGNAL(downloadsWithMetadataFound(QString,QString,DownloadsList*)),
--                this, SLOT(handleDownloadsFound(QString,QString,DownloadsList*)));
--    }
--
--public slots:
--    void startInstallation(QString title, QString icon_url, QString package_name);
--    void completeInstallation(QString package_name, QString app_id);
--
--private slots:
--    void handleDownloadsFound(const QString& key, const QString& value, DownloadsList* downloads);
--
--signals:
--
--private:
--    Ubuntu::DownloadManager::Manager* manager;
--    QMap<QString, FakeIcon*> installations;
--};
--
--
--class FakeLauncherAdaptor : public QDBusAbstractAdaptor
--{
--    Q_OBJECT
--    Q_CLASSINFO("D-Bus Interface", LAUNCHER_INTERFACE)
--
--private:
--    FakeLauncher *_launcher;
--
--public:
--    FakeLauncherAdaptor(FakeLauncher *launcher) : QDBusAbstractAdaptor(launcher), _launcher(launcher)
--    {
--    }
--
--public slots:
--    Q_NOREPLY void startInstallation(QString title, QString icon_url, QString package_name)
--    {
--        _launcher->startInstallation(title, icon_url, package_name);
--    }
--
--    Q_NOREPLY void completeInstallation(QString package_name, QString app_id)
--    {
--        _launcher->completeInstallation(package_name, app_id);
--    }
--};
--
--
--#endif /* _FAKE_LAUNCHER_H_ */
--
--
 === modified file 'scope/tests/test_query.cpp'
 --- scope/tests/test_query.cpp	2015-12-01 15:39:41 +0000
 +++ scope/tests/test_query.cpp	2016-10-25 13:13:28 +0000
@@ -27,8 +27,6 @@
   * files in the program, then also delete it here.
   */
--#include <tests/mock_pay.h>
--
  #include "clickstore/store-query.h"
  #include <string>
@@ -137,10 +135,9 @@
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
      scopes::SearchMetadata metadata("en_EN", "phone");
--    MockPayPackage pay_pkg;
      PackageSet no_installed_packages;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _)).Times(1);
      scopes::testing::MockSearchReply mock_reply;
@@ -164,10 +161,9 @@
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
      scopes::SearchMetadata metadata("en_EN", "phone");
--    MockPayPackage pay_pkg;
      PackageSet no_installed_packages;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
      scopes::CategoryRenderer renderer("{}");
@@ -195,10 +191,9 @@
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
      scopes::SearchMetadata metadata("en_EN", "phone");
--    MockPayPackage pay_pkg;
      PackageSet no_installed_packages;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
      scopes::CategoryRenderer renderer("{}");
@@ -221,10 +216,9 @@
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
      scopes::SearchMetadata metadata("en_EN", "phone");
--    MockPayPackage pay_pkg;
      PackageSet no_installed_packages;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQueryRun q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQueryRun q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      auto reply = scopes::SearchReplyProxy();
      EXPECT_CALL(q, get_installed_packages()).WillOnce(Return(no_installed_packages));
      EXPECT_CALL(q, add_available_apps(reply, no_installed_packages, _));
@@ -251,9 +245,8 @@
      };
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
--    MockPayPackage pay_pkg;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
      scopes::CategoryRenderer renderer("{}");
@@ -283,9 +276,8 @@
      };
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
--    MockPayPackage pay_pkg;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
      scopes::CategoryRenderer renderer("{}");
@@ -322,9 +314,8 @@
      };
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
--    MockPayPackage pay_pkg;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQuery q(query, mock_index, dept_lookup, depts_db, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, depts_db, highlights, metadata);
      EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
      scopes::CategoryRenderer renderer("{}");
@@ -348,9 +339,8 @@
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
--    MockPayPackage pay_pkg;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "1");
--    MockQuery q(query, mock_index, dept_lookup, depts_db, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, depts_db, highlights, metadata);
      EXPECT_CALL(mock_index, do_search(FAKE_QUERY, "1", _));
      scopes::CategoryRenderer renderer("{}");
@@ -380,9 +370,8 @@
      scopes::SearchMetadata metadata("en_EN", "phone");
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
--    MockPayPackage pay_pkg;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      PackageSet installed_packages{{"package_1", "0.1"}};
      FakeInterface fake_interface;
@@ -408,10 +397,9 @@
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
      scopes::SearchMetadata metadata("en_EN", "phone");
--    MockPayPackage pay_pkg;
      PackageSet no_installed_packages;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      q.purchased_apps.insert({"name"});
      EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
@@ -445,9 +433,8 @@
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
      scopes::SearchMetadata metadata("en_EN", "phone");
--    MockPayPackage pay_pkg;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      q.purchased_apps.insert({"name"});
      EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
@@ -481,9 +468,8 @@
      PackageSet no_installed_packages;
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
--    MockPayPackage pay_pkg;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
      scopes::CategoryRenderer renderer("{}");
@@ -513,9 +499,8 @@
      PackageSet no_installed_packages;
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
--    MockPayPackage pay_pkg;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
      scopes::CategoryRenderer renderer("{}");
@@ -546,9 +531,8 @@
      PackageSet no_installed_packages;
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
--    MockPayPackage pay_pkg;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
      scopes::CategoryRenderer renderer("{}");
@@ -581,9 +565,8 @@
      PackageSet no_installed_packages;
      DepartmentLookup dept_lookup;
      HighlightList highlights;
--    MockPayPackage pay_pkg;
      const unity::scopes::CannedQuery query("foo.scope", "", "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      scopes::CategoryRenderer renderer("{}");
      auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
@@ -613,9 +596,8 @@
      PackageSet no_installed_packages;
      DepartmentLookup dept_lookup;
      HighlightList highlights;
--    MockPayPackage pay_pkg;
      const unity::scopes::CannedQuery query("foo.scope", "", "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      scopes::CategoryRenderer renderer("{}");
      auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
@@ -642,9 +624,8 @@
      PackageSet no_installed_packages;
      click::DepartmentLookup dept_lookup;
      click::HighlightList highlights;
--    MockPayPackage pay_pkg;
      const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
--    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
++    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata);
      EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
      scopes::CategoryRenderer renderer("{}");
 === removed file 'scope/tests/test_store_scope.cpp'
 --- scope/tests/test_store_scope.cpp	2015-11-24 18:23:23 +0000
 +++ scope/tests/test_store_scope.cpp	1970-01-01 00:00:00 +0000
@@ -1,178 +0,0 @@
--/*
-- * Copyright (C) 2014-2015 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * In addition, as a special exception, the copyright holders give
-- * permission to link the code of portions of this program with the
-- * OpenSSL library under certain conditions as described in each
-- * individual source file, and distribute linked combinations
-- * including the two.
-- * You must obey the GNU General Public License in all respects
-- * for all of the code used other than OpenSSL.  If you modify
-- * file(s) with this exception, you may extend this exception to your
-- * version of the file(s), but you are not obligated to do so.  If you
-- * do not wish to do so, delete this exception statement from your
-- * version.  If you delete this exception statement from all source
-- * files in the program, then also delete it here.
-- */
--
--#include <gtest/gtest.h>
--#include <gmock/gmock.h>
--
--#include <unity/scopes/testing/Result.h>
--
--#include <click/preview.h>
--#include <clickstore/store-scope.h>
--
--using namespace ::testing;
--
--class StoreScopeTest : public Test {
--protected:
--    const std::string FAKE_SHA512 = "FAKE_SHA512";
--    click::Scope scope;
--    unity::scopes::testing::Result result;
--    unity::scopes::ActionMetadata metadata;
--    unity::scopes::VariantMap metadict;
--
--public:
--    StoreScopeTest() : metadata("en_EN", "phone") {
--        metadict["download_url"] = "fake_download_url";
--        metadict["download_sha512"] = FAKE_SHA512;
--        metadict["rating"] = unity::scopes::Variant(4.0f);
--        metadict["review"] = "This is a review.";
--        metadata.set_scope_data(unity::scopes::Variant(metadict));
--    }
--};
--
--TEST_F(StoreScopeTest, testPurchaseCompletedPassesHash)
--{
--    auto activation = scope.perform_action(result, metadata, "widget_id",
--                                           "purchaseCompleted");
--    auto response = activation->activate();
--    EXPECT_EQ(FAKE_SHA512, response.scope_data().get_dict()["download_sha512"].get_string());
--    EXPECT_TRUE(response.scope_data().get_dict()["purchased"].get_bool());
--}
--
--TEST_F(StoreScopeTest, testPurchaseError)
--{
--    auto activation = scope.perform_action(result, metadata, "widget_id",
--                                           "purchaseError");
--    auto response = activation->activate();
--    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::DOWNLOAD_FAILED].get_bool());
--}
--
--TEST_F(StoreScopeTest, testInstallClickPassesHash)
--{
--    auto activation = scope.perform_action(result, metadata, "widget_id",
--                                           click::Preview::Actions::INSTALL_CLICK);
--    auto response = activation->activate();
--    EXPECT_EQ(FAKE_SHA512, response.scope_data().get_dict()["download_sha512"].get_string());
--}
--
--TEST_F(StoreScopeTest, testDownloadFailed)
--{
--    auto activation = scope.perform_action(result, metadata, "widget_id",
--                                           click::Preview::Actions::DOWNLOAD_FAILED);
--    auto response = activation->activate();
--    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::DOWNLOAD_FAILED].get_bool());
--}
--
--TEST_F(StoreScopeTest, testDownloadCompleted)
--{
--    auto activation = scope.perform_action(result, metadata, "widget_id",
--                                           click::Preview::Actions::DOWNLOAD_COMPLETED);
--    auto response = activation->activate();
--    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::DOWNLOAD_COMPLETED].get_bool());
--    EXPECT_TRUE(response.scope_data().get_dict()["installed"].get_bool());
--}
--
--TEST_F(StoreScopeTest, testCancelPurchaseInstalled)
--{
--    auto activation = scope.perform_action(result, metadata, "widget_id",
--                                           click::Preview::Actions::CANCEL_PURCHASE_INSTALLED);
--    auto response = activation->activate();
--    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::CANCEL_PURCHASE_INSTALLED].get_bool());
--}
--
--TEST_F(StoreScopeTest, testCancelPurchaseUninstalled)
--{
--    auto activation = scope.perform_action(result, metadata, "widget_id",
--                                           click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED);
--    auto response = activation->activate();
--    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED].get_bool());
--}
--
--TEST_F(StoreScopeTest, testUninstallClick)
--{
--    auto activation = scope.perform_action(result, metadata, "widget_id",
--                                           click::Preview::Actions::UNINSTALL_CLICK);
--    auto response = activation->activate();
--    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::UNINSTALL_CLICK].get_bool());
--}
--
--TEST_F(StoreScopeTest, testShowUninstalled)
--{
--    auto activation = scope.perform_action(result, metadata, "widget_id",
--                                           click::Preview::Actions::SHOW_UNINSTALLED);
--    auto response = activation->activate();
--    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::SHOW_UNINSTALLED].get_bool());
--}
--
--TEST_F(StoreScopeTest, testShowInstalled)
--{
--    auto activation = scope.perform_action(result, metadata, "widget_id",
--                                           click::Preview::Actions::SHOW_INSTALLED);
--    auto response = activation->activate();
--    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::SHOW_INSTALLED].get_bool());
--}
--
--TEST_F(StoreScopeTest, testConfirmUninstall)
--{
--    auto activation = scope.perform_action(result, metadata, "widget_id",
--                                           click::Preview::Actions::CONFIRM_UNINSTALL);
--    auto response = activation->activate();
--    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::CONFIRM_UNINSTALL].get_bool());
--}
--
--TEST_F(StoreScopeTest, testConfirmCancelPurchaseUninstalled)
--{
--    auto activation = scope.perform_action(result, metadata, "widget_id",
--                                           click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_UNINSTALLED);
--    auto response = activation->activate();
--    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_UNINSTALLED].get_bool());
--}
--
--TEST_F(StoreScopeTest, testConfirmCancelPurcahseInstalled)
--{
--    auto activation = scope.perform_action(result, metadata, "widget_id",
--                                           click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_INSTALLED);
--    auto response = activation->activate();
--    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_INSTALLED].get_bool());
--}
--
--TEST_F(StoreScopeTest, testStoreScopeRatingNew)
--{
--    auto activation = scope.perform_action(result, metadata, "rating",
--                                           click::Preview::Actions::RATED);
--    auto response = activation->activate();
--    EXPECT_EQ("rating", response.scope_data().get_dict()["widget_id"].get_string());
--}
--
--TEST_F(StoreScopeTest, testStoreScopeRatingEdit)
--{
--    auto activation = scope.perform_action(result, metadata, "93345",
--                                           click::Preview::Actions::RATED);
--    auto response = activation->activate();
--    EXPECT_EQ("93345", response.scope_data().get_dict()["widget_id"].get_string());
--}

unity-scope-click

Merge lp:~dobey/unity-scope-click/rm-store-pay into lp:unity-scope-click

Commit message

Description of the change

Preview Diff

Subscribers