Merge lp:~dobey/unity-scope-click/more-coverage into lp:unity-scope-click

[dobey]

Add more test coverage of conditionals.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:368
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/669/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/75/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/71/console

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

review: Needs Fixing (continuous-integration)

[lp:~dobey/unity-scope-click/more-coverage]

369. By dobey on 2015-08-18

Disable the confirm uninstall test as it fails in jenkins.
Remove the new override code for qt wrapping.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:369
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/670/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/72/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Kyle Fazzari (kyrofa)]

I have a bad feeling about adding more disabled tests without the necessary refactoring to make them pass, but this looks good.

review: Approve

=== modified file 'scope/tests/test_apps_scope.cpp'
--- scope/tests/test_apps_scope.cpp	2015-08-18 01:45:28 +0000
+++ scope/tests/test_apps_scope.cpp	2015-08-18 01:45:28 +0000
@@ -27,14 +27,15 @@
  * files in the program, then also delete it here.
  */
 
+#include <clickapps/apps-scope.h>
+#include <click/preview.h>
+#include <clickapps/apps-query.h>
+
 #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 {
@@ -52,16 +53,60 @@
     }
 };
 
-TEST_F(AppsScopeTest, testStoreScopeRatingNew)
-{
-    auto activation = scope.perform_action(result, metadata, "rating", click::Preview::Actions::RATED);
+TEST_F(AppsScopeTest, DISABLED_testConfirmUninstall)
+{
+    result.set_title("foo");
+    result[click::apps::Query::ResultKeys::NAME] = "foo.name";
+    result[click::apps::Query::ResultKeys::VERSION] = "0.1";
+    auto activation = scope.perform_action(result, metadata, "widget",
+                                           click::Preview::Actions::CONFIRM_UNINSTALL);
+    auto response = activation->activate();
+}
+
+TEST_F(AppsScopeTest, testCancelPurchaseInstalled)
+{
+    auto activation = scope.perform_action(result, metadata, "button",
+                                           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(AppsScopeTest, testCancelPurchaseUninstalled)
+{
+    auto activation = scope.perform_action(result, metadata, "button",
+                                           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(AppsScopeTest, testShowInstalled)
+{
+    auto activation = scope.perform_action(result, metadata, "button",
+                                           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(AppsScopeTest, testShowUninstalled)
+{
+    auto activation = scope.perform_action(result, metadata, "button",
+                                           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(AppsScopeTest, testRatingNew)
+{
+    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)
+TEST_F(AppsScopeTest, testRatingEdit)
 {
-    auto activation = scope.perform_action(result, metadata, "93345", click::Preview::Actions::RATED);
+    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	2015-08-18 01:45:28 +0000
+++ scope/tests/test_store_scope.cpp	2015-08-18 01:45:28 +0000
@@ -57,28 +57,122 @@
 
 TEST_F(StoreScopeTest, testPurchaseCompletedPassesHash)
 {
-    auto activation = scope.perform_action(result, metadata, "widget_id", "purchaseCompleted");
+    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 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 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 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());
 }