App list: Added contents view custom animation framework.

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_animator.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_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"
@@ skipping 63 matching lines @@
   // Hides and reshows the app list with a folder open, expecting the main grid
   // view to be shown.
   void RunReshowWithOpenFolderTest();
 
   // Tests displaying of the experimental app list and shows the start page.
   void RunStartPageTest();
 
   // Tests switching rapidly between multiple pages of the launcher.
   void RunPageSwitchingAnimationTest();
 
+  // Tests custom animations between different pages of the launcher.
+  void RunCustomAnimationsTest();
+
   // Tests changing the App List profile.
   void RunProfileChangeTest();
 
   // Tests displaying of the search results.
   void RunSearchResultsTest();
 
   // A standard set of checks on a view, e.g., ensuring it is drawn and visible.
   static void CheckView(views::View* subview);
 
   // Invoked when the Widget is closing, and the view it contains is about to
@@ skipping 320 matching lines @@
     // Call Layout(). Should jump to the third page.
     contents_view->Layout();
     EXPECT_NE(expected_bounds, contents_view->GetPageView(0)->bounds());
     EXPECT_NE(expected_bounds, contents_view->GetPageView(1)->bounds());
     EXPECT_EQ(expected_bounds, contents_view->GetPageView(2)->bounds());
   }
 
   Close();
 }
 
+void AppListViewTestContext::RunCustomAnimationsTest() {
+  if (test_type_ == EXPERIMENTAL) {
+    Show();
+
+    ContentsView* contents_view = view_->app_list_main_view()->contents_view();
+    ContentsAnimator* animator;
+    bool reverse;
+
+    // A transition without a custom animation.
+    animator = contents_view->GetAnimatorForTransitionForTests(
+        contents_view->GetPageIndexForState(AppListModel::STATE_START),
+        contents_view->GetPageIndexForState(AppListModel::STATE_SEARCH_RESULTS),
+        &reverse);
+    EXPECT_EQ("DefaultAnimator", animator->NameForTests());
+    EXPECT_FALSE(reverse);
+
+    // Test some custom animations.
+    animator = contents_view->GetAnimatorForTransitionForTests(
+        contents_view->GetPageIndexForState(AppListModel::STATE_START),
+        contents_view->GetPageIndexForState(AppListModel::STATE_APPS),
+        &reverse);
+    EXPECT_EQ("StartToAppsAnimator", animator->NameForTests());
+    EXPECT_FALSE(reverse);
+
+    animator = contents_view->GetAnimatorForTransitionForTests(
+        contents_view->GetPageIndexForState(AppListModel::STATE_APPS),
+        contents_view->GetPageIndexForState(AppListModel::STATE_START),
+        &reverse);
+    EXPECT_EQ("StartToAppsAnimator", animator->NameForTests());
+    EXPECT_TRUE(reverse);
+  }
+
+  Close();

[calamity, 2014/11/05 06:29:07]

It's probably worth putting this in its own contents_view_unittest.cc given that
there are no views things going on here.

[Matt Giuca, 2014/11/06 00:32:58]

I just tried doing this. It basically requires the full setup of
app_list_view_unittest: to create a ContentsView requires an AppListMainView, an
AppListModel and an AppListViewDelegate.

Creating a valid AppListMainView requires a properly initialised AppListView
which requires a full call to InitAsBubbleAtFixedLocation which requires a
NativeView as the parent.

I've gotten this far but it's still not working and I've basically ended up
copy+pasting nearly all of the initialization code from app_list_view_unittest
into contents_view_unittest. I think I've found the reason why ContentsView is
tested in app_list_view_unittest instead of having its own separate test file.

Let's just leave this test here please pretty please?

(ContentsView probably should not be so tightly coupled to the rest of the app
list... it is severely untestable right now.)

[calamity, 2014/11/06 05:34:47]

??? Why? AppListMainViewTest gets by without an AppListView. You can move the
test there instead if you want. I just don't want this test which literally does
nothing on 2/3 of its runs to be spinning up the views unit test stuff.

[Matt Giuca, 2014/11/10 04:08:26]

Done.

(Thanks for the tip; it was non-obvious how to create a ContentsView for testing
but AppListMainViewTest shows how.)

+}
+
 void AppListViewTestContext::RunProfileChangeTest() {
   EXPECT_FALSE(view_->GetWidget()->IsVisible());
   EXPECT_EQ(-1, GetPaginationModel()->total_pages());
   delegate_->GetTestModel()->PopulateApps(kInitialItems);
 
   Show();
 
   if (is_landscape())
     EXPECT_EQ(2, GetPaginationModel()->total_pages());
   else
@@ skipping 261 matching lines @@
 
 // Tests that the start page view operates correctly.
 TEST_P(AppListViewTestAura, PageSwitchingAnimationTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunPageSwitchingAnimationTest());
 }
 
 TEST_P(AppListViewTestDesktop, PageSwitchingAnimationTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunPageSwitchingAnimationTest());
 }
 
+// Tests that the contents view correctly selects custom animations.
+TEST_P(AppListViewTestAura, CustomAnimationsTest) {
+  EXPECT_NO_FATAL_FAILURE(test_context_->RunCustomAnimationsTest());
+}
+
+TEST_P(AppListViewTestDesktop, CustomAnimationsTest) {
+  EXPECT_NO_FATAL_FAILURE(test_context_->RunCustomAnimationsTest());
+}
+
 // Tests that the profile changes operate correctly.
 TEST_P(AppListViewTestAura, ProfileChangeTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunProfileChangeTest());
 }
 
 TEST_P(AppListViewTestDesktop, ProfileChangeTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunProfileChangeTest());
 }
 
 // Tests that the correct views are displayed for showing search results.
 TEST_P(AppListViewTestAura, SearchResultsTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunSearchResultsTest());
 }
 
 TEST_P(AppListViewTestDesktop, SearchResultsTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunSearchResultsTest());
 }
 
 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