Merge lp:~stolowski/libunity/async-preview-with-null into lp:libunity

[Paweł Stołowski]

Allow null preview argument in preview_ready signal by declaring it with "?"; this results in an empty GenericPreview. Without the fix null argument is rejected with critical error by vala-generated code at runtime. Added test case for null preview.

Allow null preview argument in preview_ready signal by declaring it with "?"; this results in an empty GenericPreview. Without the fix null argument is rejected with critical error by vala-generated code at runtime. Added test case for null preview.

[Michal Hruby (mhr3)]

58 + Timeout.add (100, () =>

Can we change this to Idle.add()? The faster the tests run, the better ;)

review: Needs Fixing

[lp:~stolowski/libunity/async-preview-with-null]

185. By Paweł Stołowski on 2012-10-02

Use Idle.add instead of Timeout.add so that it runs a bit faster.

[Michal Hruby (mhr3)]

Thanks! +1

review: Approve

=== modified file 'src/unity-previews.vala'
--- src/unity-previews.vala	2012-10-01 14:10:26 +0000
+++ src/unity-previews.vala	2012-10-02 16:18:43 +0000
@@ -688,7 +688,7 @@
 
   public Cancellable cancellable { get; construct set; }
 
-  public signal void preview_ready (Preview preview);
+  public signal void preview_ready (Preview? preview);
 
   // simple emit method, so it's easy to use in C/Python
   [CCode (name = "unity_async_preview_preview_ready")]

=== modified file 'test/vala/test-lens.vala'
--- test/vala/test-lens.vala	2012-09-04 11:40:42 +0000
+++ test/vala/test-lens.vala	2012-10-02 16:18:43 +0000
@@ -56,6 +56,7 @@
     Test.add_data_func ("/Unit/Lens/Activation", test_lens_activation);
     Test.add_data_func ("/Unit/Lens/Preview", test_lens_preview);
     Test.add_data_func ("/Unit/Lens/Preview/Async", test_lens_preview_async);
+    Test.add_data_func ("/Unit/Lens/Preview/AsyncWithNull", test_lens_preview_async_with_null);
     Test.add_data_func ("/Unit/Lens/Preview/Signal", test_lens_preview_signal);
     Test.add_data_func ("/Unit/Lens/Preview/ClosedSignal", test_lens_preview_closed_signal);
     Test.add_data_func ("/Unit/Lens/Preview/ActionWithHints", test_lens_preview_action_with_hint);
@@ -905,6 +906,63 @@
     assert (got_action_activated_signal);
   }
 
+  public static void test_lens_preview_async_with_null ()
+  {
+    SignalWrapper[] signals = null;
+    assert (local_scope != null);
+
+    var ml = new MainLoop ();
+
+    var lens_results_model =
+      exported_lens.get_model_internal (0) as Dee.SharedModel;
+    var iter = lens_results_model.get_first_iter ();
+    var mangled_uri = lens_results_model.get_string (iter, 0);
+
+    bool got_preview_uri_signal = false;
+    bool got_activate_uri_signal = false;
+
+    signals += new SignalWrapper (local_scope,
+      local_scope.activate_uri.connect ((uri) =>
+    {
+      got_activate_uri_signal = true;
+      return null;
+    }));
+
+    signals += new SignalWrapper (local_scope,
+      local_scope.preview_uri.connect ((uri) =>
+    {
+      assert (uri == "scheme://local/");
+      got_preview_uri_signal = true;
+      var async_preview = new Unity.AsyncPreview ();
+
+      Idle.add (() =>
+      {
+        async_preview.preview_ready (null);
+        return false;
+      });
+      return async_preview;
+    }));
+
+    ml = new MainLoop ();
+    Unity.Protocol.Preview? reconstructed = null;
+    call_lens_activate (mangled_uri, 1, (reply) =>
+    {
+      var v = reply.get_child_value (0);
+      Unity.Protocol.ActivationReplyRaw reply_struct =
+        (Unity.Protocol.ActivationReplyRaw) v;
+      reconstructed = Unity.Protocol.Preview.parse (reply_struct.hints["preview"]);
+      ml.quit ();
+    });
+    run_with_timeout (ml, 5000);
+
+    assert (reconstructed != null);
+    assert (reconstructed is Unity.Protocol.GenericPreview);
+    assert (reconstructed.title == "");
+    assert (reconstructed.description == "");
+    assert (got_preview_uri_signal);
+    assert (!got_activate_uri_signal);
+  }
+
   public static void test_lens_preview_signal ()
   {
     SignalWrapper[] signals = null;