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

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

Issue 2439953005: Support NSFlagsChanged in ui::EventFromNative. (Closed)
Patch Set: Unify NSFlagsChanged handling between content and ui/events. Created 4 years, 2 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') | ui/events/test/cocoa_test_event_utils.h » ('j') | 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 0c46a98b1b840304458c7937d275a68ec12287a3..3c8fab598aa1c5a06da8e42c36233dac6dc9820b 100644
--- a/ui/events/cocoa/events_mac_unittest.mm
+++ b/ui/events/cocoa/events_mac_unittest.mm
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#import <Carbon/Carbon.h>
#import <Cocoa/Cocoa.h>
#include <stdint.h>
#include <memory>
+#include <utility>
#include "base/mac/scoped_cftyperef.h"
#include "base/mac/sdk_forward_declarations.h"
@@ -497,4 +499,44 @@ TEST_F(EventsMacTest, TrackpadScrollThenFlick) {
}
}
+// Check that NSFlagsChanged event is translated to key press or release event.
+TEST_F(EventsMacTest, HandleModifierOnlyKeyEvents) {
+ struct {
+ const char* description;
+ NSEventModifierFlags modifier_flags;
+ uint16_t key_code;
+ EventType expected_type;
+ KeyboardCode expected_key_code;
+ } test_cases[] = {
+ {"CapsLock pressed", NSAlphaShiftKeyMask, kVK_CapsLock, ET_KEY_PRESSED,
+ VKEY_CAPITAL},
+ {"CapsLock released", 0, kVK_CapsLock, ET_KEY_RELEASED, VKEY_CAPITAL},
+ {"Shift pressed", NSShiftKeyMask, kVK_Shift, ET_KEY_PRESSED, VKEY_SHIFT},
+ {"Shift released", 0, kVK_Shift, ET_KEY_RELEASED, VKEY_SHIFT},
+ {"Control pressed", NSControlKeyMask, kVK_Control, ET_KEY_PRESSED,
+ VKEY_CONTROL},
+ {"Control released", 0, kVK_Control, ET_KEY_RELEASED, VKEY_CONTROL},
+ {"Option pressed", NSAlternateKeyMask, kVK_Option, ET_KEY_PRESSED,
+ VKEY_MENU},
+ {"Option released", 0, kVK_Option, ET_KEY_RELEASED, VKEY_MENU},
+ {"Command pressed", NSCommandKeyMask, kVK_Command, ET_KEY_PRESSED,
+ VKEY_LWIN},
+ {"Command released", 0, kVK_Command, ET_KEY_RELEASED, VKEY_LWIN},
+ {"Shift pressed with CapsLock on", NSShiftKeyMask | NSAlphaShiftKeyMask,
+ kVK_Shift, ET_KEY_PRESSED, VKEY_SHIFT},
+ {"Shift released with CapsLock off", NSAlphaShiftKeyMask, kVK_Shift,
+ ET_KEY_RELEASED, VKEY_SHIFT},
+ };
+ for (const auto& test_case : test_cases) {
+ SCOPED_TRACE(::testing::Message() << "While checking case: "
+ << test_case.description);
+ NSEvent* native_event = cocoa_test_event_utils::KeyEventWithModifierOnly(
+ test_case.key_code, test_case.modifier_flags);
+ std::unique_ptr<ui::Event> event = EventFromNative(native_event);
+ EXPECT_TRUE(event);
+ EXPECT_EQ(test_case.expected_type, event->type());
+ EXPECT_EQ(test_case.expected_key_code, event->AsKeyEvent()->key_code());
+ }
+}
+
} // namespace ui
« no previous file with comments | « ui/events/cocoa/events_mac.mm ('k') | ui/events/test/cocoa_test_event_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698