Merge lp:~stolowski/unity-scope-home/direct-search into lp:unity-scope-home

[Paweł Stołowski]

Implemented direct search (keyword search) for server scopes, this also makes client-side keyword search actually work.
Various fixes regarding filters (interrelationships, lighting them up).
Limit updates of user's default view in dconf.

Implemented direct search (keyword search) for server scopes, this also makes client-side keyword search actually work.
Various fixes regarding filters (interrelationships, lighting them up).
Limit updates of user's default view in dconf.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-home-raring-amd64-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[lp:~stolowski/unity-scope-home/direct-search]

93. By Paweł Stołowski on 2013-04-11

Added a comment.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-home-raring-amd64-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-raring-amd64-ci/5

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/3/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Seems to work well, +1

review: Approve

=== modified file 'src/filter-state.vala'
--- src/filter-state.vala	2013-03-21 21:40:00 +0000
+++ src/filter-state.vala	2013-04-11 17:02:21 +0000
@@ -29,13 +29,10 @@
    * highlights its subscopes, or deselecting last subscope deselects its master.
    * This methods stores filter state in order to be able to detect what was selected/deselected.
    */
-  public bool update_filter_relations (Unity.AggregatedScopeSearch scope_search)
+  public bool update_filter_relations (string channel_id, Unity.OptionsFilter categories, Unity.OptionsFilter sources)
   {
     bool changed = false;
 
-    unowned Unity.OptionsFilter categories = scope_search.get_filter ("categories") as Unity.OptionsFilter;
-    unowned Unity.OptionsFilter sources = scope_search.get_filter ("sources") as Unity.OptionsFilter;
-
     if (categories == null || sources == null)
     {
       warning ("Categories or Sources filters missing");
@@ -50,12 +47,24 @@
     var current_state = new Gee.TreeSet<string> ();
     get_selected_scopes (categories, current_state);
     get_selected_scopes (sources, current_state);
+
     debug ("Scopes in current_state: %d", current_state.size);
+    if (verbose_debug)
+    {
+      foreach (var scope_id in current_state)
+        debug ("Current active: %s", scope_id);
+    }
 
-    var previous_state = filter_state.lookup (scope_search.channel_id);
+    var previous_state = filter_state.lookup (channel_id);
 
     if (previous_state != null)
     {
+      if (verbose_debug)
+      {
+        foreach (var scope_id in previous_state)
+          debug ("Previous active: %s", scope_id);
+      }
+
       var selected = new Gee.TreeSet<string> ();
       var unselected = new Gee.TreeSet<string> ();
 
@@ -88,10 +97,20 @@
     }
     else // first search - no previous state
     {
+      debug ("No previous filter state");
       changed = update_filters_for_selected (categories, sources, current_state);
     }
 
-    filter_state[scope_search.channel_id] = current_state;
+    var new_state = new Gee.TreeSet<string> ();
+    get_selected_scopes (categories, new_state);
+    get_selected_scopes (sources, new_state);
+    if (verbose_debug)
+    {
+      foreach (var scope_id in new_state)
+      debug ("New active: %s", scope_id);
+    }
+
+    filter_state[channel_id] = new_state;
 
     if (changed)
     {
@@ -250,11 +269,8 @@
     return changed;
   }
 
-  public static bool set_filters (Unity.AggregatedScopeSearch scope_search, string[] enabled_scopes)
+  public static bool set_filters (Unity.OptionsFilter categories, Unity.OptionsFilter sources, string[] enabled_scopes)
   {
-    unowned Unity.OptionsFilter categories = scope_search.get_filter ("categories") as Unity.OptionsFilter;
-    unowned Unity.OptionsFilter sources = scope_search.get_filter ("sources") as Unity.OptionsFilter;
-
     if (categories == null || sources == null)
     {
       warning ("Can't set filters, Categories or Sources filters missing");

=== modified file 'src/keyword-search.vala'
--- src/keyword-search.vala	2013-03-21 14:14:36 +0000
+++ src/keyword-search.vala	2013-04-11 17:02:21 +0000
@@ -46,7 +46,7 @@
       }
     }
 
-    private void index_keywords (string scope_id, GLib.SList<string> keywords)
+    public void index_keywords (string scope_id, GLib.SList<string> keywords)
     {
       foreach (var kw in keywords)
       {

=== modified file 'src/remote-scope-registry.vala'
--- src/remote-scope-registry.vala	2013-03-22 09:09:21 +0000
+++ src/remote-scope-registry.vala	2013-04-11 17:02:21 +0000
@@ -29,12 +29,22 @@
 
     private Dee.Model scopes_model;
     private SmartScopes.RemoteScopeInfo[] remote_scopes;
+    private Gee.TreeSet<string> remote_scopes_lut = new Gee.TreeSet<string> ();
 
     public RemoteScopeRegistry.for_scopes (SmartScopes.RemoteScopeInfo[] info)
     {
       Object ();
 
       remote_scopes = info;
+      foreach (var scope in remote_scopes)
+      {
+        remote_scopes_lut.add (scope.scope_id);
+
+        // also add a fake master scope id to the lookup
+        var master_id = SearchUtil.get_master_id_from_scope_id (scope.scope_id);
+        if (master_id != null)
+            remote_scopes_lut.add (master_id);
+      }
     }
 
     public Dee.Model create_model ()
@@ -63,5 +73,10 @@
       scopes_model = model;
       return scopes_model;
     }
+
+    public bool has_scope (string scope_id)
+    {
+      return remote_scopes_lut.contains (scope_id);
+    }
   }
 }

=== modified file 'src/scope.vala'
--- src/scope.vala	2013-03-28 12:26:57 +0000
+++ src/scope.vala	2013-04-11 17:02:21 +0000
@@ -169,10 +169,23 @@
       if (scopes != null)
       {
         debug ("Got %u remote scopes", scopes.length);
-        smart_scopes_ready = true;
+        foreach (var remote_scope in scopes)
+        {
+          if (remote_scope.keywords.length > 0)
+          {
+            var kw = new GLib.SList<string> ();
+            foreach (var k in remote_scope.keywords)
+            {
+              kw.append (k);
+            }
+            keywords_search.index_keywords (remote_scope.scope_id, kw);
+          }
+        }
 
         remote_scope_registry = new RemoteScopeRegistry.for_scopes (scopes);
         remote_scope_registry.create_model ();
+
+        smart_scopes_ready = true;
       }
     }
     catch (Error e)
