Sort experimental app list search result groups.

ui/app_list/views/search_result_page_view_unittest.cc

 // Copyright 2014 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/views/search_result_page_view.h"
 
 #include <map>
 
+#include "base/command_line.h"
 #include "ui/app_list/app_list_model.h"
+#include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
 #include "ui/app_list/test/test_search_result.h"
 #include "ui/app_list/views/search_result_list_view.h"
 #include "ui/app_list/views/search_result_list_view_delegate.h"
 #include "ui/app_list/views/search_result_tile_item_list_view.h"
 #include "ui/app_list/views/search_result_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 
 namespace app_list {
 namespace test {
 
 class SearchResultPageViewTest : public views::ViewsTestBase,
                                  public SearchResultListViewDelegate {
  public:
-  SearchResultPageViewTest() {}
+  SearchResultPageViewTest() {
+    base::CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kEnableExperimentalAppList);
+  }
   ~SearchResultPageViewTest() override {}
 
   // Overridden from testing::Test:
   void SetUp() override {
     views::ViewsTestBase::SetUp();
     view_.reset(new SearchResultPageView());
     list_view_ = new SearchResultListView(this, &view_delegate_);
     view_->AddSearchResultContainerView(GetResults(), list_view_);
     textfield_.reset(new views::Textfield());
     tile_list_view_ = new SearchResultTileItemListView(textfield_.get());
     view_->AddSearchResultContainerView(GetResults(), tile_list_view_);
   }
 
  protected:
   SearchResultPageView* view() { return view_.get(); }
 
   SearchResultListView* list_view() { return list_view_; }
   SearchResultTileItemListView* tile_list_view() { return tile_list_view_; }
 
   AppListModel::SearchResults* GetResults() {
     return view_delegate_.GetModel()->results();
   }
 
   void SetUpSearchResults(
       const std::map<SearchResult::DisplayType, int> result_types) {
     AppListModel::SearchResults* results = GetResults();
     for (const auto& data : result_types) {
       for (int i = 0; i < data.second; ++i) {
         TestSearchResult* result = new TestSearchResult();
-        result->SetDisplayType(data.first);
+        result->set_display_type(data.first);
         results->Add(result);
       }
     }
 
     // Adding results will schedule Update().
     RunPendingMessages();
   }
 
   int GetSelectedIndex() { return view_->selected_index(); }
 
@@ skipping 51 matching lines @@
   EXPECT_EQ(-1, tile_list_view()->selected_index());
 
   // Navigate off top of list.
   EXPECT_TRUE(KeyPress(ui::VKEY_UP));
   EXPECT_EQ(0, list_view()->selected_index());
   EXPECT_FALSE(KeyPress(ui::VKEY_UP));
   EXPECT_EQ(0, list_view()->selected_index());
   EXPECT_EQ(0, GetSelectedIndex());
 }
 
+TEST_F(SearchResultPageViewTest, ResultsSorted) {
+  AppListModel::SearchResults* results = GetResults();
+
+  // Add 3 results and expect the tile list view to be the first result
+  // container view.
+  TestSearchResult* tile_result = new TestSearchResult();
+  tile_result->set_display_type(SearchResult::DISPLAY_TILE);
+  tile_result->set_relevance(1.0);
+  results->Add(tile_result);
+  {
+    TestSearchResult* list_result = new TestSearchResult();
+    list_result->set_display_type(SearchResult::DISPLAY_LIST);
+    list_result->set_relevance(0.5);
+    results->Add(list_result);
+  }
+  {
+    TestSearchResult* list_result = new TestSearchResult();
+    list_result->set_display_type(SearchResult::DISPLAY_LIST);
+    list_result->set_relevance(0.3);
+    results->Add(list_result);
+  }
+
+  // Adding results will schedule Update().
+  RunPendingMessages();
+
+  EXPECT_EQ(tile_list_view(), view()->result_container_views()[0]);
+  EXPECT_EQ(list_view(), view()->result_container_views()[1]);
+
+  // Change the relevance of the tile result and expect the list results to be
+  // displayed first.
+  tile_result->set_relevance(0.4);
+
+  results->NotifyItemsChanged(0, 1);
+  RunPendingMessages();
+
+  EXPECT_EQ(list_view(), view()->result_container_views()[0]);
+  EXPECT_EQ(tile_list_view(), view()->result_container_views()[1]);
+}
+
 }  // namespace test
 }  // namespace app_list