Also pass unclamped delta and velocity values to GestureEventDetails. (DEPRECATED)

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 286 matching lines @@
   event.SetId(++motion_event_id);
 
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
   EXPECT_EQ(ET_GESTURE_TAP_DOWN, GetMostRecentGestureEventType());
   EXPECT_EQ(motion_event_id, GetMostRecentGestureEvent().motion_event_id);
   EXPECT_EQ(1, GetMostRecentGestureEvent().details.touch_points());
 
   event = ObtainMotionEvent(event_time + delta_time,
                             MotionEvent::ACTION_MOVE,
                             kFakeCoordX * 10,
-                            kFakeCoordY * 10);
+                            kFakeCoordY * 1.5);
   event.SetId(++motion_event_id);
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
 
   event = ObtainMotionEvent(event_time + delta_time * 2,
                             MotionEvent::ACTION_UP,
                             kFakeCoordX * 10,
-                            kFakeCoordY * 10);
+                            kFakeCoordY * 1.5);
   event.SetId(++motion_event_id);
 
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
   EXPECT_EQ(ET_SCROLL_FLING_START, GetMostRecentGestureEventType());
+
+  EXPECT_EQ(8000, GetMostRecentGestureEvent().details.velocity_x());

[jdduke (slow), 2014/04/24 19:58:53]

We should probably get 8000 using the |maximum_fling_velocity| constant from
|GetDefaultConfig()| (probably add a method similar to |GetTouchSlop()| above).

+  EXPECT_EQ(0, GetMostRecentGestureEvent().details.velocity_y());
+  EXPECT_EQ(8000, GetMostRecentGestureEvent().details.velocity_x_ordinal());
+  EXPECT_EQ(2400, GetMostRecentGestureEvent().details.velocity_y_ordinal());
+
   EXPECT_EQ(motion_event_id, GetMostRecentGestureEvent().motion_event_id);
   EXPECT_EQ(1, GetMostRecentGestureEvent().details.touch_points());
   EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_LONG_PRESS));
   EXPECT_EQ(
-      BoundsForSingleMockTouchAtLocation(kFakeCoordX * 10, kFakeCoordY * 10),
+      BoundsForSingleMockTouchAtLocation(kFakeCoordX * 10, kFakeCoordY * 1.5),
       GetMostRecentGestureEvent().details.bounding_box());
 }
 
 // Verify that for a normal scroll the following events are sent:
 // - ET_GESTURE_SCROLL_BEGIN
 // - ET_GESTURE_SCROLL_UPDATE
 // - ET_GESTURE_SCROLL_END
 TEST_F(GestureProviderTest, ScrollEventActionUpSequence) {
   CheckScrollEventSequenceForEndActionType(MotionEvent::ACTION_UP);
 }
@@ skipping 46 matching lines @@
   event = ObtainMotionEvent(event_time + delta_time * 2,
                             MotionEvent::ACTION_UP,
                             kFakeCoordX * 10,
                             kFakeCoordY * 10);
   event.SetId(++motion_event_id);
 
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
   EXPECT_FALSE(gesture_provider_->IsScrollInProgress());
   EXPECT_EQ(ET_SCROLL_FLING_START, GetMostRecentGestureEventType());
   EXPECT_EQ(motion_event_id, GetMostRecentGestureEvent().motion_event_id);
+
+  EXPECT_EQ(8000, GetMostRecentGestureEvent().details.velocity_x());
+  EXPECT_EQ(8000, GetMostRecentGestureEvent().details.velocity_y());
+  EXPECT_EQ(8000, GetMostRecentGestureEvent().details.velocity_x_ordinal());
+  EXPECT_EQ(8000, GetMostRecentGestureEvent().details.velocity_y_ordinal());
+
   EXPECT_EQ(1, GetMostRecentGestureEvent().details.touch_points());
   EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_SCROLL_END));
   EXPECT_EQ(event_time + delta_time * 2, GetMostRecentGestureEvent().time)
       << "FlingStart should have the time of the ACTION_UP";
 }
 
 TEST_F(GestureProviderTest, GestureCancelledWhenWindowFocusLost) {
   const base::TimeTicks event_time = TimeTicks::Now();
 
   MockMotionEvent event =
@@ skipping 185 matching lines @@
   ASSERT_LT(0U, GetReceivedGestureCount());
   GestureEventData gesture = GetMostRecentGestureEvent();
   EXPECT_EQ(ET_GESTURE_SCROLL_UPDATE, gesture.type);
   EXPECT_EQ(event_time + kOneMicrosecond * 2, gesture.time);
   EXPECT_EQ(kFakeCoordX - delta_x, gesture.x);
   EXPECT_EQ(kFakeCoordY - delta_y, gesture.y);
   EXPECT_EQ(1, gesture.details.touch_points());
 
   // No horizontal delta because of snapping.
   EXPECT_EQ(0, gesture.details.scroll_x());
+  EXPECT_EQ(-delta_x / 2, gesture.details.scroll_x_ordinal());
   EXPECT_EQ(-delta_y / 2, gesture.details.scroll_y());

[jdduke (slow), 2014/04/24 19:58:53]

Might as well round this out with 

EXPECT_EQ(-delta_y / 2, gesture.details.scroll_y_ordinal());

 }
 
 // Verify that fractional scroll deltas are rounded as expected and that
 // fractional scrolling doesn't break scroll snapping.
 TEST_F(GestureProviderTest, FractionalScroll) {
   const float delta_x = 0.4f;
   const float delta_y = 5.2f;
 
   const base::TimeTicks event_time = TimeTicks::Now();
 
@@ skipping 910 matching lines @@
 
   event = ObtainMotionEvent(event_time, MotionEvent::ACTION_CANCEL);
   event.pointer_count = 1;
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
   EXPECT_EQ(ET_GESTURE_END, GetMostRecentGestureEventType());
   EXPECT_EQ(12U, GetReceivedGestureCount());
   EXPECT_EQ(1, GetMostRecentGestureEvent().details.touch_points());
 }
 
 }  // namespace ui