ui/events/keycodes/keyboard_code_conversion_unittest.cc - Issue 841263005: Use DOM- rather than Windows-based key code for non-layout cases.

Unified Diff: ui/events/keycodes/keyboard_code_conversion_unittest.cc

Issue 841263005: Use DOM- rather than Windows-based key code for non-layout cases. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address review comments (sadrul) Created 5 years, 8 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

Index: ui/events/keycodes/keyboard_code_conversion_unittest.cc

diff --git a/ui/events/keycodes/keyboard_code_conversion_unittest.cc b/ui/events/keycodes/keyboard_code_conversion_unittest.cc

new file mode 100644

index 0000000000000000000000000000000000000000..e22208a9002fb3b004ae9cae3d46cceeefc82ac8

--- /dev/null

+++ b/ui/events/keycodes/keyboard_code_conversion_unittest.cc

@@ -0,0 +1,523 @@

+// Use of this source code is governed by a BSD-style license that can be

+// found in the LICENSE file.

+#include "ui/events/keycodes/keyboard_code_conversion.h"

+#include "base/basictypes.h"

+#include "base/strings/stringprintf.h"

+#include "testing/gtest/include/gtest/gtest.h"

+#include "ui/events/event_constants.h"

+#include "ui/events/keycodes/dom3/dom_code.h"

+#include "ui/events/keycodes/dom3/dom_key.h"

+#include "ui/events/keycodes/dom4/keycode_converter.h"

+#include "ui/events/keycodes/keyboard_codes.h"

