Merge lp:~dobey/unity-scope-click/check-purchased into lp:unity-scope-click/devel

[dobey]

Check for already purchased apps in search results in the store scope.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/208/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/183/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/182/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/182/console

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

review: Needs Fixing (continuous-integration)

[lp:~dobey/unity-scope-click/check-purchased]

329. By dobey on 2014-07-16

Merge tip of devel branch.
Move mock pay code to mock_pay.h.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:329
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/209/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/184/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/183/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/183/console

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

review: Needs Fixing (continuous-integration)

[Alejandro J. Cura (alecu)]

Jenkins is crashing on this test:
QueryTest.testAddAvailableAppsCallsClickIndex

it seems to need some extra mocking in the bootstrap code.

review: Needs Fixing

[Alejandro J. Cura (alecu)]

Please check in the test that the values for these keys are the expected ones:

            res[click::Query::ResultKeys::PURCHASED] = true;
            res[click::Query::ResultKeys::INSTALLED] = false;
            res["subtitle"] = _("✔ PURCHASED");

To do this, the Property matcher used in line 682 of the diff should be replaced by a custom matcher, like used in some other tests in our codebase.

---

I couldn't find any unit test for pay.cpp. Perhaps you forgot to bzr add some test file?

review: Needs Fixing

[lp:~dobey/unity-scope-click/check-purchased]

330. By dobey on 2014-07-17

Refactor to avoid dbus in tests.

331. By dobey on 2014-07-17

Add direct tests for pay::Package.

332. By dobey on 2014-07-17

Add more tests to verify that purchased/installed flags are correctly set.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/215/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/189
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/189/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/189/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:332
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/216/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/190
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/190/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/190

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

review: Approve (continuous-integration)

[lp:~dobey/unity-scope-click/check-purchased]

333. By dobey on 2014-07-17

Add pay-service as a binary dep now that we're using libpay.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:333
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/219/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/193
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/193/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/193

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

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good now, thanks for adding moar testz!

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-07-11 21:56:59 +0000
+++ debian/control	2014-07-17 20:26:32 +0000
@@ -9,6 +9,7 @@
                libboost-locale-dev,
                libglib2.0-dev (>= 2.32),
                libjsoncpp-dev,
+               libpay1-dev,
                libubuntu-download-manager-client-dev (>= 0.3+14.10.20140430-0ubuntu1),
                libubuntu-download-manager-common-dev (>= 0.3+14.10.20140430-0ubuntu1),
                libubuntuoneauth-2.0-dev,
@@ -27,6 +28,7 @@
 Architecture: armhf i386 amd64
 Depends: account-plugin-ubuntuone,
          packagekit-tools,
