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

Unified Diff: ui/aura/root_window_unittest.cc

Issue 10533029: Fix TAP_DOWN gesture event: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed build Created 8 years, 6 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
« no previous file with comments | « ui/aura/gestures/gesture_recognizer_unittest.cc ('k') | ui/aura/window_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window_unittest.cc
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index f1c456bd72700ab7b485584b20bd3a88f7f97444..1b8c804f6a126193537afadbbd354318620cd57c 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -425,8 +425,11 @@ std::string EventTypeToString(ui::EventType type) {
case ui::ET_GESTURE_TAP_DOWN:
return "GESTURE_TAP_DOWN";
- case ui::ET_GESTURE_TAP_UP:
- return "GESTURE_TAP_UP";
+ case ui::ET_GESTURE_BEGIN:
+ return "GESTURE_BEGIN";
+
+ case ui::ET_GESTURE_END:
+ return "GESTURE_END";
case ui::ET_GESTURE_DOUBLE_TAP:
return "GESTURE_DOUBLE_TAP";
@@ -470,9 +473,9 @@ TEST_F(RootWindowTest, GestureToMouseEventTest) {
base::TimeDelta::FromMilliseconds(time_ms));
root_window()->DispatchTouchEvent(&touch_pressed_event);
root_window()->DispatchTouchEvent(&touch_released_event);
- EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN TOUCH_RELEASED GESTURE_TAP "
- "MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED MOUSE_RELEASED "
- "GESTURE_TAP_UP",
+ EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN TOUCH_RELEASED "
+ "GESTURE_TAP MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED "
+ "MOUSE_RELEASED GESTURE_END",
EventTypesToString(filter->events()));
filter->events().clear();
}
@@ -482,7 +485,7 @@ TEST_F(RootWindowTest, GestureToMouseEventTest) {
TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(100, 101), 1,
base::TimeDelta());
root_window()->DispatchTouchEvent(&touch_event);
- EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN",
+ EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN",
EventTypesToString(filter->events()));
filter->events().clear();
}
@@ -518,7 +521,7 @@ TEST_F(RootWindowTest, GestureToMouseEventTest) {
base::TimeDelta());
root_window()->DispatchTouchEvent(&touch_event);
EXPECT_EQ("TOUCH_RELEASED GESTURE_SCROLL_END MOUSE_DRAGGED MOUSE_RELEASED "
- "GESTURE_TAP_UP",
+ "GESTURE_END",
EventTypesToString(filter->events()));
filter->events().clear();
}
@@ -556,9 +559,9 @@ TEST_F(RootWindowTest, MouseMoveThenTouch) {
base::TimeDelta::FromMilliseconds(time_ms));
root_window()->DispatchTouchEvent(&touch_pressed_event);
root_window()->DispatchTouchEvent(&touch_released_event);
- EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN TOUCH_RELEASED GESTURE_TAP "
- "MOUSE_EXITED MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED "
- "MOUSE_RELEASED GESTURE_TAP_UP",
+ EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN TOUCH_RELEASED "
+ "GESTURE_TAP MOUSE_EXITED MOUSE_ENTERED MOUSE_MOVED "
+ "MOUSE_PRESSED MOUSE_RELEASED GESTURE_END",
EventTypesToString(filter->events()));
filter->events().clear();
}
« no previous file with comments | « ui/aura/gestures/gesture_recognizer_unittest.cc ('k') | ui/aura/window_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698