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

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

Issue 6176007: Revert "Use libcros to convert input method ID to keyboard overlay ID." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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/input_method_util.cc ('k') | tools/cros.DEPS/DEPS » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/input_method_util.h" 5 #include "chrome/browser/chromeos/input_method/input_method_util.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 EXPECT_EQ("rs", GetKeyboardLayoutName("xkb:rs::srp")); 130 EXPECT_EQ("rs", GetKeyboardLayoutName("xkb:rs::srp"));
131 EXPECT_EQ("ch", GetKeyboardLayoutName("xkb:ch::ger")); 131 EXPECT_EQ("ch", GetKeyboardLayoutName("xkb:ch::ger"));
132 EXPECT_EQ("ru", GetKeyboardLayoutName("xkb:ru::rus")); 132 EXPECT_EQ("ru", GetKeyboardLayoutName("xkb:ru::rus"));
133 EXPECT_EQ("tr", GetKeyboardLayoutName("xkb:tr::tur")); 133 EXPECT_EQ("tr", GetKeyboardLayoutName("xkb:tr::tur"));
134 EXPECT_EQ("ua", GetKeyboardLayoutName("xkb:ua::ukr")); 134 EXPECT_EQ("ua", GetKeyboardLayoutName("xkb:ua::ukr"));
135 EXPECT_EQ("us", GetKeyboardLayoutName("xkb:us::eng")); 135 EXPECT_EQ("us", GetKeyboardLayoutName("xkb:us::eng"));
136 EXPECT_EQ("us", GetKeyboardLayoutName("xkb:us:dvorak:eng")); 136 EXPECT_EQ("us", GetKeyboardLayoutName("xkb:us:dvorak:eng"));
137 EXPECT_EQ("us", GetKeyboardLayoutName("xkb:us:colemak:eng")); 137 EXPECT_EQ("us", GetKeyboardLayoutName("xkb:us:colemak:eng"));
138 } 138 }
139 139
140 TEST(InputMethodUtilTest, GetKeyboardOverlayId) {
141 // Invalid IDs
142 EXPECT_EQ("", GetKeyboardOverlayId(""));
143 EXPECT_EQ("", GetKeyboardOverlayId("aaa"));
144
145 // Valid IDs
146 EXPECT_EQ("nl", GetKeyboardOverlayId("xkb:nl::nld"));
147 EXPECT_EQ("nl", GetKeyboardOverlayId("xkb:be::nld"));
148 EXPECT_EQ("fr", GetKeyboardOverlayId("xkb:fr::fra"));
149 EXPECT_EQ("fr", GetKeyboardOverlayId("xkb:be::fra"));
150 EXPECT_EQ("fr_CA", GetKeyboardOverlayId("xkb:ca::fra"));
151 EXPECT_EQ("fr", GetKeyboardOverlayId("xkb:ch:fr:fra"));
152 EXPECT_EQ("de", GetKeyboardOverlayId("xkb:de::ger"));
153 EXPECT_EQ("de", GetKeyboardOverlayId("xkb:be::ger"));
154 EXPECT_EQ("de", GetKeyboardOverlayId("xkb:ch::ger"));
155 EXPECT_EQ("en_US", GetKeyboardOverlayId("mozc"));
156 EXPECT_EQ("ja", GetKeyboardOverlayId("mozc-jp"));
157 EXPECT_EQ("en_US_dvorak", GetKeyboardOverlayId("mozc-dv"));
158 EXPECT_EQ("ja", GetKeyboardOverlayId("xkb:jp::jpn"));
159 EXPECT_EQ("ru", GetKeyboardOverlayId("xkb:ru::rus"));
160 EXPECT_EQ("ru", GetKeyboardOverlayId("xkb:ru:phonetic:rus"));
161 EXPECT_EQ("th", GetKeyboardOverlayId("m17n:th:kesmanee"));
162 EXPECT_EQ("th", GetKeyboardOverlayId("m17n:th:pattachote"));
163 EXPECT_EQ("th", GetKeyboardOverlayId("m17n:th:tis820"));
164 EXPECT_EQ("zh_TW", GetKeyboardOverlayId("chewing"));
165 EXPECT_EQ("zh_TW", GetKeyboardOverlayId("m17n:zh:cangjie"));
166 EXPECT_EQ("zh_TW", GetKeyboardOverlayId("m17n:zh:quick"));
167 EXPECT_EQ("vi", GetKeyboardOverlayId("m17n:vi:tcvn"));
168 EXPECT_EQ("vi", GetKeyboardOverlayId("m17n:vi:telex"));
169 EXPECT_EQ("vi", GetKeyboardOverlayId("m17n:vi:viqr"));
170 EXPECT_EQ("vi", GetKeyboardOverlayId("m17n:vi:vni"));
171 EXPECT_EQ("en_US", GetKeyboardOverlayId("xkb:us::eng"));
172 EXPECT_EQ("en_US", GetKeyboardOverlayId("xkb:us:intl:eng"));
173 EXPECT_EQ("en_US", GetKeyboardOverlayId("xkb:us:altgr-intl:eng"));
174 EXPECT_EQ("en_US_dvorak", GetKeyboardOverlayId("xkb:us:dvorak:eng"));
175 // TODO(mazda): Add keyboard overlay definition for US Colemak.
176 EXPECT_EQ("en_US", GetKeyboardOverlayId("xkb:us:colemak:eng"));
177 EXPECT_EQ("ko", GetKeyboardOverlayId("hangul"));
178 EXPECT_EQ("zh_CN", GetKeyboardOverlayId("pinyin"));
179 EXPECT_EQ("ar", GetKeyboardOverlayId("m17n:ar:kbd"));
180 EXPECT_EQ("hi", GetKeyboardOverlayId("m17n:hi:itrans"));
181 EXPECT_EQ("ar", GetKeyboardOverlayId("m17n:fa:isiri"));
182 EXPECT_EQ("pt_BR", GetKeyboardOverlayId("xkb:br::por"));
183 EXPECT_EQ("bg", GetKeyboardOverlayId("xkb:bg::bul"));
184 EXPECT_EQ("bg", GetKeyboardOverlayId("xkb:bg:phonetic:bul"));
185 EXPECT_EQ("ca", GetKeyboardOverlayId("xkb:ca:eng:eng"));
186 EXPECT_EQ("cs", GetKeyboardOverlayId("xkb:cz::cze"));
187 EXPECT_EQ("et", GetKeyboardOverlayId("xkb:ee::est"));
188 EXPECT_EQ("es", GetKeyboardOverlayId("xkb:es::spa"));
189 EXPECT_EQ("ca", GetKeyboardOverlayId("xkb:es:cat:cat"));
190 EXPECT_EQ("da", GetKeyboardOverlayId("xkb:dk::dan"));
191 EXPECT_EQ("el", GetKeyboardOverlayId("xkb:gr::gre"));
192 EXPECT_EQ("iw", GetKeyboardOverlayId("xkb:il::heb"));
193 EXPECT_EQ("ko", GetKeyboardOverlayId("xkb:kr:kr104:kor"));
194 EXPECT_EQ("es_419", GetKeyboardOverlayId("xkb:latam::spa"));
195 EXPECT_EQ("lt", GetKeyboardOverlayId("xkb:lt::lit"));
196 EXPECT_EQ("lv", GetKeyboardOverlayId("xkb:lv:apostrophe:lav"));
197 EXPECT_EQ("hr", GetKeyboardOverlayId("xkb:hr::scr"));
198 EXPECT_EQ("en_GB", GetKeyboardOverlayId("xkb:gb:extd:eng"));
199 EXPECT_EQ("fi", GetKeyboardOverlayId("xkb:fi::fin"));
200 EXPECT_EQ("hu", GetKeyboardOverlayId("xkb:hu::hun"));
201 EXPECT_EQ("it", GetKeyboardOverlayId("xkb:it::ita"));
202 EXPECT_EQ("no", GetKeyboardOverlayId("xkb:no::nob"));
203 EXPECT_EQ("pl", GetKeyboardOverlayId("xkb:pl::pol"));
204 EXPECT_EQ("pt_PT", GetKeyboardOverlayId("xkb:pt::por"));
205 EXPECT_EQ("ro", GetKeyboardOverlayId("xkb:ro::rum"));
206 EXPECT_EQ("sv", GetKeyboardOverlayId("xkb:se::swe"));
207 EXPECT_EQ("sk", GetKeyboardOverlayId("xkb:sk::slo"));
208 EXPECT_EQ("sl", GetKeyboardOverlayId("xkb:si::slv"));
209 EXPECT_EQ("sr", GetKeyboardOverlayId("xkb:rs::srp"));
210 EXPECT_EQ("tr", GetKeyboardOverlayId("xkb:tr::tur"));
211 EXPECT_EQ("uk", GetKeyboardOverlayId("xkb:ua::ukr"));
212 }
213
140 TEST(InputMethodUtilTest, GetLanguageDisplayNameFromCode) { 214 TEST(InputMethodUtilTest, GetLanguageDisplayNameFromCode) {
141 EXPECT_EQ(UTF8ToUTF16("Finnish"), GetLanguageDisplayNameFromCode("fi")); 215 EXPECT_EQ(UTF8ToUTF16("Finnish"), GetLanguageDisplayNameFromCode("fi"));
142 } 216 }
143 217
144 TEST(InputMethodUtilTest, GetLanguageNativeDisplayNameFromCode) { 218 TEST(InputMethodUtilTest, GetLanguageNativeDisplayNameFromCode) {
145 EXPECT_EQ(UTF8ToUTF16("suomi"), GetLanguageNativeDisplayNameFromCode("fi")); 219 EXPECT_EQ(UTF8ToUTF16("suomi"), GetLanguageNativeDisplayNameFromCode("fi"));
146 } 220 }
147 221
148 TEST(InputMethodUtilTest, SortLanguageCodesByNames) { 222 TEST(InputMethodUtilTest, SortLanguageCodesByNames) {
149 std::vector<std::string> language_codes; 223 std::vector<std::string> language_codes;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 EXPECT_EQ("xkb:fr:fra", result[0]); 310 EXPECT_EQ("xkb:fr:fra", result[0]);
237 311
238 EXPECT_FALSE(GetInputMethodIdsFromLanguageCodeInternal( 312 EXPECT_FALSE(GetInputMethodIdsFromLanguageCodeInternal(
239 language_code_to_ids_map, "invalid_lang", kAllInputMethods, &result)); 313 language_code_to_ids_map, "invalid_lang", kAllInputMethods, &result));
240 EXPECT_FALSE(GetInputMethodIdsFromLanguageCodeInternal( 314 EXPECT_FALSE(GetInputMethodIdsFromLanguageCodeInternal(
241 language_code_to_ids_map, "invalid_lang", kKeyboardLayoutsOnly, &result)); 315 language_code_to_ids_map, "invalid_lang", kKeyboardLayoutsOnly, &result));
242 } 316 }
243 317
244 } // namespace input_method 318 } // namespace input_method
245 } // namespace chromeos 319 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_util.cc ('k') | tools/cros.DEPS/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698