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

Side by Side Diff: chrome/browser/ui/webui/options/language_options_handler_unittest.cc

Issue 13509006: Add UX for languages that don't have any associated input method (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove deprecated test Created 7 years, 8 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
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.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/ui/webui/options/language_options_handler.h" 5 #include "chrome/browser/ui/webui/options/language_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 ASSERT_TRUE(list->GetDictionary(3, &entry)); 106 ASSERT_TRUE(list->GetDictionary(3, &entry));
107 ASSERT_TRUE(entry->GetString("id", &input_method_id)); 107 ASSERT_TRUE(entry->GetString("id", &input_method_id));
108 ASSERT_TRUE(entry->GetString("displayName", &display_name)); 108 ASSERT_TRUE(entry->GetString("displayName", &display_name));
109 ASSERT_TRUE(entry->GetDictionary("languageCodeSet", &language_code_set)); 109 ASSERT_TRUE(entry->GetDictionary("languageCodeSet", &language_code_set));
110 EXPECT_EQ("mozc", input_method_id); 110 EXPECT_EQ("mozc", input_method_id);
111 // Commented out. See above. 111 // Commented out. See above.
112 // EXPECT_EQ("Japanese input method (for US keyboard)", display_name); 112 // EXPECT_EQ("Japanese input method (for US keyboard)", display_name);
113 ASSERT_TRUE(language_code_set->HasKey("ja")); 113 ASSERT_TRUE(language_code_set->HasKey("ja"));
114 } 114 }
115
116 TEST_F(LanguageOptionsHandlerTest, GetLanguageList) {
117 InputMethodDescriptors descriptors = CreateInputMethodDescriptors();
118 scoped_ptr<ListValue> list(
119 chromeos::options::CrosLanguageOptionsHandler::GetLanguageList(
120 descriptors));
121 ASSERT_EQ(9U, list->GetSize());
122
123 DictionaryValue* entry = NULL;
124 std::string language_code;
125 std::string display_name;
126 std::string native_display_name;
127
128 // As shown below, the list should be sorted by the display names,
129 // and these names should not have duplicates.
130
131 // This comes from kExtraLanguages.
132 ASSERT_TRUE(list->GetDictionary(0, &entry));
133 ASSERT_TRUE(entry->GetString("code", &language_code));
134 ASSERT_TRUE(entry->GetString("displayName", &display_name));
135 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
136 EXPECT_EQ("nl", language_code);
137 EXPECT_EQ("Dutch", display_name);
138 EXPECT_EQ("Nederlands", native_display_name);
139
140 // This comes from kExtraLanguages.
141 ASSERT_TRUE(list->GetDictionary(1, &entry));
142 ASSERT_TRUE(entry->GetString("code", &language_code));
143 ASSERT_TRUE(entry->GetString("displayName", &display_name));
144 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
145 EXPECT_EQ("en-AU", language_code);
146 EXPECT_EQ("English (Australia)", display_name);
147 EXPECT_EQ("English (Australia)", native_display_name);
148
149 ASSERT_TRUE(list->GetDictionary(2, &entry));
150 ASSERT_TRUE(entry->GetString("code", &language_code));
151 ASSERT_TRUE(entry->GetString("displayName", &display_name));
152 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
153 EXPECT_EQ("en-US", language_code);
154 EXPECT_EQ("English (United States)", display_name);
155 EXPECT_EQ("English (United States)", native_display_name);
156
157 // This comes from kExtraLanguages.
158 ASSERT_TRUE(list->GetDictionary(3, &entry));
159 ASSERT_TRUE(entry->GetString("code", &language_code));
160 ASSERT_TRUE(entry->GetString("displayName", &display_name));
161 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
162 EXPECT_EQ("fil", language_code);
163 EXPECT_EQ("Filipino", display_name);
164 EXPECT_EQ("Filipino", native_display_name);
165
166 ASSERT_TRUE(list->GetDictionary(4, &entry));
167 ASSERT_TRUE(entry->GetString("code", &language_code));
168 ASSERT_TRUE(entry->GetString("displayName", &display_name));
169 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
170 EXPECT_EQ("fr", language_code);
171 EXPECT_EQ("French", display_name);
172 EXPECT_EQ("fran\u00E7ais", native_display_name);
173
174 // This comes from kExtraLanguages.
175 ASSERT_TRUE(list->GetDictionary(5, &entry));
176 ASSERT_TRUE(entry->GetString("code", &language_code));
177 ASSERT_TRUE(entry->GetString("displayName", &display_name));
178 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
179 EXPECT_EQ("id", language_code);
180 EXPECT_EQ("Indonesian", display_name);
181 EXPECT_EQ("Bahasa Indonesia", native_display_name);
182
183 ASSERT_TRUE(list->GetDictionary(6, &entry));
184 ASSERT_TRUE(entry->GetString("code", &language_code));
185 ASSERT_TRUE(entry->GetString("displayName", &display_name));
186 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
187 EXPECT_EQ("ja", language_code);
188 EXPECT_EQ("Japanese", display_name);
189 EXPECT_EQ("\u65E5\u672C\u8A9E", native_display_name);
190
191 // This comes from kExtraLanguages.
192 ASSERT_TRUE(list->GetDictionary(7, &entry));
193 ASSERT_TRUE(entry->GetString("code", &language_code));
194 ASSERT_TRUE(entry->GetString("displayName", &display_name));
195 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
196 EXPECT_EQ("ms", language_code);
197 EXPECT_EQ("Malay", display_name);
198 EXPECT_EQ("Bahasa Melayu", native_display_name);
199
200 // This comes from kExtraLanguages.
201 ASSERT_TRUE(list->GetDictionary(8, &entry));
202 ASSERT_TRUE(entry->GetString("code", &language_code));
203 ASSERT_TRUE(entry->GetString("displayName", &display_name));
204 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
205 EXPECT_EQ("es-419", language_code);
206 EXPECT_EQ("Spanish (Latin America)", display_name);
207 EXPECT_EQ("espa\u00F1ol (Latinoam\u00E9rica)", native_display_name);
208 }
209 #endif // defined(OS_CHROMEOS) 115 #endif // defined(OS_CHROMEOS)
210 116
211 #if !defined(OS_MACOSX) 117 #if !defined(OS_MACOSX)
212 TEST_F(LanguageOptionsHandlerTest, GetUILanguageCodeSet) { 118 TEST_F(LanguageOptionsHandlerTest, GetUILanguageCodeSet) {
213 scoped_ptr<DictionaryValue> dictionary( 119 scoped_ptr<DictionaryValue> dictionary(
214 options::LanguageOptionsHandler::GetUILanguageCodeSet()); 120 options::LanguageOptionsHandler::GetUILanguageCodeSet());
215 EXPECT_TRUE(dictionary->HasKey("en-US")); 121 EXPECT_TRUE(dictionary->HasKey("en-US"));
216 // Note that we don't test a false case, as such an expectation will 122 // Note that we don't test a false case, as such an expectation will
217 // fail when we add support for the language. 123 // fail when we add support for the language.
218 // EXPECT_FALSE(dictionary->HasKey("no")); 124 // EXPECT_FALSE(dictionary->HasKey("no"));
219 } 125 }
220 #endif // !defined(OS_MACOSX) 126 #endif // !defined(OS_MACOSX)
221 127
222 TEST_F(LanguageOptionsHandlerTest, GetSpellCheckLanguageCodeSet) { 128 TEST_F(LanguageOptionsHandlerTest, GetSpellCheckLanguageCodeSet) {
223 scoped_ptr<DictionaryValue> dictionary( 129 scoped_ptr<DictionaryValue> dictionary(
224 options::LanguageOptionsHandler::GetSpellCheckLanguageCodeSet()); 130 options::LanguageOptionsHandler::GetSpellCheckLanguageCodeSet());
225 EXPECT_TRUE(dictionary->HasKey("en-US")); 131 EXPECT_TRUE(dictionary->HasKey("en-US"));
226 } 132 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698