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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/language_options_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/options/language_options_handler_unittest.cc b/chrome/browser/ui/webui/options/language_options_handler_unittest.cc
index 5b9d2a26c1e8f71a58b5b2cc8dd580737999d3ed..031bfc2b3b3db4546c376849228e4676f327e3e3 100644
--- a/chrome/browser/ui/webui/options/language_options_handler_unittest.cc
+++ b/chrome/browser/ui/webui/options/language_options_handler_unittest.cc
@@ -112,100 +112,6 @@ TEST_F(LanguageOptionsHandlerTest, GetInputMethodList) {
// EXPECT_EQ("Japanese input method (for US keyboard)", display_name);
ASSERT_TRUE(language_code_set->HasKey("ja"));
}
-
-TEST_F(LanguageOptionsHandlerTest, GetLanguageList) {
- InputMethodDescriptors descriptors = CreateInputMethodDescriptors();
- scoped_ptr<ListValue> list(
- chromeos::options::CrosLanguageOptionsHandler::GetLanguageList(
- descriptors));
- ASSERT_EQ(9U, list->GetSize());
-
- DictionaryValue* entry = NULL;
- std::string language_code;
- std::string display_name;
- std::string native_display_name;
-
- // As shown below, the list should be sorted by the display names,
- // and these names should not have duplicates.
-
- // This comes from kExtraLanguages.
- ASSERT_TRUE(list->GetDictionary(0, &entry));
- ASSERT_TRUE(entry->GetString("code", &language_code));
- ASSERT_TRUE(entry->GetString("displayName", &display_name));
- ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
- EXPECT_EQ("nl", language_code);
- EXPECT_EQ("Dutch", display_name);
- EXPECT_EQ("Nederlands", native_display_name);
-
- // This comes from kExtraLanguages.
- ASSERT_TRUE(list->GetDictionary(1, &entry));
- ASSERT_TRUE(entry->GetString("code", &language_code));
- ASSERT_TRUE(entry->GetString("displayName", &display_name));
- ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
- EXPECT_EQ("en-AU", language_code);
- EXPECT_EQ("English (Australia)", display_name);
- EXPECT_EQ("English (Australia)", native_display_name);
-
- ASSERT_TRUE(list->GetDictionary(2, &entry));
- ASSERT_TRUE(entry->GetString("code", &language_code));
- ASSERT_TRUE(entry->GetString("displayName", &display_name));
- ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
- EXPECT_EQ("en-US", language_code);
- EXPECT_EQ("English (United States)", display_name);
- EXPECT_EQ("English (United States)", native_display_name);
-
- // This comes from kExtraLanguages.
- ASSERT_TRUE(list->GetDictionary(3, &entry));
- ASSERT_TRUE(entry->GetString("code", &language_code));
- ASSERT_TRUE(entry->GetString("displayName", &display_name));
- ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
- EXPECT_EQ("fil", language_code);
- EXPECT_EQ("Filipino", display_name);
- EXPECT_EQ("Filipino", native_display_name);
-
- ASSERT_TRUE(list->GetDictionary(4, &entry));
- ASSERT_TRUE(entry->GetString("code", &language_code));
- ASSERT_TRUE(entry->GetString("displayName", &display_name));
- ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
- EXPECT_EQ("fr", language_code);
- EXPECT_EQ("French", display_name);
- EXPECT_EQ("fran\u00E7ais", native_display_name);
-
- // This comes from kExtraLanguages.
- ASSERT_TRUE(list->GetDictionary(5, &entry));
- ASSERT_TRUE(entry->GetString("code", &language_code));
- ASSERT_TRUE(entry->GetString("displayName", &display_name));
- ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
- EXPECT_EQ("id", language_code);
- EXPECT_EQ("Indonesian", display_name);
- EXPECT_EQ("Bahasa Indonesia", native_display_name);
-
- ASSERT_TRUE(list->GetDictionary(6, &entry));
- ASSERT_TRUE(entry->GetString("code", &language_code));
- ASSERT_TRUE(entry->GetString("displayName", &display_name));
- ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
- EXPECT_EQ("ja", language_code);
- EXPECT_EQ("Japanese", display_name);
- EXPECT_EQ("\u65E5\u672C\u8A9E", native_display_name);
-
- // This comes from kExtraLanguages.
- ASSERT_TRUE(list->GetDictionary(7, &entry));
- ASSERT_TRUE(entry->GetString("code", &language_code));
- ASSERT_TRUE(entry->GetString("displayName", &display_name));
- ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
- EXPECT_EQ("ms", language_code);
- EXPECT_EQ("Malay", display_name);
- EXPECT_EQ("Bahasa Melayu", native_display_name);
-
- // This comes from kExtraLanguages.
- ASSERT_TRUE(list->GetDictionary(8, &entry));
- ASSERT_TRUE(entry->GetString("code", &language_code));
- ASSERT_TRUE(entry->GetString("displayName", &display_name));
- ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
- EXPECT_EQ("es-419", language_code);
- EXPECT_EQ("Spanish (Latin America)", display_name);
- EXPECT_EQ("espa\u00F1ol (Latinoam\u00E9rica)", native_display_name);
-}
#endif // defined(OS_CHROMEOS)
#if !defined(OS_MACOSX)
« 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