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

Side by Side Diff: ui/events/mojo/struct_traits_unittest.cc

Issue 2786693002: Add PointerDetails to ui::MouseEvent's constructors (Closed)
Patch Set: mouse constructor Created 3 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "mojo/public/cpp/bindings/binding_set.h" 6 #include "mojo/public/cpp/bindings/binding_set.h"
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 #include "ui/events/event.h" 8 #include "ui/events/event.h"
9 #include "ui/events/keycodes/dom/dom_code.h" 9 #include "ui/events/keycodes/dom/dom_code.h"
10 #include "ui/events/mojo/event.mojom.h" 10 #include "ui/events/mojo/event.mojom.h"
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 EXPECT_EQ(kTestData[i].code(), output_key_event->code()); 165 EXPECT_EQ(kTestData[i].code(), output_key_event->code());
166 EXPECT_EQ(kTestData[i].time_stamp(), output_key_event->time_stamp()); 166 EXPECT_EQ(kTestData[i].time_stamp(), output_key_event->time_stamp());
167 } 167 }
168 } 168 }
169 169
170 TEST_F(StructTraitsTest, PointerEvent) { 170 TEST_F(StructTraitsTest, PointerEvent) {
171 PointerEvent kTestData[] = { 171 PointerEvent kTestData[] = {
172 // Mouse pointer events: 172 // Mouse pointer events:
173 {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE, 0, 173 {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE, 0,
174 PointerDetails(EventPointerType::POINTER_TYPE_MOUSE, 174 PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
175 PointerEvent::kMousePointerId), 175 MouseEvent::kMousePointerId),
176 base::TimeTicks()}, 176 base::TimeTicks()},
177 {ET_POINTER_MOVED, gfx::Point(1, 5), gfx::Point(5, 1), 177 {ET_POINTER_MOVED, gfx::Point(1, 5), gfx::Point(5, 1),
178 EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON, 178 EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON,
179 PointerDetails(EventPointerType::POINTER_TYPE_MOUSE, 179 PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
180 PointerEvent::kMousePointerId), 180 MouseEvent::kMousePointerId),
181 base::TimeTicks()}, 181 base::TimeTicks()},
182 {ET_POINTER_UP, gfx::Point(411, 130), gfx::Point(20, 30), 182 {ET_POINTER_UP, gfx::Point(411, 130), gfx::Point(20, 30),
183 EF_MIDDLE_MOUSE_BUTTON | EF_RIGHT_MOUSE_BUTTON, EF_RIGHT_MOUSE_BUTTON, 183 EF_MIDDLE_MOUSE_BUTTON | EF_RIGHT_MOUSE_BUTTON, EF_RIGHT_MOUSE_BUTTON,
184 PointerDetails(EventPointerType::POINTER_TYPE_MOUSE, 184 PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
185 PointerEvent::kMousePointerId), 185 MouseEvent::kMousePointerId),
186 base::TimeTicks()}, 186 base::TimeTicks()},
187 {ET_POINTER_EXITED, gfx::Point(10, 10), gfx::Point(20, 30), 187 {ET_POINTER_EXITED, gfx::Point(10, 10), gfx::Point(20, 30),
188 EF_BACK_MOUSE_BUTTON, 0, 188 EF_BACK_MOUSE_BUTTON, 0,
189 PointerDetails(EventPointerType::POINTER_TYPE_MOUSE, 189 PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
190 PointerEvent::kMousePointerId), 190 MouseEvent::kMousePointerId),
191 base::TimeTicks()}, 191 base::TimeTicks()},
192 192
193 // Touch pointer events: 193 // Touch pointer events:
194 {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE, 0, 194 {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE, 0,
195 PointerDetails(EventPointerType::POINTER_TYPE_TOUCH, 195 PointerDetails(EventPointerType::POINTER_TYPE_TOUCH,
196 /* pointer_id*/ 1, 196 /* pointer_id*/ 1,
197 /* radius_x */ 1.0f, 197 /* radius_x */ 1.0f,
198 /* radius_y */ 2.0f, 198 /* radius_y */ 2.0f,
199 /* force */ 3.0f, 199 /* force */ 3.0f,
200 /* tilt_x */ 4.0f, 200 /* tilt_x */ 4.0f,
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 std::unique_ptr<Event> event_ptr = Event::Clone(key_event); 270 std::unique_ptr<Event> event_ptr = Event::Clone(key_event);
271 std::unique_ptr<Event> deserialized; 271 std::unique_ptr<Event> deserialized;
272 ASSERT_TRUE(mojom::Event::Deserialize(mojom::Event::Serialize(&event_ptr), 272 ASSERT_TRUE(mojom::Event::Deserialize(mojom::Event::Serialize(&event_ptr),
273 &deserialized)); 273 &deserialized));
274 ASSERT_TRUE(deserialized->IsKeyEvent()); 274 ASSERT_TRUE(deserialized->IsKeyEvent());
275 ASSERT_TRUE(deserialized->AsKeyEvent()->properties()); 275 ASSERT_TRUE(deserialized->AsKeyEvent()->properties());
276 EXPECT_EQ(properties, *(deserialized->AsKeyEvent()->properties())); 276 EXPECT_EQ(properties, *(deserialized->AsKeyEvent()->properties()));
277 } 277 }
278 278
279 } // namespace ui 279 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698