Add a SearchResultPageView to the experimental app list.

ui/app_list/views/app_list_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/app_list_view.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/test/app_list_test_model.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/app_list_folder_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/apps_grid_view.h"
 #include "ui/app_list/views/contents_switcher_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/search_result_list_view.h"
+#include "ui/app_list/views/search_result_page_view.h"
 #include "ui/app_list/views/search_result_tile_item_view.h"
 #include "ui/app_list/views/start_page_view.h"
 #include "ui/app_list/views/test/apps_grid_view_test_api.h"
 #include "ui/app_list/views/tile_item_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 namespace app_list {
@@ skipping 84 matching lines @@
   }
 
   // Whether the experimental "landscape" app launcher UI is being tested.
   bool is_landscape() const {
     return test_type_ == LANDSCAPE || test_type_ == EXPERIMENTAL;
   }
 
  private:
   // Switches the active launcher page in the contents view and lays out to
   // ensure all launcher pages are in the correct position.
-  void ShowContentsViewPageAndVerify(AppListModel::State state);
+  bool ShowContentsViewPageAndVerify(AppListModel::State state);

[Matt Giuca, 2014/10/29 03:40:53]

Why did you change to bools now? Is it just because you get the failure messages
on the correct line, or is there actually a reason you needed it here?

(Just interested.. I'm happy either way.)

You should rename these methods, though, since they are no longer verifying.
Also update their documentation.

ShowContentsViewPageAndVerify -> ShowContentsViewPage (document that it returns
true if the page is now active).
VerifyPageActive -> IsPageActive.

May as well also s/Page/State here.

Note that it might make more sense to just make ShowContentsViewPage void, and
force all callers to explicitly do:
ShowContentsViewPage(state)
EXPECT_TRUE(IsPageActive(state))

That would be a more conventional test pattern: do action; verify result.

[calamity, 2014/10/29 06:27:53]

Yah, got a failure, got angry trying to find it.
Done.
I'd prefer to leave them bundled so that it's impossible to forget to verify.

 
   // Tests that the app list is in |state|.
-  void VerifyPageActive(AppListModel::State state);
+  bool VerifyPageActive(AppListModel::State state);
 
   // Shows the app list and waits until a paint occurs.
   void Show();
 
   // Closes the app list. This sets |view_| to NULL.
   void Close();
 
   // Gets the PaginationModel owned by |view_|.
   PaginationModel* GetPaginationModel();
 
@@ skipping 64 matching lines @@
 }
 
 // static
 void AppListViewTestContext::CheckView(views::View* subview) {
   ASSERT_TRUE(subview);
   EXPECT_TRUE(subview->parent());
   EXPECT_TRUE(subview->visible());
   EXPECT_TRUE(subview->IsDrawn());
 }
 
