ui/events/gesture_detection/gesture_provider_unittest.cc - Issue 407313002: Add a MotionEventGeneric implementation

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

Issue 407313002: Add a MotionEventGeneric implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 5 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

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 262ec36cfd1d5287c91d746a08919085cecc077f..ca5251ba6f059def2bd7b398e202b4d0cf2556d1 100644

--- a/ui/events/gesture_detection/gesture_provider_unittest.cc

+++ b/ui/events/gesture_detection/gesture_provider_unittest.cc

@@ -1951,7 +1951,6 @@ TEST_F(GestureProviderTest, GestureBeginAndEnd) {

EXPECT_EQ(0U, GetReceivedGestureCount());

MockMotionEvent event =

ObtainMotionEvent(event_time, MotionEvent::ACTION_DOWN, 1, 1);

- event.pointer_count = 1;

event.SetRawOffset(raw_offset_x, raw_offset_y);

EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));

EXPECT_EQ(ET_GESTURE_BEGIN, GetReceivedGesture(0).type());

@@ -1970,7 +1969,6 @@ TEST_F(GestureProviderTest, GestureBeginAndEnd) {

event = ObtainMotionEvent(

event_time, MotionEvent::ACTION_POINTER_DOWN, 1, 1, 2, 2);

- event.pointer_count = 2;

event.SetRawOffset(raw_offset_x, raw_offset_y);

EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));

EXPECT_EQ(ET_GESTURE_BEGIN, GetMostRecentGestureEventType());

@@ -1983,7 +1981,6 @@ TEST_F(GestureProviderTest, GestureBeginAndEnd) {

event = ObtainMotionEvent(

event_time, MotionEvent::ACTION_POINTER_DOWN, 1, 1, 2, 2, 3, 3);

- event.pointer_count = 3;

event.SetRawOffset(raw_offset_x, raw_offset_y);

EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));

EXPECT_EQ(ET_GESTURE_BEGIN, GetMostRecentGestureEventType());

@@ -1996,12 +1993,11 @@ TEST_F(GestureProviderTest, GestureBeginAndEnd) {

event = ObtainMotionEvent(

event_time, MotionEvent::ACTION_POINTER_UP, 1, 1, 2, 2, 3, 3);

- event.pointer_count = 2;

event.SetRawOffset(raw_offset_x, raw_offset_y);

EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));

EXPECT_EQ(ET_GESTURE_END, GetMostRecentGestureEventType());

EXPECT_EQ(5U, GetReceivedGestureCount());

- EXPECT_EQ(2, GetMostRecentGestureEvent().details.touch_points());

+ EXPECT_EQ(3, GetMostRecentGestureEvent().details.touch_points());

EXPECT_EQ(1, GetMostRecentGestureEvent().x);

EXPECT_EQ(1, GetMostRecentGestureEvent().y);

EXPECT_EQ(1 + raw_offset_x, GetMostRecentGestureEvent().raw_x);

@@ -2010,7 +2006,6 @@ TEST_F(GestureProviderTest, GestureBeginAndEnd) {

event = ObtainMotionEvent(

event_time, MotionEvent::ACTION_POINTER_DOWN, 2, 2, 3, 3, 4, 4);

event.SetRawOffset(raw_offset_x, raw_offset_y);

- event.pointer_count = 3;

EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));

EXPECT_EQ(ET_GESTURE_BEGIN, GetMostRecentGestureEventType());

EXPECT_EQ(6U, GetReceivedGestureCount());

@@ -2022,12 +2017,11 @@ TEST_F(GestureProviderTest, GestureBeginAndEnd) {

event = ObtainMotionEvent(

event_time, MotionEvent::ACTION_POINTER_UP, 2, 2, 3, 3, 4, 4);

- event.pointer_count = 2;

event.SetRawOffset(raw_offset_x, raw_offset_y);

EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));

EXPECT_EQ(ET_GESTURE_END, GetMostRecentGestureEventType());

EXPECT_EQ(7U, GetReceivedGestureCount());

