Maintain Diamond (F15) modifier state when rewriting.

chrome/browser/chromeos/events/event_rewriter_unittest.cc

 // Copyright 2014 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 "chrome/browser/chromeos/events/event_rewriter.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
@@ skipping 999 matching lines @@
   rewriter.set_ime_keyboard_for_testing(&ime_keyboard);
 
   KeyTestCase tests[] = {
       // F15 should work as Ctrl when --has-chromeos-diamond-key is not
       // specified.
       {KeyTestCase::TEST_VKEY,
        ui::ET_KEY_PRESSED,
        {ui::VKEY_F15, ui::EF_NONE},
        {ui::VKEY_CONTROL, ui::EF_CONTROL_DOWN}},
 
+      {KeyTestCase::TEST_VKEY,
+       ui::ET_KEY_RELEASED,
+       {ui::VKEY_F15, ui::EF_NONE},
+       {ui::VKEY_CONTROL, ui::EF_NONE}},
+
       // However, Mod2Mask should not be rewritten to CtrlMask when
       // --has-chromeos-diamond-key is not specified.
       {KeyTestCase::TEST_VKEY,
        ui::ET_KEY_PRESSED,
        {ui::VKEY_A, ui::EF_NONE},
        {ui::VKEY_A, ui::EF_NONE}},
   };
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
     SCOPED_TRACE(i);
@@ skipping 13 matching lines @@
   EventRewriter rewriter(NULL);
   rewriter.KeyboardDeviceAddedForTesting(kKeyboardDeviceId, "PC Keyboard");
   rewriter.set_pref_service_for_testing(&prefs);
   rewriter.set_ime_keyboard_for_testing(&ime_keyboard);
 
   // By default, F15 should work as Control.
   EXPECT_EQ(GetExpectedResultAsString(
                 ui::VKEY_CONTROL, ui::EF_CONTROL_DOWN, ui::ET_KEY_PRESSED),
             GetRewrittenEventAsString(
                 &rewriter, ui::VKEY_F15, ui::EF_NONE, ui::ET_KEY_PRESSED));
+  // Check that Control is applied to a subsequent key press.
+  EXPECT_EQ(GetExpectedResultAsString(
+                ui::VKEY_A, ui::EF_CONTROL_DOWN, ui::ET_KEY_PRESSED),
+            GetRewrittenEventAsString(
+                &rewriter, ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED));
+  // Release F15
+  EXPECT_EQ(GetExpectedResultAsString(
+                ui::VKEY_CONTROL, ui::EF_NONE, ui::ET_KEY_RELEASED),
+            GetRewrittenEventAsString(
+                &rewriter, ui::VKEY_F15, ui::EF_NONE, ui::ET_KEY_RELEASED));
+  // Check that Control is no longer applied to a subsequent key press.
+  EXPECT_EQ(
+      GetExpectedResultAsString(ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED),
+      GetRewrittenEventAsString(
+          &rewriter, ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED));
 
   IntegerPrefMember diamond;
   diamond.Init(prefs::kLanguageRemapDiamondKeyTo, &prefs);
   diamond.SetValue(chromeos::input_method::kVoidKey);
 
   EXPECT_EQ(GetExpectedResultAsString(
                 ui::VKEY_UNKNOWN, ui::EF_NONE, ui::ET_KEY_PRESSED),
             GetRewrittenEventAsString(
                 &rewriter, ui::VKEY_F15, ui::EF_NONE, ui::ET_KEY_PRESSED));
+  // Check that no modifier is applied to another key.
+  EXPECT_EQ(
+      GetExpectedResultAsString(ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED),
+      GetRewrittenEventAsString(
+          &rewriter, ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED));
 
   diamond.SetValue(chromeos::input_method::kControlKey);
 
   EXPECT_EQ(GetExpectedResultAsString(
                 ui::VKEY_CONTROL, ui::EF_CONTROL_DOWN, ui::ET_KEY_PRESSED),
             GetRewrittenEventAsString(
                 &rewriter, ui::VKEY_F15, ui::EF_NONE, ui::ET_KEY_PRESSED));
