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

Unified Diff: chrome/browser/ui/views/ash/key_rewriter_unittest.cc

Issue 9854025: Automatically remap Command key on an Apple keyboard to Control [part 2 of 2 - Chrome part] (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 9 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: chrome/browser/ui/views/ash/key_rewriter_unittest.cc
diff --git a/chrome/browser/ui/views/ash/key_rewriter_unittest.cc b/chrome/browser/ui/views/ash/key_rewriter_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2621eb1a83be205c42369182ba6f3d2dba5d108e
--- /dev/null
+++ b/chrome/browser/ui/views/ash/key_rewriter_unittest.cc
@@ -0,0 +1,197 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/basictypes.h"
+#include "chrome/browser/ui/views/ash/key_rewriter.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/aura/event.h"
+
+#if defined(OS_CHROMEOS)
+#include "ui/base/x/x11_util.h"
+
+#include <X11/keysymdef.h>
+#include <X11/Xlib.h>
+
+namespace {
+
+void InitXKeyEvent(unsigned int x_keycode,
+ unsigned int x_state,
+ XEvent* event) {
+ ui::InitXKeyEventForTesting(ui::ET_KEY_PRESSED,
+ ui::VKEY_A, // dummy
+ 0, // dummy
+ event);
+ event->xkey.keycode = x_keycode;
+ event->xkey.state = x_state;
+}
+
+} // namespace
+#endif
+
+TEST(KeyRewriterTest, TestGetDeviceType) {
+ // This is the typical string which an Apple keyboard sends.
+ EXPECT_EQ(KeyRewriter::kDeviceAppleKeyboard,
+ KeyRewriter::GetDeviceType("Apple Inc. Apple Keyboard"));
+
+ // Other cases we accept.
+ EXPECT_EQ(KeyRewriter::kDeviceAppleKeyboard,
+ KeyRewriter::GetDeviceType("Apple Keyboard"));
+ EXPECT_EQ(KeyRewriter::kDeviceAppleKeyboard,
+ KeyRewriter::GetDeviceType("apple keyboard"));
+ EXPECT_EQ(KeyRewriter::kDeviceAppleKeyboard,
+ KeyRewriter::GetDeviceType("apple keyboard."));
+ EXPECT_EQ(KeyRewriter::kDeviceAppleKeyboard,
+ KeyRewriter::GetDeviceType("apple.keyboard."));
+ EXPECT_EQ(KeyRewriter::kDeviceAppleKeyboard,
+ KeyRewriter::GetDeviceType(".apple.keyboard."));
+
+ // Dell, Microsoft, Logitech, ... should be recognized as a kDevicePcKeyboard.
+ EXPECT_EQ(KeyRewriter::kDevicePcKeyboard,
+ KeyRewriter::GetDeviceType("Dell Dell USB Entry Keyboard"));
+ EXPECT_EQ(KeyRewriter::kDevicePcKeyboard,
+ KeyRewriter::GetDeviceType("Microsoft Natural Ergonomic Keyboard"));
+ EXPECT_EQ(KeyRewriter::kDevicePcKeyboard,
+ KeyRewriter::GetDeviceType("CHESEN USB Keyboard"));
+
+ // Some corner cases.
+ EXPECT_EQ(KeyRewriter::kDevicePcKeyboard, KeyRewriter::GetDeviceType(""));
+ EXPECT_EQ(KeyRewriter::kDevicePcKeyboard,
+ KeyRewriter::GetDeviceType("."));
+ EXPECT_EQ(KeyRewriter::kDevicePcKeyboard,
+ KeyRewriter::GetDeviceType(". "));
+ EXPECT_EQ(KeyRewriter::kDevicePcKeyboard,
+ KeyRewriter::GetDeviceType(" ."));
+ EXPECT_EQ(KeyRewriter::kDevicePcKeyboard,
+ KeyRewriter::GetDeviceType("not-an-apple keyboard"));
+}
+
+TEST(KeyRewriterTest, TestDeviceAdded) {
+ KeyRewriter rewriter;
+ EXPECT_TRUE(rewriter.device_id_to_type_for_testing().empty());
+ EXPECT_EQ(KeyRewriter::kDevicePcKeyboard,
+ rewriter.DeviceAddedForTesting(0, "PC Keyboard"));
+ EXPECT_EQ(1U, rewriter.device_id_to_type_for_testing().size());
+ EXPECT_EQ(KeyRewriter::kDeviceAppleKeyboard,
+ rewriter.DeviceAddedForTesting(1, "Apple Keyboard"));
+ EXPECT_EQ(2U, rewriter.device_id_to_type_for_testing().size());
+ // Try to reuse the first ID.
+ EXPECT_EQ(KeyRewriter::kDeviceAppleKeyboard,
+ rewriter.DeviceAddedForTesting(0, "Apple Keyboard"));
+ EXPECT_EQ(2U, rewriter.device_id_to_type_for_testing().size());
+}
+
+#if defined(OS_CHROMEOS)
+TEST(KeyRewriterTest, TestRewriteCommandToControl) {
+ XEvent xev;
+
+ // First, test with a PC keyboard.
+ KeyRewriter rewriter;
+ rewriter.DeviceAddedForTesting(0, "PC Keyboard");
+ rewriter.set_last_device_id_for_testing(0);
+ {
+ // XK_a, Alt modifier.
+ InitXKeyEvent(38, Mod1Mask, &xev);
+ aura::KeyEvent keyevent(&xev, false /* is_char */);
+ rewriter.RewriteCommandToControlForTesting(&keyevent);
+ const XKeyEvent& xkey = keyevent.native_event()->xkey;
+ // Confirm the original values are preserved.
+ EXPECT_EQ(38U, xkey.keycode);
+ EXPECT_EQ(static_cast<unsigned int>(Mod1Mask), xkey.state);
+ }
+ {
+ // XK_a, Win modifier.
+ InitXKeyEvent(38, Mod4Mask, &xev);
+ aura::KeyEvent keyevent(&xev, false /* is_char */);
+ rewriter.RewriteCommandToControlForTesting(&keyevent);
+ const XKeyEvent& xkey = keyevent.native_event()->xkey;
+ // Confirm the original values are preserved.
+ EXPECT_EQ(38U, xkey.keycode);
+ EXPECT_EQ(static_cast<unsigned int>(Mod4Mask), xkey.state);
+ }
+ {
+ // XK_a, Alt+Win modifier.
+ InitXKeyEvent(38, Mod1Mask | Mod4Mask, &xev);
+ aura::KeyEvent keyevent(&xev, false /* is_char */);
+ rewriter.RewriteCommandToControlForTesting(&keyevent);
+ const XKeyEvent& xkey = keyevent.native_event()->xkey;
+ // Confirm the original values are preserved.
+ EXPECT_EQ(38U, xkey.keycode);
+ EXPECT_EQ(static_cast<unsigned int>(Mod1Mask | Mod4Mask), xkey.state);
+ }
+ {
+ // XK_Super_L (left Windows key), Alt modifier.
+ InitXKeyEvent(133, Mod1Mask, &xev);
+ aura::KeyEvent keyevent(&xev, false /* is_char */);
+ rewriter.RewriteCommandToControlForTesting(&keyevent);
+ const XKeyEvent& xkey = keyevent.native_event()->xkey;
+ // Confirm the original values are preserved.
+ EXPECT_EQ(133U, xkey.keycode);
+ EXPECT_EQ(static_cast<unsigned int>(Mod1Mask), xkey.state);
+ }
+ {
+ // XK_Super_R (right Windows key), Alt modifier.
+ InitXKeyEvent(134, Mod1Mask, &xev);
+ aura::KeyEvent keyevent(&xev, false /* is_char */);
+ rewriter.RewriteCommandToControlForTesting(&keyevent);
+ const XKeyEvent& xkey = keyevent.native_event()->xkey;
+ // Confirm the original values are preserved.
+ EXPECT_EQ(134U, xkey.keycode);
+ EXPECT_EQ(static_cast<unsigned int>(Mod1Mask), xkey.state);
+ }
+
+ // An Apple keyboard reuse the ID, zero.
+ rewriter.DeviceAddedForTesting(0, "Apple Keyboard");
+ rewriter.set_last_device_id_for_testing(0);
+ {
+ // XK_a, Alt modifier.
+ InitXKeyEvent(38, Mod1Mask, &xev);
+ aura::KeyEvent keyevent(&xev, false /* is_char */);
+ rewriter.RewriteCommandToControlForTesting(&keyevent);
+ const XKeyEvent& xkey = keyevent.native_event()->xkey;
+ // Confirm the original values are preserved.
+ EXPECT_EQ(38U, xkey.keycode);
+ EXPECT_EQ(static_cast<unsigned int>(Mod1Mask), xkey.state);
+ }
+ {
+ // XK_a, Win modifier.
+ InitXKeyEvent(38, Mod4Mask, &xev);
+ aura::KeyEvent keyevent(&xev, false /* is_char */);
+ rewriter.RewriteCommandToControlForTesting(&keyevent);
+ const XKeyEvent& xkey = keyevent.native_event()->xkey;
+ // Confirm the original values are preserved.
+ EXPECT_EQ(38U, xkey.keycode);
+ EXPECT_EQ(static_cast<unsigned int>(ControlMask), xkey.state);
+ }
+ {
+ // XK_a, Alt+Win modifier.
+ InitXKeyEvent(38, Mod1Mask | Mod4Mask, &xev);
+ aura::KeyEvent keyevent(&xev, false /* is_char */);
+ rewriter.RewriteCommandToControlForTesting(&keyevent);
+ const XKeyEvent& xkey = keyevent.native_event()->xkey;
+ // Confirm the original values are preserved.
+ EXPECT_EQ(38U, xkey.keycode);
+ EXPECT_EQ(static_cast<unsigned int>(Mod1Mask | ControlMask), xkey.state);
+ }
+ {
+ // XK_Super_L (left Windows key), Alt modifier.
+ InitXKeyEvent(133, Mod1Mask, &xev);
+ aura::KeyEvent keyevent(&xev, false /* is_char */);
+ rewriter.RewriteCommandToControlForTesting(&keyevent);
+ const XKeyEvent& xkey = keyevent.native_event()->xkey;
+ // Confirm the original values are preserved.
+ EXPECT_EQ(37U /* Control_L */, xkey.keycode);
+ EXPECT_EQ(static_cast<unsigned int>(Mod1Mask), xkey.state);
+ }
+ {
+ // XK_Super_R (right Windows key), Alt modifier.
+ InitXKeyEvent(134, Mod1Mask, &xev);
+ aura::KeyEvent keyevent(&xev, false /* is_char */);
+ rewriter.RewriteCommandToControlForTesting(&keyevent);
+ const XKeyEvent& xkey = keyevent.native_event()->xkey;
+ // Confirm the original values are preserved.
+ EXPECT_EQ(105U /* Control_R */, xkey.keycode);
+ EXPECT_EQ(static_cast<unsigned int>(Mod1Mask), xkey.state);
+ }
+}
+#endif // OS_CHROMEOS
« no previous file with comments | « chrome/browser/ui/views/ash/key_rewriter.cc ('k') | chrome/browser/ui/webui/options2/chromeos/pointer_handler2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698