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

Unified Diff: ui/aura/window_unittest.cc

Issue 10533029: Fix TAP_DOWN gesture event: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: ui/aura/window_unittest.cc
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index ed9e34c6f2fca5b95ca23596a413912b4cf3db8f..9b2221161aa58888e426c7666512abb187983c1f 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -601,7 +601,8 @@ TEST_F(WindowTest, TouchCaptureCancelsOtherTouches) {
TouchEvent press(ui::ET_TOUCH_PRESSED,
gfx::Point(10, 10), 0, getTime());
root_window()->DispatchTouchEvent(&press);
- EXPECT_EQ(1, delegate1.gesture_event_count());
+ // We will get both GESTURE_BEGIN and GESTURE_TAP_DOWN.
+ EXPECT_EQ(2, delegate1.gesture_event_count());
delegate1.ResetCounts();
w2->SetCapture();
@@ -633,7 +634,8 @@ TEST_F(WindowTest, TouchCaptureCancelsOtherTouches) {
gfx::Point(10, 10), 0, getTime());
root_window()->DispatchTouchEvent(&press2);
EXPECT_EQ(0, delegate1.gesture_event_count());
- EXPECT_EQ(1, delegate2.gesture_event_count());
+ // We will get both GESTURE_BEGIN and GESTURE_TAP_DOWN.
+ EXPECT_EQ(2, delegate2.gesture_event_count());
}
TEST_F(WindowTest, TouchCaptureDoesntCancelCapturedTouches) {
@@ -645,7 +647,8 @@ TEST_F(WindowTest, TouchCaptureDoesntCancelCapturedTouches) {
gfx::Point(10, 10), 0, getTime());
root_window()->DispatchTouchEvent(&press);
- EXPECT_EQ(1, delegate.gesture_event_count());
+ // We will get both GESTURE_BEGIN and GESTURE_TAP_DOWN.
+ EXPECT_EQ(2, delegate.gesture_event_count());
delegate.ResetCounts();
window->SetCapture();

Powered by Google App Engine
This is Rietveld 408576698