Update gesture logic.

athena/home/home_card_gesture_manager_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 "athena/home/home_card_gesture_manager.h"
 
 #include "athena/home/home_card_constants.h"
 #include "athena/home/public/home_card.h"
 #include "athena/test/athena_test_base.h"
 #include "base/time/time.h"
@@ skipping 162 matching lines @@
   EXPECT_EQ(1.0f, last_progress_);
 
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 900);
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 910);
   EXPECT_EQ(2, GetProgressCountAndReset());
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, last_from_state_);
   EXPECT_EQ(HomeCard::VISIBLE_CENTERED, last_to_state_);
   EXPECT_GT(1.0f, last_progress_);
   EXPECT_LT(0.0f, last_progress_);
 
+  ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 960);
+  EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_END, 960));
+  EXPECT_EQ(1, GetEndCountAndReset());
+  EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, final_state_);
+}
+
+// Test gesture progress when the gesture is initiated when the home card is in
+// the centered state.
+TEST_F(HomeCardGestureManagerTest, StartBottom) {
+  HomeCard::Get()->SetState(HomeCard::VISIBLE_BOTTOM);
+
+  // No changes for slight changes.

[pkotwicz, 2014/09/18 21:24:26]

changes -> move

[Jun Mukai, 2014/09/18 21:57:29]

Done.

+  EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 950));
+  ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 960);
+  EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_END, 960));
+  EXPECT_EQ(1, GetEndCountAndReset());
+  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, final_state_);
+
+  EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 950));
+  EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_END, 800));
+  EXPECT_EQ(1, GetEndCountAndReset());
+  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, final_state_);
+
+  // State change for the bigger move.
+  EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 950));
+  ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 1000);
   EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_END, 1000));
   EXPECT_EQ(1, GetEndCountAndReset());
-  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, final_state_);
+  EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, final_state_);
+
+  EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 950));
+  ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 300);
+  EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_END, 300));
+  EXPECT_EQ(1, GetEndCountAndReset());
+  EXPECT_EQ(HomeCard::VISIBLE_CENTERED, final_state_);
 }
 
 TEST_F(HomeCardGestureManagerTest, FlingUpAtEnd) {
   ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 
   EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 1020));
   EXPECT_EQ(0, GetEndCountAndReset());
   EXPECT_EQ(0, GetProgressCountAndReset());
 
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 1010);
-  ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 800);
   ProcessFlingGesture(-150.0f);
   EXPECT_EQ(1, GetEndCountAndReset());
-  EXPECT_EQ(HomeCard::VISIBLE_CENTERED, final_state_);
+  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, final_state_);
 }
 
 TEST_F(HomeCardGestureManagerTest, FlingDownAtEnd) {
-  ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
+  HomeCard::Get()->SetState(HomeCard::VISIBLE_CENTERED);
 
-  EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 1020));
+  EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 20));
   EXPECT_EQ(0, GetEndCountAndReset());
   EXPECT_EQ(0, GetProgressCountAndReset());
 
-  ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 1010);
-  ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 800);
-  ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 200);
+  ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 30);
+  ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 100);
   ProcessFlingGesture(150.0f);
   EXPECT_EQ(1, GetEndCountAndReset());
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, final_state_);
 }
 
 TEST_F(HomeCardGestureManagerTest, WeakFling) {
   ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 
   EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 1020));
   EXPECT_EQ(0, GetEndCountAndReset());
   EXPECT_EQ(0, GetProgressCountAndReset());
 
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 1010);
+  ProcessFlingGesture(-30.0f);
+  EXPECT_EQ(1, GetEndCountAndReset());
+  EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, final_state_);
+}
+
+// Sometimes the fling event happens after the estimated height gets to bottom
+// state, but the state should not change to centered but remain in bottom.

[pkotwicz, 2014/09/18 21:24:26]

I am not sure whether this test case is very useful. The test case tests a case
where the desired behavior is ambiguous.

Testing the behavior of a weak fling after the home card is slightly larger than
kHomeCardHeight is more useful in my opinion.

[Jun Mukai, 2014/09/18 21:57:29]

Hmm, a weak fling doesn't cause any effects ("WeakFling" captures the case that
a weak fling is treated as a touch-release).

Updated the comment. Is it clearer?

+TEST_F(HomeCardGestureManagerTest, FastFling) {
+  ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
+
+  EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 1020));
+  EXPECT_EQ(0, GetEndCountAndReset());
+  EXPECT_EQ(0, GetProgressCountAndReset());
+
+  ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 1010);
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 800);
-  ProcessFlingGesture(-30.0f);
+  ProcessFlingGesture(-150.0f);
   EXPECT_EQ(1, GetEndCountAndReset());
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, final_state_);
 }
 
 }  // namespace athena