summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/input_method
diff options
context:
space:
mode:
authoryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 07:44:42 +0000
committeryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 07:44:42 +0000
commite70a0b8125ebf42426c3bbb3c8f7fd95cc5267e1 (patch)
tree83c0a52ae03aca2a0aa4d226da34fe4e8d03b3ee /chrome/browser/chromeos/input_method
parenta040f8c8736abf6c255f3c962de81d213154a22e (diff)
downloadchromium_src-e70a0b8125ebf42426c3bbb3c8f7fd95cc5267e1.zip
chromium_src-e70a0b8125ebf42426c3bbb3c8f7fd95cc5267e1.tar.gz
chromium_src-e70a0b8125ebf42426c3bbb3c8f7fd95cc5267e1.tar.bz2
Fix typo in xkeyboard_unittests.cc.
Without the CL, if the test runs with num lock enaled, it'll fail. BUG=None TEST=ran the test on Goobuntu with all 4 combinations of caps/num lock initial states (NumCaps=00,01,10,11). Review URL: http://codereview.chromium.org/8562001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/input_method')
-rw-r--r--chrome/browser/chromeos/input_method/xkeyboard_unittest.cc26
1 files changed, 22 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
index e0eccaf..c9d87d3 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
+++ b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
@@ -325,13 +325,31 @@ TEST_F(XKeyboardTest, TestSetCapsLockAndNumLockAtTheSameTime) {
EXPECT_EQ(initial_caps_lock_state, c);
EXPECT_EQ(!initial_num_lock_state, n);
- // Flip Num Lock to restore the initial state.
+ // Flip both.
+ xkey_->SetLockedModifiers(
+ initial_caps_lock_state ? kDisableLock : kEnableLock,
+ initial_num_lock_state ? kEnableLock : kDisableLock);
+ EXPECT_EQ(!initial_caps_lock_state,
+ TestableXKeyboard::CapsLockIsEnabled());
+ EXPECT_EQ(initial_num_lock_state,
+ TestableXKeyboard::NumLockIsEnabled(num_lock_mask));
+
+ // Flip Num Lock.
xkey_->SetLockedModifiers(
kDontChange,
- initial_caps_lock_state ? kEnableLock : kDisableLock);
+ initial_num_lock_state ? kDisableLock : kEnableLock);
TestableXKeyboard::GetLockedModifiers(num_lock_mask, &c, &n);
- EXPECT_EQ(initial_caps_lock_state, c);
- EXPECT_EQ(initial_num_lock_state, 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,
+ TestableXKeyboard::CapsLockIsEnabled());
+ EXPECT_EQ(initial_num_lock_state,
+ TestableXKeyboard::NumLockIsEnabled(num_lock_mask));
// No-op SetLockedModifiers call.
xkey_->SetLockedModifiers(kDontChange, kDontChange);