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

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

Issue 7331009: Add US-intl to the language configuration dialog for Dutch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fixes Created 9 years, 5 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.h ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 EXPECT_EQ("mozc", input_method_id); 87 EXPECT_EQ("mozc", input_method_id);
88 // Commented out. See above. 88 // Commented out. See above.
89 // EXPECT_EQ("Japanese input method (for US keyboard)", display_name); 89 // EXPECT_EQ("Japanese input method (for US keyboard)", display_name);
90 ASSERT_TRUE(language_code_set->HasKey("ja")); 90 ASSERT_TRUE(language_code_set->HasKey("ja"));
91 } 91 }
92 92
93 TEST(LanguageOptionsHandlerTest, GetLanguageList) { 93 TEST(LanguageOptionsHandlerTest, GetLanguageList) {
94 InputMethodDescriptors descriptors = CreateInputMethodDescriptors(); 94 InputMethodDescriptors descriptors = CreateInputMethodDescriptors();
95 scoped_ptr<ListValue> list( 95 scoped_ptr<ListValue> list(
96 chromeos::CrosLanguageOptionsHandler::GetLanguageList(descriptors)); 96 chromeos::CrosLanguageOptionsHandler::GetLanguageList(descriptors));
97 ASSERT_EQ(7U, list->GetSize()); 97 ASSERT_EQ(8U, list->GetSize());
98 98
99 DictionaryValue* entry = NULL; 99 DictionaryValue* entry = NULL;
100 std::string language_code; 100 std::string language_code;
101 std::string display_name; 101 std::string display_name;
102 std::string native_display_name; 102 std::string native_display_name;
103 103
104 // As shown below, the list should be sorted by the display names, 104 // As shown below, the list should be sorted by the display names,
105 // and these names should not have duplicates. 105 // and these names should not have duplicates.
106 106
107 // This comes from kExtraLanguages. 107 // This comes from kExtraLanguages.
108 ASSERT_TRUE(list->GetDictionary(0, &entry)); 108 ASSERT_TRUE(list->GetDictionary(0, &entry));
109 ASSERT_TRUE(entry->GetString("code", &language_code)); 109 ASSERT_TRUE(entry->GetString("code", &language_code));
110 ASSERT_TRUE(entry->GetString("displayName", &display_name)); 110 ASSERT_TRUE(entry->GetString("displayName", &display_name));
111 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name)); 111 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
112 EXPECT_EQ("nl", language_code);
113 EXPECT_EQ("Dutch", display_name);
114 EXPECT_EQ("Nederlands", native_display_name);
115
116 // This comes from kExtraLanguages.
117 ASSERT_TRUE(list->GetDictionary(1, &entry));
118 ASSERT_TRUE(entry->GetString("code", &language_code));
119 ASSERT_TRUE(entry->GetString("displayName", &display_name));
120 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
112 EXPECT_EQ("en-AU", language_code); 121 EXPECT_EQ("en-AU", language_code);
113 EXPECT_EQ("English (Australia)", display_name); 122 EXPECT_EQ("English (Australia)", display_name);
114 EXPECT_EQ("English (Australia)", native_display_name); 123 EXPECT_EQ("English (Australia)", native_display_name);
115 124
116 ASSERT_TRUE(list->GetDictionary(1, &entry)); 125 ASSERT_TRUE(list->GetDictionary(2, &entry));
117 ASSERT_TRUE(entry->GetString("code", &language_code)); 126 ASSERT_TRUE(entry->GetString("code", &language_code));
118 ASSERT_TRUE(entry->GetString("displayName", &display_name)); 127 ASSERT_TRUE(entry->GetString("displayName", &display_name));
119 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name)); 128 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
120 EXPECT_EQ("en-US", language_code); 129 EXPECT_EQ("en-US", language_code);
121 EXPECT_EQ("English (United States)", display_name); 130 EXPECT_EQ("English (United States)", display_name);
122 EXPECT_EQ("English (United States)", native_display_name); 131 EXPECT_EQ("English (United States)", native_display_name);
123 132
124 // This comes from kExtraLanguages. 133 // This comes from kExtraLanguages.
125 ASSERT_TRUE(list->GetDictionary(2, &entry)); 134 ASSERT_TRUE(list->GetDictionary(3, &entry));
126 ASSERT_TRUE(entry->GetString("code", &language_code)); 135 ASSERT_TRUE(entry->GetString("code", &language_code));
127 ASSERT_TRUE(entry->GetString("displayName", &display_name)); 136 ASSERT_TRUE(entry->GetString("displayName", &display_name));
128 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name)); 137 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
129 EXPECT_EQ("fil", language_code); 138 EXPECT_EQ("fil", language_code);
130 EXPECT_EQ("Filipino", display_name); 139 EXPECT_EQ("Filipino", display_name);
131 EXPECT_EQ("Filipino", native_display_name); 140 EXPECT_EQ("Filipino", native_display_name);
132 141
133 ASSERT_TRUE(list->GetDictionary(3, &entry)); 142 ASSERT_TRUE(list->GetDictionary(4, &entry));
134 ASSERT_TRUE(entry->GetString("code", &language_code)); 143 ASSERT_TRUE(entry->GetString("code", &language_code));
135 ASSERT_TRUE(entry->GetString("displayName", &display_name)); 144 ASSERT_TRUE(entry->GetString("displayName", &display_name));
136 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name)); 145 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
137 EXPECT_EQ("fr", language_code); 146 EXPECT_EQ("fr", language_code);
138 EXPECT_EQ("French", display_name); 147 EXPECT_EQ("French", display_name);
139 EXPECT_EQ("fran\u00E7ais", native_display_name); 148 EXPECT_EQ("fran\u00E7ais", native_display_name);
140 149
141 // This comes from kExtraLanguages. 150 // This comes from kExtraLanguages.
142 ASSERT_TRUE(list->GetDictionary(4, &entry)); 151 ASSERT_TRUE(list->GetDictionary(5, &entry));
143 ASSERT_TRUE(entry->GetString("code", &language_code)); 152 ASSERT_TRUE(entry->GetString("code", &language_code));
144 ASSERT_TRUE(entry->GetString("displayName", &display_name)); 153 ASSERT_TRUE(entry->GetString("displayName", &display_name));
145 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name)); 154 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
146 EXPECT_EQ("id", language_code); 155 EXPECT_EQ("id", language_code);
147 EXPECT_EQ("Indonesian", display_name); 156 EXPECT_EQ("Indonesian", display_name);
148 EXPECT_EQ("Bahasa Indonesia", native_display_name); 157 EXPECT_EQ("Bahasa Indonesia", native_display_name);
149 158
150 ASSERT_TRUE(list->GetDictionary(5, &entry)); 159 ASSERT_TRUE(list->GetDictionary(6, &entry));
151 ASSERT_TRUE(entry->GetString("code", &language_code)); 160 ASSERT_TRUE(entry->GetString("code", &language_code));
152 ASSERT_TRUE(entry->GetString("displayName", &display_name)); 161 ASSERT_TRUE(entry->GetString("displayName", &display_name));
153 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name)); 162 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
154 EXPECT_EQ("ja", language_code); 163 EXPECT_EQ("ja", language_code);
155 EXPECT_EQ("Japanese", display_name); 164 EXPECT_EQ("Japanese", display_name);
156 EXPECT_EQ("\u65E5\u672C\u8A9E", native_display_name); 165 EXPECT_EQ("\u65E5\u672C\u8A9E", native_display_name);
157 166
158 // This comes from kExtraLanguages. 167 // This comes from kExtraLanguages.
159 ASSERT_TRUE(list->GetDictionary(6, &entry)); 168 ASSERT_TRUE(list->GetDictionary(7, &entry));
160 ASSERT_TRUE(entry->GetString("code", &language_code)); 169 ASSERT_TRUE(entry->GetString("code", &language_code));
161 ASSERT_TRUE(entry->GetString("displayName", &display_name)); 170 ASSERT_TRUE(entry->GetString("displayName", &display_name));
162 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name)); 171 ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
163 EXPECT_EQ("es-419", language_code); 172 EXPECT_EQ("es-419", language_code);
164 EXPECT_EQ("Spanish (Latin America)", display_name); 173 EXPECT_EQ("Spanish (Latin America)", display_name);
165 EXPECT_EQ("espa\u00F1ol (Latinoam\u00E9rica y el Caribe)", 174 EXPECT_EQ("espa\u00F1ol (Latinoam\u00E9rica y el Caribe)",
166 native_display_name); 175 native_display_name);
167 } 176 }
168 #endif // defined(OS_CHROMEOS) 177 #endif // defined(OS_CHROMEOS)
169 178
170 #if !defined(OS_MACOSX) 179 #if !defined(OS_MACOSX)
171 TEST(LanguageOptionsHandlerTest, GetUILanguageCodeSet) { 180 TEST(LanguageOptionsHandlerTest, GetUILanguageCodeSet) {
172 scoped_ptr<DictionaryValue> dictionary( 181 scoped_ptr<DictionaryValue> dictionary(
173 LanguageOptionsHandler::GetUILanguageCodeSet()); 182 LanguageOptionsHandler::GetUILanguageCodeSet());
174 EXPECT_TRUE(dictionary->HasKey("en-US")); 183 EXPECT_TRUE(dictionary->HasKey("en-US"));
175 // Note that we don't test a false case, as such an expectation will 184 // Note that we don't test a false case, as such an expectation will
176 // fail when we add support for the language. 185 // fail when we add support for the language.
177 // EXPECT_FALSE(dictionary->HasKey("no")); 186 // EXPECT_FALSE(dictionary->HasKey("no"));
178 } 187 }
179 #endif // !defined(OS_MACOSX) 188 #endif // !defined(OS_MACOSX)
180 189
181 TEST(LanguageOptionsHandlerTest, GetSpellCheckLanguageCodeSet) { 190 TEST(LanguageOptionsHandlerTest, GetSpellCheckLanguageCodeSet) {
182 scoped_ptr<DictionaryValue> dictionary( 191 scoped_ptr<DictionaryValue> dictionary(
183 LanguageOptionsHandler::GetSpellCheckLanguageCodeSet()); 192 LanguageOptionsHandler::GetSpellCheckLanguageCodeSet());
184 EXPECT_TRUE(dictionary->HasKey("en-US")); 193 EXPECT_TRUE(dictionary->HasKey("en-US"));
185 } 194 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698