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

Unified Diff: ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc

Issue 959923002: Fix CapsLock remapping. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unit test Created 5 years, 10 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 | « no previous file | ui/events/ozone/evdev/event_modifiers_evdev.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
diff --git a/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc b/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
index 71a5b8afdb5eee94897315da92906d0d782c0f02..b0de29dca8a569cd4fdc69c926f895ec945f053f 100644
--- a/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
+++ b/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
@@ -344,58 +344,22 @@ TEST_F(EventConverterEvdevImplTest, KeyWithLock) {
{{0, 0}, EV_MSC, MSC_SCAN, 0x70039},
{{0, 0}, EV_KEY, KEY_CAPSLOCK, 0},
{{0, 0}, EV_SYN, SYN_REPORT, 0},
-
- {{0, 0}, EV_MSC, MSC_SCAN, 0x70014},
- {{0, 0}, EV_KEY, KEY_Q, 1},
- {{0, 0}, EV_SYN, SYN_REPORT, 0},
-
- {{0, 0}, EV_MSC, MSC_SCAN, 0x70014},
- {{0, 0}, EV_KEY, KEY_Q, 0},
- {{0, 0}, EV_SYN, SYN_REPORT, 0},
-
- {{0, 0}, EV_MSC, MSC_SCAN, 0x70039},
- {{0, 0}, EV_KEY, KEY_CAPSLOCK, 1},
- {{0, 0}, EV_SYN, SYN_REPORT, 0},
-
- {{0, 0}, EV_MSC, MSC_SCAN, 0x70039},
- {{0, 0}, EV_KEY, KEY_CAPSLOCK, 0},
- {{0, 0}, EV_SYN, SYN_REPORT, 0},
};
dev->ProcessEvents(mock_kernel_queue, arraysize(mock_kernel_queue));
- EXPECT_EQ(6u, size());
+ EXPECT_EQ(2u, size());
ui::KeyEvent* event;
event = dispatched_event(0);
EXPECT_EQ(ui::ET_KEY_PRESSED, event->type());
EXPECT_EQ(ui::VKEY_CAPITAL, event->key_code());
- EXPECT_EQ(ui::EF_CAPS_LOCK_DOWN, event->flags());
+ EXPECT_EQ(ui::EF_MOD3_DOWN, event->flags());
event = dispatched_event(1);
EXPECT_EQ(ui::ET_KEY_RELEASED, event->type());
EXPECT_EQ(ui::VKEY_CAPITAL, event->key_code());
- EXPECT_EQ(ui::EF_CAPS_LOCK_DOWN, event->flags());
-
- event = dispatched_event(2);
- EXPECT_EQ(ui::ET_KEY_PRESSED, event->type());
- EXPECT_EQ(ui::VKEY_Q, event->key_code());
- EXPECT_EQ(ui::EF_CAPS_LOCK_DOWN, event->flags());
-
- event = dispatched_event(3);
- EXPECT_EQ(ui::ET_KEY_RELEASED, event->type());
- EXPECT_EQ(ui::VKEY_Q, event->key_code());
- EXPECT_EQ(ui::EF_CAPS_LOCK_DOWN, event->flags());
-
- event = dispatched_event(4);
- EXPECT_EQ(ui::ET_KEY_PRESSED, event->type());
- EXPECT_EQ(ui::VKEY_CAPITAL, event->key_code());
- EXPECT_EQ(0, event->flags());
-
- event = dispatched_event(5);
- EXPECT_EQ(ui::ET_KEY_RELEASED, event->type());
- EXPECT_EQ(ui::VKEY_CAPITAL, event->key_code());
- EXPECT_EQ(0, event->flags());
+ EXPECT_EQ(ui::EF_NONE, event->flags());
}
TEST_F(EventConverterEvdevImplTest, MouseButton) {
« no previous file with comments | « no previous file | ui/events/ozone/evdev/event_modifiers_evdev.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698