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

Unified Diff: ui/events/event_unittest.cc

Issue 1843433002: mash: Fix DCHECK when clicking on window close box (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments 2 Created 4 years, 9 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/event.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/event_unittest.cc
diff --git a/ui/events/event_unittest.cc b/ui/events/event_unittest.cc
index 2090055f659915ed3a36e80cba127a33fa793e80..7dadd36d0853bf39eba874f8898cf0934ad6cca3 100644
--- a/ui/events/event_unittest.cc
+++ b/ui/events/event_unittest.cc
@@ -725,6 +725,52 @@ TEST(EventTest, PointerDetailsCustomTouch) {
EXPECT_EQ(touch_event.pointer_details(), touch_event_copy.pointer_details());
}
+TEST(EventTest, PointerEventCanConvertFrom) {
+ const gfx::Point point;
+ const base::TimeDelta time;
+
+ // Common mouse events can be converted.
+ const EventType mouse_allowed[] = {
+ ET_MOUSE_PRESSED,
+ ET_MOUSE_DRAGGED,
+ ET_MOUSE_MOVED,
+ ET_MOUSE_ENTERED,
+ ET_MOUSE_EXITED,
+ ET_MOUSE_RELEASED
+ };
+ for (size_t i = 0; i < arraysize(mouse_allowed); i++) {
+ MouseEvent event(mouse_allowed[i], point, point, time, 0, 0);
+ EXPECT_TRUE(PointerEvent::CanConvertFrom(event));
+ }
+
+ // Common touch events can be converted.
+ const EventType touch_allowed[] = {
+ ET_TOUCH_PRESSED,
+ ET_TOUCH_MOVED,
+ ET_TOUCH_RELEASED,
+ ET_TOUCH_CANCELLED
+ };
+ for (size_t i = 0; i < arraysize(touch_allowed); i++) {
+ TouchEvent event(touch_allowed[i], point, 0, time);
+ EXPECT_TRUE(PointerEvent::CanConvertFrom(event));
+ }
+
+ // Capture changes cannot be converted.
+ EXPECT_FALSE(
+ PointerEvent::CanConvertFrom(
+ MouseEvent(ET_MOUSE_CAPTURE_CHANGED, point, point, time, 0, 0)));
+
+ // Wheel events cannot be converted.
+ EXPECT_FALSE(
+ PointerEvent::CanConvertFrom(
+ MouseWheelEvent(gfx::Vector2d(), point, point, time, 0, 0)));
+
+ // Non-mouse non-touch events cannot be converted.
+ EXPECT_FALSE(
+ PointerEvent::CanConvertFrom(
+ KeyEvent(ET_KEY_PRESSED, VKEY_SPACE, EF_NONE)));
+}
+
TEST(EventTest, PointerEventType) {
const ui::EventType kMouseTypeMap[][2] = {
{ui::ET_MOUSE_PRESSED, ui::ET_POINTER_DOWN},
« no previous file with comments | « ui/events/event.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698