@@ -442,8 +455,8 @@
     bool wait_for_push = false;
     bool wait_for_search = false;
     bool sss_query_done = false;
+    bool sss_query_started = false;
     uint num_scopes = 0;
-    bool push_done = false;
 
     // ids of scopes recommended by Smart Scope Service
     var recommended_search_scopes = new List<SmartScopes.RecommendedScope?> ();
@@ -523,12 +536,23 @@
 
     bool empty_query = (scope_search.search_string.strip ().length == 0);
 
+    // set if this search is a filter update only (e.g. search string is the same)
+    bool filter_change_only = false;
+    if (search_query_changed == SearchQueryChange.NOT_CHANGED)
+    {
+      filter_change_only = true;
+      debug ("Filter change only");
+    }
+
     // apply user filters only if search string is unchanged, the query is empty or smart scopes are disabled completly.
     // this mean user set filters *after* entering a query and we apply them;
     // otherwise smart scopes recommendations will take precedence.
     // if search query is empty, then apply default user's filters.
-    if (search_query_changed == SearchQueryChange.NOT_CHANGED || empty_query || sss_client == null)
+    if (filter_change_only || empty_query || sss_client == null)
     {
+      unowned Unity.OptionsFilter categories_filter = scope_search.get_filter ("categories") as Unity.OptionsFilter;
+      unowned Unity.OptionsFilter sources_filter = scope_search.get_filter ("sources") as Unity.OptionsFilter;
+
       // if query is empty but it's not just a filter change (i.e. state is REMOVES_FROM_PREVIOUS_QUERY or NEW_QUERY),
       // then apply default user filters.
       if (empty_query && search_query_changed != SearchQueryChange.NOT_CHANGED)
@@ -537,21 +561,27 @@
         if (default_filters.length > 0)
         {
           debug ("Empty query, applying default filter view");
-          needs_filter_update |= FilterState.set_filters (scope_search, default_filters);
+          needs_filter_update |= FilterState.set_filters (categories_filter, sources_filter, default_filters);
         }
         default_view = true;
       }
 
       debug ("Updating filter interrelationships");
