Merge lp:~mikemc/unity-scope-click/fix-1262780-use-dotdesktop into lp:unity-scope-click

[Mike McCracken]

- Send correct application:/// url to preview after install (LP: #1262780)

- Send correct application:/// url to preview after install (LP: #1262780)

Reinstate use of url generated from dot-desktop filename so that the "Open" button shown by the preview after install works.

Adds a few tests to verify correct installed preview generation.

Also avoids logging two lines for each installed app every time we get the list, which is fairly often.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:98
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/136/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/34

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

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'src/click-interface.vala'
--- src/click-interface.vala	2013-12-04 13:31:52 +0000
+++ src/click-interface.vala	2013-12-19 23:53:33 +0000
@@ -106,7 +106,7 @@
         return versions;
     }
 
-    public async string get_dotdesktop (string app_id) throws ClickError {
+    public virtual async string get_dotdesktop (string app_id) throws ClickError {
         foreach (var element in yield get_manifests()) {
             var manifest = element.get_object();
             var pkg_name = manifest.get_string_member("name");
@@ -115,7 +115,10 @@
                 var hooks = manifest.get_object_member("hooks");
                 foreach (var app_name in hooks.get_members()) {
                     // FIXME: "Primary app" is not defined yet, so we take the first one
-                    return "%s_%s_%s.desktop".printf(pkg_name, app_name, version);
+                    var ddstr = "%s_%s_%s.desktop".printf(pkg_name, app_name, version);
+                    debug ("get_dotdesktop: using first of %u hooks members, returning %s",
+                           hooks.get_members().length(), ddstr);
+                    return ddstr;
                 }
             }
         }
@@ -123,7 +126,7 @@
         throw new ClickError.EXEC_FAILURE(msg);
     }
 