- EXPECT_EQ(2, GetMostRecentGestureEvent().details.touch_points());

+ EXPECT_EQ(3, GetMostRecentGestureEvent().details.touch_points());

EXPECT_EQ(2, GetMostRecentGestureEvent().x);

EXPECT_EQ(2, GetMostRecentGestureEvent().y);

EXPECT_EQ(2 + raw_offset_x, GetMostRecentGestureEvent().raw_x);

@@ -2035,12 +2029,11 @@ TEST_F(GestureProviderTest, GestureBeginAndEnd) {

event =

ObtainMotionEvent(event_time, MotionEvent::ACTION_POINTER_UP, 3, 3, 4, 4);

- event.pointer_count = 1;

event.SetRawOffset(raw_offset_x, raw_offset_y);

EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));

EXPECT_EQ(ET_GESTURE_END, GetMostRecentGestureEventType());

EXPECT_EQ(8U, GetReceivedGestureCount());

- EXPECT_EQ(1, GetMostRecentGestureEvent().details.touch_points());

+ EXPECT_EQ(2, GetMostRecentGestureEvent().details.touch_points());

EXPECT_EQ(3, GetMostRecentGestureEvent().x);

EXPECT_EQ(3, GetMostRecentGestureEvent().y);

EXPECT_EQ(3 + raw_offset_x, GetMostRecentGestureEvent().raw_x);

@@ -2048,7 +2041,6 @@ TEST_F(GestureProviderTest, GestureBeginAndEnd) {

event = ObtainMotionEvent(event_time, MotionEvent::ACTION_UP, 4, 4);

- event.pointer_count = 1;

event.SetRawOffset(raw_offset_x, raw_offset_y);

EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));

EXPECT_EQ(ET_GESTURE_END, GetMostRecentGestureEventType());

@@ -2069,7 +2061,6 @@ TEST_F(GestureProviderTest, GestureBeginAndEndOnCancel) {

EXPECT_EQ(0U, GetReceivedGestureCount());

MockMotionEvent event =

ObtainMotionEvent(event_time, MotionEvent::ACTION_DOWN, 1, 1);

- event.pointer_count = 1;

EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));

EXPECT_EQ(ET_GESTURE_BEGIN, GetReceivedGesture(0).type());

EXPECT_EQ(ET_GESTURE_TAP_DOWN, GetMostRecentGestureEventType());

@@ -2085,7 +2076,6 @@ TEST_F(GestureProviderTest, GestureBeginAndEndOnCancel) {

event = ObtainMotionEvent(

event_time, MotionEvent::ACTION_POINTER_DOWN, 1, 1, 2, 2);

- event.pointer_count = 2;

EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));

EXPECT_EQ(ET_GESTURE_BEGIN, GetMostRecentGestureEventType());

EXPECT_EQ(3U, GetReceivedGestureCount());

@@ -2096,7 +2086,6 @@ TEST_F(GestureProviderTest, GestureBeginAndEndOnCancel) {

event = ObtainMotionEvent(

event_time, MotionEvent::ACTION_POINTER_DOWN, 1, 1, 2, 2, 3, 3);

- event.pointer_count = 3;

EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));

EXPECT_EQ(ET_GESTURE_BEGIN, GetMostRecentGestureEventType());

EXPECT_EQ(4U, GetReceivedGestureCount());

@@ -2106,7 +2095,6 @@ TEST_F(GestureProviderTest, GestureBeginAndEndOnCancel) {

event = ObtainMotionEvent(

event_time, MotionEvent::ACTION_CANCEL, 1, 1, 2, 2, 3, 3);

- event.pointer_count = 3;

EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));

EXPECT_EQ(7U, GetReceivedGestureCount());

EXPECT_EQ(3, GetReceivedGesture(4).details.touch_points());

« no previous file with comments | « ui/events/events.gyp ('k') | ui/events/gesture_detection/motion_event.h » ('j') | ui/events/gesture_detection/motion_event_generic_unittest.cc » ('J')