-      needs_filter_update |= filter_state.update_filter_relations (scope_search);
-      debug ("Filter interrelationships changed: %s", needs_filter_update.to_string ());
+      bool relations_changed = filter_state.update_filter_relations (scope_search.channel_id, categories_filter, sources_filter);
+
+      // caution: push_filter_settings may get cancelled if we ever yield before;
+      // in such case internal filter state must be updated later (at the end of search).
+      if (relations_changed)
+        push_filters_update (scope_search);
+      debug ("Filter interrelationships changed: %s", relations_changed.to_string ());
 
       SearchUtil.scopes_to_query_from_filters (scope_search.get_filter ("sources") as Unity.OptionsFilter,
                                                scope_search.get_filter ("categories") as Unity.OptionsFilter,
                                                search_scopes);
 
-      // if this search request is a filter change only, then update user's default view in gsettings
-      if (search_query_changed == SearchQueryChange.NOT_CHANGED && empty_query)
+      // if this search request is a filter change only and query is empty,
+      // update user's default view in gsettings
+      if (filter_change_only && empty_query && relations_changed)
       {
         default_view = true;
         debug ("Updating user's default filter view");
@@ -559,13 +589,29 @@
       }
     }
 
+    // handle keywords (direct search)
+    string? search_string = null;
+    bool direct_search = false;
+    unowned Gee.Set<string>? requested_scope_ids = keywords_search.process_query (
+      scope_search.search_string, out search_string);
+    if (requested_scope_ids != null && search_string != null)
+    {
+      debug ("Direct search query, search_string = '%s'", search_string);
+      direct_search = SearchUtil.scopes_to_query_from_requested_ids (requested_scope_ids, search_scopes);
+    }
+
+    if (search_string == null)
+      search_string = scope_search.search_string;
+    else
+      empty_query = (search_string.strip ().length == 0);
+
     uint push_data_idle_src = 0;
 
     // initiate Smart Scopes Search (if enabled and query not empty)
     if (smart_scopes_ready)
     {
       if (empty_query)
-      { 
+      {
         if (channel_id_map.has_session_id_for_channel (scope_search.channel_id))
         {
           debug ("Empty search, removing session mapping for channel %s", scope_search.channel_id);
@@ -575,7 +621,7 @@
       else // only sent the query to smart scopes if it's not empty
       {
         var session_id = get_session_id (search_query_changed, scope_search.channel_id);
-     
+
         AsyncReadyCallback sss_cb = (obj, res) =>
         {
           try
@@ -592,43 +638,67 @@
             search.callback ();
         };
 
-        // apply filter to remote scopes query; since we don't really know remote scopes,
-        // we can only pass master scopes ids.
-        
+        // apply filters to remote scopes query (either keyword-search filters or normal filters)
         var reg = ScopeRegistry.instance ();
         string[] remote_scopes_to_query = new string [0];
-        foreach (var scope_id in search_scopes.get_keys ())
+        var iter = HashTableIter<string, Gee.Set<string>> (search_scopes);
+        string scope_id;
+        Gee.Set<string> subscopes;
+        while (iter.next (out scope_id, out subscopes))
         {
-          if (reg.is_master (scope_id)) //make sure it's really a master, we don't want 'applications.scope' etc.
+          // this is to support virtual more_suggestions-* scopes and
+          // effectively filter out applications.scope and alike.
+          if (subscopes == null && remote_scope_registry.has_scope (scope_id))
             remote_scopes_to_query += scope_id;
-        }
-
-        // timeout to give cancellable a chance for update; it depends on query length (the longer the string, the shorter timeout);
-        // the formula is as follows:
-        // min_delay + (max_delay - min_delay) / query_length
-        // it gives the following values for lengths in 1..inf and min=50, max=100:
-        // 100, 75, 66, 62, 60, 58, 57, 56, 55, 55, 54, 54, 53, 53, 53, 53, 52, 52, 52, ... 50 ...
-        //
-        // note: query is guaranteed to be non-empty at this point, so we're never dividing by 0!
-        GLib.Timeout.add (SMART_SCOPES_QUERY_MIN_DELAY_MS + 
-                          (SMART_SCOPES_QUERY_MAX_DELAY_MS - SMART_SCOPES_QUERY_MIN_DELAY_MS) / 
-                           scope_search.search_string.length,
-                          ()=>
-        {
-          if (wait_for_search == false && wait_for_push == false && wait_for_sss_query == false)
-            search.callback ();
-          return false;
-        });
-        yield;
-
-        if (cancellable.is_cancelled ())
-        {
-          debug ("The search for '%s' on channel %s was cancelled", scope_search.search_string, scope_search.channel_id);
-          return;
-        }
-
-        sss_client.search.begin (scope_search.search_string, session_id, remote_scopes_to_query, scope_mgr.disabled_scopes,
-            (scope_id, row) =>
+
+          if (subscopes != null)
+          {
+            foreach (var subscope_id in subscopes)
+            {
+              if (remote_scope_registry.has_scope (subscope_id))
+                remote_scopes_to_query += subscope_id;
+            }
+          }
+        };
+
+        // if specific scopes were requested via filters or direct search, then
+        // only send the query to smart scopes server if
+        // it has (some) of the requested scopes (will be passed via &scopes=)
+        if ((direct_search || filter_change_only) && (remote_scopes_to_query == null || remote_scopes_to_query.length == 0))
+        {
+          debug ("No remote scopes to query based on keyword search or filters");
+        }
+        else
+        {
+          // timeout to give cancellable a chance for update; it depends on query length (the longer the string, the shorter timeout);
+          // the formula is as follows:
+          // min_delay + (max_delay - min_delay) / query_length
+          // it gives the following values for lengths in 1..inf and min=50, max=100:
+          // 100, 75, 66, 62, 60, 58, 57, 56, 55, 55, 54, 54, 53, 53, 53, 53, 52, 52, 52, ... 50 ...
+          //
+          // note: query is guaranteed to be non-empty at this point, so we're never dividing by 0!
+          GLib.Timeout.add (SMART_SCOPES_QUERY_MIN_DELAY_MS + 
+                            (SMART_SCOPES_QUERY_MAX_DELAY_MS - SMART_SCOPES_QUERY_MIN_DELAY_MS) / 
+                            search_string.length,
+                            ()=>
+                            {
+                              if (wait_for_search == false
+                                  && wait_for_push == false
+                                  && wait_for_sss_query == false)
+                                search.callback ();
+                              return false;
+                            });
+          yield;
+
+          if (cancellable.is_cancelled ())
+          {
+            debug ("The search for '%s' on channel %s was cancelled", scope_search.search_string, scope_search.channel_id);
+            return;
+          }
+
+          sss_query_started = true;
+          sss_client.search.begin (search_string, session_id, remote_scopes_to_query, scope_mgr.disabled_scopes,
+                                   (scope_id, row) =>
             {
               var pushed_model = push_data.lookup (scope_id);
               if (pushed_model == null)
@@ -650,17 +720,19 @@
             (server_sid, recommendations) =>
             {
               if (server_sid != null)
-              {             
+              {
                 channel_id_map.map_server_sid (scope_search.channel_id, server_sid);
                 int rec_limit_count = 0;
                 foreach (var scope_rec in recommendations)
                 {
-                  recommended_search_scopes.append (scope_rec);
                   if (scope_rec.scope_type == SmartScopes.ScopeType.ClientScope)
                   {
-                    if (++rec_limit_count == SMART_SCOPES_RECOMMENDATIONS_CUTOFF)
-                      break;
+                    if (rec_limit_count == SMART_SCOPES_RECOMMENDATIONS_CUTOFF)
+                      continue; // past cut off, ignore this client scope
+                    ++rec_limit_count;
                   }
+                  recommended_search_scopes.append (scope_rec);
+                  debug ("Got recommended scope: %s, %s", scope_rec.scope_id, scope_rec.scope_type.to_string ());
                 }
               }
               else
@@ -668,6 +740,7 @@
                 warning ("server_sid is null");
               }
             }, cancellable, sss_cb);
+        }
       }
     }
     else
@@ -683,22 +756,9 @@
       SearchUtil.scopes_to_query_from_requested_ids (scope_mgr.get_always_run_scopes (), search_scopes);
     }
 
-    // handle keywords
-    string search_string;
-    bool direct_search = false;
-    unowned Gee.Set<string>? requested_scope_ids = keywords_search.process_query (scope_search.search_string, out search_string);
-    if (requested_scope_ids != null && search_string != null)
-    {
-      debug ("Potential keyword-based query, search_string = '%s'", search_string);
-      direct_search = SearchUtil.scopes_to_query_from_requested_ids (requested_scope_ids, search_scopes);
-    }
-
     num_scopes = search_scopes.size ();
     debug ("Dispatching search to %u scopes, home_channel=%s", num_scopes, scope_search.channel_id);
 
-    if (search_string == null)
-      search_string = scope_search.search_string;
-
     // iterate over master scopes, dispatch search query
     foreach (var scope_id in search_scopes.get_keys ())
     {
@@ -716,7 +776,7 @@
     if (smart_scopes_ready && !empty_query)
     {
       // wait for smart scopes service query to finish
-      if (!sss_query_done)
+      if (sss_query_started && !sss_query_done)
       {
         debug ("Waiting for Smart Scopes query to finish");
         wait_for_sss_query = true;
@@ -740,15 +800,19 @@
             debug ("Waiting for results pushing to finish");
             wait_for_push = true;
             yield;
+            wait_for_push = false;
           }
         }
       }
+      catch (Error e)
+      {
+        debug ("The search for '%s' on channel %s was cancelled", scope_search.search_string, scope_search.channel_id);
+      }
       finally
       {
         if (push_data_idle_src > 0)
           Source.remove (push_data_idle_src);
         push_data_idle_src = 0;
-        debug ("The search for '%s' on channel %s was cancelled", scope_search.search_string, scope_search.channel_id);
       }
 
       debug ("Got %u recommended scopes from Smart Scope Service", recommended_search_scopes.length ());
@@ -828,14 +892,10 @@
 
     // update filter state again, but this time check result counts and send the update only if any of the highlighted masters has no results
     if (!default_view)
-      needs_filter_update |= SearchUtil.update_filters (search_scopes, use_recommended_scopes ? recommended_search_scopes : null, scope_search, true);
+      needs_filter_update |= SearchUtil.update_filters (search_scopes, use_recommended_scopes ? recommended_search_scopes : null, scope_search, filter_change_only == false);
 
     if (needs_filter_update)
-    {
-      var filters = FilterState.create_filter_set (scope_search);
-      debug ("Sending updated filters");
-      scope_search.push_filter_settings (filters);
-    }
+      push_filters_update (scope_search);
 
     if (use_recommended_scopes)
     {
@@ -848,13 +908,21 @@
     }
 
     debug ("All search activities finished");
+    search_cancel.remove (scope_search.channel_id);
   }
 
   public override int category_index_for_scope_id (string scope_id)
   {
     return CategoryManager.instance ().get_category_index (scope_id);
   }
-  
+
+  private void push_filters_update (AggregatedScopeSearch scope_search)
+  {
+    var filters = FilterState.create_filter_set (scope_search);
+    debug ("Sending updated filters");
+    scope_search.push_filter_settings (filters);
+  }
+
   private void signal_categories_order (AggregatedScopeSearch search, List<SmartScopes.RecommendedScope?> recommended_scopes)
   {
     var cats = CategoryManager.instance ().get_category_order (search.search_string, search.channel_id, search.results_model, recommended_scopes);

=== modified file 'src/search-util.vala'
--- src/search-util.vala	2013-03-21 21:51:40 +0000
+++ src/search-util.vala	2013-04-11 17:02:21 +0000
@@ -34,14 +34,14 @@
     {
       foreach (var scope in recommendations)
       {
-        var parts = scope.scope_id.split ("-", 2);
-        string master_scope_id = "%s.scope".printf (parts[0]);
+        string master_scope_id = get_master_id_from_scope_id (scope.scope_id);
         
         rec_lookup.add (scope.scope_id);
         rec_lookup.add (master_scope_id);
       }
     }
 
+    var registry = ScopeRegistry.instance ();
     search_scopes.foreach ((master, subscopes) =>
     {
       rec_lookup.add (master);
@@ -50,6 +50,17 @@
         foreach (var scope in subscopes)
           rec_lookup.add (scope);
       }
+      else //no subscopes specified - assume all subscopes
+      {
+        var node = registry.get_master_scope_node (master);
+        if (node != null)
+        {
+          foreach (var info in node.sub_scopes)
+          {
+            rec_lookup.add (info.id);
+          }
+        }
+      }
     });
 
     var home_channel = scope_search.channel_id;
@@ -63,18 +74,15 @@
       {
         int result_count = mgr.get_result_count (home_channel, opt.id);
         debug ("Results for %s: %d", opt.id, result_count);
+        bool value = false;
         if (rec_lookup.contains (opt.id))
-        {
-          bool value = check_result_counts == false || result_count > 0;
-          if (opt.active != value)
-          {
-            opt.active = value;
-            changed = true;
-          }
-        }
+          value = check_result_counts == false || result_count > 0;
         else
+          value = false;
+        if (opt.active != value)
         {
-          opt.active = false;
+          opt.active = value;
+          changed = true;
         }
         debug ("Setting category filter %s: %s", opt.id, opt.active.to_string ());
       }
@@ -88,23 +96,19 @@
     {
       foreach (var opt in sources.options)
       {
-        var parts = opt.id.split ("-", 2);
-        string master_scope_id = "%s.scope".printf (parts[0]);
+        string master_scope_id = get_master_id_from_scope_id (opt.id);
 
-        // we don't have result counts for specific scopes, so light them up if master has any results
-        int result_count = mgr.get_result_count (home_channel, master_scope_id);
+        // light up subscope in sources filter if it has results
+        int result_count = mgr.get_result_count (home_channel, opt.id);
+        bool value = false;
         if (rec_lookup.contains (opt.id))
-        {
-          bool value = check_result_counts == false || result_count > 0;
-          if (opt.active != value)
-          {
-            opt.active = value;
-            changed = true;
-          }
-        }
+          value = check_result_counts == false || result_count > 0;
         else
+          value = false;
+        if (opt.active != value)
         {
-          opt.active = false;
+          opt.active = value;
+          changed = true;
         }
         debug ("Setting sources filter %s: %s", opt.id, opt.active.to_string ());
       }
@@ -197,6 +201,14 @@
     return scopes;
   }
 
+  public string? get_master_id_from_scope_id (string scope_id)
+  {
+    var parts = scope_id.split ("-", 2);
+    if (parts.length == 2)
+      return "%s.scope".printf (parts[0]);
+    return null;
+  }
+
   public bool scopes_to_query_from_requested_ids (Gee.Set<string> requested_scope_ids, HashTable<string, Gee.Set<string>?> search_scopes)
   {
     bool found = false;
@@ -215,7 +227,7 @@
       }
       else // user may have requested a subscope (not a master scope), we need to find a master that needs to receive the query
       {
-        var master_id = registry.get_master_scope_id (req_scope_id);
+        var master_id = get_master_id_from_scope_id (req_scope_id);
         if (master_id != null)
         {
           if (!found)

=== modified file 'tests/unit/test-home-scope.vala'
--- tests/unit/test-home-scope.vala	2013-03-27 15:53:09 +0000
+++ tests/unit/test-home-scope.vala	2013-04-11 17:02:21 +0000
@@ -82,6 +82,9 @@
     Test.add_data_func ("/Unit/SearchUtil/BuildSearchScopesList", Fixture.create<SearchUtilTester> (SearchUtilTester.test_build_search_scopes_list));
     Test.add_data_func ("/Unit/SearchUtil/SetSubscopesFilterHint", Fixture.create<SearchUtilTester> (SearchUtilTester.test_set_subscopes_filter_hint));
     Test.add_data_func ("/Unit/SearchUtil/ScopesToQueryFromRequestedIds", Fixture.create<SearchUtilTester> (SearchUtilTester.test_scopes_to_query_from_requested_ids));
+    Test.add_data_func ("/Unit/SearchUtil/GetMasterScopeIdFromScopeId", Fixture.create<SearchUtilTester> (SearchUtilTester.test_get_master_id_from_scope_id));
+
+    Test.add_data_func ("/Unit/FilterState/SetFilters", Fixture.create<FilterStateTester> (FilterStateTester.test_set_filters));
 
     Test.add_data_func ("/Unit/SmartScopes/Parse", Fixture.create<SmartScopesUtilTester> (SmartScopesUtilTester.test_smart_scopes_parse));
     Test.add_data_func ("/Unit/SmartScopes/ParseErrors", Fixture.create<SmartScopesUtilTester> (SmartScopesUtilTester.test_smart_scopes_parse_errors));
@@ -585,6 +588,41 @@
       assert (subscopes.contains ("masterscope_b-subscope1.scope"));
       assert (subscopes.contains ("masterscope_b-subscope2.scope"));
     }
+
+    internal void test_get_master_id_from_scope_id ()
+    {
+      assert (SearchUtil.get_master_id_from_scope_id ("foo-bar.scope") == "foo.scope");
+      assert (SearchUtil.get_master_id_from_scope_id ("foo.scope") == null);
+    }
+  }
+
+  class FilterStateTester: Object, Fixture
+  {
+    internal void test_set_filters ()
+    {
+      var categories = new Unity.OptionsFilter ();
+      categories.add_option ("a.scope", "A");
+
+      var sources = new Unity.OptionsFilter ();
+      sources.add_option ("a-b.scope", "A");
+      
+      var enabled_scopes = new string [0];
+      assert (FilterState.set_filters (categories, sources, enabled_scopes) == false);
+      assert (categories.get_option ("a.scope").active == false);
+      assert (sources.get_option ("a-b.scope").active == false);
+
+      enabled_scopes += "a.scope";
+      assert (FilterState.set_filters (categories, sources, enabled_scopes) == true);
+      assert (FilterState.set_filters (categories, sources, enabled_scopes) == false);
+      assert (categories.get_option ("a.scope").active == true);
+      assert (sources.get_option ("a-b.scope").active == false);
+
+      enabled_scopes += "a-b.scope";
+      assert (FilterState.set_filters (categories, sources, enabled_scopes) == true);
+      assert (FilterState.set_filters (categories, sources, enabled_scopes) == false);
+      assert (categories.get_option ("a.scope").active == true);
+      assert (sources.get_option ("a-b.scope").active == true);
+    }
   }
 
   class SmartScopesUtilTester: Object, Fixture