-    public async bool can_uninstall (string app_id) {
+    public virtual async bool can_uninstall (string app_id) {
         const string REMOVABLE_FIELD = "_removable";
         GLib.List<weak Json.Node> manifests;
         try {
 
=== modified file 'src/click-scope.vala'
--- src/click-scope.vala	2013-12-17 20:17:01 +0000
+++ src/click-scope.vala	2013-12-19 23:53:33 +0000
@@ -148,10 +148,10 @@
         return preview;
     }
 
-    async Unity.Preview build_installed_preview (Unity.ScopeResult result) {
+    public async Unity.Preview build_installed_preview (Unity.ScopeResult result, string application_uri) {
         var app_id = result.metadata.get(METADATA_APP_ID).get_string();
         Unity.Preview preview = yield build_app_preview (result);
-        preview.add_action (new Unity.PreviewAction (ACTION_OPEN_CLICK + ":" + result.uri, ("Open"), null));
+        preview.add_action (new Unity.PreviewAction (ACTION_OPEN_CLICK + ":" + application_uri, ("Open"), null));
 
         if (yield click_if.can_uninstall (app_id)) {
             preview.add_action (new Unity.PreviewAction (ACTION_UNINSTALL_CLICK, ("Uninstall"), null));
@@ -192,7 +192,7 @@
         if (uri_is_click_install(result.uri)) {
             return yield build_uninstalled_preview (result);
         } else {
-            return yield build_installed_preview (result);
+            return yield build_installed_preview (result, result.uri);
         }
     }
 
@@ -236,7 +236,7 @@
                 // application name *must* be in path part of URL as host part
                 // might get lowercased
                 var application_uri = "application:///" + dotdesktop;
-                preview = yield build_installed_preview (result);
+                preview = yield build_installed_preview (result, application_uri);
             } else if (action_id.has_prefix(ACTION_OPEN_CLICK)) {
                 var application_uri = action_id.split(":", 2)[1];
                 debug ("Let the dash launch the app: %s", application_uri);
@@ -386,7 +386,6 @@
 
   private void add_app (App app, int category)
   {
-    debug (app.title);
     var uri = app.uri;
     var comment = "";
     var dnd_uri = uri;
@@ -403,8 +402,8 @@
     var result = Unity.ScopeResult.create(uri, app.icon_url, category, Unity.ResultType.DEFAULT, mimetype, app.title, comment, dnd_uri, metadata);
 
     var download_progress = get_download_progress(app.app_id);
-    debug ("download progress source for app %s: %s", app.app_id, download_progress);
     if (download_progress != null) {
+        debug ("download in progress for %s: progress source path = %s", app.app_id, download_progress);
         result.metadata.insert("show_progressbar", new Variant.boolean(true));
         result.metadata.insert("progressbar_source", new GLib.Variant.string(download_progress));
     }
 
=== modified file 'src/test-click-webservice.vala'
--- src/test-click-webservice.vala	2013-12-19 19:58:49 +0000
+++ src/test-click-webservice.vala	2013-12-19 23:53:33 +0000
@@ -17,6 +17,7 @@
 using Assertions;
 
 const string FAKE_APP_ID = "FAKE_APP_ID";
+const string FAKE_DOT_DESKTOP = "FAKE_DOT_DESKTOP";
 const string FAKE_OBJECT_PATH = "/com/fake/object";
 const string FAKE_DOWNLOAD_ERROR_MESSAGE = "fake generic download error message";
 const string FAKE_CREDS_ERROR_MESSAGE = "fake creds error message";
@@ -121,6 +122,15 @@
             parser.load_from_data (FAKE_APP_MANIFEST);
             return parser.get_root().get_array().get_elements();
         }
+        
+        public override async string get_dotdesktop (string app_id) throws ClickError {
+            return FAKE_DOT_DESKTOP;
+        }
+
+        public bool fake_can_uninstall = true;
+        public override async bool can_uninstall (string app_id) {
+            return fake_can_uninstall;
+        }
     }
 
     public static void test_click_architecture ()
@@ -420,6 +430,49 @@
         assert (run_with_timeout (mainloop, 10000));
     }
 
+    public static void test_scope_build_installed_preview_with_uninstall ()
+    {
+        do_test_build_installed_preview_uninstall (true);
+    }
+
+    public static void test_scope_build_installed_preview_without_uninstall ()
+    {
+        do_test_build_installed_preview_uninstall (false);
+    }
+    
+    private static void do_test_build_installed_preview_uninstall (bool can_uninstall)
+    {
+        MainLoop mainloop = new MainLoop ();
+        ClickScope scope = new ClickScope ();
+        scope.webservice = new FakeClickWebservice ();
+        scope.click_if = new FakeClickInterface ();
+        ((FakeClickInterface) scope.click_if).fake_can_uninstall = can_uninstall;
+
+        var metadata = new HashTable<string, Variant> (str_hash, str_equal);
+        metadata.insert(METADATA_APP_ID, new GLib.Variant.string(FAKE_APP_ID));
+        var fake_result = Unity.ScopeResult.create("", "", 0,
+                                                   Unity.ResultType.DEFAULT,
+                                                   "application/x-desktop",
+                                                   "", "", "", metadata);
+
+        string fake_app_uri = "application:///" + FAKE_DOT_DESKTOP;
+        scope.build_installed_preview.begin(fake_result, fake_app_uri, (obj, res) => {
+                mainloop.quit ();
+                try {
+                    var preview = scope.build_installed_preview.end(res);
+                    assert(preview_has_action(preview, "open_click:" + fake_app_uri, "Open"));
+                    
+                    bool has_uninstall = preview_has_action(preview, "uninstall_click", "Uninstall");
+                    assert(can_uninstall == has_uninstall);
+
+                } catch (GLib.Error e) {
+                    error ("Exception caught building installed preview: %s", e.message);
+                }
+            });
+
+        assert (run_with_timeout (mainloop, 10000));
+    }
+
     public static Unity.ScopeResult create_fake_result () {
         uint fake_category = 0;
         var fake_result_type = Unity.ResultType.DEFAULT;
@@ -488,6 +541,10 @@
         Test.add_data_func ("/Unit/ClickChecker/Test_Click_GetDotDesktop", test_click_get_dotdesktop);
         Test.add_data_func ("/Unit/ClickChecker/Test_Scope_Build_Purchasing_Preview", 
                             test_scope_build_purchasing_preview);
+        Test.add_data_func ("/Unit/ClickChecker/Test_Scope_Build_Installed_Preview_With_Uninstall", 
+                            test_scope_build_installed_preview_with_uninstall);
+        Test.add_data_func ("/Unit/ClickChecker/Test_Scope_Build_Installed_Preview_Without_Uninstall", 
+                            test_scope_build_installed_preview_without_uninstall);
         Test.add_data_func ("/Unit/ClickChecker/Test_Scope_InProgress", test_scope_in_progress);
         return Test.run ();
     }