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

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

Issue 502993004: Remove abstract Clone and Cancel methods from MotionEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Owner for BUILD.gn Created 6 years, 1 month 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 9
9 namespace ui { 10 namespace ui {
10 11
11 TEST(MotionEventGenericTest, Basic) { 12 TEST(MotionEventGenericTest, Basic) {
12 base::TimeTicks event_time = base::TimeTicks::Now(); 13 base::TimeTicks event_time = base::TimeTicks::Now();
13 MotionEventGeneric event( 14 MotionEventGeneric event(
14 MotionEvent::ACTION_DOWN, event_time, PointerProperties()); 15 MotionEvent::ACTION_DOWN, event_time, PointerProperties());
15 EXPECT_EQ(1U, event.GetPointerCount()); 16 EXPECT_EQ(1U, event.GetPointerCount());
16 EXPECT_EQ(0U, event.GetHistorySize()); 17 EXPECT_EQ(0U, event.GetHistorySize());
17 EXPECT_EQ(event_time, event.GetEventTime()); 18 EXPECT_EQ(event_time, event.GetEventTime());
18 19
19 event.PushPointer(PointerProperties(8.3f, 4.7f)); 20 event.PushPointer(PointerProperties(8.3f, 4.7f, 0.9f));
20 ASSERT_EQ(2U, event.GetPointerCount()); 21 ASSERT_EQ(2U, event.GetPointerCount());
21 EXPECT_EQ(8.3f, event.GetX(1)); 22 EXPECT_EQ(8.3f, event.GetX(1));
22 EXPECT_EQ(4.7f, event.GetY(1)); 23 EXPECT_EQ(4.7f, event.GetY(1));
23 24
24 event.PushPointer(PointerProperties(2.3f, -3.7f)); 25 event.PushPointer(PointerProperties(2.3f, -3.7f, 5.8f));
25 ASSERT_EQ(3U, event.GetPointerCount()); 26 ASSERT_EQ(3U, event.GetPointerCount());
26 EXPECT_EQ(2.3f, event.GetX(2)); 27 EXPECT_EQ(2.3f, event.GetX(2));
27 EXPECT_EQ(-3.7f, event.GetY(2)); 28 EXPECT_EQ(-3.7f, event.GetY(2));
28 29
29 event.set_id(1); 30 event.set_id(1);
30 EXPECT_EQ(1, event.GetId()); 31 EXPECT_EQ(1, event.GetId());
31 32
32 event.set_action(MotionEvent::ACTION_POINTER_DOWN); 33 event.set_action(MotionEvent::ACTION_POINTER_DOWN);
33 EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction()); 34 EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction());
34 35
35 event_time += base::TimeDelta::FromMilliseconds(5); 36 event_time += base::TimeDelta::FromMilliseconds(5);
36 event.set_event_time(event_time); 37 event.set_event_time(event_time);
37 EXPECT_EQ(event_time, event.GetEventTime()); 38 EXPECT_EQ(event_time, event.GetEventTime());
38 39
39 event.set_button_state(MotionEvent::BUTTON_PRIMARY); 40 event.set_button_state(MotionEvent::BUTTON_PRIMARY);
40 EXPECT_EQ(MotionEvent::BUTTON_PRIMARY, event.GetButtonState()); 41 EXPECT_EQ(MotionEvent::BUTTON_PRIMARY, event.GetButtonState());
41 42
42 event.set_flags(EF_ALT_DOWN | EF_SHIFT_DOWN); 43 event.set_flags(EF_ALT_DOWN | EF_SHIFT_DOWN);
43 EXPECT_EQ(EF_ALT_DOWN | EF_SHIFT_DOWN, event.GetFlags()); 44 EXPECT_EQ(EF_ALT_DOWN | EF_SHIFT_DOWN, event.GetFlags());
44 45
45 event.set_action_index(1); 46 event.set_action_index(1);
46 EXPECT_EQ(1, event.GetActionIndex()); 47 EXPECT_EQ(1, event.GetActionIndex());
48
49 event.set_action(MotionEvent::ACTION_MOVE);
50 EXPECT_EQ(MotionEvent::ACTION_MOVE, event.GetAction());
51
52 PointerProperties historical_pointer0(1.2f, 2.4f, 1.f);
53 PointerProperties historical_pointer1(2.4f, 4.8f, 2.f);
54 PointerProperties historical_pointer2(4.8f, 9.6f, 3.f);
55 MotionEventGeneric historical_event(
56 MotionEvent::ACTION_MOVE,
57 event_time - base::TimeDelta::FromMilliseconds(5),
58 historical_pointer0);
59 historical_event.PushPointer(historical_pointer1);
60 historical_event.PushPointer(historical_pointer2);
61
62 event.PushHistoricalEvent(historical_event.Clone());
63 EXPECT_EQ(1U, event.GetHistorySize());
64 EXPECT_EQ(event_time - base::TimeDelta::FromMilliseconds(5),
65 event.GetHistoricalEventTime(0));
66 EXPECT_EQ(1.2f, event.GetHistoricalX(0, 0));
67 EXPECT_EQ(2.4f, event.GetHistoricalY(0, 0));
68 EXPECT_EQ(1.f, event.GetHistoricalTouchMajor(0, 0));
69 EXPECT_EQ(2.4f, event.GetHistoricalX(1, 0));
70 EXPECT_EQ(4.8f, event.GetHistoricalY(1, 0));
71 EXPECT_EQ(2.f, event.GetHistoricalTouchMajor(1, 0));
72 EXPECT_EQ(4.8f, event.GetHistoricalX(2, 0));
73 EXPECT_EQ(9.6f, event.GetHistoricalY(2, 0));
74 EXPECT_EQ(3.f, event.GetHistoricalTouchMajor(2, 0));
47 } 75 }
48 76
49 TEST(MotionEventGenericTest, Clone) { 77 TEST(MotionEventGenericTest, Clone) {
50 MotionEventGeneric event(MotionEvent::ACTION_DOWN, 78 MotionEventGeneric event(MotionEvent::ACTION_DOWN,
51 base::TimeTicks::Now(), 79 base::TimeTicks::Now(),
52 PointerProperties(8.3f, 4.7f)); 80 PointerProperties(8.3f, 4.7f, 2.f));
53 event.set_id(1); 81 event.set_id(1);
54 event.set_button_state(MotionEvent::BUTTON_PRIMARY); 82 event.set_button_state(MotionEvent::BUTTON_PRIMARY);
55 83
56 scoped_ptr<MotionEvent> clone = event.Clone(); 84 scoped_ptr<MotionEvent> clone = event.Clone();
57 ASSERT_TRUE(clone); 85 ASSERT_TRUE(clone);
58 EXPECT_EQ(event, *clone); 86 EXPECT_EQ(event, *clone);
59 } 87 }
60 88
89 TEST(MotionEventGenericTest, CloneWithHistory) {
90 base::TimeTicks event_time = base::TimeTicks::Now();
91 base::TimeTicks historical_event_time =
92 event_time - base::TimeDelta::FromMilliseconds(5);
93
94 PointerProperties pointer(8.3f, 4.7f, 10.1f);
95 MotionEventGeneric event(MotionEvent::ACTION_MOVE, event_time, pointer);
96
97 PointerProperties historical_pointer(3.4f, -4.3f, 11.5);
98 scoped_ptr<MotionEvent> historical_event(new MotionEventGeneric(
99 MotionEvent::ACTION_MOVE, historical_event_time, historical_pointer));
100
101 event.PushHistoricalEvent(historical_event.Pass());
102 EXPECT_EQ(1U, event.GetHistorySize());
103
104 scoped_ptr<MotionEvent> clone = event.Clone();
105 ASSERT_TRUE(clone);
106 EXPECT_EQ(event, *clone);
107 }
108
61 TEST(MotionEventGenericTest, Cancel) { 109 TEST(MotionEventGenericTest, Cancel) {
62 MotionEventGeneric event(MotionEvent::ACTION_UP, 110 MotionEventGeneric event(MotionEvent::ACTION_UP,
63 base::TimeTicks::Now(), 111 base::TimeTicks::Now(),
64 PointerProperties(8.7f, 4.3f)); 112 PointerProperties(8.7f, 4.3f, 1.f));
65 event.set_id(2); 113 event.set_id(2);
66 event.set_button_state(MotionEvent::BUTTON_SECONDARY); 114 event.set_button_state(MotionEvent::BUTTON_SECONDARY);
67 115
68 scoped_ptr<MotionEvent> cancel = event.Cancel(); 116 scoped_ptr<MotionEvent> cancel = event.Cancel();
69 event.set_action(MotionEvent::ACTION_CANCEL); 117 event.set_action(MotionEvent::ACTION_CANCEL);
70 ASSERT_TRUE(cancel); 118 ASSERT_TRUE(cancel);
71 EXPECT_EQ(event, *cancel); 119 EXPECT_EQ(event, *cancel);
72 } 120 }
73 121
74 TEST(MotionEventGenericTest, FindPointerIndexOfId) { 122 TEST(MotionEventGenericTest, FindPointerIndexOfId) {
(...skipping 16 matching lines...) Expand all
91 MotionEventGeneric event2(event1); 139 MotionEventGeneric event2(event1);
92 pointer.id = 3; 140 pointer.id = 3;
93 event2.PushPointer(pointer); 141 event2.PushPointer(pointer);
94 EXPECT_EQ(0, event2.FindPointerIndexOfId(0)); 142 EXPECT_EQ(0, event2.FindPointerIndexOfId(0));
95 EXPECT_EQ(1, event2.FindPointerIndexOfId(7)); 143 EXPECT_EQ(1, event2.FindPointerIndexOfId(7));
96 EXPECT_EQ(2, event2.FindPointerIndexOfId(3)); 144 EXPECT_EQ(2, event2.FindPointerIndexOfId(3));
97 EXPECT_EQ(-1, event2.FindPointerIndexOfId(1)); 145 EXPECT_EQ(-1, event2.FindPointerIndexOfId(1));
98 EXPECT_EQ(-1, event2.FindPointerIndexOfId(2)); 146 EXPECT_EQ(-1, event2.FindPointerIndexOfId(2));
99 } 147 }
100 148
149 TEST(MotionEventGenericTest, ToString) {
150 base::TimeTicks event_time = base::TimeTicks::Now();
151 base::TimeTicks historical_event_time0 =
152 event_time - base::TimeDelta::FromMilliseconds(10);
153 base::TimeTicks historical_event_time1 =
154 event_time - base::TimeDelta::FromMilliseconds(5);
155
156 PointerProperties pointer0(1, 2, 3);
157 pointer0.id = 7;
158 pointer0.pressure = 10;
159 pointer0.touch_minor = 15;
160 pointer0.touch_major = 20;
161 pointer0.orientation = 1;
162
163 PointerProperties pointer1(4, 5, 6);
164 pointer1.id = 3;
165 pointer0.pressure = 25;
166 pointer0.touch_minor = 30;
167 pointer0.touch_major = 35;
168 pointer0.orientation = -1;
169
170 MotionEventGeneric event(MotionEvent::ACTION_MOVE, event_time, pointer0);
171 event.PushPointer(pointer1);
172
173 pointer0.x += 50;
174 pointer1.x -= 50;
175 scoped_ptr<MotionEventGeneric> historical_event0(new MotionEventGeneric(
176 MotionEvent::ACTION_MOVE, historical_event_time0, pointer0));
177 historical_event0->PushPointer(pointer1);
178
179 pointer0.x += 100;
180 pointer1.x -= 100;
181 scoped_ptr<MotionEventGeneric> historical_event1(new MotionEventGeneric(
182 MotionEvent::ACTION_MOVE, historical_event_time1, pointer0));
183 historical_event1->PushPointer(pointer1);
184
185 event.PushHistoricalEvent(historical_event0.Pass());
186 event.PushHistoricalEvent(historical_event1.Pass());
187 ASSERT_EQ(2U, event.GetHistorySize());
188 ASSERT_EQ(2U, event.GetPointerCount());
189
190 // Do a basic smoke exercise of event stringification to ensure things don't
191 // explode in the process.
192 std::stringstream ss;
193 ss << event;
194 std::string event_string = ss.str();
195 EXPECT_FALSE(event_string.empty());
196 }
197
101 } // namespace ui 198 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698