+namespace {

+struct Meaning {

+ bool defined;

+ ui::DomKey dom_key;

+ base::char16 character;

+ ui::KeyboardCode legacy_key_code;

+};

+const Meaning kUndefined = {false, ui::DomKey::NONE, 0, ui::VKEY_UNKNOWN};

+void CheckDomCodeToMeaning(const char* label,

+ bool f(ui::DomCode dom_code,

+ int flags,

+ ui::DomKey* out_dom_key,

+ base::char16* out_character,

+ ui::KeyboardCode* out_key_code),

+ ui::DomCode dom_code,

+ int event_flags,

+ const Meaning& result) {

+ ui::DomKey result_dom_key = ui::DomKey::NONE;

+ base::char16 result_character = 0;

+ ui::KeyboardCode result_legacy_key_code = ui::VKEY_UNKNOWN;

+ bool success = f(dom_code, event_flags, &result_dom_key, &result_character,

+ &result_legacy_key_code);

+ SCOPED_TRACE(

+ base::StringPrintf("%s %s %06X:%04X", label,

+ ui::KeycodeConverter::DomCodeToCodeString(dom_code),

+ static_cast<int>(dom_code), event_flags));

+ EXPECT_EQ(result.defined, success);

+ if (success) {

+ EXPECT_EQ(result.dom_key, result_dom_key);

+ EXPECT_EQ(result.character, result_character);

+ EXPECT_EQ(result.legacy_key_code, result_legacy_key_code);

+ } else {

+ // Should not have touched output parameters.

+ EXPECT_EQ(ui::DomKey::NONE, result_dom_key);

+ EXPECT_EQ(0, result_character);

+ EXPECT_EQ(ui::VKEY_UNKNOWN, result_legacy_key_code);

+ }

+TEST(KeyboardCodeConversion, ControlCharacters) {

+ // The codes in this table are handled by |DomCodeToControlCharacter()|.

+ static const struct {

+ ui::DomCode dom_code;

+ Meaning control;

+ Meaning control_shift;

+ } kControlCharacters[] = {

+ {ui::DomCode::KEY_A,

+ {true, ui::DomKey::CHARACTER, 0x01, ui::VKEY_A},

+ {true, ui::DomKey::CHARACTER, 0x01, ui::VKEY_A}},

+ {ui::DomCode::KEY_B,

+ {true, ui::DomKey::CHARACTER, 0x02, ui::VKEY_B},

+ {true, ui::DomKey::CHARACTER, 0x02, ui::VKEY_B}},

+ {ui::DomCode::KEY_C,

+ {true, ui::DomKey::CHARACTER, 0x03, ui::VKEY_C},

+ {true, ui::DomKey::CHARACTER, 0x03, ui::VKEY_C}},

+ {ui::DomCode::KEY_D,

+ {true, ui::DomKey::CHARACTER, 0x04, ui::VKEY_D},

+ {true, ui::DomKey::CHARACTER, 0x04, ui::VKEY_D}},

+ {ui::DomCode::KEY_E,

+ {true, ui::DomKey::CHARACTER, 0x05, ui::VKEY_E},

+ {true, ui::DomKey::CHARACTER, 0x05, ui::VKEY_E}},

+ {ui::DomCode::KEY_F,

+ {true, ui::DomKey::CHARACTER, 0x06, ui::VKEY_F},

+ {true, ui::DomKey::CHARACTER, 0x06, ui::VKEY_F}},

+ {ui::DomCode::KEY_G,

+ {true, ui::DomKey::CHARACTER, 0x07, ui::VKEY_G},

+ {true, ui::DomKey::CHARACTER, 0x07, ui::VKEY_G}},

+ {ui::DomCode::KEY_H,

+ {true, ui::DomKey::BACKSPACE, 0x08, ui::VKEY_BACK},

+ {true, ui::DomKey::BACKSPACE, 0x08, ui::VKEY_BACK}},

+ {ui::DomCode::KEY_I,

+ {true, ui::DomKey::TAB, 0x09, ui::VKEY_TAB},

+ {true, ui::DomKey::TAB, 0x09, ui::VKEY_TAB}},

+ {ui::DomCode::KEY_J,

+ {true, ui::DomKey::CHARACTER, 0x0A, ui::VKEY_J},

+ {true, ui::DomKey::CHARACTER, 0x0A, ui::VKEY_J}},

+ {ui::DomCode::KEY_K,

+ {true, ui::DomKey::CHARACTER, 0x0B, ui::VKEY_K},

+ {true, ui::DomKey::CHARACTER, 0x0B, ui::VKEY_K}},

+ {ui::DomCode::KEY_L,

+ {true, ui::DomKey::CHARACTER, 0x0C, ui::VKEY_L},

+ {true, ui::DomKey::CHARACTER, 0x0C, ui::VKEY_L}},

+ {ui::DomCode::KEY_M,

+ {true, ui::DomKey::ENTER, 0x0D, ui::VKEY_RETURN},

+ {true, ui::DomKey::ENTER, 0x0D, ui::VKEY_RETURN}},

+ {ui::DomCode::KEY_N,

+ {true, ui::DomKey::CHARACTER, 0x0E, ui::VKEY_N},

+ {true, ui::DomKey::CHARACTER, 0x0E, ui::VKEY_N}},

+ {ui::DomCode::KEY_O,

+ {true, ui::DomKey::CHARACTER, 0x0F, ui::VKEY_O},

+ {true, ui::DomKey::CHARACTER, 0x0F, ui::VKEY_O}},

+ {ui::DomCode::KEY_P,

+ {true, ui::DomKey::CHARACTER, 0x10, ui::VKEY_P},

+ {true, ui::DomKey::CHARACTER, 0x10, ui::VKEY_P}},

+ {ui::DomCode::KEY_Q,

+ {true, ui::DomKey::CHARACTER, 0x11, ui::VKEY_Q},

+ {true, ui::DomKey::CHARACTER, 0x11, ui::VKEY_Q}},

+ {ui::DomCode::KEY_R,

+ {true, ui::DomKey::CHARACTER, 0x12, ui::VKEY_R},

+ {true, ui::DomKey::CHARACTER, 0x12, ui::VKEY_R}},

+ {ui::DomCode::KEY_S,

+ {true, ui::DomKey::CHARACTER, 0x13, ui::VKEY_S},

+ {true, ui::DomKey::CHARACTER, 0x13, ui::VKEY_S}},

+ {ui::DomCode::KEY_T,

+ {true, ui::DomKey::CHARACTER, 0x14, ui::VKEY_T},

+ {true, ui::DomKey::CHARACTER, 0x14, ui::VKEY_T}},

+ {ui::DomCode::KEY_U,

+ {true, ui::DomKey::CHARACTER, 0x15, ui::VKEY_U},

+ {true, ui::DomKey::CHARACTER, 0x15, ui::VKEY_U}},

+ {ui::DomCode::KEY_V,

+ {true, ui::DomKey::CHARACTER, 0x16, ui::VKEY_V},

+ {true, ui::DomKey::CHARACTER, 0x16, ui::VKEY_V}},

+ {ui::DomCode::KEY_W,

+ {true, ui::DomKey::CHARACTER, 0x17, ui::VKEY_W},

+ {true, ui::DomKey::CHARACTER, 0x17, ui::VKEY_W}},

+ {ui::DomCode::KEY_X,

+ {true, ui::DomKey::CHARACTER, 0x18, ui::VKEY_X},

+ {true, ui::DomKey::CHARACTER, 0x18, ui::VKEY_X}},

+ {ui::DomCode::KEY_Y,

+ {true, ui::DomKey::CHARACTER, 0x19, ui::VKEY_Y},

+ {true, ui::DomKey::CHARACTER, 0x19, ui::VKEY_Y}},

+ {ui::DomCode::KEY_Z,

+ {true, ui::DomKey::CHARACTER, 0x1A, ui::VKEY_Z},

+ {true, ui::DomKey::CHARACTER, 0x1A, ui::VKEY_Z}},

+ };

+ for (const auto& it : kControlCharacters) {

+ // Verify |DomCodeToControlCharacter()|.

+ CheckDomCodeToMeaning("c_cc_n", ui::DomCodeToControlCharacter, it.dom_code,

+ ui::EF_NONE, kUndefined);

+ CheckDomCodeToMeaning("c_cc_c", ui::DomCodeToControlCharacter, it.dom_code,

+ ui::EF_CONTROL_DOWN, it.control);

+ CheckDomCodeToMeaning("c_cc_cs", ui::DomCodeToControlCharacter, it.dom_code,

+ ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,

+ it.control_shift);

+ // Verify |DomCodeToUsLayoutMeaning()|.

+ CheckDomCodeToMeaning("c_us_c", ui::DomCodeToUsLayoutMeaning, it.dom_code,

+ ui::EF_CONTROL_DOWN, it.control);

+ CheckDomCodeToMeaning("c_us_cs", ui::DomCodeToUsLayoutMeaning, it.dom_code,

+ ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,

+ it.control_shift);

+ }

+ // The codes in this table are sensitive to the Shift state, so they are

+ // handled differently by |DomCodeToControlCharacter()|, which returns false

+ // for unknown combinations, vs |DomCodeToUsLayoutMeaning()|, which returns

+ // true with DomKey::UNIDENTIFIED.

+ static const struct {

+ ui::DomCode dom_code;

+ Meaning cc_control;

+ Meaning cc_control_shift;

+ Meaning us_control;

+ Meaning us_control_shift;

+ } kShiftControlCharacters[] = {

+ {ui::DomCode::DIGIT2,