DOM Level 3 .code and .key value enumerations.

ui/events/keycodes/dom4/keycode_converter_unittest.cc

Index: ui/events/keycodes/dom4/keycode_converter_unittest.cc
diff --git a/ui/events/keycodes/dom4/keycode_converter_unittest.cc b/ui/events/keycodes/dom4/keycode_converter_unittest.cc
index 0b96583617b7c09d7867583991813043ccb5a081..156d44ad39970a93a5b40fcf9fca8e9e3ab47ad6 100644
--- a/ui/events/keycodes/dom4/keycode_converter_unittest.cc
+++ b/ui/events/keycodes/dom4/keycode_converter_unittest.cc
@@ -8,6 +8,8 @@
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/events/keycodes/dom3/dom_code.h"
+#include "ui/events/keycodes/dom3/dom_key.h"
 
 using ui::KeycodeConverter;
 
@@ -16,7 +18,7 @@ namespace {
 #if defined(OS_WIN)
 const size_t kExpectedMappedKeyCount = 138;
 #elif defined(OS_LINUX)
-const size_t kExpectedMappedKeyCount = 145;
+const size_t kExpectedMappedKeyCount = 155;
 #elif defined(OS_MACOSX)
 const size_t kExpectedMappedKeyCount = 118;
 #else
@@ -56,36 +58,30 @@ TEST(UsbKeycodeMap, Basic) {
         ui::KeycodeConverter::UsbKeycodeToNativeKeycode(entry->usb_keycode));
 
     // Verify CodeToNativeKeycode and NativeKeycodeToCode work correctly.
-    if (entry->code) {
+    if (entry->code != ui::DomCode::NONE) {
       EXPECT_EQ(entry->native_keycode,
-                ui::KeycodeConverter::CodeToNativeKeycode(entry->code));
-      EXPECT_STREQ(
-          entry->code,
-          ui::KeycodeConverter::NativeKeycodeToCode(entry->native_keycode));
-    }
-    else {
+                ui::KeycodeConverter::DomCodeToNativeKeycode(entry->code));
+      EXPECT_EQ(
+          static_cast<int>(entry->code),
+          static_cast<int>(ui::KeycodeConverter::NativeKeycodeToDomCode(
+              entry->native_keycode)));
+    } else {
       EXPECT_EQ(ui::KeycodeConverter::InvalidNativeKeycode(),
-                ui::KeycodeConverter::CodeToNativeKeycode(entry->code));
+                ui::KeycodeConverter::DomCodeToNativeKeycode(entry->code));
     }
 
     // Verify that the USB or native codes aren't duplicated.
     EXPECT_EQ(0U, usb_to_native.count(entry->usb_keycode))
         << " duplicate of USB code 0x" << std::hex << std::setfill('0')
-        << std::setw(6) << entry->usb_keycode
-        << " to native 0x"
-        << std::setw(4) << entry->native_keycode
-        << " (previous was 0x"
-        << std::setw(4) << usb_to_native[entry->usb_keycode]
-        << ")";
+        << std::setw(6) << entry->usb_keycode << " to native 0x" << std::setw(4)
+        << entry->native_keycode << " (previous was 0x" << std::setw(4)
+        << usb_to_native[entry->usb_keycode] << ")";
     usb_to_native[entry->usb_keycode] = entry->native_keycode;
     EXPECT_EQ(0U, native_to_usb.count(entry->native_keycode))
         << " duplicate of native code 0x" << std::hex << std::setfill('0')
-        << std::setw(4) << entry->native_keycode
-        << " to USB 0x"
-        << std::setw(6) << entry->usb_keycode
-        << " (previous was 0x"
-        << std::setw(6) << native_to_usb[entry->native_keycode]
-        << ")";
+        << std::setw(4) << entry->native_keycode << " to USB 0x" << std::setw(6)
+        << entry->usb_keycode << " (previous was 0x" << std::setw(6)
+        << native_to_usb[entry->native_keycode] << ")";
     native_to_usb[entry->native_keycode] = entry->usb_keycode;
   }
   ASSERT_EQ(usb_to_native.size(), native_to_usb.size());
@@ -109,4 +105,44 @@ TEST(UsbKeycodeMap, UsBackslashIsNonUsHash) {
             ui::KeycodeConverter::UsbKeycodeToNativeKeycode(kUsbNonUsHash));
 }
 
+TEST(KeycodeConverter, DomCode) {
+  // Test invalid and unknown arguments to CodeStringToDomCode()
+  EXPECT_EQ(ui::DomCode::NONE,
+            ui::KeycodeConverter::CodeStringToDomCode(nullptr));
+  EXPECT_EQ(ui::DomCode::NONE, ui::KeycodeConverter::CodeStringToDomCode("-"));
+  EXPECT_EQ(ui::DomCode::NONE, ui::KeycodeConverter::CodeStringToDomCode(""));
+  // Round-trip test DOM Level 3 .code strings.
+  const char* s = nullptr;
+  for (size_t i = 0;
+       (s = ui::KeycodeConverter::DomCodeStringForTest(i)) != nullptr;
+       ++i) {
+    SCOPED_TRACE(i);
+    ui::DomCode code = ui::KeycodeConverter::CodeStringToDomCode(s);
+    if (s) {
+      EXPECT_STREQ(s, ui::KeycodeConverter::DomCodeToCodeString(code));
+    } else {
+      EXPECT_EQ(ui::DomCode::NONE, code);
+    }
+  }
+}
+
+TEST(KeycodeConverter, DomKey) {
+  // Test invalid and unknown arguments to KeyStringToDomKey()
+  EXPECT_EQ(ui::DomKey::NONE, ui::KeycodeConverter::KeyStringToDomKey(nullptr));
+  EXPECT_EQ(ui::DomKey::NONE, ui::KeycodeConverter::KeyStringToDomKey("-"));
+  // Round-trip test DOM Level 3 .key strings.
+  const char* s = nullptr;
+  for (size_t i = 0;
+       (s = ui::KeycodeConverter::DomKeyStringForTest(i)) != nullptr;
+       ++i) {
+    SCOPED_TRACE(i);
+    ui::DomKey key = ui::KeycodeConverter::KeyStringToDomKey(s);
+    if (s) {
+      EXPECT_STREQ(s, ui::KeycodeConverter::DomKeyToKeyString(key));
+    } else {
+      EXPECT_EQ(ui::DomKey::NONE, key);
+    }
+  }
+}
+
 }  // namespace