chrome/browser/chromeos/input_method/input_method_util_unittest.cc - Issue 312443002: Updates the whitelisted XKB input method IDs to sync up with the component XKB extension.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/input_method/input_method_util_unittest.cc

Issue 312443002: Updates the whitelisted XKB input method IDs to sync up with the component XKB extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 7 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

« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_util.cc ('k') | chrome/browser/resources/chromeos/keyboard_overlay_data.js » ('j') | tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/input_method/input_method_util_unittest.cc

diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc

index b314c0998e01b7a83ff93ea90d3e5085091164d5..be5be9ba1ce5561c36a279845cf343fa235374fe 100644

--- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc

+++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc

@@ -93,7 +93,8 @@ class InputMethodUtilTest : public testing::Test {

GURL(""));

input_methods.push_back(zhuyin_ime);

- util_.SetComponentExtensions(input_methods);

+ util_.InitXkbInputMethodsForTesting();

+ util_.AppendInputMethods(input_methods);

}

std::string Id(const std::string& id) {

@@ -481,7 +482,7 @@ TEST_F(InputMethodUtilTest, TestGetLanguageCodesFromInputMethodIds) {

std::vector<std::string> language_codes;

util_.GetLanguageCodesFromInputMethodIds(input_method_ids, &language_codes);

ASSERT_EQ(3U, language_codes.size());

- EXPECT_EQ("en-US", language_codes[0]);

+ EXPECT_EQ("en", language_codes[0]);

EXPECT_EQ("zh-CN", language_codes[1]);

EXPECT_EQ("fr", language_codes[2]);

}

@@ -495,7 +496,7 @@ TEST_F(InputMethodUtilTest, TestIBusInputMethodText) {

l10n_util::GetDisplayNameForLocale(language_code, "en", false);

// Only two formats, like "fr" (lower case) and "en-US" (lower-upper), are

// allowed. See the text file for details.

- EXPECT_TRUE(language_code.length() == 2 ||

+ EXPECT_TRUE(language_code == "fil" || language_code.length() == 2 ||

(language_code.length() == 5 && language_code[2] == '-'))

<< "Invalid language code " << language_code;

EXPECT_TRUE(l10n_util::IsValidLocaleSyntax(language_code))