+         pay-service,
          ubuntu-app-launch-tools,
          ubuntu-download-manager,
          ubuntu-sdk-libs,

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-07-14 15:35:10 +0000
+++ libclickscope/click/preview.cpp	2014-07-17 20:26:32 +0000
@@ -761,7 +761,8 @@
 scopes::PreviewWidgetList UninstalledPreview::uninstalledActionButtonWidgets(const PackageDetails &details)
 {
     scopes::PreviewWidgetList widgets;
-    if (details.package.price > double(0.00)) {
+    if (details.package.price > double(0.00)
+        && result["purchased"].get_bool() == false) {
         scopes::PreviewWidget payments("purchase", "payments");
         scopes::VariantMap tuple;
         tuple["currency"] = "$";

=== modified file 'scope/clickstore/CMakeLists.txt'
--- scope/clickstore/CMakeLists.txt	2014-07-02 15:24:07 +0000
+++ scope/clickstore/CMakeLists.txt	2014-07-17 20:26:32 +0000
@@ -3,6 +3,7 @@
 find_package (Qt5Core REQUIRED)
 find_package (Qt5Sql REQUIRED)
 pkg_check_modules(JSON_CPP REQUIRED jsoncpp)
+pkg_check_modules(LIBPAY REQUIRED pay-1)
 
 add_definitions(
   -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
@@ -10,6 +11,7 @@
 )
 
 add_library(${STORE_LIB_UNVERSIONED} SHARED
+  pay.cpp
   store-query.cpp
   store-scope.cpp
 )
@@ -18,6 +20,7 @@
 include_directories(
   ${CMAKE_SOURCE_DIR}/libclickscope
   ${JSON_CPP_INCLUDE_DIRS}
+  ${LIBPAY_INCLUDE_DIRS}
 )
 
 qt5_use_modules (${STORE_LIB_UNVERSIONED} Network Sql)
@@ -27,6 +30,7 @@
   ${JSON_CPP_LDFLAGS}
   ${UNITY_SCOPES_LDFLAGS}
   ${UBUNTUONE_LDFLAGS}
+  ${LIBPAY_LDFLAGS}
   ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
   ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
 )

=== added file 'scope/clickstore/pay.cpp'
--- scope/clickstore/pay.cpp	1970-01-01 00:00:00 +0000
+++ scope/clickstore/pay.cpp	2014-07-17 20:26:32 +0000
@@ -0,0 +1,150 @@
+/*
+ * 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 <glib.h>
+#include <libpay/pay-package.h>
+
+#include <QDebug>
+
+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);
+    if (p->callbacks.count(item_id) == 0) {
+        // Do nothing if we don't have a callback registered.
+        return;
+    }
+
+    switch (status) {
+    case PAY_PACKAGE_ITEM_STATUS_PURCHASED:
+        p->callbacks[item_id](item_id, true);
+        break;
+    case PAY_PACKAGE_ITEM_STATUS_NOT_PURCHASED:
+        p->callbacks[item_id](item_id, false);
+        break;
+    default:
+        break;
+    }
+}
+
+
+namespace pay {
+
+Package::Package() :
+    impl(new Private())
+{
+}
+
+Package::~Package()
+{
+    if (running) {
+        pay_package_item_observer_uninstall(impl->pay_package,
+                                            pay_verification_observer,
+                                            this);
+        pay_package_delete(impl->pay_package);
+    }
+}
+
+bool Package::verify(const std::string& pkg_name)
+{
+    typedef std::pair<std::string, bool> _PurchasedTuple;
+    std::promise<_PurchasedTuple> purchased_promise;
+    std::future<_PurchasedTuple> purchased_future = purchased_promise.get_future();
+    _PurchasedTuple result;
+
+    if (callbacks.count(pkg_name) == 0) {
+        callbacks[pkg_name] = [pkg_name,
+                               &purchased_promise](const std::string& item_id,
+                                                   bool purchased) {
+            if (item_id == pkg_name) {
+                _PurchasedTuple found_purchase{item_id, purchased};
+                try {
+                    purchased_promise.set_value(found_purchase);
+                } 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 = purchased_future.get();
+
+        callbacks.erase(pkg_name);
+
+        return result.second;
+    }
+    return false;
+}
+
+void Package::setup_pay_service()
+{
+    impl->pay_package = pay_package_new(Package::NAME);
+    pay_package_item_observer_install(impl->pay_package,
+                                      pay_verification_observer,
+                                      this);
+    running = true;
+}
+
+void Package::pay_package_verify(const std::string& pkg_name)
+{
+    if (!running) {
+        setup_pay_service();
+    }
+
+    if (callbacks.count(pkg_name) == 0) {
+        return;
+    }
+
+    pay_package_item_start_verification(impl->pay_package, pkg_name.c_str());
+}
+
+} // namespace pay

=== added file 'scope/clickstore/pay.h'
--- scope/clickstore/pay.h	1970-01-01 00:00:00 +0000
+++ scope/clickstore/pay.h	2014-07-17 20:26:32 +0000
@@ -0,0 +1,67 @@
+/*
+ * 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 <map>
+#include <memory>
+
+
+namespace pay
+{
+    class Package
+    {
+    public:
+        typedef std::function<void(const std::string& item_id,
+                                   bool status)> StatusFunction;
+
+        constexpr static const char* NAME{"click-scope"};
+
+        Package();
+        virtual ~Package();
+
+        virtual bool verify(const std::string& pkg_name);
+
+    protected:
+        virtual void setup_pay_service();
+        virtual void pay_package_verify(const std::string& pkg_name);
+
+    private:
+        struct Private;
+        std::shared_ptr<pay::Package::Private> impl;
+
+        bool running = false;
+    public:
+        std::map<std::string, StatusFunction> callbacks;
+    };
+
+} //namespace pay
+
+#endif // _PAY_H_

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-07-14 08:49:39 +0000
+++ scope/clickstore/store-query.cpp	2014-07-17 20:26:32 +0000
@@ -27,15 +27,15 @@
  * 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 "store-query.h"
-#include "store-scope.h"
+#include <click/key_file_locator.h>
 #include <click/qtbridge.h>
 #include <click/departments-db.h>
 
-#include <click/key_file_locator.h>
-
 #include <unity/scopes/Annotation.h>
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/CategorisedResult.h>
@@ -116,12 +116,15 @@
 {
     Private(click::Index& index, click::DepartmentLookup& depts,
             std::shared_ptr<click::DepartmentsDb> depts_db,
-            click::HighlightList& highlights, const scopes::SearchMetadata& metadata)
+            click::HighlightList& highlights,
+            const scopes::SearchMetadata& metadata,
+            pay::Package& in_package)
         : index(index),
           department_lookup(depts),
           depts_db(depts_db),
           highlights(highlights),
-          meta(metadata)
+          meta(metadata),
+          pay_package(in_package)
     {
     }
     click::Index& index;
@@ -130,14 +133,18 @@
     click::HighlightList& highlights;
     scopes::SearchMetadata meta;
     click::web::Cancellable search_operation;
+    pay::Package& pay_package;
 };
 
-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)
+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)
     : unity::scopes::SearchQueryBase(query, metadata),
-      impl(new Private(index, depts, depts_db, highlights, metadata))
+      impl(new Private(index, depts, depts_db, highlights, metadata, in_package))
 {
 }
 
@@ -264,12 +271,24 @@
         res.set_uri(pkg.url);
         res[click::Query::ResultKeys::NAME] = pkg.name;
         auto installed = installedPackages.find(pkg);
+
+        bool purchased = false;
+        if (pkg.price > 0.00f) {
+            // Check if the priced app was already purchased.
+            purchased = impl->pay_package.verify(pkg.name);
+        }
         if (installed != installedPackages.end()) {
             res[click::Query::ResultKeys::INSTALLED] = true;
+            res[click::Query::ResultKeys::PURCHASED] = purchased;
             res["subtitle"] = _("✔ INSTALLED");
             res[click::Query::ResultKeys::VERSION] = installed->version;
+        } else if (purchased) {
+            res[click::Query::ResultKeys::PURCHASED] = true;
+            res[click::Query::ResultKeys::INSTALLED] = false;
+            res["subtitle"] = _("✔ PURCHASED");
         } else {
             res[click::Query::ResultKeys::INSTALLED] = false;
+            res[click::Query::ResultKeys::PURCHASED] = false;
             res["subtitle"] = _("FREE");
             // TODO: get the real price from the webservice (upcoming branch)
         }

=== modified file 'scope/clickstore/store-query.h'
--- scope/clickstore/store-query.h	2014-07-02 15:24:07 +0000
+++ scope/clickstore/store-query.h	2014-07-17 20:26:32 +0000
@@ -30,6 +30,7 @@
 #ifndef STORE_QUERY_H
 #define STORE_QUERY_H
 
+#include "pay.h"
 
 #include <unity/scopes/SearchQueryBase.h>
 #include <unity/scopes/Department.h>
@@ -55,16 +56,6 @@
 class Query : public scopes::SearchQueryBase
 {
 public:
-    struct JsonKeys
-    {
-        JsonKeys() = delete;
-
-        constexpr static const char* RESOURCE_URL{"resource_url"};
-        constexpr static const char* TITLE{"title"};
-        constexpr static const char* ICON_URL{"icon_url"};
-        constexpr static const char* NAME{"name"};
-    };
-
     struct ResultKeys
     {
         ResultKeys() = delete;
@@ -73,12 +64,18 @@
         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* DOWNLOAD_URL{"download_url"};
         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);
+    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);
     virtual ~Query();
 
     virtual void cancelled() override;

=== modified file 'scope/clickstore/store-scope.cpp'
--- scope/clickstore/store-scope.cpp	2014-07-02 15:24:07 +0000
+++ scope/clickstore/store-scope.cpp	2014-07-17 20:26:32 +0000
@@ -54,6 +54,8 @@
     index.reset(new click::Index(client));
     depts.reset(new click::DepartmentLookup());
     highlights.reset(new click::HighlightList());
+    pay_package.reset(new pay::Package());
+
     try
     {
         depts_db = click::DepartmentsDb::create_db();
@@ -104,7 +106,7 @@
 
 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));
+    return scopes::SearchQueryBase::UPtr(new click::Query(q, *index, *depts, depts_db, *highlights, metadata, *pay_package));
 }
 
 

=== modified file 'scope/clickstore/store-scope.h'
--- scope/clickstore/store-scope.h	2014-07-02 15:24:07 +0000
+++ scope/clickstore/store-scope.h	2014-07-17 20:26:32 +0000
@@ -30,6 +30,8 @@
 #ifndef CLICK_SCOPE_H
 #define CLICK_SCOPE_H
 
+#include "pay.h"
+
 #include <memory>
 #include <click/network_access_manager.h>
 #include <click/webclient.h>
@@ -75,6 +77,7 @@
     std::shared_ptr<click::DepartmentLookup> depts;
     std::shared_ptr<click::HighlightList> highlights;
     std::shared_ptr<click::DepartmentsDb> depts_db;
+    std::shared_ptr<pay::Package> pay_package;
 
     std::string installApplication(unity::scopes::Result const& result);
     static bool old_api;

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-07-10 07:51:36 +0000
+++ scope/tests/CMakeLists.txt	2014-07-17 20:26:32 +0000
@@ -18,6 +18,7 @@
 )
 
 add_executable (${CLICKSCOPE_TESTS_TARGET}
+  test_pay.cpp
   test_query.cpp
 )
 

=== added file 'scope/tests/mock_pay.h'
--- scope/tests/mock_pay.h	1970-01-01 00:00:00 +0000
+++ scope/tests/mock_pay.h	2014-07-17 20:26:32 +0000
@@ -0,0 +1,57 @@
+/*
+ * 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 "clickstore/pay.h"
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+
+namespace
+{
+
+    class MockPayPackage : public pay::Package {
+    public:
+        MockPayPackage()
+        {
+        }
+
+        void pay_package_verify(const std::string& pkg_name)
+        {
+            callbacks[pkg_name](pkg_name, purchased);
+            do_pay_package_verify(pkg_name);
+        }
+
+        MOCK_METHOD0(setup_pay_service, void());
+        MOCK_METHOD1(do_pay_package_verify, void(const std::string&));
+
+        bool purchased = false;
+};
+
+} // namespace

=== added file 'scope/tests/test_pay.cpp'
--- scope/tests/test_pay.cpp	1970-01-01 00:00:00 +0000
+++ scope/tests/test_pay.cpp	2014-07-17 20:26:32 +0000
@@ -0,0 +1,56 @@
+/*
+ * 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 <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+
+TEST(PayTest, testPayPackageVerifyCalled)
+{
+    MockPayPackage package;
+    EXPECT_CALL(package, do_pay_package_verify("foo")).Times(1);
+    EXPECT_EQ(false, package.verify("foo"));
+}
+
+TEST(PayTest, testPayPackageVerifyNotCalledIfCallbackExists)
+{
+    MockPayPackage package;
+    package.callbacks["foo"] = [](const std::string&, bool) {};
+    EXPECT_CALL(package, do_pay_package_verify("foo")).Times(0);
+    EXPECT_EQ(false, package.verify("foo"));
+}
+
+TEST(PayTest, testVerifyReturnsTrueForPurchasedItem)
+{
+    MockPayPackage package;
+    package.purchased = true;
+    EXPECT_EQ(true, package.verify("foo"));
+}

=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2014-07-16 11:53:51 +0000
+++ scope/tests/test_query.cpp	2014-07-17 20:26:32 +0000
@@ -27,6 +27,10 @@
  * files in the program, then also delete it here.
  */
 
+#include "mock_pay.h"
+
+#include "clickstore/store-query.h"
+
 #include <string>
 #include <memory>
 
@@ -34,6 +38,7 @@
 #include <gmock/gmock.h>
 
 #include "click/qtbridge.h"
+#include "click/index.h"
 #include "clickstore/store-query.h"
 #include "click/application.h"
 #include "click/departments-db.h"
@@ -61,9 +66,10 @@
                   click::DepartmentLookup& depts,
                   std::shared_ptr<click::DepartmentsDb> depts_db,
                   click::HighlightList& highlights,
-                  scopes::SearchMetadata const& metadata) : click::Query(query, index, depts, depts_db, highlights, metadata)
+                  scopes::SearchMetadata const& metadata,
+                  pay::Package& in_package) :
+        click::Query(query, index, depts, depts_db, highlights, metadata, in_package)
     {
-
     }
 
     void run_under_qt(const std::function<void()> &task) {
@@ -78,9 +84,10 @@
               click::DepartmentLookup& depts,
               std::shared_ptr<click::DepartmentsDb> depts_db,
               click::HighlightList& highlights,
-              scopes::SearchMetadata const& metadata) : MockQueryBase(query, index, depts, depts_db, highlights, metadata)
+              scopes::SearchMetadata const& metadata,
+              pay::Package& in_package) :
+        MockQueryBase(query, index, depts, depts_db, highlights, metadata, in_package)
     {
-
     }
     void wrap_add_available_apps(const scopes::SearchReplyProxy &searchReply,
                                  const PackageSet &installedPackages,
@@ -105,9 +112,10 @@
                  click::DepartmentLookup& depts,
                  std::shared_ptr<click::DepartmentsDb> depts_db,
                  click::HighlightList& highlights,
-                 scopes::SearchMetadata const& metadata) : MockQueryBase(query, index, depts, depts_db, highlights, metadata)
+                 scopes::SearchMetadata const& metadata,
+                 pay::Package& in_package) :
+        MockQueryBase(query, index, depts, depts_db, highlights, metadata, in_package)
     {
-
     }
     MOCK_METHOD3(add_available_apps,
                  void(scopes::SearchReplyProxy const&searchReply,
@@ -126,9 +134,10 @@
     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);
+    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
     EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)).Times(1);
 
     scopes::testing::MockSearchReply mock_reply;
