Merge lp:~dobey/unity-scope-click/rate-widget-id into lp:unity-scope-click/touch-15-04

[dobey]

Add missing setting of widget_id when rating from store scope.
Add tests.

[Kyle Fazzari (kyrofa)]

Looks good to me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/unity-scope-click-touch-15-04-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-touch-15-04-vivid-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-touch-15-04-vivid-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-touch-15-04-vivid-armhf-ci/9/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'scope/clickstore/store-scope.cpp'
--- scope/clickstore/store-scope.cpp	2015-07-07 02:48:20 +0000
+++ scope/clickstore/store-scope.cpp	2015-08-17 17:53:00 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * 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
@@ -184,6 +184,7 @@
         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);

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2015-04-14 20:43:12 +0000
+++ scope/tests/CMakeLists.txt	2015-08-17 17:53:00 +0000
@@ -26,6 +26,7 @@
 
 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)

=== added file 'scope/tests/test_apps_scope.cpp'
--- scope/tests/test_apps_scope.cpp	1970-01-01 00:00:00 +0000
+++ scope/tests/test_apps_scope.cpp	2015-08-17 17:53:00 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 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 <clickapps/apps-scope.h>
+
+using namespace ::testing;
+
+class AppsScopeTest : public Test {
+protected:
+    click::Scope scope;
+    unity::scopes::testing::Result result;
+    unity::scopes::ActionMetadata metadata;
+    unity::scopes::VariantMap metadict;
+
+public:
+    AppsScopeTest() : metadata("en_EN", "phone") {
+        metadict["rating"] = unity::scopes::Variant(4.0f);
+        metadict["review"] = "This is a review.";
+        metadata.set_scope_data(unity::scopes::Variant(metadict));
+    }
+};
+
+TEST_F(AppsScopeTest, 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(AppsScopeTest, 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());
+}

=== modified file 'scope/tests/test_store_scope.cpp'
--- scope/tests/test_store_scope.cpp	2014-08-13 14:43:32 +0000
+++ scope/tests/test_store_scope.cpp	2015-08-17 17:53:00 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * 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
@@ -49,6 +49,8 @@
     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));
     }
 };
@@ -66,3 +68,17 @@
     auto response = activation->activate();
     EXPECT_EQ(FAKE_SHA512, response.scope_data().get_dict()["download_sha512"].get_string());
 }
+
+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());
+}