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

Unified Diff: ui/events/mojo/struct_traits_unittest.cc

Issue 2301593002: Add POINTER_WHEEL_CHANGED event to mojo. (Closed)
Patch Set: rebase Created 4 years, 3 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
« no previous file with comments | « ui/events/mojo/event_struct_traits.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/mojo/struct_traits_unittest.cc
diff --git a/ui/events/mojo/struct_traits_unittest.cc b/ui/events/mojo/struct_traits_unittest.cc
index 62b9649e13bd798f8bfaee66bcca94a3808ad9f2..0f3fb7f81267e533b255ee63c9e6de114825f88c 100644
--- a/ui/events/mojo/struct_traits_unittest.cc
+++ b/ui/events/mojo/struct_traits_unittest.cc
@@ -207,7 +207,7 @@ TEST_F(StructTraitsTest, PointerEvent) {
}
}
-TEST_F(StructTraitsTest, MouseWheelEvent) {
+TEST_F(StructTraitsTest, PointerWheelEvent) {
MouseWheelEvent kTestData[] = {
{gfx::Vector2d(11, 15), gfx::Point(3, 4), gfx::Point(40, 30),
base::TimeTicks(), EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON},
@@ -221,16 +221,17 @@ TEST_F(StructTraitsTest, MouseWheelEvent) {
mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
for (size_t i = 0; i < arraysize(kTestData); i++) {
std::unique_ptr<Event> output;
- proxy->EchoEvent(Event::Clone(kTestData[i]), &output);
- EXPECT_TRUE(output->IsMouseWheelEvent());
+ proxy->EchoEvent(Event::Clone(ui::PointerEvent(kTestData[i])), &output);
+ EXPECT_EQ(ET_POINTER_WHEEL_CHANGED, output->type());
- const MouseWheelEvent* output_wheel_event = output->AsMouseWheelEvent();
- EXPECT_EQ(kTestData[i].type(), output_wheel_event->type());
- EXPECT_EQ(kTestData[i].flags(), output_wheel_event->flags());
- EXPECT_EQ(kTestData[i].location(), output_wheel_event->location());
+ const PointerEvent* output_pointer_event = output->AsPointerEvent();
+ EXPECT_EQ(ET_POINTER_WHEEL_CHANGED, output_pointer_event->type());
+ EXPECT_EQ(kTestData[i].flags(), output_pointer_event->flags());
+ EXPECT_EQ(kTestData[i].location(), output_pointer_event->location());
EXPECT_EQ(kTestData[i].root_location(),
- output_wheel_event->root_location());
- EXPECT_EQ(kTestData[i].offset(), output_wheel_event->offset());
+ output_pointer_event->root_location());
+ EXPECT_EQ(kTestData[i].offset(),
+ output_pointer_event->pointer_details().offset);
}
}
« no previous file with comments | « ui/events/mojo/event_struct_traits.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698