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

Side by Side Diff: ui/events/android/motion_event_android_unittest.cc

Issue 2054193002: Android mouse events shouldn't appear as TouchEvents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Kept old touch-like behavior in pre-M. Created 4 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 <android/input.h> 5 #include <android/input.h>
6 #include <stddef.h> 6 #include <stddef.h>
7 7
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/events/android/motion_event_android.h" 10 #include "ui/events/android/motion_event_android.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 nullptr, 52 nullptr,
53 event_time_ms, 53 event_time_ms,
54 kAndroidActionDown, 54 kAndroidActionDown,
55 pointer_count, 55 pointer_count,
56 history_size, 56 history_size,
57 action_index, 57 action_index,
58 kAndroidButtonPrimary, 58 kAndroidButtonPrimary,
59 kAndroidAltKeyDown, 59 kAndroidAltKeyDown,
60 raw_offset, 60 raw_offset,
61 -raw_offset, 61 -raw_offset,
62 p0, 62 &p0,
63 p1); 63 &p1);
64 64
65 EXPECT_EQ(MotionEvent::ACTION_DOWN, event.GetAction()); 65 EXPECT_EQ(MotionEvent::ACTION_DOWN, event.GetAction());
66 EXPECT_EQ(event_time, event.GetEventTime()); 66 EXPECT_EQ(event_time, event.GetEventTime());
67 EXPECT_EQ(p0.pos_x_pixels * kPixToDip, event.GetX(0)); 67 EXPECT_EQ(p0.pos_x_pixels * kPixToDip, event.GetX(0));
68 EXPECT_EQ(p0.pos_y_pixels * kPixToDip, event.GetY(0)); 68 EXPECT_EQ(p0.pos_y_pixels * kPixToDip, event.GetY(0));
69 EXPECT_EQ(p1.pos_x_pixels * kPixToDip, event.GetX(1)); 69 EXPECT_EQ(p1.pos_x_pixels * kPixToDip, event.GetX(1));
70 EXPECT_EQ(p1.pos_y_pixels * kPixToDip, event.GetY(1)); 70 EXPECT_EQ(p1.pos_y_pixels * kPixToDip, event.GetY(1));
71 EXPECT_FLOAT_EQ((p0.pos_x_pixels + raw_offset) * kPixToDip, event.GetRawX(0)); 71 EXPECT_FLOAT_EQ((p0.pos_x_pixels + raw_offset) * kPixToDip, event.GetRawX(0));
72 EXPECT_FLOAT_EQ((p0.pos_y_pixels - raw_offset) * kPixToDip, event.GetRawY(0)); 72 EXPECT_FLOAT_EQ((p0.pos_y_pixels - raw_offset) * kPixToDip, event.GetRawY(0));
73 EXPECT_FLOAT_EQ((p1.pos_x_pixels + raw_offset) * kPixToDip, event.GetRawX(1)); 73 EXPECT_FLOAT_EQ((p1.pos_x_pixels + raw_offset) * kPixToDip, event.GetRawX(1));
(...skipping 26 matching lines...) Expand all
100 nullptr, 100 nullptr,
101 0, 101 0,
102 kAndroidActionDown, 102 kAndroidActionDown,
103 pointer_count, 103 pointer_count,
104 0, 104 0,
105 0, 105 0,
106 0, 106 0,
107 0, 107 0,
108 0, 108 0,
109 0, 109 0,
110 p0, 110 &p0,
111 p1); 111 &p1);
112 112
113 std::unique_ptr<MotionEvent> clone = event.Clone(); 113 std::unique_ptr<MotionEvent> clone = event.Clone();
114 EXPECT_EQ(ui::test::ToString(event), ui::test::ToString(*clone)); 114 EXPECT_EQ(ui::test::ToString(event), ui::test::ToString(*clone));
115 } 115 }
116 116
117 TEST(MotionEventAndroidTest, Cancel) { 117 TEST(MotionEventAndroidTest, Cancel) {
118 const int event_time_ms = 5; 118 const int event_time_ms = 5;
119 const int pointer_count = 1; 119 const int pointer_count = 1;
120 MotionEventAndroid::Pointer p0( 120 MotionEventAndroid::Pointer p0(
121 1, 13.7f, -7.13f, 5.3f, 1.2f, 0.1f, 0.2f, kAndroidToolTypeFinger); 121 1, 13.7f, -7.13f, 5.3f, 1.2f, 0.1f, 0.2f, kAndroidToolTypeFinger);
122 MotionEventAndroid::Pointer p1(0, 0, 0, 0, 0, 0, 0, 0); 122 MotionEventAndroid::Pointer p1(0, 0, 0, 0, 0, 0, 0, 0);
123 MotionEventAndroid event(kPixToDip, 123 MotionEventAndroid event(kPixToDip,
124 base::android::AttachCurrentThread(), 124 base::android::AttachCurrentThread(),
125 nullptr, 125 nullptr,
126 event_time_ms, 126 event_time_ms,
127 kAndroidActionDown, 127 kAndroidActionDown,
128 pointer_count, 128 pointer_count,
129 0, 129 0,
130 0, 130 0,
131 0, 131 0,
132 0, 132 0,
133 0, 133 0,
134 0, 134 0,
135 p0, 135 &p0,
136 p1); 136 &p1);
137 137
138 std::unique_ptr<MotionEvent> cancel_event = event.Cancel(); 138 std::unique_ptr<MotionEvent> cancel_event = event.Cancel();
139 EXPECT_EQ(MotionEvent::ACTION_CANCEL, cancel_event->GetAction()); 139 EXPECT_EQ(MotionEvent::ACTION_CANCEL, cancel_event->GetAction());
140 EXPECT_EQ( 140 EXPECT_EQ(
141 base::TimeTicks() + base::TimeDelta::FromMilliseconds(event_time_ms), 141 base::TimeTicks() + base::TimeDelta::FromMilliseconds(event_time_ms),
142 cancel_event->GetEventTime()); 142 cancel_event->GetEventTime());
143 EXPECT_EQ(p0.pos_x_pixels * kPixToDip, cancel_event->GetX(0)); 143 EXPECT_EQ(p0.pos_x_pixels * kPixToDip, cancel_event->GetX(0));
144 EXPECT_EQ(p0.pos_y_pixels * kPixToDip, cancel_event->GetY(0)); 144 EXPECT_EQ(p0.pos_y_pixels * kPixToDip, cancel_event->GetY(0));
145 EXPECT_EQ(static_cast<size_t>(pointer_count), 145 EXPECT_EQ(static_cast<size_t>(pointer_count),
146 cancel_event->GetPointerCount()); 146 cancel_event->GetPointerCount());
(...skipping 11 matching lines...) Expand all
158 nullptr, 158 nullptr,
159 0, 159 0,
160 kAndroidActionDown, 160 kAndroidActionDown,
161 pointer_count, 161 pointer_count,
162 0, 162 0,
163 0, 163 0,
164 0, 164 0,
165 0, 165 0,
166 0, 166 0,
167 0, 167 0,
168 p0, 168 &p0,
169 p1); 169 &p1);
170 170
171 EXPECT_EQ(0.f, event.GetOrientation(0)); 171 EXPECT_EQ(0.f, event.GetOrientation(0));
172 EXPECT_EQ(0.f, event.GetOrientation(1)); 172 EXPECT_EQ(0.f, event.GetOrientation(1));
173 } 173 }
174 174
175 TEST(MotionEventAndroidTest, NonEmptyHistoryForNonMoveEventsSanitized) { 175 TEST(MotionEventAndroidTest, NonEmptyHistoryForNonMoveEventsSanitized) {
176 int pointer_count = 1; 176 int pointer_count = 1;
177 size_t history_size = 5; 177 size_t history_size = 5;
178 MotionEventAndroid::Pointer p0(0, 0, 0, 0, 0, 0, 0, 0); 178 MotionEventAndroid::Pointer p0(0, 0, 0, 0, 0, 0, 0, 0);
179 MotionEventAndroid::Pointer p1(0, 0, 0, 0, 0, 0, 0, 0); 179 MotionEventAndroid::Pointer p1(0, 0, 0, 0, 0, 0, 0, 0);
180 MotionEventAndroid event(kPixToDip, 180 MotionEventAndroid event(kPixToDip,
181 base::android::AttachCurrentThread(), 181 base::android::AttachCurrentThread(),
182 nullptr, 182 nullptr,
183 0, 183 0,
184 kAndroidActionDown, 184 kAndroidActionDown,
185 pointer_count, 185 pointer_count,
186 history_size, 186 history_size,
187 0, 187 0,
188 0, 188 0,
189 0, 189 0,
190 0, 190 0,
191 0, 191 0,
192 p0, 192 &p0,
193 p1); 193 &p1);
194 194
195 EXPECT_EQ(0U, event.GetHistorySize()); 195 EXPECT_EQ(0U, event.GetHistorySize());
196 } 196 }
197 197
198 TEST(MotionEventAndroidTest, ActionIndexForPointerDown) { 198 TEST(MotionEventAndroidTest, ActionIndexForPointerDown) {
199 MotionEventAndroid::Pointer p0( 199 MotionEventAndroid::Pointer p0(
200 1, 13.7f, -7.13f, 5.3f, 1.2f, 0.1f, 0.2f, kAndroidToolTypeFinger); 200 1, 13.7f, -7.13f, 5.3f, 1.2f, 0.1f, 0.2f, kAndroidToolTypeFinger);
201 MotionEventAndroid::Pointer p1( 201 MotionEventAndroid::Pointer p1(
202 2, -13.7f, 7.13f, 3.5f, 12.1f, -0.1f, -0.4f, kAndroidToolTypeFinger); 202 2, -13.7f, 7.13f, 3.5f, 12.1f, -0.1f, -0.4f, kAndroidToolTypeFinger);
203 int pointer_count = 2; 203 int pointer_count = 2;
204 int history_size = 0; 204 int history_size = 0;
205 int action_index = 1; 205 int action_index = 1;
206 MotionEventAndroid event(kPixToDip, 206 MotionEventAndroid event(kPixToDip,
207 base::android::AttachCurrentThread(), 207 base::android::AttachCurrentThread(),
208 nullptr, 208 nullptr,
209 0, 209 0,
210 kAndroidActionPointerDown, 210 kAndroidActionPointerDown,
211 pointer_count, 211 pointer_count,
212 history_size, 212 history_size,
213 action_index, 213 action_index,
214 0, 214 0,
215 0, 215 0,
216 0, 216 0,
217 0, 217 0,
218 p0, 218 &p0,
219 p1); 219 &p1);
220 220
221 EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction()); 221 EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction());
222 EXPECT_EQ(action_index, event.GetActionIndex()); 222 EXPECT_EQ(action_index, event.GetActionIndex());
223 } 223 }
224 224
225 } // namespace content 225 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698