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

Side by Side Diff: ui/events/event_unittest.cc

Issue 2317253005: SourceEventType added to LatencyInfo (Closed)
Patch Set: unittest added for source type assignment for pointerEvents. 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/events/event.h" 5 #include "ui/events/event.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 949 matching lines...) Expand 10 before | Expand all | Expand 10 after
960 EventTimeForNow(), 11.5, 13.5, 13.0, 0.5)); 960 EventTimeForNow(), 11.5, 13.5, 13.0, 0.5));
961 ui::TouchEvent touch_event(pointer_event); 961 ui::TouchEvent touch_event(pointer_event);
962 962
963 EXPECT_EQ(pointer_event.location(), touch_event.location()); 963 EXPECT_EQ(pointer_event.location(), touch_event.location());
964 EXPECT_EQ(pointer_event.flags(), touch_event.flags()); 964 EXPECT_EQ(pointer_event.flags(), touch_event.flags());
965 EXPECT_EQ(pointer_event.pointer_id(), touch_event.touch_id()); 965 EXPECT_EQ(pointer_event.pointer_id(), touch_event.touch_id());
966 EXPECT_EQ(pointer_event.pointer_details(), touch_event.pointer_details()); 966 EXPECT_EQ(pointer_event.pointer_details(), touch_event.pointer_details());
967 EXPECT_EQ(pointer_event.time_stamp(), touch_event.time_stamp()); 967 EXPECT_EQ(pointer_event.time_stamp(), touch_event.time_stamp());
968 } 968 }
969 969
970 TEST(EventTest, PointerEventSourceEventTypeExistsInLatencyInfo) {
971 ui::PointerEvent wheel_poniter_event(
972 ui::ET_POINTER_WHEEL_CHANGED, gfx::Point(), gfx::Point(), 0, 0, 0,
973 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
974 ui::EventTimeForNow());
975 EXPECT_EQ(wheel_poniter_event.latency()->source_event_type(),
976 ui::SourceEventType::WHEEL);
977
978 ui::PointerEvent touch_poniter_event(
979 ui::ET_TOUCH_PRESSED, gfx::Point(), gfx::Point(), 0, 0, 0,
980 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
981 ui::EventTimeForNow());
982 EXPECT_EQ(touch_poniter_event.latency()->source_event_type(),
983 ui::SourceEventType::TOUCH);
984 }
985
970 // Checks that Event.Latency.OS.TOUCH_PRESSED, TOUCH_MOVED, 986 // Checks that Event.Latency.OS.TOUCH_PRESSED, TOUCH_MOVED,
971 // and TOUCH_RELEASED histograms are computed properly. 987 // and TOUCH_RELEASED histograms are computed properly.
972 #if defined(USE_X11) 988 #if defined(USE_X11)
973 TEST(EventTest, EventLatencyOSTouchHistograms) { 989 TEST(EventTest, EventLatencyOSTouchHistograms) {
974 base::HistogramTester histogram_tester; 990 base::HistogramTester histogram_tester;
975 ScopedXI2Event scoped_xevent; 991 ScopedXI2Event scoped_xevent;
976 992
977 // SetUp for test 993 // SetUp for test
978 DeviceDataManagerX11::CreateInstance(); 994 DeviceDataManagerX11::CreateInstance();
979 std::vector<int> devices; 995 std::vector<int> devices;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1013 XButtonEvent* button_event = &(native_event.xbutton); 1029 XButtonEvent* button_event = &(native_event.xbutton);
1014 button_event->type = ButtonPress; 1030 button_event->type = ButtonPress;
1015 button_event->button = 4; // A valid wheel button number between min and max. 1031 button_event->button = 4; // A valid wheel button number between min and max.
1016 MouseWheelEvent mouse_ev(&native_event); 1032 MouseWheelEvent mouse_ev(&native_event);
1017 1033
1018 histogram_tester.ExpectTotalCount("Event.Latency.OS.MOUSE_WHEEL", 1); 1034 histogram_tester.ExpectTotalCount("Event.Latency.OS.MOUSE_WHEEL", 1);
1019 #endif 1035 #endif
1020 } 1036 }
1021 1037
1022 } // namespace ui 1038 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698