Merge lp:~alecu/unity-scope-click/sequential-install-uninstall into lp:unity-scope-click

[Alejandro J. Cura]

Put the store version in the result, to be used if uninstalling just after installing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:307
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/564/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/414
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/464
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/464/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:308
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/565/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/416
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/471
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/471/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'libclickscope/click/package.cpp'
--- libclickscope/click/package.cpp	2014-09-30 23:33:40 +0000
+++ libclickscope/click/package.cpp	2015-01-20 17:05:11 +0000
@@ -93,6 +93,7 @@
     p.content = item[Package::JsonKeys::content].asString();
     p.publisher = item[Package::JsonKeys::publisher].asString();
     p.rating = item[Package::JsonKeys::rating].asDouble();
+    p.version = item[Package::JsonKeys::version].asString();
     return p;
 }
 

=== modified file 'libclickscope/click/package.h'
--- libclickscope/click/package.h	2014-09-30 21:17:53 +0000
+++ libclickscope/click/package.h	2015-01-20 17:05:11 +0000
@@ -63,6 +63,7 @@
         constexpr static const char* content{"content"};
         constexpr static const char* publisher{"publisher"};
         constexpr static const char* rating{"ratings_average"};
+        constexpr static const char* version{"version"};
 
         // NOTE: The "price" field is deprecated in favor of "prices"
         constexpr static const char* prices{"prices"};

=== modified file 'libclickscope/tests/fake_json.cpp'
--- libclickscope/tests/fake_json.cpp	2014-10-07 13:37:51 +0000
+++ libclickscope/tests/fake_json.cpp	2015-01-20 17:05:11 +0000
@@ -56,6 +56,7 @@
                 {
                     "name": "org.example.awesomelauncher",
                     "title": "Awesome Launcher",
+                    "version": "0.83b",
                     "description": "This is an awesome launcher.",
                     "price": 1.99,
                     "icon_url": "http://software-center.ubuntu.com/site_media/appmedia/2012/09/SPAZ.png",

=== modified file 'libclickscope/tests/test_package.cpp'
--- libclickscope/tests/test_package.cpp	2014-09-30 23:33:40 +0000
+++ libclickscope/tests/test_package.cpp	2015-01-20 17:05:11 +0000
@@ -95,6 +95,17 @@
     ASSERT_EQ(3, pl[0].prices.size());
 }
 
+TEST_F(PackageTest, testPackageParsesVersion)
+{
+    Json::Value root;
+    Json::Reader().parse(FAKE_JSON_SEARCH_RESULT_ONE, root);
+    auto const embedded = root[Package::JsonKeys::embedded];
+    auto const ci_package = embedded[Package::JsonKeys::ci_package];
+
+    Packages pl = package_list_from_json_node(ci_package);
+    ASSERT_EQ("0.83b", pl[0].version);
+}
+
 TEST_F(PackageTest, testPackageDetailsParsesMultiplePrices)
 {
     auto details = PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS);

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-12-04 11:53:36 +0000
+++ scope/clickstore/store-query.cpp	2015-01-20 17:05:11 +0000
@@ -305,6 +305,7 @@
             cur_price = pkg.price;
         }
         res["price"] = scopes::Variant(cur_price);
+        res[click::Query::ResultKeys::VERSION] = pkg.version;
 
         if (cur_price > 0.00f) {
             if (!Configuration::get_purchases_enabled()) {

=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2014-11-17 16:20:57 +0000
+++ scope/tests/test_query.cpp	2015-01-20 17:05:11 +0000
@@ -600,3 +600,33 @@
     ASSERT_EQ(unsetenv(Configuration::CURRENCY_ENVVAR), 0);
     ASSERT_EQ(unsetenv(Configuration::PURCHASES_ENVVAR), 0);
 }
+
+MATCHER_P(HasVersion, v, "") { return arg[click::Query::ResultKeys::VERSION].get_string() == v; }
+
+TEST(QueryTest, testPushPackagePushesVersion)
+{
+    auto const fake_version = "0.83b";
+    click::Packages packages {
+        {"org.example.app1", "app title1", 0.0, "icon", "uri", fake_version, "scope"},
+    };
+    MockIndex mock_index(packages);
+    scopes::SearchMetadata metadata("en_EN", "phone");
+    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);
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+
+    scopes::CategoryRenderer renderer("{}");
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+    EXPECT_CALL(q, register_category(_, _, _, _, _)).Times(2).WillRepeatedly(Return(ptrCat));
+
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+    EXPECT_CALL(q, push_result(_, HasVersion(fake_version)));
+    EXPECT_CALL(q, finished(_)).Times(1);
+    q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
+}
+