Index: content/browser/renderer_host/web_input_event_aura_unittest.cc |
diff --git a/content/browser/renderer_host/web_input_event_aura_unittest.cc b/content/browser/renderer_host/web_input_event_aura_unittest.cc |
index 15f98089fa68314611f74fdc6c0da81a9df5afa6..5a86f734d696395011ce303a1d2130de7ca6d851 100644 |
--- a/content/browser/renderer_host/web_input_event_aura_unittest.cc |
+++ b/content/browser/renderer_host/web_input_event_aura_unittest.cc |
@@ -73,4 +73,71 @@ TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventWindowsKeyCode) { |
#endif |
} |
+// Checks that MakeWebKeyboardEvent fills a correct keypard modifier. |
+TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventKeyPadKeyCode) { |
+#if defined(USE_X11) |
+ struct TestCase { |
+ ui::KeyboardCode ui_keycode; // The virtual key code. |
+ uint32 x_keycode; // The platform key code. |
+ bool expected_result; // true if the event has "isKeyPad" modifier. |
+ } kTesCases[] = { |
+ {ui::VKEY_0, XK_0, false}, |
+ {ui::VKEY_1, XK_1, false}, |
+ {ui::VKEY_2, XK_2, false}, |
+ {ui::VKEY_3, XK_3, false}, |
+ {ui::VKEY_4, XK_4, false}, |
+ {ui::VKEY_5, XK_5, false}, |
+ {ui::VKEY_6, XK_6, false}, |
+ {ui::VKEY_7, XK_7, false}, |
+ {ui::VKEY_8, XK_8, false}, |
+ {ui::VKEY_9, XK_9, false}, |
+ |
+ {ui::VKEY_NUMPAD0, XK_KP_0, true}, |
+ {ui::VKEY_NUMPAD1, XK_KP_1, true}, |
+ {ui::VKEY_NUMPAD2, XK_KP_2, true}, |
+ {ui::VKEY_NUMPAD3, XK_KP_3, true}, |
+ {ui::VKEY_NUMPAD4, XK_KP_4, true}, |
+ {ui::VKEY_NUMPAD5, XK_KP_5, true}, |
+ {ui::VKEY_NUMPAD6, XK_KP_6, true}, |
+ {ui::VKEY_NUMPAD7, XK_KP_7, true}, |
+ {ui::VKEY_NUMPAD8, XK_KP_8, true}, |
+ {ui::VKEY_NUMPAD9, XK_KP_9, true}, |
+ |
+ {ui::VKEY_MULTIPLY, XK_KP_Multiply, true}, |
+ {ui::VKEY_SUBTRACT, XK_KP_Subtract, true}, |
+ {ui::VKEY_ADD, XK_KP_Add, true}, |
+ {ui::VKEY_DIVIDE, XK_KP_Divide, true}, |
+ {ui::VKEY_DECIMAL, XK_KP_Decimal, true}, |
+ {ui::VKEY_DELETE, XK_KP_Delete, true}, |
+ {ui::VKEY_INSERT, XK_KP_Insert, true}, |
+ {ui::VKEY_END, XK_KP_End, true}, |
+ {ui::VKEY_DOWN, XK_KP_Down, true}, |
+ {ui::VKEY_NEXT, XK_KP_Page_Down, true}, |
+ {ui::VKEY_LEFT, XK_KP_Left, true}, |
+ {ui::VKEY_CLEAR, XK_KP_Begin, true}, |
+ {ui::VKEY_RIGHT, XK_KP_Right, true}, |
+ {ui::VKEY_HOME, XK_KP_Home, true}, |
+ {ui::VKEY_UP, XK_KP_Up, true}, |
+ {ui::VKEY_PRIOR, XK_KP_Page_Up, true}, |
+ }; |
+ ui::ScopedXI2Event xev; |
+ for (size_t i = 0; i < arraysize(kTesCases); ++i) { |
+ const TestCase& test_case = kTesCases[i]; |
+ |
+ xev.InitKeyEvent(ui::ET_KEY_PRESSED, test_case.ui_keycode, 0); |
+ XEvent* xevent = xev; |
+ xevent->xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(), |
+ test_case.x_keycode); |
+ ui::KeyEvent event(xev); |
+ blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); |
+ EXPECT_EQ(test_case.expected_result, |
+ (webkit_event.modifiers & blink::WebInputEvent::IsKeyPad) != 0) |
+ << "Failed in " << i << "th test case: " |
+ << "{ui_keycode:" << test_case.ui_keycode |
+ << ", x_keycode:" << test_case.x_keycode |
+ << "}, expect: " << test_case.expected_result; |
+ } |
+#endif |
+} |
+ |
} // namespace content |