Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2527)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/events/gesture_detection/gesture_provider_unittest.cc

Issue 212663010: Store the id of a contributing motion event in GestureEventData (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Store motion_event_id, not touch_id. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/events/gesture_detection/gesture_provider.cc ('K') | « ui/events/gesture_detection/gesture_provider.cc ('k') | ui/events/gesture_detection/mock_motion_event.h » ('j') | ui/events/gesture_detection/mock_motion_event.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gesture_detection/gesture_provider_unittest.cc
diff --git a/ui/events/gesture_detection/gesture_provider_unittest.cc b/ui/events/gesture_detection/gesture_provider_unittest.cc
index 1be9ec7fec30c6abbc50c8a0ff020d926f58e5a4..c4f344abf9d49a8d4add1cff0800b1673b23847d 100644
--- a/ui/events/gesture_detection/gesture_provider_unittest.cc
+++ b/ui/events/gesture_detection/gesture_provider_unittest.cc
@@ -149,9 +149,11 @@ class GestureProviderTest : public testing::Test, public GestureProviderClient {
base::TimeTicks event_time = base::TimeTicks::Now();
const int scroll_to_x = kFakeCoordX + 100;
const int scroll_to_y = kFakeCoordY + 100;
+ const int motion_event_id = 5;
MockMotionEvent event =
ObtainMotionEvent(event_time, MotionEvent::ACTION_DOWN);
+ event.SetId(motion_event_id);
EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
@@ -159,25 +161,33 @@ class GestureProviderTest : public testing::Test, public GestureProviderClient {
MotionEvent::ACTION_MOVE,
scroll_to_x,
scroll_to_y);
+ event.SetId(motion_event_id);
+
EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
EXPECT_TRUE(gesture_provider_->IsScrollInProgress());
EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_SCROLL_BEGIN));
+ EXPECT_EQ(motion_event_id, GetMostRecentGestureEvent().motion_event_id);
EXPECT_EQ(ET_GESTURE_SCROLL_UPDATE, GetMostRecentGestureEventType());
ASSERT_EQ(4U, GetReceivedGestureCount()) << "Only TapDown, TapCancel, "
"ScrollBegin and ScrollBy "
"should have been sent";
EXPECT_EQ(ET_GESTURE_TAP_CANCEL, GetReceivedGesture(1).type);
+ EXPECT_EQ(motion_event_id, GetReceivedGesture(1).motion_event_id);
EXPECT_EQ(ET_GESTURE_SCROLL_BEGIN, GetReceivedGesture(2).type);
+ EXPECT_EQ(motion_event_id, GetReceivedGesture(2).motion_event_id);
EXPECT_EQ(event_time + kOneSecond, GetReceivedGesture(2).time)
<< "ScrollBegin should have the time of the ACTION_MOVE";
event = ObtainMotionEvent(
event_time + kOneSecond, end_action_type, scroll_to_x, scroll_to_y);
+ event.SetId(motion_event_id);
jdduke (slow) 2014/04/02 18:33:12 Please increment motion_event_id whenever you |Set
tdresser 2014/04/03 14:01:23 Done.
+
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);
}
static void RunTasksAndWait(base::TimeDelta delay) {
@@ -195,44 +205,57 @@ class GestureProviderTest : public testing::Test, public GestureProviderClient {
// Verify that a DOWN followed shortly by an UP will trigger a single tap.
TEST_F(GestureProviderTest, GestureTapTap) {
base::TimeTicks event_time = base::TimeTicks::Now();
+ const int motion_event_id = 8;
gesture_provider_->SetDoubleTapSupportForPlatformEnabled(false);
MockMotionEvent event =
ObtainMotionEvent(event_time, MotionEvent::ACTION_DOWN);
+ event.SetId(motion_event_id);
+
EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
EXPECT_EQ(ET_GESTURE_TAP_DOWN, GetMostRecentGestureEventType());
event = ObtainMotionEvent(event_time + kOneMicrosecond,
MotionEvent::ACTION_UP);
+ event.SetId(motion_event_id);
jdduke (slow) 2014/04/02 18:33:12 Same as above, make sure each MotionEvent is getti
tdresser 2014/04/03 14:01:23 Done.
+
EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
EXPECT_EQ(ET_GESTURE_TAP, GetMostRecentGestureEventType());
// Ensure tap details have been set.
EXPECT_EQ(10, GetMostRecentGestureEvent().details.bounding_box().width());
EXPECT_EQ(10, GetMostRecentGestureEvent().details.bounding_box().height());
EXPECT_EQ(1, GetMostRecentGestureEvent().details.tap_count());
+ EXPECT_EQ(motion_event_id, GetMostRecentGestureEvent().motion_event_id);
}
// Verify that a DOWN followed shortly by an UP will trigger
// a ET_GESTURE_TAP_UNCONFIRMED event if double-tap is enabled.
TEST_F(GestureProviderTest, GestureTapTapWithDelay) {
base::TimeTicks event_time = base::TimeTicks::Now();
+ const int motion_event_id = 3;
gesture_provider_->SetDoubleTapSupportForPlatformEnabled(true);
MockMotionEvent event =
ObtainMotionEvent(event_time, MotionEvent::ACTION_DOWN);
+ 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);
event = ObtainMotionEvent(event_time + kOneMicrosecond,
MotionEvent::ACTION_UP);
+ event.SetId(motion_event_id);
+
EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
EXPECT_EQ(ET_GESTURE_TAP_UNCONFIRMED, GetMostRecentGestureEventType());
// Ensure tap details have been set.
EXPECT_EQ(10, GetMostRecentGestureEvent().details.bounding_box().width());
EXPECT_EQ(10, GetMostRecentGestureEvent().details.bounding_box().height());
EXPECT_EQ(1, GetMostRecentGestureEvent().details.tap_count());
+ EXPECT_EQ(motion_event_id, GetMostRecentGestureEvent().motion_event_id);
EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_TAP));
}
@@ -241,25 +264,32 @@ TEST_F(GestureProviderTest, GestureTapTapWithDelay) {
TEST_F(GestureProviderTest, GestureFlingAndCancelLongPress) {
base::TimeTicks event_time = TimeTicks::Now();
base::TimeDelta delta_time = kDeltaTimeForFlingSequences;
+ const int motion_event_id = 6;
MockMotionEvent event =
ObtainMotionEvent(event_time, MotionEvent::ACTION_DOWN);
+ 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);
event = ObtainMotionEvent(event_time + delta_time,
MotionEvent::ACTION_MOVE,
kFakeCoordX * 10,
kFakeCoordY * 10);
+ 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);
+ event.SetId(motion_event_id);
+
EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
EXPECT_EQ(ET_SCROLL_FLING_START, GetMostRecentGestureEventType());
+ EXPECT_EQ(motion_event_id, GetMostRecentGestureEvent().motion_event_id);
EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_LONG_PRESS));
}
@@ -286,9 +316,11 @@ TEST_F(GestureProviderTest, ScrollEventActionCancelSequence) {
TEST_F(GestureProviderTest, FlingEventSequence) {
base::TimeTicks event_time = base::TimeTicks::Now();
base::TimeDelta delta_time = kDeltaTimeForFlingSequences;
+ const int motion_event_id = 4;
MockMotionEvent event =
ObtainMotionEvent(event_time, MotionEvent::ACTION_DOWN);
+ event.SetId(motion_event_id);
EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
@@ -296,12 +328,16 @@ TEST_F(GestureProviderTest, FlingEventSequence) {
MotionEvent::ACTION_MOVE,
kFakeCoordX * 5,
kFakeCoordY * 5);
+ event.SetId(motion_event_id);
+
EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
EXPECT_TRUE(gesture_provider_->IsScrollInProgress());
EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_SCROLL_BEGIN));
EXPECT_EQ(ET_GESTURE_SCROLL_UPDATE, GetMostRecentGestureEventType());
+ EXPECT_EQ(motion_event_id, GetMostRecentGestureEvent().motion_event_id);
ASSERT_EQ(4U, GetReceivedGestureCount());
ASSERT_EQ(ET_GESTURE_SCROLL_BEGIN, GetReceivedGesture(2).type);
+ EXPECT_EQ(motion_event_id, GetReceivedGesture(2).motion_event_id);
// We don't want to take a dependency here on exactly how hints are calculated
// for a fling (eg. may depend on velocity), so just validate the direction.
@@ -314,9 +350,12 @@ TEST_F(GestureProviderTest, FlingEventSequence) {
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_FALSE(HasReceivedGesture(ET_GESTURE_SCROLL_END));
EXPECT_EQ(event_time + delta_time * 2, GetMostRecentGestureEvent().time)
<< "FlingStart should have the time of the ACTION_UP";
@@ -701,6 +740,7 @@ TEST_F(GestureProviderTest, GestureLongPressDoesNotPreventScrolling) {
TEST_F(GestureProviderTest, NoGestureLongPressDuringDoubleTap) {
base::TimeTicks event_time = base::TimeTicks::Now();
+ const int motion_event_id =13;
MockMotionEvent event = ObtainMotionEvent(
event_time, MotionEvent::ACTION_DOWN, kFakeCoordX, kFakeCoordY);
@@ -730,16 +770,21 @@ TEST_F(GestureProviderTest, NoGestureLongPressDuringDoubleTap) {
MotionEvent::ACTION_MOVE,
kFakeCoordX + 20,
kFakeCoordY + 20);
+ event.SetId(motion_event_id);
+
EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
EXPECT_EQ(ET_GESTURE_PINCH_BEGIN, GetMostRecentGestureEventType());
+ EXPECT_EQ(motion_event_id, GetMostRecentGestureEvent().motion_event_id);
EXPECT_TRUE(gesture_provider_->IsDoubleTapInProgress());
event = ObtainMotionEvent(event_time + long_press_timeout + kOneMicrosecond,
MotionEvent::ACTION_UP,
kFakeCoordX,
kFakeCoordY + 1);
+ event.SetId(motion_event_id);
EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
EXPECT_EQ(ET_GESTURE_SCROLL_END, GetMostRecentGestureEventType());
+ EXPECT_EQ(motion_event_id, GetMostRecentGestureEvent().motion_event_id);
EXPECT_FALSE(gesture_provider_->IsDoubleTapInProgress());
}
@@ -988,6 +1033,8 @@ TEST_F(GestureProviderTest, FixedPageScaleDuringDoubleTapDragZoom) {
TEST_F(GestureProviderTest, PinchZoom) {
base::TimeTicks event_time = base::TimeTicks::Now();
const int scaled_touch_slop = GetTouchSlop();
+ const int motion_event_id_1 = 4;
+ const int motion_event_id_2 = 7;
gesture_provider_->SetMultiTouchSupportEnabled(true);
@@ -996,6 +1043,7 @@ TEST_F(GestureProviderTest, PinchZoom) {
MockMotionEvent event =
ObtainMotionEvent(event_time, MotionEvent::ACTION_DOWN);
+ event.SetId(motion_event_id_1);
EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
EXPECT_EQ(ET_GESTURE_TAP_DOWN, GetMostRecentGestureEventType());
@@ -1005,6 +1053,8 @@ TEST_F(GestureProviderTest, PinchZoom) {
kFakeCoordY,
secondary_coord_x,
secondary_coord_y);
+ event.SetId(motion_event_id_2);
+
gesture_provider_->OnTouchEvent(event);
EXPECT_EQ(1U, GetReceivedGestureCount());
@@ -1017,6 +1067,7 @@ TEST_F(GestureProviderTest, PinchZoom) {
kFakeCoordY,
secondary_coord_x,
secondary_coord_y);
+ event.SetId(motion_event_id_1);
EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
EXPECT_TRUE(HasReceivedGesture(ET_GESTURE_PINCH_BEGIN));
« ui/events/gesture_detection/gesture_provider.cc ('K') | « ui/events/gesture_detection/gesture_provider.cc ('k') | ui/events/gesture_detection/mock_motion_event.h » ('j') | ui/events/gesture_detection/mock_motion_event.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698