app_list: Touch scroll and animation improvement.

ui/app_list/pagination_model_unittest.cc

 // Copyright (c) 2012 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/pagination_model.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 172 matching lines @@
   MessageLoop::current()->Run();
   EXPECT_EQ(1, observer_.transition_start_count());
   EXPECT_EQ(1, observer_.transition_end_count());
   EXPECT_EQ(1, observer_.selection_count());
   EXPECT_EQ(std::string("1"), observer_.selected_pages());
 
   // More than two transitions and only the first and last would happen.
   SetStartPageAndExpects(kStartPage, 2, 0, 0);
   pagination_.SelectPage(1, true /* animate */);
   pagination_.SelectPage(3, true /* animate */);  // Ignored
-  pagination_.SelectPage(0, true /* animate */);  // Ignored
+  pagination_.SelectPage(4, true /* animate */);  // Ignored
   pagination_.SelectPage(2, true /* animate */);
   MessageLoop::current()->Run();
   EXPECT_EQ(2, observer_.transition_start_count());
   EXPECT_EQ(2, observer_.transition_end_count());
   EXPECT_EQ(2, observer_.selection_count());
   EXPECT_EQ(std::string("1 2"), observer_.selected_pages());
+
+  // Multiple transitions with one transition that goes back to the original
+  // and followed by a new transition. Two transitions would happen. The first
+  // one will be reversed by the kStart transition and the second one will be
+  // finished.
+  SetStartPageAndExpects(kStartPage, 1, 0, 0);
+  pagination_.SelectPage(1, true /* animate */);
+  pagination_.SelectPage(2, true /* animate */);  // Ignored
+  pagination_.SelectPage(kStartPage, true /* animate */);
+  pagination_.SelectPage(3, true /* animate */);
+  MessageLoop::current()->Run();
+  EXPECT_EQ(std::string("3"), observer_.selected_pages());
 }
 
 TEST_F(PaginationModelTest, SimpleScroll) {
   const int kStartPage = 2;
 
-  // Scroll to the next page (negative delta) and end at more than 0.5
+  // Scroll to the next page (negative delta) and finish it.
   SetStartPageAndExpects(kStartPage, 1, 0, 0);
   pagination_.StartScroll();
   pagination_.UpdateScroll(-0.1);
   EXPECT_EQ(kStartPage + 1, pagination_.transition().target_page);
-  pagination_.UpdateScroll(-0.5);
-  pagination_.EndScroll();
-  // More than 0.5 transition will be finished with a page select.
-  EXPECT_GT(pagination_.transition().progress, 0.5);
+  pagination_.EndScroll(false);  // Finish transition
   MessageLoop::current()->Run();
   EXPECT_EQ(1, observer_.selection_count());
 
-  // Scroll to the previous page (positive delta) and end at more than 0.5
+  // Scroll to the previous page (positive delta) and finish it.
   SetStartPageAndExpects(kStartPage, 1, 0, 0);
   pagination_.StartScroll();
   pagination_.UpdateScroll(0.1);
   EXPECT_EQ(kStartPage - 1, pagination_.transition().target_page);
-  pagination_.UpdateScroll(0.5);
-  pagination_.EndScroll();
-  // More than 0.5 transition will be finished with a page select.
-  EXPECT_GT(pagination_.transition().progress, 0.5);
+  pagination_.EndScroll(false);  // Finish transition
   MessageLoop::current()->Run();
   EXPECT_EQ(1, observer_.selection_count());
 
-  // Scroll to the next page (negative delta) and end at less than 0.5
+  // Scroll to the next page (negative delta) and cancel it.
   SetStartPageAndExpects(kStartPage, 0, 1, 0);
   pagination_.StartScroll();
   pagination_.UpdateScroll(-0.1);
   EXPECT_EQ(kStartPage + 1, pagination_.transition().target_page);
-  pagination_.EndScroll();
-  // Less than 0.5 transition will be reverted with no page select.
-  EXPECT_LT(pagination_.transition().progress, 0.5);
+  pagination_.EndScroll(true);  // Cancel transition
   MessageLoop::current()->Run();
   EXPECT_EQ(0, observer_.selection_count());
 
-  // Scroll to the previous page (position delta) and end at less than 0.5
+  // Scroll to the previous page (position delta) and cancel it.
   SetStartPageAndExpects(kStartPage, 0, 1, 0);
   pagination_.StartScroll();
   pagination_.UpdateScroll(0.1);
   EXPECT_EQ(kStartPage - 1, pagination_.transition().target_page);
-  pagination_.EndScroll();
-  // Less than 0.5 transition will be reverted with no page select.
-  EXPECT_LT(pagination_.transition().progress, 0.5);
+  pagination_.EndScroll(true);  // Cancel transition
   MessageLoop::current()->Run();
   EXPECT_EQ(0, observer_.selection_count());
 }
 
 TEST_F(PaginationModelTest, ScrollWithTransition) {
   const int kStartPage = 2;
 
   // Scroll to the next page (negative delta) with a transition in the same
   // direction.
   SetStartPageAndExpects(kStartPage, 1, 0, 0);
   pagination_.SetTransition(PaginationModel::Transition(kStartPage + 1, 0.5));
   pagination_.StartScroll();
   pagination_.UpdateScroll(-0.1);
   EXPECT_EQ(kStartPage + 1, pagination_.transition().target_page);
   EXPECT_EQ(0.6, pagination_.transition().progress);
-  pagination_.EndScroll();
+  pagination_.EndScroll(false);
   MessageLoop::current()->Run();
   EXPECT_EQ(1, observer_.selection_count());
 
   // Scroll to the next page (negative delta) with a transition in a different
   // direction.
   SetStartPageAndExpects(kStartPage, 0, 1, 0);
   pagination_.SetTransition(PaginationModel::Transition(kStartPage - 1, 0.5));
   pagination_.StartScroll();
   pagination_.UpdateScroll(-0.1);
   EXPECT_EQ(kStartPage - 1, pagination_.transition().target_page);
   EXPECT_EQ(0.4, pagination_.transition().progress);
-  pagination_.EndScroll();
-  MessageLoop::current()->Run();
-  EXPECT_EQ(0, observer_.selection_count());
+  pagination_.EndScroll(true);
 
   // Scroll to the previous page (positive delta) with a transition in the same
   // direction.
   SetStartPageAndExpects(kStartPage, 1, 0, 0);
   pagination_.SetTransition(PaginationModel::Transition(kStartPage - 1, 0.5));
   pagination_.StartScroll();
   pagination_.UpdateScroll(0.1);
   EXPECT_EQ(kStartPage - 1, pagination_.transition().target_page);
   EXPECT_EQ(0.6, pagination_.transition().progress);
-  pagination_.EndScroll();
+  pagination_.EndScroll(false);
   MessageLoop::current()->Run();
   EXPECT_EQ(1, observer_.selection_count());
 
   // Scroll to the previous page (positive delta) with a transition in a
   // different direction.
   SetStartPageAndExpects(kStartPage, 0, 1, 0);
   pagination_.SetTransition(PaginationModel::Transition(kStartPage + 1, 0.5));
   pagination_.StartScroll();
   pagination_.UpdateScroll(0.1);
   EXPECT_EQ(kStartPage + 1, pagination_.transition().target_page);
   EXPECT_EQ(0.4, pagination_.transition().progress);
-  pagination_.EndScroll();
-  MessageLoop::current()->Run();
-  EXPECT_EQ(0, observer_.selection_count());
+  pagination_.EndScroll(true);
 }
 
 TEST_F(PaginationModelTest, LongScroll) {
   const int kStartPage = 2;
 
   // Scroll to the next page (negative delta) with a transition in the same
   // direction. And scroll enough to change page twice.
   SetStartPageAndExpects(kStartPage, 2, 0, 0);
   pagination_.SetTransition(PaginationModel::Transition(kStartPage + 1, 0.5));
   pagination_.StartScroll();
   pagination_.UpdateScroll(-0.1);
   EXPECT_EQ(kStartPage + 1, pagination_.transition().target_page);
   EXPECT_EQ(0.6, pagination_.transition().progress);
   pagination_.UpdateScroll(-0.5);
   EXPECT_EQ(1, observer_.selection_count());
   pagination_.UpdateScroll(-0.5);
   EXPECT_EQ(kStartPage + 2, pagination_.transition().target_page);
-  pagination_.EndScroll();
+  pagination_.EndScroll(false);
   MessageLoop::current()->Run();
   EXPECT_EQ(2, observer_.selection_count());
 
   // Scroll to the next page (negative delta) with a transition in a different
   // direction. And scroll enough to revert it and switch page once.
   SetStartPageAndExpects(kStartPage, 1, 0, 0);
   pagination_.SetTransition(PaginationModel::Transition(kStartPage - 1, 0.5));
   pagination_.StartScroll();
   pagination_.UpdateScroll(-0.1);
   EXPECT_EQ(kStartPage - 1, pagination_.transition().target_page);
   EXPECT_EQ(0.4, pagination_.transition().progress);
   pagination_.UpdateScroll(-0.5);  // This clears the transition.
   pagination_.UpdateScroll(-0.5);  // This starts a new transition.
   EXPECT_EQ(kStartPage + 1, pagination_.transition().target_page);
-  pagination_.EndScroll();
+  pagination_.EndScroll(false);
   MessageLoop::current()->Run();
   EXPECT_EQ(1, observer_.selection_count());
 
   // Similar cases as above but in the opposite direction.
   // Scroll to the previous page (positive delta) with a transition in the same
   // direction. And scroll enough to change page twice.
   SetStartPageAndExpects(kStartPage, 2, 0, 0);
   pagination_.SetTransition(PaginationModel::Transition(kStartPage - 1, 0.5));
   pagination_.StartScroll();
   pagination_.UpdateScroll(0.1);
   EXPECT_EQ(kStartPage - 1, pagination_.transition().target_page);
   EXPECT_EQ(0.6, pagination_.transition().progress);
   pagination_.UpdateScroll(0.5);
   EXPECT_EQ(1, observer_.selection_count());
   pagination_.UpdateScroll(0.5);
   EXPECT_EQ(kStartPage - 2, pagination_.transition().target_page);
-  pagination_.EndScroll();
+  pagination_.EndScroll(false);
   MessageLoop::current()->Run();
   EXPECT_EQ(2, observer_.selection_count());
 
   // Scroll to the previous page (positive delta) with a transition in a
   // different direction. And scroll enough to revert it and switch page once.
   SetStartPageAndExpects(kStartPage, 1, 0, 0);
   pagination_.SetTransition(PaginationModel::Transition(kStartPage + 1, 0.5));
   pagination_.StartScroll();
   pagination_.UpdateScroll(0.1);
   EXPECT_EQ(kStartPage + 1, pagination_.transition().target_page);
   EXPECT_EQ(0.4, pagination_.transition().progress);
   pagination_.UpdateScroll(0.5);  // This clears the transition.
   pagination_.UpdateScroll(0.5);  // This starts a new transition.
   EXPECT_EQ(kStartPage - 1, pagination_.transition().target_page);
-  pagination_.EndScroll();
+  pagination_.EndScroll(false);
   MessageLoop::current()->Run();
   EXPECT_EQ(1, observer_.selection_count());
 }
 
 TEST_F(PaginationModelTest, SelectedPageIsLost) {
   pagination_.SetTotalPages(2);
   // The selected page is set to 0 once the total number of pages are set.
   EXPECT_EQ(0, pagination_.selected_page());
 
   pagination_.SelectPage(1, false /* animate */);
   EXPECT_EQ(1, pagination_.selected_page());
 
   // The selected page is unchanged if it's still valid.
   pagination_.SetTotalPages(3);
   EXPECT_EQ(1, pagination_.selected_page());
   pagination_.SetTotalPages(2);
   EXPECT_EQ(1, pagination_.selected_page());
 
   // But if the currently selected_page exceeds the total number of pages,
   // it automatically switches to the last page.
   pagination_.SetTotalPages(1);
   EXPECT_EQ(0, pagination_.selected_page());
 }
 
 }  // namespace test
 }  // namespace app_list