diff options
| author | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 21:45:19 +0000 |
|---|---|---|
| committer | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 21:45:19 +0000 |
| commit | d94e0bf48332e8bca1b7036863aded435a99ddf4 (patch) | |
| tree | 27e1b4631ef9fb252fc285418347e5f425d91fd3 /chrome/browser/chromeos/input_method/input_method_util_unittest.cc | |
| parent | 3f997d5136b197a73faad7befac8baf6d96c00e1 (diff) | |
| download | chromium_src-d94e0bf48332e8bca1b7036863aded435a99ddf4.zip chromium_src-d94e0bf48332e8bca1b7036863aded435a99ddf4.tar.gz chromium_src-d94e0bf48332e8bca1b7036863aded435a99ddf4.tar.bz2 | |
Remove kEnglishAndInputMethodIdToResourceIdArraySize.
Resolving string ambiguity using the current input method id seems like a bad idea because the string translation function could be called before global-engine-changed ibus signal is sent to Chrome.
BUG=chromium-os:20036
TEST=try,manual
Review URL: http://codereview.chromium.org/7828079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/input_method/input_method_util_unittest.cc')
| -rw-r--r-- | chrome/browser/chromeos/input_method/input_method_util_unittest.cc | 20 |
1 files changed, 8 insertions, 12 deletions
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 5485bc0..38e21f09 100644 --- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc @@ -55,24 +55,20 @@ class InputMethodUtilTest : public testing::Test { }; TEST_F(InputMethodUtilTest, TestGetStringUTF8) { - EXPECT_EQ("Pinyin input method", - GetStringUTF8("pinyin", "")); + EXPECT_EQ("Pinyin input method", GetStringUTF8("pinyin")); #if !defined(GOOGLE_CHROME_BUILD) EXPECT_EQ("Japanese input method (for US Dvorak keyboard)", - GetStringUTF8("mozc-dv", "")); + GetStringUTF8("mozc-dv")); #endif } TEST_F(InputMethodUtilTest, TestStringIsSupported) { - EXPECT_TRUE(StringIsSupported("Hiragana", "mozc")); - EXPECT_TRUE(StringIsSupported("Latin", "mozc")); - EXPECT_TRUE(StringIsSupported("Direct input", "mozc")); - EXPECT_FALSE(StringIsSupported( - "####THIS_STRING_IS_NOT_SUPPORTED####", "mozc")); - EXPECT_TRUE(StringIsSupported("Chinese", "pinyin")); - EXPECT_TRUE(StringIsSupported("Chinese", "mozc-chewing")); - // The string "Chinese" is not for "hangul". - EXPECT_FALSE(StringIsSupported("Chinese", "hangul")); + EXPECT_TRUE(StringIsSupported("Hiragana")); + EXPECT_TRUE(StringIsSupported("Latin")); + EXPECT_TRUE(StringIsSupported("Direct input")); + EXPECT_FALSE(StringIsSupported("####THIS_STRING_IS_NOT_SUPPORTED####")); + EXPECT_TRUE(StringIsSupported("Chinese")); + EXPECT_TRUE(StringIsSupported("_Chinese")); } TEST_F(InputMethodUtilTest, TestNormalizeLanguageCode) { |