cros: Simplify chromeos::input_method::XKeyboard interface.

chromeos/ime/xkeyboard_unittest.cc

 // Copyright 2013 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 "chromeos/ime/xkeyboard.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
@@ skipping 73 matching lines @@
   EXPECT_TRUE(xkey_->CapsLockIsEnabled());
   xkey_->SetCapsLockEnabled(false);
   EXPECT_FALSE(xkey_->CapsLockIsEnabled());
   xkey_->SetCapsLockEnabled(true);
   EXPECT_TRUE(xkey_->CapsLockIsEnabled());
   xkey_->SetCapsLockEnabled(false);
   EXPECT_FALSE(xkey_->CapsLockIsEnabled());
   xkey_->SetCapsLockEnabled(initial_lock_state);
 }
 
-TEST_F(XKeyboardTest, TestSetNumLockEnabled) {
-  if (!DisplayAvailable()) {
-    DVLOG(1) << "X server is not available. Skip the test.";
-    return;
-  }
-  const unsigned int num_lock_mask = xkey_->GetNumLockMask();
-  ASSERT_NE(0U, num_lock_mask);
-
-  const bool initial_lock_state = xkey_->NumLockIsEnabled();
-  xkey_->SetNumLockEnabled(true);
-  EXPECT_TRUE(xkey_->NumLockIsEnabled());
-  xkey_->SetNumLockEnabled(false);
-  EXPECT_FALSE(xkey_->NumLockIsEnabled());
-  xkey_->SetNumLockEnabled(true);
-  EXPECT_TRUE(xkey_->NumLockIsEnabled());
-  xkey_->SetNumLockEnabled(false);
-  EXPECT_FALSE(xkey_->NumLockIsEnabled());
-  xkey_->SetNumLockEnabled(initial_lock_state);
-}
-
-TEST_F(XKeyboardTest, TestSetCapsLockAndNumLockAtTheSameTime) {
-  if (!DisplayAvailable()) {
-    DVLOG(1) << "X server is not available. Skip the test.";
-    return;
-  }
-  const unsigned int num_lock_mask = xkey_->GetNumLockMask();
-  ASSERT_NE(0U, num_lock_mask);
-
-  const bool initial_caps_lock_state = xkey_->CapsLockIsEnabled();
-  const bool initial_num_lock_state = xkey_->NumLockIsEnabled();
-
-  // Flip both.
-  xkey_->SetLockedModifiers(
-      initial_caps_lock_state ? kDisableLock : kEnableLock,
-      initial_num_lock_state ? kDisableLock : kEnableLock);
-  EXPECT_EQ(!initial_caps_lock_state, xkey_->CapsLockIsEnabled());
-  EXPECT_EQ(!initial_num_lock_state, xkey_->NumLockIsEnabled());
-
-  // Flip Caps Lock.
-  xkey_->SetLockedModifiers(
-      initial_caps_lock_state ? kEnableLock : kDisableLock,
-      kDontChange);
-  // Use GetLockedModifiers() for verifying the result.
-  bool c, n;
-  xkey_->GetLockedModifiers(&c, &n);
-  EXPECT_EQ(initial_caps_lock_state, c);
-  EXPECT_EQ(!initial_num_lock_state, n);
-
-  // Flip both.
-  xkey_->SetLockedModifiers(
-      initial_caps_lock_state ? kDisableLock : kEnableLock,
-      initial_num_lock_state ? kEnableLock : kDisableLock);
-  EXPECT_EQ(!initial_caps_lock_state, xkey_->CapsLockIsEnabled());
-  EXPECT_EQ(initial_num_lock_state, xkey_->NumLockIsEnabled());
-
-  // Flip Num Lock.
-  xkey_->SetLockedModifiers(
-      kDontChange,
-      initial_num_lock_state ? kDisableLock : kEnableLock);
-  xkey_->GetLockedModifiers(&c, &n);
-  EXPECT_EQ(!initial_caps_lock_state, c);
-  EXPECT_EQ(!initial_num_lock_state, n);
-
-  // Flip both to restore the initial state.
-  xkey_->SetLockedModifiers(
-      initial_caps_lock_state ? kEnableLock : kDisableLock,
-      initial_num_lock_state ? kEnableLock : kDisableLock);
-  EXPECT_EQ(initial_caps_lock_state, xkey_->CapsLockIsEnabled());
-  EXPECT_EQ(initial_num_lock_state, xkey_->NumLockIsEnabled());
-
-  // No-op SetLockedModifiers call.
-  xkey_->SetLockedModifiers(kDontChange, kDontChange);
-  EXPECT_EQ(initial_caps_lock_state, xkey_->CapsLockIsEnabled());
-  EXPECT_EQ(initial_num_lock_state, xkey_->NumLockIsEnabled());
-
-  // No-op GetLockedModifiers call. Confirm it does not crash.
-  xkey_->GetLockedModifiers(NULL, NULL);
-}
-
 TEST_F(XKeyboardTest, TestSetAutoRepeatEnabled) {
   if (!DisplayAvailable()) {
     DVLOG(1) << "X server is not available. Skip the test.";
     return;
   }
   const bool state = XKeyboard::GetAutoRepeatEnabledForTesting();
   xkey_->SetAutoRepeatEnabled(!state);
   EXPECT_EQ(!state, XKeyboard::GetAutoRepeatEnabledForTesting());
   // Restore the initial state.
   xkey_->SetAutoRepeatEnabled(state);
@@ skipping 18 matching lines @@
 
   // Restore the initial state.
   EXPECT_TRUE(xkey_->SetAutoRepeatRate(rate));
   EXPECT_TRUE(XKeyboard::GetAutoRepeatRateForTesting(&tmp));
   EXPECT_EQ(rate.initial_delay_in_ms, tmp.initial_delay_in_ms);
   EXPECT_EQ(rate.repeat_interval_in_ms, tmp.repeat_interval_in_ms);
 }
 
 }  // namespace input_method
 }  // namespace chromeos