Remove people search

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 "ui/app_list/search/mixer.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <string>
@@ skipping 13 matching lines @@
 #include "ui/app_list/search_result.h"
 
 namespace app_list {
 namespace test {
 
 // Maximum number of results to show in each mixer group.
 const size_t kMaxAppsGroupResults = 4;
 // Ignored unless AppListMixer field trial is "Blended".
 const size_t kMaxOmniboxResults = 4;
 const size_t kMaxWebstoreResults = 2;
-const size_t kMaxPeopleResults = 2;
 
 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 {}
@@ skipping 84 matching lines @@
   void SetUp() override {
     // If the parameter is true, enable the field trial.
     const char* field_trial_name = GetParam() ? "Blended" : "Control";
     base::FieldTrialList::CreateFieldTrial("AppListMixer", field_trial_name);
 
     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()));
 
     size_t apps_group_id = mixer_->AddGroup(kMaxAppsGroupResults, 3.0, 1.0);
     size_t omnibox_group_id =
         mixer_->AddOmniboxGroup(kMaxOmniboxResults, 2.0, 1.0);
     size_t webstore_group_id = mixer_->AddGroup(kMaxWebstoreResults, 1.0, 0.5);
-    size_t people_group_id = mixer_->AddGroup(kMaxPeopleResults, 0.0, 1.0);
 
     mixer_->AddProviderToGroup(apps_group_id, providers_[0]);
     mixer_->AddProviderToGroup(omnibox_group_id, providers_[1]);
     mixer_->AddProviderToGroup(webstore_group_id, providers_[2]);
-    mixer_->AddProviderToGroup(people_group_id, providers_[3]);
   }
 
   void RunQuery() {
     const base::string16 query;
 
     for (size_t i = 0; i < providers_.size(); ++i) {
       providers_[i]->Start(is_voice_query_, query);
       providers_[i]->Stop();
     }
 
     mixer_->MixAndPublish(is_voice_query_, known_results_);
   }
 
   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;
   }
 
   void AddKnownResult(const std::string& id, KnownResultType type) {
     known_results_[id] = type;
   }
 