@@ -151,9 +160,10 @@
     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);
+    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
     EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
 
     scopes::CategoryRenderer renderer("{}");
@@ -180,9 +190,10 @@
     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);
+    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
     EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
 
     scopes::CategoryRenderer renderer("{}");
@@ -204,9 +215,10 @@
     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);
+    MockQueryRun q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
     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, _));
@@ -230,8 +242,9 @@
     };
     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);
+    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
     EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
 
     scopes::CategoryRenderer renderer("{}");
@@ -260,8 +273,9 @@
     };
     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);
+    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
     EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
 
     scopes::CategoryRenderer renderer("{}");
@@ -295,8 +309,9 @@
     };
     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);
+    MockQuery q(query, mock_index, dept_lookup, depts_db, highlights, metadata, pay_pkg);
     EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
 
     scopes::CategoryRenderer renderer("{}");
@@ -323,8 +338,9 @@
     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);
+    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
     PackageSet installed_packages{{"package_1", "0.1"}};
 
     FakeInterface fake_interface;
@@ -336,3 +352,106 @@
 
     ASSERT_EQ(q.get_installed_packages(), installed_packages);
 }
+
+typedef std::pair<bool, bool> _PurchasedValues;
+MATCHER_P(PurchasedProperties, b, "") { return arg[click::Query::ResultKeys::PURCHASED].get_bool() == b.first && arg[click::Query::ResultKeys::INSTALLED].get_bool() == b.second; }
+
+TEST(QueryTest, testQueryRunCallsPayPackageVerify)
+{
+    click::Packages packages {
+        {"name", "title", 0.99, "icon", "uri"}
+    };
+    MockIndex mock_index(packages);
+    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);
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+
+    scopes::CategoryRenderer renderer("{}");
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+
+    ON_CALL(q, register_category(_, _, _, _, _)).WillByDefault(Return(ptrCat));
+    EXPECT_CALL(q, register_category(_, "appstore", CategoryHasNumberOfResults(1), _, _));
+    EXPECT_CALL(q, register_category(_, "recommends", _, _, _));
+
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+
+    EXPECT_CALL(pay_pkg, do_pay_package_verify(_)).Times(1);
+    EXPECT_CALL(q, push_result(_, PurchasedProperties(_PurchasedValues{false, false}))).Times(1);
+    EXPECT_CALL(q, finished(_));
+
+    q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
+}
+
+TEST(QueryTest, testQueryRunPurchased)
+{
+    click::Packages packages {
+        {"name", "title", 0.99, "icon", "uri"}
+    };
+    MockIndex mock_index(packages);
+    click::DepartmentLookup dept_lookup;
+    click::HighlightList highlights;
+    scopes::SearchMetadata metadata("en_EN", "phone");
+    MockPayPackage pay_pkg;
+    pay_pkg.purchased = true;
+    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);
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+
+    scopes::CategoryRenderer renderer("{}");
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+
+    ON_CALL(q, register_category(_, _, _, _, _)).WillByDefault(Return(ptrCat));
+    EXPECT_CALL(q, register_category(_, "appstore", CategoryHasNumberOfResults(1), _, _));
+    EXPECT_CALL(q, register_category(_, "recommends", _, _, _));
+
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+
+    EXPECT_CALL(pay_pkg, do_pay_package_verify(_)).Times(1);
+    EXPECT_CALL(q, push_result(_, PurchasedProperties(_PurchasedValues{true, false}))).Times(1);
+    EXPECT_CALL(q, finished(_));
+
+    q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
+}
+
+TEST(QueryTest, testQueryRunPurchasedAndInstalled)
+{
+    click::Packages packages {
+        {"name", "title", 0.99, "icon", "uri"}
+    };
+    PackageSet one_installed_package {
+        {"name", "0.2"}
+    };
+    MockIndex mock_index(packages);
+    click::DepartmentLookup dept_lookup;
+    click::HighlightList highlights;
+    scopes::SearchMetadata metadata("en_EN", "phone");
+    MockPayPackage pay_pkg;
+    pay_pkg.purchased = true;
+    const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
+    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+
+    scopes::CategoryRenderer renderer("{}");
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+
+    ON_CALL(q, register_category(_, _, _, _, _)).WillByDefault(Return(ptrCat));
+    EXPECT_CALL(q, register_category(_, "appstore", CategoryHasNumberOfResults(1), _, _));
+    EXPECT_CALL(q, register_category(_, "recommends", _, _, _));
+
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+
+    EXPECT_CALL(pay_pkg, do_pay_package_verify(_)).Times(1);
+    EXPECT_CALL(q, push_result(_, PurchasedProperties(_PurchasedValues{true, true}))).Times(1);
+    EXPECT_CALL(q, finished(_));
+
+    q.wrap_add_available_apps(reply, one_installed_package, FAKE_CATEGORY_TEMPLATE);
+}