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 48 matching lines @@
         home_card_top = screen_bounds().height() - kHomeCardMinimizedHeight;
 
       gfx::Point location = event.location();
       location.set_y(location.y() - home_card_top);
       event.set_location(location);
     }
     gesture_manager_->ProcessGestureEvent(&event);
     last_y_ = y;
     return event.handled();
   }
+
   void ProcessFlingGesture(float velocity) {
     ui::GestureEvent event(0, last_y_, ui::EF_NONE, base::TimeDelta(),
                            ui::GestureEventDetails(
                                ui::ET_SCROLL_FLING_START, 0, velocity));
     gesture_manager_->ProcessGestureEvent(&event);
   }
 
+  int screen_height() const {
+    return screen_bounds().height();
+  }
+
   HomeCard::State final_state_;
   HomeCard::State last_from_state_;
   HomeCard::State last_to_state_;
   float last_progress_;
 
  private:
   gfx::Rect screen_bounds() const {
     return gfx::Rect(0, 0, 1280, 1024);
   }
 
@@ skipping 87 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 moves.
+  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 moves.
+  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);
-  ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 800);
   ProcessFlingGesture(-30.0f);
   EXPECT_EQ(1, GetEndCountAndReset());
+  EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, final_state_);
+}
+

[pkotwicz, 2014/09/18 22:15:32]

I now understand what the test tests. Thank you for updating the comment

Nit: Tests the situation where

[Jun Mukai, 2014/09/18 22:33:33]

Done.

+// This test case adresses the situation where the user intends a single fling
+// but the finger touches the screen long enough, so that the home card becomes
+// bigger than the height of VISIBLE_BOTTOM state due to the scroll events.
+// In this case the fling event should not change the final state from
+// VISIBLE_BOTTOM to VISIBLE_CENTERED because the user's intention was a single
+// fling. See http://crbug.com/415211
+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,
+                      screen_height() - kHomeCardHeight);
+  ProcessFlingGesture(-150.0f);
+  EXPECT_EQ(1, GetEndCountAndReset());
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, final_state_);
 }
 
 }  // namespace athena