@@ skipping 13 matching lines @@
 
 TEST_P(MixerTest, Basic) {
   // Note: Some cases in |expected_blended| have vastly more results than
   // others, due to the "at least 6" mechanism. If it gets at least 6 results
   // from all providers, it stops at 6. If not, it fetches potentially many more
   // results from all providers. Not ideal, but currently by design.
   struct TestCase {
     const size_t app_results;
     const size_t omnibox_results;
     const size_t webstore_results;
-    const size_t people_results;
     const char* expected_default;  // Expected results with trial off.
     const char* expected_blended;  // Expected results with trial on.
   } kTestCases[] = {
-      {0, 0, 0, 0, "", ""},
-      {10,
-       0,
-       0,
-       0,
-       "app0,app1,app2,app3",
+      {0, 0, 0, "", ""},
+      {10, 0, 0, "app0,app1,app2,app3",
        "app0,app1,app2,app3,app4,app5,app6,app7,app8,app9"},
-      {0,
-       0,
-       10,
-       0,
-       "webstore0,webstore1",
+      {0, 0, 10, "webstore0,webstore1",
        "webstore0,webstore1,webstore2,webstore3,webstore4,webstore5,webstore6,"
        "webstore7,webstore8,webstore9"},
-      {0,
-       0,
-       0,
-       10,
-       "people0,people1",
-       "people0,people1,people2,people3,people4,people5,people6,people7,"
-       "people8,people9"},
-      {4,
-       6,
-       0,
-       0,
-       "app0,app1,app2,app3,omnibox0,omnibox1",
+      {4, 6, 0, "app0,app1,app2,app3,omnibox0,omnibox1",
        "app0,omnibox0,app1,omnibox1,app2,omnibox2,app3,omnibox3"},
-      {4,
-       6,
-       2,
-       0,
-       "app0,app1,app2,app3,omnibox0,webstore0",
+      {4, 6, 2, "app0,app1,app2,app3,omnibox0,webstore0",
        "app0,omnibox0,app1,omnibox1,app2,omnibox2,app3,omnibox3,webstore0,"
        "webstore1"},
-      {4,
-       6,
-       0,
-       2,
-       "app0,app1,app2,app3,omnibox0,people0",
-       "app0,omnibox0,people0,app1,omnibox1,people1,app2,omnibox2,app3,"
-       "omnibox3"},
-      {10,
-       10,
-       10,
-       0,
-       "app0,app1,app2,app3,omnibox0,webstore0",
+      {10, 10, 10, "app0,app1,app2,app3,omnibox0,webstore0",
        "app0,omnibox0,app1,omnibox1,app2,omnibox2,app3,omnibox3,webstore0,"
        "webstore1"},
-      {0,
-       10,
-       0,
-       0,
-       "omnibox0,omnibox1,omnibox2,omnibox3,omnibox4,omnibox5",
+      {0, 10, 0, "omnibox0,omnibox1,omnibox2,omnibox3,omnibox4,omnibox5",
        "omnibox0,omnibox1,omnibox2,omnibox3,omnibox4,omnibox5,omnibox6,"
        "omnibox7,omnibox8,omnibox9"},
-      {0,
-       10,
-       1,
-       0,
-       "omnibox0,omnibox1,omnibox2,omnibox3,omnibox4,webstore0",
+      {0, 10, 1, "omnibox0,omnibox1,omnibox2,omnibox3,omnibox4,webstore0",
        "omnibox0,omnibox1,omnibox2,omnibox3,webstore0,omnibox4,omnibox5,"
        "omnibox6,omnibox7,omnibox8,omnibox9"},
-      {0,
-       10,
-       2,
-       0,
-       "omnibox0,omnibox1,omnibox2,omnibox3,webstore0,webstore1",
+      {0, 10, 2, "omnibox0,omnibox1,omnibox2,omnibox3,webstore0,webstore1",
        "omnibox0,omnibox1,omnibox2,omnibox3,webstore0,webstore1"},
-      {1,
-       10,
-       0,
-       0,
-       "app0,omnibox0,omnibox1,omnibox2,omnibox3,omnibox4",
+      {1, 10, 0, "app0,omnibox0,omnibox1,omnibox2,omnibox3,omnibox4",
        "app0,omnibox0,omnibox1,omnibox2,omnibox3,omnibox4,omnibox5,omnibox6,"
        "omnibox7,omnibox8,omnibox9"},
-      {2,
-       10,
-       0,
-       0,
-       "app0,app1,omnibox0,omnibox1,omnibox2,omnibox3",
+      {2, 10, 0, "app0,app1,omnibox0,omnibox1,omnibox2,omnibox3",
        "app0,omnibox0,app1,omnibox1,omnibox2,omnibox3"},
-      {2,
-       10,
-       1,
-       0,
-       "app0,app1,omnibox0,omnibox1,omnibox2,webstore0",
+      {2, 10, 1, "app0,app1,omnibox0,omnibox1,omnibox2,webstore0",
        "app0,omnibox0,app1,omnibox1,omnibox2,omnibox3,webstore0"},
-      {2,
-       10,
-       2,
-       0,
-       "app0,app1,omnibox0,omnibox1,webstore0,webstore1",
+      {2, 10, 2, "app0,app1,omnibox0,omnibox1,webstore0,webstore1",
        "app0,omnibox0,app1,omnibox1,omnibox2,omnibox3,webstore0,webstore1"},
-      {2,
-       0,
-       2,
-       0,
-       "app0,app1,webstore0,webstore1",
+      {2, 0, 2, "app0,app1,webstore0,webstore1",
        "app0,app1,webstore0,webstore1"},
-      {10,
-       0,
-       10,
-       10,
-       "app0,app1,app2,app3,webstore0,webstore1",
-       "app0,people0,app1,people1,app2,app3,webstore0,webstore1"},
-      {10,
-       10,
-       10,
-       10,
-       "app0,app1,app2,app3,omnibox0,webstore0",
-       "app0,omnibox0,people0,app1,omnibox1,people1,app2,omnibox2,app3,"
-       "omnibox3,webstore0,webstore1"},
-      {0, 0, 0, 0, "", ""},
+      {0, 0, 0, "", ""},
   };
 
   for (size_t i = 0; i < arraysize(kTestCases); ++i) {
     app_provider()->set_count(kTestCases[i].app_results);
     omnibox_provider()->set_count(kTestCases[i].omnibox_results);
     webstore_provider()->set_count(kTestCases[i].webstore_results);
-    people_provider()->set_count(kTestCases[i].people_results);
     RunQuery();
 
     const char* expected = GetParam() ? kTestCases[i].expected_blended
                                       : kTestCases[i].expected_default;
     EXPECT_EQ(expected, GetResults()) << "Case " << i;
   }
 }
 
 TEST_P(MixerTest, RemoveDuplicates) {
   const std::string dup = "dup";
@@ skipping 69 matching lines @@
   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_P(MixerTest, BadRelevanceRange) {
-  // This gives relevance scores: (10.0, 0.0). Even though providers are
-  // supposed to give scores within the range [0.0, 1.0], we cannot rely on
-  // providers to do this, since they retrieve results from disparate and
-  // unreliable sources (like the Google+ API).
-  people_provider()->set_bad_relevance_range();
-  people_provider()->set_count(2);
-
-  // Give a massive boost to the second result.
-  AddKnownResult("people1", PERFECT_PRIMARY);
-
-  RunQuery();
-
-  // If the results are correctly clamped to the range [0.0, 1.0], the boost to
-  // "people1" will push it over the first result. If not, the massive base
-  // score of "people0" will erroneously keep it on top.
-  EXPECT_EQ("people1,people0", GetResults());
-}
-
 TEST_P(MixerTest, Publish) {
   std::unique_ptr<SearchResult> result1(new TestSearchResult("app1", 0));
   std::unique_ptr<SearchResult> result2(new TestSearchResult("app2", 0));
   std::unique_ptr<SearchResult> result3(new TestSearchResult("app3", 0));
   std::unique_ptr<SearchResult> result3_copy = result3->Duplicate();
   std::unique_ptr<SearchResult> result4(new TestSearchResult("app4", 0));
   std::unique_ptr<SearchResult> result5(new TestSearchResult("app5", 0));
 
   AppListModel::SearchResults ui_results;
 
@@ skipping 72 matching lines @@
   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)));
 }
 
 INSTANTIATE_TEST_CASE_P(MixerTestInstance, MixerTest, testing::Bool());
 
 }  // namespace test
 }  // namespace app_list