App list voice searches now prioritize exact-match web results.

ui/app_list/search/mixer_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <set>
 #include <string>
 
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/search/history_types.h"
 #include "ui/app_list/search/mixer.h"
 #include "ui/app_list/search_provider.h"
 #include "ui/app_list/search_result.h"
 
 namespace app_list {
 namespace test {
 
 class TestSearchResult : public SearchResult {
  public:
   TestSearchResult(const std::string& id, double relevance)
       : instance_id_(instantiation_count++) {
     set_id(id);
     set_title(base::UTF8ToUTF16(id));
     set_relevance(relevance);
   }
   ~TestSearchResult() override {}
 
+  using SearchResult::set_voice_result;
+
   // SearchResult overrides:
   void Open(int event_flags) override {}
   void InvokeAction(int action_index, int event_flags) override {}
   scoped_ptr<SearchResult> Duplicate() override {
     return scoped_ptr<SearchResult>(new TestSearchResult(id(), relevance()));
   }
 
   // For reference equality testing. (Addresses cannot be used to test reference
   // equality because it is possible that an object will be allocated at the
   // same address as a previously deleted one.)
@@ skipping 16 matching lines @@
       : prefix_(prefix), count_(0) {}
   ~TestSearchProvider() override {}
 
   // SearchProvider overrides:
   void Start(const base::string16& query) override {
     ClearResults();
     for (size_t i = 0; i < count_; ++i) {
       const std::string id =
           base::StringPrintf("%s%d", prefix_.c_str(), static_cast<int>(i));
       const double relevance = 1.0 - i / 10.0;
-      Add(scoped_ptr<SearchResult>(new TestSearchResult(id, relevance)).Pass());
+      TestSearchResult* result = new TestSearchResult(id, relevance);
+      if (voice_result_indices.find(i) != voice_result_indices.end())
+        result->set_voice_result(true);
+      Add(scoped_ptr<SearchResult>(result).Pass());
     }
   }
   void Stop() override {}
 
   void set_prefix(const std::string& prefix) { prefix_ = prefix; }
   void set_count(size_t count) { count_ = count; }
+  void set_as_voice_result(size_t index) { voice_result_indices.insert(index); }
 
  private:
   std::string prefix_;
   size_t count_;
+  // Indices of results that will have the |voice_result| flag set.
+  std::set<size_t> voice_result_indices;
 
   DISALLOW_COPY_AND_ASSIGN(TestSearchProvider);
 };
 
 class MixerTest : public testing::Test {
  public:
-  MixerTest() {}
+  MixerTest() : is_voice_query_(false) {}
   ~MixerTest() override {}
 
   // testing::Test overrides:
   void SetUp() override {
     results_.reset(new AppListModel::SearchResults);
 
     providers_.push_back(new TestSearchProvider("app"));
     providers_.push_back(new TestSearchProvider("omnibox"));
     providers_.push_back(new TestSearchProvider("webstore"));
     providers_.push_back(new TestSearchProvider("people"));
 
+    is_voice_query_ = false;
+
     mixer_.reset(new Mixer(results_.get()));
     mixer_->Init();
     mixer_->AddProviderToGroup(Mixer::MAIN_GROUP, providers_[0]);
     mixer_->AddProviderToGroup(Mixer::OMNIBOX_GROUP, providers_[1]);
     mixer_->AddProviderToGroup(Mixer::WEBSTORE_GROUP, providers_[2]);
     mixer_->AddProviderToGroup(Mixer::PEOPLE_GROUP, providers_[3]);
   }
 
   void RunQuery() {
     const base::string16 query;
 
     for (size_t i = 0; i < providers_.size(); ++i) {
       providers_[i]->Start(query);
       providers_[i]->Stop();
     }
 
-    mixer_->MixAndPublish(KnownResults());
+    mixer_->MixAndPublish(is_voice_query_, KnownResults());
   }
 
   std::string GetResults() const {
     std::string result;
     for (size_t i = 0; i < results_->item_count(); ++i) {
       if (!result.empty())
         result += ',';
 
       result += base::UTF16ToUTF8(results_->GetItemAt(i)->title());
     }
 
     return result;
   }
 
   Mixer* mixer() { return mixer_.get(); }
   TestSearchProvider* app_provider() { return providers_[0]; }
   TestSearchProvider* omnibox_provider() { return providers_[1]; }
   TestSearchProvider* webstore_provider() { return providers_[2]; }
   TestSearchProvider* people_provider() { return providers_[3]; }
 
+  // Sets whether test runs should be treated as a voice query.
+  void set_is_voice_query(bool is_voice_query) {
+    is_voice_query_ = is_voice_query;
+  }
+
  private:
   scoped_ptr<Mixer> mixer_;
   scoped_ptr<AppListModel::SearchResults> results_;
 
+  bool is_voice_query_;
+
   ScopedVector<TestSearchProvider> providers_;
 
   DISALLOW_COPY_AND_ASSIGN(MixerTest);
 };
 
 TEST_F(MixerTest, Basic) {
   struct TestCase {
     const size_t app_results;
     const size_t omnibox_results;
     const size_t webstore_results;
@@ skipping 46 matching lines @@
   // This gives "dup0".
   webstore_provider()->set_prefix(dup);
   webstore_provider()->set_count(1);
 
   RunQuery();
 
   // Only three results with unique id are kept.
   EXPECT_EQ("dup0,dup1,dup2", GetResults());
 }
 
+TEST_F(MixerTest, VoiceQuery) {
+  omnibox_provider()->set_count(3);
+  RunQuery();
+  EXPECT_EQ("omnibox0,omnibox1,omnibox2", GetResults());
+
+  // Set "omnibox1" as a voice result. Do not expect any changes (as this is not
+  // a voice query).
+  omnibox_provider()->set_as_voice_result(1);
+  RunQuery();
+  EXPECT_EQ("omnibox0,omnibox1,omnibox2", GetResults());
+
+  // Perform a voice query. Expect voice result first.
+  set_is_voice_query(true);
+  RunQuery();
+  EXPECT_EQ("omnibox1,omnibox0,omnibox2", GetResults());
+
+  // All voice results should appear before non-voice results.
+  omnibox_provider()->set_as_voice_result(2);
+  RunQuery();
+  EXPECT_EQ("omnibox1,omnibox2,omnibox0", GetResults());
+}
+
 TEST_F(MixerTest, Publish) {
   scoped_ptr<SearchResult> result1(new TestSearchResult("app1", 0));
   scoped_ptr<SearchResult> result2(new TestSearchResult("app2", 0));
   scoped_ptr<SearchResult> result3(new TestSearchResult("app3", 0));
   scoped_ptr<SearchResult> result3_copy = result3->Duplicate();
   scoped_ptr<SearchResult> result4(new TestSearchResult("app4", 0));
   scoped_ptr<SearchResult> result5(new TestSearchResult("app5", 0));
 
   AppListModel::SearchResults ui_results;
 
@@ skipping 70 matching lines @@
   EXPECT_EQ(old_ui_result_ids[0],
             TestSearchResult::GetInstanceId(ui_results.GetItemAt(3)));
   EXPECT_EQ(old_ui_result_ids[1],
             TestSearchResult::GetInstanceId(ui_results.GetItemAt(0)));
   EXPECT_EQ(old_ui_result_ids[2],
             TestSearchResult::GetInstanceId(ui_results.GetItemAt(2)));
 }
 
 }  // namespace test
 }  // namespace app_list