Implementing the dispatch of the swipe gesture for one-finger touch swipes.

ui/events/gesture_detection/gesture_provider_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 "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 182 matching lines @@
   base::TimeDelta GetDoubleTapTimeout() const {
     return GetDefaultConfig().gesture_detector_config.double_tap_timeout;
   }
 
   void EnableBeginEndTypes() {
     GestureProvider::Config config = GetDefaultConfig();
     config.gesture_begin_end_types_enabled = true;
     SetUpWithConfig(config);
   }
 
-  void EnableMultiFingerSwipe() {
+  void EnableSwipe() {
     GestureProvider::Config config = GetDefaultConfig();
     config.gesture_detector_config.swipe_enabled = true;
     SetUpWithConfig(config);
   }
 
   void EnableTwoFingerTap(float max_distance_for_two_finger_tap,
                           base::TimeDelta two_finger_tap_timeout) {
     GestureProvider::Config config = GetDefaultConfig();
     config.gesture_detector_config.two_finger_tap_enabled = true;
     config.gesture_detector_config.two_finger_tap_max_separation =
@@ skipping 48 matching lines @@
     gesture_provider_->OnTouchEvent(event);
     EXPECT_FALSE(gesture_provider_->IsScrollInProgress());
     EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_SCROLL_END));
     EXPECT_EQ(ET_GESTURE_SCROLL_END, GetMostRecentGestureEventType());
     EXPECT_EQ(motion_event_id, GetMostRecentGestureEvent().motion_event_id);
     EXPECT_EQ(1, GetMostRecentGestureEvent().details.touch_points());
     EXPECT_EQ(BoundsForSingleMockTouchAtLocation(scroll_to_x, scroll_to_y),
               GetMostRecentGestureEvent().details.bounding_box());
   }
 
+  void OneFingerSwipe(float vx, float vy) {
+    std::vector<gfx::Vector2dF> velocities;
+    velocities.push_back(gfx::Vector2dF(vx, vy));
+    MultiFingerSwipe(velocities);
+  }
+
   void TwoFingerSwipe(float vx0, float vy0, float vx1, float vy1) {
     std::vector<gfx::Vector2dF> velocities;
     velocities.push_back(gfx::Vector2dF(vx0, vy0));
     velocities.push_back(gfx::Vector2dF(vx1, vy1));
     MultiFingerSwipe(velocities);
   }
 
   void ThreeFingerSwipe(float vx0,
                         float vy0,
                         float vx1,
@@ skipping 1159 matching lines @@
   EXPECT_EQ(1, GetMostRecentGestureEvent().details.touch_points());
   EXPECT_EQ(gfx::RectF(kFakeCoordX - kMockTouchRadius,
                        kFakeCoordY - kMockTouchRadius,
                        kMockTouchRadius * 2,
                        kMockTouchRadius * 2),
             GetMostRecentGestureEvent().details.bounding_box());
 }
 
 // Verify that multi-finger swipe sends the proper event sequence.
 TEST_F(GestureProviderTest, MultiFingerSwipe) {
-  EnableMultiFingerSwipe();
+  EnableSwipe();
   gesture_provider_->SetMultiTouchZoomSupportEnabled(false);
   const float min_swipe_velocity = GetMinSwipeVelocity();
 
+  // One finger - swipe right
+  OneFingerSwipe(2 * min_swipe_velocity, 0);
+  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_SWIPE));
+  EXPECT_TRUE(GetMostRecentGestureEvent().details.swipe_right());
+  EXPECT_EQ(1, GetMostRecentGestureEvent().details.touch_points());
+  ResetGestureDetection();
+
+  // One finger - swipe left
+  OneFingerSwipe(-2 * min_swipe_velocity, 0);
+  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_SWIPE));
+  EXPECT_TRUE(GetMostRecentGestureEvent().details.swipe_left());
+  EXPECT_EQ(1, GetMostRecentGestureEvent().details.touch_points());
+  ResetGestureDetection();
+
+  // One finger - swipe down
+  OneFingerSwipe(0, 2 * min_swipe_velocity);
+  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_SWIPE));
+  EXPECT_TRUE(GetMostRecentGestureEvent().details.swipe_down());
+  EXPECT_EQ(1, GetMostRecentGestureEvent().details.touch_points());
+  ResetGestureDetection();
+
+  // One finger - swipe up
+  OneFingerSwipe(0, -2 * min_swipe_velocity);
+  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_SWIPE));
+  EXPECT_TRUE(GetMostRecentGestureEvent().details.swipe_up());
+  EXPECT_EQ(1, GetMostRecentGestureEvent().details.touch_points());
+  ResetGestureDetection();
+
+  // Two fingers
   // Swipe right.
   TwoFingerSwipe(min_swipe_velocity * 2, 0, min_swipe_velocity * 2, 0);
-  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_MULTIFINGER_SWIPE));
+  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_SWIPE));
   EXPECT_TRUE(GetMostRecentGestureEvent().details.swipe_right());
   EXPECT_EQ(2, GetMostRecentGestureEvent().details.touch_points());
   ResetGestureDetection();
 
   // Swipe left.
   TwoFingerSwipe(-min_swipe_velocity * 2, 0, -min_swipe_velocity * 2, 0);
