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

Side by Side Diff: chrome/browser/chromeos/input_method/xkeyboard_unittest.cc

Issue 9616053: Fix browser_tests failure. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/input_method/xkeyboard.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 5 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 11 matching lines...) Expand all
22 22
23 #if defined(USE_VIRTUAL_KEYBOARD) 23 #if defined(USE_VIRTUAL_KEYBOARD)
24 // Since USE_VIRTUAL_KEYBOARD build only supports a few keyboard layouts, we 24 // Since USE_VIRTUAL_KEYBOARD build only supports a few keyboard layouts, we
25 // skip the tests for now. 25 // skip the tests for now.
26 #define TestCreateFullXkbLayoutNameKeepAlt \ 26 #define TestCreateFullXkbLayoutNameKeepAlt \
27 DISABLED_TestCreateFullXkbLayoutNameKeepAlt 27 DISABLED_TestCreateFullXkbLayoutNameKeepAlt
28 #define TestCreateFullXkbLayoutNameKeepCapsLock \ 28 #define TestCreateFullXkbLayoutNameKeepCapsLock \
29 DISABLED_TestCreateFullXkbLayoutNameKeepCapsLock 29 DISABLED_TestCreateFullXkbLayoutNameKeepCapsLock
30 #endif // USE_VIRTUAL_KEYBOARD 30 #endif // USE_VIRTUAL_KEYBOARD
31 31
32 // TODO(yusukes): Re-enable the tests.
33 #define TestSetCapsLockAndNumLockAtTheSameTime \
mazda 2012/03/07 05:31:19 I prefer directly renaming the test name instead o
Yusuke Sato 2012/03/07 05:43:42 Done.
34 DISABLED_TestSetCapsLockAndNumLockAtTheSameTime
35 #define TestSetCapsLockEnabled DISABLED_TestSetCapsLockEnabled
36 #define TestSetNumLockEnabled DISABLED_TestSetNumLockEnabled
37
32 namespace chromeos { 38 namespace chromeos {
33 namespace input_method { 39 namespace input_method {
34 40
35 namespace { 41 namespace {
36 42
37 class XKeyboardTest : public testing::Test { 43 class XKeyboardTest : public testing::Test {
38 public: 44 public:
39 XKeyboardTest() 45 XKeyboardTest()
40 : controller_(IBusController::Create()), 46 : controller_(IBusController::Create()),
41 util_(controller_->GetSupportedInputMethods()), 47 util_(controller_->GetSupportedInputMethods()),
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 412
407 // Restore the initial state. 413 // Restore the initial state.
408 EXPECT_TRUE(XKeyboard::SetAutoRepeatRate(rate)); 414 EXPECT_TRUE(XKeyboard::SetAutoRepeatRate(rate));
409 EXPECT_TRUE(XKeyboard::GetAutoRepeatRateForTesting(&tmp)); 415 EXPECT_TRUE(XKeyboard::GetAutoRepeatRateForTesting(&tmp));
410 EXPECT_EQ(rate.initial_delay_in_ms, tmp.initial_delay_in_ms); 416 EXPECT_EQ(rate.initial_delay_in_ms, tmp.initial_delay_in_ms);
411 EXPECT_EQ(rate.repeat_interval_in_ms, tmp.repeat_interval_in_ms); 417 EXPECT_EQ(rate.repeat_interval_in_ms, tmp.repeat_interval_in_ms);
412 } 418 }
413 419
414 } // namespace input_method 420 } // namespace input_method
415 } // namespace chromeos 421 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/xkeyboard.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698