Sort input methods names in the language selector by language names.

chrome/browser/chromeos/options/language_config_view_test.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <map>
 #include <string>
+#include <utility>
 #include <vector>
+
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/options/language_config_view.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 TEST(LanguageConfigViewTest, MaybeRewriteLanguageName) {
   EXPECT_EQ(L"English",
             LanguageConfigView::MaybeRewriteLanguageName(L"English"));
   EXPECT_EQ(l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_OTHERS),
             LanguageConfigView::MaybeRewriteLanguageName(L"t"));
 }
 
 TEST(LanguageConfigViewTest, GetLanguageDisplayNameFromCode) {
   EXPECT_EQ(L"French",
             LanguageConfigView::GetLanguageDisplayNameFromCode("fr"));
   // MaybeRewriteLanguageName() should be applied.
   EXPECT_EQ(l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_OTHERS),
             LanguageConfigView::GetLanguageDisplayNameFromCode("t"));
 }
 
 TEST(LanguageConfigViewTest, SortLanguageCodesByNames) {
   std::vector<std::string> language_codes;
+  // Check if this function can handle an empty list.
+  LanguageConfigView::SortLanguageCodesByNames(&language_codes);
+
   language_codes.push_back("ja");
   language_codes.push_back("fr");
   language_codes.push_back("t");
   LanguageConfigView::SortLanguageCodesByNames(&language_codes);
   ASSERT_EQ(3, static_cast<int>(language_codes.size()));
   ASSERT_EQ("fr", language_codes[0]);  // French
   ASSERT_EQ("ja", language_codes[1]);  // Japanese
   ASSERT_EQ("t",  language_codes[2]);  // Others
 
   // Add a duplicate entry and see if it works.
   language_codes.push_back("ja");
   LanguageConfigView::SortLanguageCodesByNames(&language_codes);
   ASSERT_EQ(4, static_cast<int>(language_codes.size()));
   ASSERT_EQ("fr", language_codes[0]);  // French
   ASSERT_EQ("ja", language_codes[1]);  // Japanese
   ASSERT_EQ("ja", language_codes[2]);  // Japanese
   ASSERT_EQ("t",  language_codes[3]);  // Others
 }
 
+TEST(LanguageConfigViewTest, SortInputMethodIdsByNames) {
+  std::map<std::string, std::string> id_to_language_code_map;
+  id_to_language_code_map.insert(std::make_pair("mozc", "ja"));
+  id_to_language_code_map.insert(std::make_pair("mozc-jp", "ja"));
+  id_to_language_code_map.insert(std::make_pair("xkb:jp::jpn", "ja"));
+  id_to_language_code_map.insert(std::make_pair("xkb:fr::fra", "fr"));
+  id_to_language_code_map.insert(std::make_pair("m17n:latn-pre", "t"));
+
+  std::vector<std::string> input_method_ids;
+  // Check if this function can handle an empty list.
+  LanguageConfigView::SortInputMethodIdsByNames(id_to_language_code_map,
+                                                &input_method_ids);
+
+  input_method_ids.push_back("mozc");           // Japanese
+  input_method_ids.push_back("xkb:fr::fra");    // French
+  input_method_ids.push_back("m17n:latn-pre");  // Others
+  LanguageConfigView::SortInputMethodIdsByNames(id_to_language_code_map,
+                                                &input_method_ids);
+  ASSERT_EQ(3, static_cast<int>(input_method_ids.size()));
+  ASSERT_EQ("xkb:fr::fra", input_method_ids[0]);     // French
+  ASSERT_EQ("mozc", input_method_ids[1]);            // Japanese
+  ASSERT_EQ("m17n:latn-pre",  input_method_ids[2]);  // Others
+
+  // Add a duplicate entry and see if it works.
+  // Note that SortInputMethodIdsByNames uses std::stable_sort.
+  input_method_ids.push_back("xkb:jp::jpn");  // also Japanese
+  LanguageConfigView::SortInputMethodIdsByNames(id_to_language_code_map,
+                                                &input_method_ids);
+  ASSERT_EQ(4, static_cast<int>(input_method_ids.size()));
+  ASSERT_EQ("xkb:fr::fra", input_method_ids[0]);     // French
+  ASSERT_EQ("mozc", input_method_ids[1]);            // Japanese
+  ASSERT_EQ("xkb:jp::jpn", input_method_ids[2]);     // Japanese
+  ASSERT_EQ("m17n:latn-pre",  input_method_ids[3]);  // Others
+
+  input_method_ids.push_back("mozc-jp");  // also Japanese
+  LanguageConfigView::SortInputMethodIdsByNames(id_to_language_code_map,
+                                                &input_method_ids);
+  ASSERT_EQ(5, static_cast<int>(input_method_ids.size()));
+  ASSERT_EQ("xkb:fr::fra", input_method_ids[0]);     // French
+  ASSERT_EQ("mozc", input_method_ids[1]);            // Japanese
+  ASSERT_EQ("xkb:jp::jpn", input_method_ids[2]);     // Japanese
+  ASSERT_EQ("mozc-jp", input_method_ids[3]);         // Japanese
+  ASSERT_EQ("m17n:latn-pre",  input_method_ids[4]);  // Others
+}
+
 TEST(LanguageConfigViewTest, ReorderInputMethodIdsForLanguageCode_DE) {
   std::vector<std::string> input_method_ids;
   input_method_ids.push_back("xkb:ch::ger");  // Switzerland - German
   input_method_ids.push_back("xkb:de::ger");  // Germany - German
   LanguageConfigView::ReorderInputMethodIdsForLanguageCode(
       "de", &input_method_ids);
   // The list should be reordered.
   ASSERT_EQ(2, static_cast<int>(input_method_ids.size()));
   EXPECT_EQ("xkb:de::ger", input_method_ids[0]);
   EXPECT_EQ("xkb:ch::ger", input_method_ids[1]);
@@ skipping 119 matching lines @@
   EXPECT_EQ("de", model.GetLocaleFromIndex(model.GetLanguageIndex(2)));
   EXPECT_EQ("ko", model.GetLocaleFromIndex(model.GetLanguageIndex(3)));
 
   // Mark "ja" (not in the model) to be ignored.
   model.SetIgnored("ja", true);
   // The GetItemCount() should not be changed.
   ASSERT_EQ(4, model.GetItemCount());
 }
 
 }  // namespace chromeos