Merge lp:~mhr3/libunity/few-more-tests into lp:libunity

[Michal Hruby]

Add a few more Scope tests that don't focus on DBus communication.

Add a few more Scope tests that don't focus on DBus communication.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:248
http://jenkins.qa.ubuntu.com/job/libunity-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/32

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/47/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

LGTM. +1

review: Approve

=== modified file 'test/vala/Makefile.am'
--- test/vala/Makefile.am	2013-02-26 13:40:47 +0000
+++ test/vala/Makefile.am	2013-06-27 10:41:28 +0000
@@ -65,7 +65,7 @@
 	test-launcher.vala \
 	test-preferences.vala \
 	test-previews.vala \
-	test-scope-signals.vala \
+	test-scope-base.vala \
 	test-scope-discovery.vala \
 	test-vala.vala \
 	test-results-synchronizer.vala \

=== modified file 'test/vala/common.vala'
--- test/vala/common.vala	2013-06-04 16:52:24 +0000
+++ test/vala/common.vala	2013-06-27 10:41:28 +0000
@@ -19,6 +19,44 @@
 
 namespace Unity.Test
 {
+  /* A bit of magic to get proper-ish fixture support */
+  public interface Fixture : Object
+  {
+    class DelegateWrapper
+    {
+      TestDataFunc func;
+      public DelegateWrapper (owned TestDataFunc f) { func = (owned) f; }
+    }
+
+    public virtual void setup () {}
+    public virtual void teardown () {}
+
+    [CCode (has_target = false)]
+    public delegate void Callback<T> (T ptr);
+
+    private static List<DelegateWrapper> _tests;
+
+    public static unowned TestDataFunc create<F> (Callback<void*> cb)
+      requires (typeof (F).is_a (typeof (Fixture)))
+    {
+      TestDataFunc functor = () =>
+      {
+        var type = typeof (F);
+        var instance = Object.new (type) as Fixture;
+        instance.setup ();
+        cb (instance);
+        instance.teardown ();
+      };
+      unowned TestDataFunc copy = functor;
+      _tests.append (new DelegateWrapper ((owned) functor));
+      return copy;
+    }
+    public static unowned TestDataFunc create_static<F> (Callback<F> cb)
+    {
+      return create<F> ((Callback<void*>) cb);
+    }
+  }
+
   public static bool run_with_timeout (MainLoop ml, uint timeout_ms = 5000)
   {
     bool timeout_reached = false;

=== renamed file 'test/vala/test-scope-signals.vala' => 'test/vala/test-scope-base.vala'
--- test/vala/test-scope-signals.vala	2013-02-01 09:57:48 +0000
+++ test/vala/test-scope-base.vala	2013-06-27 10:41:28 +0000
@@ -26,6 +26,10 @@
   {
     public ScopeSuite ()
     {
+      GLib.Test.add_data_func ("/Unit/AbstractScope/AddResult",
+        Fixture.create<AbstractScopeTester> (AbstractScopeTester.test_add_result));
+      GLib.Test.add_data_func ("/Unit/AbstractScope/AddResultFromVariant",
+        Fixture.create<AbstractScopeTester> (AbstractScopeTester.test_add_variant_result));
       /* disabled for now
       GLib.Test.add_data_func ("/Unit/Scope/Signal/NoSearchChanged",
                                test_no_search_changed);
@@ -42,6 +46,169 @@
       */
     }
 
+    class AbstractScopeTester: Object, Fixture
+    {
+      delegate void RunFunc (SearchContext search);
+
+      private AbstractScopeTestImpl scope;
+
+      class ScopeSearchTestImpl: ScopeSearchBase
+      {
+        private unowned RunFunc runner;
+        public ScopeSearchTestImpl (RunFunc run_func)
+        {
+          runner = run_func;
+        }
+        protected override void run ()
+        {
+          runner (search_context);
+        }
+      }
+
+      class AbstractScopeTestImpl : AbstractScope
+      {
+        public RunFunc run_func;
+
+        public AbstractScopeTestImpl ()
+        {
+        }
+
+        protected override ScopeSearchBase create_search_for_query (SearchContext search_context)
+        {
+          var search_runner = new ScopeSearchTestImpl (run_func);
+          search_runner.set_search_context (search_context);
+          return search_runner;
+        }
+
+        protected override ResultPreviewer create_previewer (ScopeResult result, SearchMetadata metadata)
+        {
+          return null;
+        }
+
+        protected override CategorySet get_categories ()
+        {
+          return new CategorySet ();
+        }
+
+        protected override FilterSet get_filters ()
+        {
+          return new FilterSet ();
+        }
+
+        protected override Schema get_schema ()
+        {
+          return new Schema ();
+        }
+
+        protected override string get_group_name ()
+        {
+          return "com.canonical.example.Scope.Test";
+        }
+
+        protected override string get_unique_name ()
+        {
+          return "/com/canonical/example/Scope/Test";
+        }
+      }
+
+      private void setup ()
+      {
+        scope = new AbstractScopeTestImpl ();
+      }
+
+      private void teardown ()
+      {
+      }
+
+      class ResultSetTestImpl: ResultSet
+      {
+        public GenericArray<ScopeResult?> results;
+
+        construct
+        {
+          results = new GenericArray<ScopeResult?> ();
+        }
+        protected override void add_result (ScopeResult result)
+        {
+          results.add (result);
+        }
+      }
+
+      public void test_add_result ()
+      {
+        bool runner_invoked = false;
+        scope.run_func = (context) =>
+        {
+          runner_invoked = true;
+          var result = ScopeResult ();
+          result.uri = "test://";
+          result.icon_hint = "unknown";
+          result.category = 0;
+          result.mimetype = "text/html";
+          result.title = "Test";
+          result.comment = "comment";
+          result.dnd_uri = result.uri;
+
+          context.result_set.add_result (result);
+        };
+
+        var result_set = new ResultSetTestImpl ();
+        var search = scope.create_search_for_query (
+          SearchContext.create ("foo", SearchType.DEFAULT,
+                                new FilterSet (), null,
+                                result_set, null));
+        search.run ();
+
+        assert (runner_invoked);
+        assert (result_set.results.length == 1);
+
+        var test_result = result_set.results[0];
+        assert (test_result.uri == "test://");
+        assert (test_result.title == "Test");
+      }
+      
+      public void test_add_variant_result ()
+      {
+        bool runner_invoked = false;
+        scope.run_func = (context) =>
+        {
+          runner_invoked = true;
+          var result = ScopeResult ();
+          result.uri = "test://";
+          result.icon_hint = "unknown";
+          result.category = 0;
+          result.mimetype = "text/html";
+          result.title = "Test";
+          result.comment = "comment";
+          result.dnd_uri = result.uri;
+
+          var metadata = new Variant.array (VariantType.VARDICT.element (), {});
+          var variant = new Variant ("(ssuussss@a{sv})",
+                                     result.uri, result.icon_hint,
+                                     result.category, result.result_type,
+                                     result.mimetype, result.title,
+                                     result.comment, result.dnd_uri,
+                                     metadata);
+
+          context.result_set.add_result_from_variant (variant);
+        };
+
+        var result_set = new ResultSetTestImpl ();
+        var search = scope.create_search_for_query (
+          SearchContext.create ("foo", SearchType.DEFAULT,
+                                new FilterSet (), null,
+                                result_set, null));
+        search.run ();
+
+        assert (runner_invoked);
+        assert (result_set.results.length == 1);
+
+        var test_result = result_set.results[0];
+        assert (test_result.uri == "test://");
+        assert (test_result.title == "Test");
+      }
+    }
+
 /* disabled for now
     static void test_no_search_changed ()
     {

=== modified file 'test/vala/test-scope.vala'
--- test/vala/test-scope.vala	2013-06-19 01:31:25 +0000
+++ test/vala/test-scope.vala	2013-06-27 10:41:28 +0000
@@ -20,44 +20,6 @@
 using Unity.Protocol;
 using Unity.Test;
 
-/* A bit of magic to get proper-ish fixture support */
-public interface Fixture : Object
-{
-  class DelegateWrapper
-  {
-    TestDataFunc func;
-    public DelegateWrapper (owned TestDataFunc f) { func = (owned) f; }
-  }
-
-  public virtual void setup () {}
-  public virtual void teardown () {}
-
-  [CCode (has_target = false)]
-  public delegate void Callback<T> (T ptr);
-
-  private static List<DelegateWrapper> _tests;
-
-  public static unowned TestDataFunc create<F> (Callback<void*> cb)
-    requires (typeof (F).is_a (typeof (Fixture)))
-  {
-    TestDataFunc functor = () =>
-    {
-      var type = typeof (F);
-      var instance = Object.new (type) as Fixture;
-      instance.setup ();
-      cb (instance);
-      instance.teardown ();
-    };
-    unowned TestDataFunc copy = functor;
-    _tests.append (new DelegateWrapper ((owned) functor));
-    return copy;
-  }
-  public static unowned TestDataFunc create_static<F> (Callback<F> cb)
-  {
-    return create<F> ((Callback<void*>) cb);
-  }
-}
-
 public class Main
 {
   const string DBUS_NAME = "com.canonical.Unity.Scope.Test";