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 "ui/app_list/app_list_model.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
@@ skipping 34 matching lines @@
   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);

[Matt Giuca, 2015/02/17 08:24:20]

Can you make this 0.4 (so the TILE comes in between the two LISTs). That way, we
test that ALL the lists come before all the tiles (the 0.3 gets bumped up above
the 0.4, despite having a lower score, because it joins the list).

[calamity, 2015/02/18 01:28:30]

Done.

+  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.1);
+
+  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