Fix key identifier conversion.

chrome/browser/extensions/key_identifier_conversion_views_unittest.cc

Index: chrome/browser/extensions/key_identifier_conversion_views_unittest.cc
diff --git a/ui/base/keycodes/keyboard_code_conversion_unittest.cc b/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc
similarity index 15%
rename from ui/base/keycodes/keyboard_code_conversion_unittest.cc
rename to chrome/browser/extensions/key_identifier_conversion_views_unittest.cc
index 689145a533739bb56d052eb04a51f7fa49f4fc87..159023bcc2a7c362dda6f6edf0ae10061131a26c 100644
--- a/ui/base/keycodes/keyboard_code_conversion_unittest.cc
+++ b/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc
@@ -2,42 +2,76 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/keycodes/keyboard_code_conversion.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "chrome/browser/extensions/key_identifier_conversion_views.h"
+
+#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/message_loop.h"
+#include "chrome/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/keycodes/keyboard_codes.h"
+
+namespace {
+
+class KeyEventFromKeyIdentifierTest : public testing::Test {
+ protected:
+  KeyEventFromKeyIdentifierTest()
+      : ui_thread_(BrowserThread::UI, &message_loop_) {}
 
-namespace ui {
+  MessageLoopForUI message_loop_;
+  BrowserThread ui_thread_;
+};
 
-TEST(KeyCodeFromKeyIdentifierTest, MatchOnIdentifier) {
-  EXPECT_EQ(VKEY_APPS, KeyCodeFromKeyIdentifier("Apps"));
-  EXPECT_EQ(VKEY_UNKNOWN, KeyCodeFromKeyIdentifier("Nonsense"));
+TEST_F(KeyEventFromKeyIdentifierTest, MatchOnIdentifier) {
+  EXPECT_EQ(ui::VKEY_APPS, KeyEventFromKeyIdentifier("Apps").GetKeyCode());
+  EXPECT_EQ(ui::VKEY_UNKNOWN,
+      KeyEventFromKeyIdentifier("Nonsense").GetKeyCode());
 }
 
-TEST(KeyCodeFromKeyIdentifierTest, MatchOnCharacter) {
-  EXPECT_EQ(VKEY_A, KeyCodeFromKeyIdentifier("a"));
-  EXPECT_EQ(VKEY_A, KeyCodeFromKeyIdentifier("A"));
-  EXPECT_EQ(VKEY_OEM_PERIOD, KeyCodeFromKeyIdentifier(">"));
+TEST_F(KeyEventFromKeyIdentifierTest, MatchOnCharacter) {
+  EXPECT_EQ(ui::VKEY_A, KeyEventFromKeyIdentifier("a").GetKeyCode());
+  EXPECT_EQ(ui::VKEY_A, KeyEventFromKeyIdentifier("A").GetKeyCode());
+  EXPECT_EQ(ui::VKEY_OEM_PERIOD, KeyEventFromKeyIdentifier(">").GetKeyCode());
 
   std::string non_printing_char(" ");
   non_printing_char[0] = static_cast<char>(1);
-  EXPECT_EQ(VKEY_UNKNOWN, KeyCodeFromKeyIdentifier(non_printing_char));
+  EXPECT_EQ(ui::VKEY_UNKNOWN,
+      KeyEventFromKeyIdentifier(non_printing_char).GetKeyCode());
 }
 
-TEST(KeyCodeFromKeyIdentifierTest, MatchOnUnicodeCodepoint) {
-  EXPECT_EQ(VKEY_A, KeyCodeFromKeyIdentifier("U+0041"));
-  EXPECT_EQ(VKEY_A, KeyCodeFromKeyIdentifier("U+0061"));
-  EXPECT_EQ(VKEY_DELETE, KeyCodeFromKeyIdentifier("U+007F"));
+TEST_F(KeyEventFromKeyIdentifierTest, MatchOnUnicodeCodepoint) {
+  EXPECT_EQ(ui::VKEY_A, KeyEventFromKeyIdentifier("U+0041").GetKeyCode());
+  EXPECT_EQ(ui::VKEY_A, KeyEventFromKeyIdentifier("U+0061").GetKeyCode());
+  EXPECT_EQ(ui::VKEY_DELETE, KeyEventFromKeyIdentifier("U+007F").GetKeyCode());
 
-  // this one exists in the map, but has no valid VKEY
-  EXPECT_EQ(VKEY_UNKNOWN, KeyCodeFromKeyIdentifier("U+030A"));
+  // this one exists in the map, but has no valid ui::VKEY
+  EXPECT_EQ(ui::VKEY_UNKNOWN, KeyEventFromKeyIdentifier("U+030A").GetKeyCode());
 
   // this one is not in the map
-  EXPECT_EQ(VKEY_UNKNOWN, KeyCodeFromKeyIdentifier("U+0001"));
+  EXPECT_EQ(ui::VKEY_UNKNOWN, KeyEventFromKeyIdentifier("U+0001").GetKeyCode());
 }
 
-TEST(KeyCodeFromKeyIdentifierTest, DoesNotMatchEmptyString) {
-  EXPECT_EQ(VKEY_UNKNOWN, KeyCodeFromKeyIdentifier(""));
+TEST_F(KeyEventFromKeyIdentifierTest, DoesNotMatchEmptyString) {
+  EXPECT_EQ(ui::VKEY_UNKNOWN, KeyEventFromKeyIdentifier("").GetKeyCode());
+}
+
+TEST_F(KeyEventFromKeyIdentifierTest, ModifiersAreSetCorrectly) {
+  EXPECT_EQ(0, KeyEventFromKeyIdentifier("1").GetFlags());
+  EXPECT_EQ(views::Event::EF_SHIFT_DOWN,

[Erik does not do reviews, 2011/01/31 06:28:35]

isn't this exact case also tested in the next test?

[bryeung, 2011/02/02 20:56:44]

This was testing both set and unset.  I've moved the unset case into the test
below.

+      KeyEventFromKeyIdentifier("!").GetFlags());
+}
+
+TEST_F(KeyEventFromKeyIdentifierTest, ShiftModifiersAreSet) {

[Erik does not do reviews, 2011/01/31 06:28:35]

should there be a similar control modifier test?

[bryeung, 2011/02/02 20:56:44]

Currently we don't have any identifiers returning Control-modified KeyEvents. 
When we sort through that, I'll add a test for them here.

+  const char* keys_with_shift[] = {
+    "~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "+",
+    "{", "}", "|", ":", "<", ">", "?", "\""
+  };
+  int kNumKeysWithShift = arraysize(keys_with_shift);
+
+  for (int i = 0; i < kNumKeysWithShift; ++i) {
+    EXPECT_EQ(views::Event::EF_SHIFT_DOWN,
+        KeyEventFromKeyIdentifier(keys_with_shift[i]).GetFlags());
+  }
 }
 
-}  // namespace ui
+}  // namespace