-  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_MULTIFINGER_SWIPE));
+  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_SWIPE));
   EXPECT_TRUE(GetMostRecentGestureEvent().details.swipe_left());
   EXPECT_EQ(2, GetMostRecentGestureEvent().details.touch_points());
   ResetGestureDetection();
 
   // No swipe with different touch directions.
   TwoFingerSwipe(min_swipe_velocity * 2, 0, -min_swipe_velocity * 2, 0);
-  EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_MULTIFINGER_SWIPE));
+  EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_SWIPE));
   ResetGestureDetection();
 
   // No swipe without a dominant direction.
   TwoFingerSwipe(min_swipe_velocity * 2,
                  min_swipe_velocity * 2,
                  min_swipe_velocity * 2,
                  min_swipe_velocity * 2);
-  EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_MULTIFINGER_SWIPE));
+  EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_SWIPE));
   ResetGestureDetection();
 
-  // Swipe up with non-zero velocities on both axes and dominant direction.
+  // Swipe down with non-zero velocities on both axes and dominant direction.
   TwoFingerSwipe(-min_swipe_velocity,
                  min_swipe_velocity * 4,
                  -min_swipe_velocity,
                  min_swipe_velocity * 4);
-  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_MULTIFINGER_SWIPE));
+  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_SWIPE));
   EXPECT_TRUE(GetMostRecentGestureEvent().details.swipe_down());
   EXPECT_FALSE(GetMostRecentGestureEvent().details.swipe_left());
   EXPECT_EQ(2, GetMostRecentGestureEvent().details.touch_points());
   ResetGestureDetection();
 
-  // Swipe down with non-zero velocities on both axes.
+  // Swipe up with non-zero velocities on both axes.
   TwoFingerSwipe(min_swipe_velocity,
                  -min_swipe_velocity * 4,
                  min_swipe_velocity,
                  -min_swipe_velocity * 4);
-  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_MULTIFINGER_SWIPE));
+  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_SWIPE));
   EXPECT_TRUE(GetMostRecentGestureEvent().details.swipe_up());
   EXPECT_FALSE(GetMostRecentGestureEvent().details.swipe_right());
   EXPECT_EQ(2, GetMostRecentGestureEvent().details.touch_points());
   ResetGestureDetection();
 
   // No swipe without sufficient velocity.
   TwoFingerSwipe(min_swipe_velocity / 2, 0, 0, 0);
-  EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_MULTIFINGER_SWIPE));
+  EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_SWIPE));
   ResetGestureDetection();
 
   // Swipe up with one small and one medium velocity in slightly different but
   // not opposing directions.
   TwoFingerSwipe(min_swipe_velocity / 2,
                  min_swipe_velocity / 2,
                  0,
                  min_swipe_velocity * 2);
-  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_MULTIFINGER_SWIPE));
+  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_SWIPE));
   EXPECT_TRUE(GetMostRecentGestureEvent().details.swipe_down());
   EXPECT_FALSE(GetMostRecentGestureEvent().details.swipe_right());
   EXPECT_EQ(2, GetMostRecentGestureEvent().details.touch_points());
   ResetGestureDetection();
 
   // No swipe in orthogonal directions.
   TwoFingerSwipe(min_swipe_velocity * 2, 0, 0, min_swipe_velocity * 7);
-  EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_MULTIFINGER_SWIPE));
+  EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_SWIPE));
   ResetGestureDetection();
 
   // Three finger swipe in same directions.
   ThreeFingerSwipe(min_swipe_velocity * 2,
                    0,
                    min_swipe_velocity * 3,
                    0,
                    min_swipe_velocity * 4,
                    0);
-  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_MULTIFINGER_SWIPE));
+  EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_SWIPE));
   EXPECT_TRUE(GetMostRecentGestureEvent().details.swipe_right());
   EXPECT_EQ(3, GetMostRecentGestureEvent().details.touch_points());
   ResetGestureDetection();
 
   // No three finger swipe in different directions.
   ThreeFingerSwipe(min_swipe_velocity * 2,
                    0,
                    0,
                    min_swipe_velocity * 3,
                    min_swipe_velocity * 4,
                    0);
-  EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_MULTIFINGER_SWIPE));
+  EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_SWIPE));
 }
 
 // Verify that the timer of LONG_PRESS will be cancelled when scrolling begins
 // so LONG_PRESS and LONG_TAP won't be triggered.
 TEST_F(GestureProviderTest, GesturesCancelledAfterLongPressCausesLostFocus) {
   base::TimeTicks event_time = base::TimeTicks::Now();
 
   MockMotionEvent event =
       ObtainMotionEvent(event_time, MotionEvent::ACTION_DOWN);
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
@@ skipping 348 matching lines @@
                             kFakeCoordY,
                             kFakeCoordX + kMaxTwoFingerTapSeparation,
                             kFakeCoordY);
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
 
   EXPECT_EQ(ET_GESTURE_TAP_DOWN, GetReceivedGesture(0).type);
   EXPECT_EQ(1U, GetReceivedGestureCount());
 }
 
 }  // namespace ui