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

Unified Diff: ui/events/cocoa/events_mac_unittest.mm

Issue 346463003: MacViews: Fix missing NSMouseMove in ui::EventTypeFromNative, add test coverage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/cocoa/events_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/cocoa/events_mac_unittest.mm
diff --git a/ui/events/cocoa/events_mac_unittest.mm b/ui/events/cocoa/events_mac_unittest.mm
index adaafea1df397d907ebca93c1d1007d0afbebbfe..4e90aea4e06b0af55fa0991ec60ef7dd21b8d1d8 100644
--- a/ui/events/cocoa/events_mac_unittest.mm
+++ b/ui/events/cocoa/events_mac_unittest.mm
@@ -288,4 +288,28 @@ TEST_F(EventsMacTest, NativeTitlebarEventLocation) {
ui::EventLocationFromNative(event));
}
+// Testing for ui::EventTypeFromNative() not covered by ButtonEvents.
+TEST_F(EventsMacTest, EventTypeFromNative) {
+ NSEvent* event = cocoa_test_event_utils::KeyEventWithType(NSKeyDown, 0);
+ EXPECT_EQ(ui::ET_KEY_PRESSED, ui::EventTypeFromNative(event));
+
+ event = cocoa_test_event_utils::KeyEventWithType(NSKeyUp, 0);
+ EXPECT_EQ(ui::ET_KEY_RELEASED, ui::EventTypeFromNative(event));
+
+ event = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseDragged, 0);
+ EXPECT_EQ(ui::ET_MOUSE_DRAGGED, ui::EventTypeFromNative(event));
+ event = cocoa_test_event_utils::MouseEventWithType(NSRightMouseDragged, 0);
+ EXPECT_EQ(ui::ET_MOUSE_DRAGGED, ui::EventTypeFromNative(event));
+ event = cocoa_test_event_utils::MouseEventWithType(NSOtherMouseDragged, 0);
+ EXPECT_EQ(ui::ET_MOUSE_DRAGGED, ui::EventTypeFromNative(event));
+
+ event = cocoa_test_event_utils::MouseEventWithType(NSMouseMoved, 0);
+ EXPECT_EQ(ui::ET_MOUSE_MOVED, ui::EventTypeFromNative(event));
+
+ // Attempting to generate mouse events using +[NSEvent mouseEventWithType:..]
+ // for NSMouseExited, NSMouseEntered or NSEventTypeSwipe fails some internal
+ // data validation and throws an exception. There is no corresponding CGEvent
Robert Sesek 2014/06/18 15:15:01 What about using cocoa_test_event_utils::EnterExit
tapted 2014/06/19 00:16:57 Ooh - nice. How did I miss that.. Done. I poked a
+ // type for these.
+}
+
} // namespace ui
« no previous file with comments | « ui/events/cocoa/events_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698