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

Side by Side Diff: ui/events/gesture_detection/motion_event_generic_unittest.cc

Issue 999423003: Set the unique_event_id when converting from TouchEvent to WebTouchEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "testing/gtest/include/gtest/gtest.h" 5 #include "testing/gtest/include/gtest/gtest.h"
6 #include "ui/events/event_constants.h" 6 #include "ui/events/event_constants.h"
7 #include "ui/events/gesture_detection/motion_event_generic.h" 7 #include "ui/events/gesture_detection/motion_event_generic.h"
8 #include "ui/events/test/motion_event_test_utils.h" 8 #include "ui/events/test/motion_event_test_utils.h"
9 9
10 namespace ui { 10 namespace ui {
11 11
12 TEST(MotionEventGenericTest, Basic) { 12 TEST(MotionEventGenericTest, Basic) {
13 base::TimeTicks event_time = base::TimeTicks::Now(); 13 base::TimeTicks event_time = base::TimeTicks::Now();
14 MotionEventGeneric event( 14 MotionEventGeneric event(
15 MotionEvent::ACTION_DOWN, event_time, PointerProperties()); 15 MotionEvent::ACTION_DOWN, event_time, PointerProperties());
16 EXPECT_EQ(1U, event.GetPointerCount()); 16 EXPECT_EQ(1U, event.GetPointerCount());
jdduke (slow) 2015/04/21 22:40:16 Maybe add a |DCHECK_NE(0U, event.GetUniqueEventId(
lanwei 2015/04/22 20:51:31 Done.
17 EXPECT_EQ(0U, event.GetHistorySize()); 17 EXPECT_EQ(0U, event.GetHistorySize());
18 EXPECT_EQ(event_time, event.GetEventTime()); 18 EXPECT_EQ(event_time, event.GetEventTime());
19 19
20 event.set_unique_event_id(123456U);
21 EXPECT_EQ(123456U, event.GetUniqueEventId());
22
20 event.PushPointer(PointerProperties(8.3f, 4.7f, 0.9f)); 23 event.PushPointer(PointerProperties(8.3f, 4.7f, 0.9f));
21 ASSERT_EQ(2U, event.GetPointerCount()); 24 ASSERT_EQ(2U, event.GetPointerCount());
22 EXPECT_EQ(8.3f, event.GetX(1)); 25 EXPECT_EQ(8.3f, event.GetX(1));
23 EXPECT_EQ(4.7f, event.GetY(1)); 26 EXPECT_EQ(4.7f, event.GetY(1));
24 27
25 event.PushPointer(PointerProperties(2.3f, -3.7f, 5.8f)); 28 event.PushPointer(PointerProperties(2.3f, -3.7f, 5.8f));
26 ASSERT_EQ(3U, event.GetPointerCount()); 29 ASSERT_EQ(3U, event.GetPointerCount());
27 EXPECT_EQ(2.3f, event.GetX(2)); 30 EXPECT_EQ(2.3f, event.GetX(2));
28 EXPECT_EQ(-3.7f, event.GetY(2)); 31 EXPECT_EQ(-3.7f, event.GetY(2));
29 32
30 event.set_id(1); 33 event.pointer(0).id = 3;
31 EXPECT_EQ(1, event.GetId()); 34 EXPECT_EQ(3, event.GetPointerId(0));
32 35
33 event.set_action(MotionEvent::ACTION_POINTER_DOWN); 36 event.set_action(MotionEvent::ACTION_POINTER_DOWN);
34 EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction()); 37 EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction());
35 38
36 event_time += base::TimeDelta::FromMilliseconds(5); 39 event_time += base::TimeDelta::FromMilliseconds(5);
37 event.set_event_time(event_time); 40 event.set_event_time(event_time);
38 EXPECT_EQ(event_time, event.GetEventTime()); 41 EXPECT_EQ(event_time, event.GetEventTime());
39 42
40 event.set_button_state(MotionEvent::BUTTON_PRIMARY); 43 event.set_button_state(MotionEvent::BUTTON_PRIMARY);
41 EXPECT_EQ(MotionEvent::BUTTON_PRIMARY, event.GetButtonState()); 44 EXPECT_EQ(MotionEvent::BUTTON_PRIMARY, event.GetButtonState());
(...skipping 29 matching lines...) Expand all
71 EXPECT_EQ(2.f, event.GetHistoricalTouchMajor(1, 0)); 74 EXPECT_EQ(2.f, event.GetHistoricalTouchMajor(1, 0));
72 EXPECT_EQ(4.8f, event.GetHistoricalX(2, 0)); 75 EXPECT_EQ(4.8f, event.GetHistoricalX(2, 0));
73 EXPECT_EQ(9.6f, event.GetHistoricalY(2, 0)); 76 EXPECT_EQ(9.6f, event.GetHistoricalY(2, 0));
74 EXPECT_EQ(3.f, event.GetHistoricalTouchMajor(2, 0)); 77 EXPECT_EQ(3.f, event.GetHistoricalTouchMajor(2, 0));
75 } 78 }
76 79
77 TEST(MotionEventGenericTest, Clone) { 80 TEST(MotionEventGenericTest, Clone) {
78 MotionEventGeneric event(MotionEvent::ACTION_DOWN, 81 MotionEventGeneric event(MotionEvent::ACTION_DOWN,
79 base::TimeTicks::Now(), 82 base::TimeTicks::Now(),
80 PointerProperties(8.3f, 4.7f, 2.f)); 83 PointerProperties(8.3f, 4.7f, 2.f));
81 event.set_id(1);
82 event.set_button_state(MotionEvent::BUTTON_PRIMARY); 84 event.set_button_state(MotionEvent::BUTTON_PRIMARY);
83 85
84 scoped_ptr<MotionEvent> clone = event.Clone(); 86 scoped_ptr<MotionEvent> clone = event.Clone();
85 ASSERT_TRUE(clone); 87 ASSERT_TRUE(clone);
86 EXPECT_EQ(test::ToString(event), test::ToString(*clone)); 88 EXPECT_EQ(test::ToString(event), test::ToString(*clone));
87 } 89 }
88 90
89 TEST(MotionEventGenericTest, CloneWithHistory) { 91 TEST(MotionEventGenericTest, CloneWithHistory) {
90 base::TimeTicks event_time = base::TimeTicks::Now(); 92 base::TimeTicks event_time = base::TimeTicks::Now();
91 base::TimeTicks historical_event_time = 93 base::TimeTicks historical_event_time =
(...skipping 11 matching lines...) Expand all
103 105
104 scoped_ptr<MotionEvent> clone = event.Clone(); 106 scoped_ptr<MotionEvent> clone = event.Clone();
105 ASSERT_TRUE(clone); 107 ASSERT_TRUE(clone);
106 EXPECT_EQ(test::ToString(event), test::ToString(*clone)); 108 EXPECT_EQ(test::ToString(event), test::ToString(*clone));
107 } 109 }
108 110
109 TEST(MotionEventGenericTest, Cancel) { 111 TEST(MotionEventGenericTest, Cancel) {
110 MotionEventGeneric event(MotionEvent::ACTION_UP, 112 MotionEventGeneric event(MotionEvent::ACTION_UP,
111 base::TimeTicks::Now(), 113 base::TimeTicks::Now(),
112 PointerProperties(8.7f, 4.3f, 1.f)); 114 PointerProperties(8.7f, 4.3f, 1.f));
113 event.set_id(2);
114 event.set_button_state(MotionEvent::BUTTON_SECONDARY); 115 event.set_button_state(MotionEvent::BUTTON_SECONDARY);
115 116
116 scoped_ptr<MotionEvent> cancel = event.Cancel(); 117 scoped_ptr<MotionEvent> cancel = event.Cancel();
117 event.set_action(MotionEvent::ACTION_CANCEL); 118 event.set_action(MotionEvent::ACTION_CANCEL);
118 ASSERT_TRUE(cancel); 119 ASSERT_TRUE(cancel);
119 EXPECT_EQ(test::ToString(event), test::ToString(*cancel)); 120 EXPECT_EQ(test::ToString(event), test::ToString(*cancel));
120 } 121 }
121 122
122 TEST(MotionEventGenericTest, FindPointerIndexOfId) { 123 TEST(MotionEventGenericTest, FindPointerIndexOfId) {
123 base::TimeTicks event_time = base::TimeTicks::Now(); 124 base::TimeTicks event_time = base::TimeTicks::Now();
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 ASSERT_EQ(2U, event.GetHistorySize()); 214 ASSERT_EQ(2U, event.GetHistorySize());
214 ASSERT_EQ(2U, event.GetPointerCount()); 215 ASSERT_EQ(2U, event.GetPointerCount());
215 216
216 // Do a basic smoke exercise of event stringification to ensure things don't 217 // Do a basic smoke exercise of event stringification to ensure things don't
217 // explode in the process. 218 // explode in the process.
218 std::string event_string = test::ToString(event); 219 std::string event_string = test::ToString(event);
219 EXPECT_FALSE(event_string.empty()); 220 EXPECT_FALSE(event_string.empty());
220 } 221 }
221 222
222 } // namespace ui 223 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698