-void AppListViewTestContext::ShowContentsViewPageAndVerify(
+bool AppListViewTestContext::ShowContentsViewPageAndVerify(
     AppListModel::State state) {
   ContentsView* contents_view = view_->app_list_main_view()->contents_view();
   int index = contents_view->GetPageIndexForState(state);
   contents_view->SetActivePage(index);
   contents_view->Layout();
-  VerifyPageActive(state);
+  return VerifyPageActive(state);
 }
 
-void AppListViewTestContext::VerifyPageActive(AppListModel::State state) {
+bool AppListViewTestContext::VerifyPageActive(AppListModel::State state) {
   ContentsView* contents_view = view_->app_list_main_view()->contents_view();
   int index = contents_view->GetPageIndexForState(state);
+  bool success = true;
   for (int i = 0; i < contents_view->NumLauncherPages(); ++i) {
-    EXPECT_EQ(i == index,
-              contents_view->GetDefaultContentsBounds() ==
-                  contents_view->GetPageView(i)->bounds());
+    success = success &&
+              (i == index) == (contents_view->GetDefaultContentsBounds() ==
+                               contents_view->GetPageView(i)->bounds());
   }
-  EXPECT_EQ(state, delegate_->GetTestModel()->state());
+  return success && state == delegate_->GetTestModel()->state();
 }
 
 void AppListViewTestContext::Show() {
   view_->GetWidget()->Show();
   run_loop_.reset(new base::RunLoop);
   view_->SetNextPaintCallback(run_loop_->QuitClosure());
   run_loop_->Run();
 
   EXPECT_TRUE(view_->GetWidget()->IsVisible());
 }
@@ skipping 114 matching lines @@
   AppListMainView* main_view = view_->app_list_main_view();
   StartPageView* start_page_view =
       main_view->contents_view()->start_page_view();
   // Checks on the main view.
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view));
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view->contents_view()));
   if (test_type_ == EXPERIMENTAL) {
     EXPECT_NO_FATAL_FAILURE(CheckView(start_page_view));
 
     // Show the start page view.
-    ShowContentsViewPageAndVerify(AppListModel::STATE_START);
+    EXPECT_TRUE(ShowContentsViewPageAndVerify(AppListModel::STATE_START));
     EXPECT_FALSE(main_view->search_box_view()->visible());
     gfx::Size view_size(view_->GetPreferredSize());
 
     // Simulate clicking the "All apps" button. Check that we navigate to the
     // apps grid view.
     SimulateClick(start_page_view->all_apps_button());
     main_view->contents_view()->Layout();
-    VerifyPageActive(AppListModel::STATE_APPS);
+    EXPECT_TRUE(VerifyPageActive(AppListModel::STATE_APPS));
     EXPECT_TRUE(main_view->search_box_view()->visible());
 
     // Hiding and showing the search box should not affect the app list's
     // preferred size. This is a regression test for http://crbug.com/386912.
     EXPECT_EQ(view_size.ToString(), view_->GetPreferredSize().ToString());
 
     // Check tiles hide and show on deletion and addition.
     model->results()->Add(new TestTileSearchResult());
     start_page_view->UpdateForTesting();
     EXPECT_EQ(1u, GetVisibleViews(start_page_view->tile_views()));
@@ skipping 110 matching lines @@
 void AppListViewTestContext::RunSearchResultsTest() {
   EXPECT_FALSE(view_->GetWidget()->IsVisible());
   EXPECT_EQ(-1, GetPaginationModel()->total_pages());
   AppListTestModel* model = delegate_->GetTestModel();
   model->PopulateApps(3);
 
   Show();
 
   AppListMainView* main_view = view_->app_list_main_view();
   ContentsView* contents_view = main_view->contents_view();
-  ShowContentsViewPageAndVerify(AppListModel::STATE_APPS);
+  EXPECT_TRUE(ShowContentsViewPageAndVerify(AppListModel::STATE_APPS));
   EXPECT_TRUE(main_view->search_box_view()->visible());
 
   // Show the search results.
   contents_view->ShowSearchResults(true);
   contents_view->Layout();
-  EXPECT_TRUE(contents_view->IsShowingSearchResults());
+  EXPECT_TRUE(contents_view->IsStateActive(AppListModel::STATE_SEARCH_RESULTS));
   EXPECT_TRUE(main_view->search_box_view()->visible());
 
   const gfx::Rect default_contents_bounds =
       contents_view->GetDefaultContentsBounds();
   if (test_type_ == EXPERIMENTAL) {
-    EXPECT_TRUE(contents_view->IsStateActive(AppListModel::STATE_START));
-    EXPECT_EQ(AppListModel::STATE_START, delegate_->GetTestModel()->state());
-    EXPECT_EQ(default_contents_bounds,
-              contents_view->start_page_view()->bounds());
-  } else {
-    EXPECT_TRUE(
-        contents_view->IsStateActive(AppListModel::STATE_SEARCH_RESULTS));
     EXPECT_EQ(AppListModel::STATE_SEARCH_RESULTS,
               delegate_->GetTestModel()->state());
     EXPECT_EQ(default_contents_bounds,
-              contents_view->search_results_view()->bounds());
+              contents_view->search_results_page_view()->bounds());
+  } else {
+    EXPECT_EQ(AppListModel::STATE_SEARCH_RESULTS,
+              delegate_->GetTestModel()->state());
+    EXPECT_EQ(default_contents_bounds,
+              contents_view->search_results_list_view()->bounds());
   }
 
   // Hide the search results.
   contents_view->ShowSearchResults(false);
   contents_view->Layout();
-  EXPECT_FALSE(contents_view->IsShowingSearchResults());
 
   // Check that we return to the page that we were on before the search.
   EXPECT_TRUE(contents_view->IsStateActive(AppListModel::STATE_APPS));
   EXPECT_EQ(AppListModel::STATE_APPS, delegate_->GetTestModel()->state());
   EXPECT_EQ(default_contents_bounds,
             contents_view->apps_container_view()->bounds());
   EXPECT_TRUE(main_view->search_box_view()->visible());
 
   if (test_type_ == EXPERIMENTAL) {
-    ShowContentsViewPageAndVerify(AppListModel::STATE_START);
+    EXPECT_TRUE(ShowContentsViewPageAndVerify(AppListModel::STATE_START));
 
     // Check that typing into the dummy search box triggers the search page.
     base::string16 search_text = base::UTF8ToUTF16("test");
     SearchBoxView* dummy_search_box =
         contents_view->start_page_view()->dummy_search_box_view();
     EXPECT_TRUE(dummy_search_box->IsDrawn());
     dummy_search_box->search_box()->InsertText(search_text);
     contents_view->Layout();
     // Check that the current search is using |search_text|.
     EXPECT_EQ(search_text, delegate_->GetTestModel()->search_box()->text());
-    EXPECT_TRUE(contents_view->IsShowingSearchResults());
-    EXPECT_FALSE(dummy_search_box->IsDrawn());
     EXPECT_TRUE(main_view->search_box_view()->visible());
     EXPECT_EQ(search_text, main_view->search_box_view()->search_box()->text());
-    EXPECT_TRUE(contents_view->IsStateActive(AppListModel::STATE_START));
-    EXPECT_EQ(AppListModel::STATE_START, delegate_->GetTestModel()->state());
+    EXPECT_TRUE(
+        contents_view->IsStateActive(AppListModel::STATE_SEARCH_RESULTS));
+    EXPECT_EQ(AppListModel::STATE_SEARCH_RESULTS,
+              delegate_->GetTestModel()->state());
     EXPECT_EQ(default_contents_bounds,
-              contents_view->start_page_view()->bounds());
+              contents_view->search_results_page_view()->bounds());
 
     // Check that typing into the real search box triggers the search page.
-    ShowContentsViewPageAndVerify(AppListModel::STATE_APPS);
+    EXPECT_TRUE(ShowContentsViewPageAndVerify(AppListModel::STATE_APPS));
     EXPECT_EQ(default_contents_bounds,
               contents_view->apps_container_view()->bounds());
 
     base::string16 new_search_text = base::UTF8ToUTF16("apple");
     main_view->search_box_view()->search_box()->SetText(base::string16());
     main_view->search_box_view()->search_box()->InsertText(new_search_text);
     // Check that the current search is using |search_text|.
     EXPECT_EQ(new_search_text, delegate_->GetTestModel()->search_box()->text());
     EXPECT_EQ(new_search_text,
               main_view->search_box_view()->search_box()->text());
-    EXPECT_TRUE(contents_view->IsShowingSearchResults());
-    EXPECT_FALSE(dummy_search_box->IsDrawn());
+    contents_view->Layout();
+    EXPECT_TRUE(
+        contents_view->IsStateActive(AppListModel::STATE_SEARCH_RESULTS));
     EXPECT_TRUE(main_view->search_box_view()->visible());
     EXPECT_TRUE(dummy_search_box->search_box()->text().empty());
 
     // Check that the dummy search box is clear when reshowing the start page.
-    ShowContentsViewPageAndVerify(AppListModel::STATE_APPS);
-    ShowContentsViewPageAndVerify(AppListModel::STATE_START);
+    EXPECT_TRUE(ShowContentsViewPageAndVerify(AppListModel::STATE_APPS));
+    EXPECT_TRUE(ShowContentsViewPageAndVerify(AppListModel::STATE_START));
     EXPECT_TRUE(dummy_search_box->IsDrawn());
     EXPECT_TRUE(dummy_search_box->search_box()->text().empty());
   }
 
   Close();
 }
 
 class AppListViewTestAura : public views::ViewsTestBase,
                             public ::testing::WithParamInterface<int> {
  public:
@@ skipping 147 matching lines @@
 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance,
                         AppListViewTestAura,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
                         AppListViewTestDesktop,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 }  // namespace test
 }  // namespace app_list