+  // Check that Control is applied to a subsequent key press.
+  EXPECT_EQ(GetExpectedResultAsString(
+                ui::VKEY_A, ui::EF_CONTROL_DOWN, ui::ET_KEY_PRESSED),
+            GetRewrittenEventAsString(
+                &rewriter, ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED));
+  // Release F15
+  EXPECT_EQ(GetExpectedResultAsString(
+                ui::VKEY_CONTROL, ui::EF_NONE, ui::ET_KEY_RELEASED),
+            GetRewrittenEventAsString(
+                &rewriter, ui::VKEY_F15, ui::EF_NONE, ui::ET_KEY_RELEASED));
+  // Check that Control is no longer applied to a subsequent key press.
+  EXPECT_EQ(
+      GetExpectedResultAsString(ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED),
+      GetRewrittenEventAsString(
+          &rewriter, ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED));
 
   diamond.SetValue(chromeos::input_method::kAltKey);
 
   EXPECT_EQ(GetExpectedResultAsString(
                 ui::VKEY_MENU, ui::EF_ALT_DOWN, ui::ET_KEY_PRESSED),
             GetRewrittenEventAsString(
                 &rewriter, ui::VKEY_F15, ui::EF_NONE, ui::ET_KEY_PRESSED));
+  // Check that Alt is applied to a subsequent key press.
+  EXPECT_EQ(GetExpectedResultAsString(
+                ui::VKEY_A, ui::EF_ALT_DOWN, ui::ET_KEY_PRESSED),
+            GetRewrittenEventAsString(
+                &rewriter, ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED));
+  // Release F15
+  EXPECT_EQ(GetExpectedResultAsString(
+                ui::VKEY_MENU, ui::EF_NONE, ui::ET_KEY_RELEASED),
+            GetRewrittenEventAsString(
+                &rewriter, ui::VKEY_F15, ui::EF_NONE, ui::ET_KEY_RELEASED));
+  // Check that Alt is no longer applied to a subsequent key press.
+  EXPECT_EQ(
+      GetExpectedResultAsString(ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED),
+      GetRewrittenEventAsString(
+          &rewriter, ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED));
 
   diamond.SetValue(chromeos::input_method::kCapsLockKey);
 
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CAPITAL,
                                       ui::EF_CAPS_LOCK_DOWN | ui::EF_MOD3_DOWN,
                                       ui::ET_KEY_PRESSED),
             GetRewrittenEventAsString(
                 &rewriter, ui::VKEY_F15, ui::EF_NONE, ui::ET_KEY_PRESSED));
+  // Check that Caps is applied to a subsequent key press.
+  EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_A,
+                                      ui::EF_CAPS_LOCK_DOWN | ui::EF_MOD3_DOWN,
+                                      ui::ET_KEY_PRESSED),
+            GetRewrittenEventAsString(
+                &rewriter, ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED));
+  // Release F15
+  EXPECT_EQ(GetExpectedResultAsString(
+                ui::VKEY_CAPITAL, ui::EF_NONE, ui::ET_KEY_RELEASED),
+            GetRewrittenEventAsString(
+                &rewriter, ui::VKEY_F15, ui::EF_NONE, ui::ET_KEY_RELEASED));
+  // Check that Control is no longer applied to a subsequent key press.
+  EXPECT_EQ(
+      GetExpectedResultAsString(ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED),
+      GetRewrittenEventAsString(
+          &rewriter, ui::VKEY_A, ui::EF_NONE, ui::ET_KEY_PRESSED));
 
   *CommandLine::ForCurrentProcess() = original_cl;
 }
 
 TEST_F(EventRewriterTest, TestRewriteCapsLockToControl) {
   // Remap CapsLock to Control.
   TestingPrefServiceSyncable prefs;
   chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
   IntegerPrefMember control;
   control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs);
@@ skipping 1287 matching lines @@
   EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
   EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
 
   // Turn off AltGr and Mod3.
   sticky_keys_controller_->SetModifiersEnabled(false, false);
   EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
   EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
 }
 
 }  // namespace chromeos