Make input_methods.txt to be able to specify indicator string.

chrome/browser/chromeos/input_method/input_method_util_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/input_method/input_method_util.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 48 matching lines @@
   virtual void SetUp() OVERRIDE {
     InputMethodDescriptors input_methods;
 
     std::vector<std::string> layouts;
     std::vector<std::string> languages;
     layouts.push_back("us");
     languages.push_back("zh-CN");
 
     InputMethodDescriptor pinyin_ime(pinyin_ime_id,
                                      "Pinyin input for testing",
+                                     "CN",
                                      layouts,
                                      languages,
                                      false,
                                      GURL(""),
                                      GURL(""));
     input_methods.push_back(pinyin_ime);
 
     languages.clear();
     languages.push_back("zh-TW");
     InputMethodDescriptor zhuyin_ime(zhuyin_ime_id,
                                      "Zhuyin input for testing",
+                                     "TW",
                                      layouts,
                                      languages,
                                      false,
                                      GURL(""),
                                      GURL(""));
     input_methods.push_back(zhuyin_ime);
 
     util_.SetComponentExtensions(input_methods);
   }
 
   InputMethodDescriptor GetDesc(const std::string& id,
                                 const std::string& raw_layout,
-                                const std::string& language_code) {
+                                const std::string& language_code,
+                                const std::string& indicator) {
     std::vector<std::string> layouts;
     layouts.push_back(raw_layout);
     std::vector<std::string> languages;
     languages.push_back(language_code);
     return InputMethodDescriptor(id,
-                                 "",
+                                 "",  // Description.
+                                 indicator,  // Short name used for indicator.
                                  layouts,
                                  languages,
                                  true,
                                  GURL(),  // options page url
                                  GURL());  // input view page url
   }
 
   static base::string16 GetDisplayLanguageName(const std::string& language_code) {
     return l10n_util::GetDisplayNameForLocale(language_code, "en", true);
   }
 
   FakeInputMethodDelegate delegate_;
   InputMethodWhitelist whitelist_;
   TestableInputMethodUtil util_;
 };
 
 TEST_F(InputMethodUtilTest, GetInputMethodShortNameTest) {
   // Test normal cases. Two-letter language code should be returned.
   {
     InputMethodDescriptor desc = GetDesc("m17n:fa:isiri",  // input method id
                                          "us",  // keyboard layout name
-                                         "fa");  // language name
+                                         "fa", // language name
+                                         ""); // indicator
     EXPECT_EQ(ASCIIToUTF16("FA"), util_.GetInputMethodShortName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("mozc-hangul", "us", "ko");
+    InputMethodDescriptor desc = GetDesc("mozc-hangul", "us", "ko", "");
     EXPECT_EQ(base::UTF8ToUTF16("\xed\x95\x9c"),
               util_.GetInputMethodShortName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("invalid-id", "us", "xx");
+    InputMethodDescriptor desc = GetDesc("invalid-id", "us", "xx", "");
     // Upper-case string of the unknown language code, "xx", should be returned.
     EXPECT_EQ(ASCIIToUTF16("XX"), util_.GetInputMethodShortName(desc));
   }
 
   // Test special cases.
   {
-    InputMethodDescriptor desc = GetDesc("xkb:us:dvorak:eng", "us", "en-US");
+    InputMethodDescriptor desc =
+        GetDesc("xkb:us:dvorak:eng", "us", "en-US", "DV");
     EXPECT_EQ(ASCIIToUTF16("DV"), util_.GetInputMethodShortName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("xkb:us:colemak:eng", "us", "en-US");
+    InputMethodDescriptor desc =
+        GetDesc("xkb:us:colemak:eng", "us", "en-US", "CO");
     EXPECT_EQ(ASCIIToUTF16("CO"), util_.GetInputMethodShortName(desc));
   }
   {
     InputMethodDescriptor desc =
-        GetDesc("xkb:us:altgr-intl:eng", "us", "en-US");
+        GetDesc("xkb:us:altgr-intl:eng", "us", "en-US", "EXTD");
     EXPECT_EQ(ASCIIToUTF16("EXTD"), util_.GetInputMethodShortName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("xkb:us:intl:eng", "us", "en-US");
+    InputMethodDescriptor desc =
+        GetDesc("xkb:us:intl:eng", "us", "en-US", "INTL");
     EXPECT_EQ(ASCIIToUTF16("INTL"), util_.GetInputMethodShortName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("xkb:de:neo:ger", "de(neo)", "de");
+    InputMethodDescriptor desc =
+        GetDesc("xkb:de:neo:ger", "de(neo)", "de", "NEO");
     EXPECT_EQ(ASCIIToUTF16("NEO"), util_.GetInputMethodShortName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("xkb:es:cat:cat", "es(cat)", "ca");
+    InputMethodDescriptor desc =
+        GetDesc("xkb:es:cat:cat", "es(cat)", "ca", "CAS");
     EXPECT_EQ(ASCIIToUTF16("CAS"), util_.GetInputMethodShortName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc(pinyin_ime_id, "us", "zh-CN");
+    InputMethodDescriptor desc =
+        GetDesc(pinyin_ime_id, "us", "zh-CN", "");
     EXPECT_EQ(base::UTF8ToUTF16("\xe6\x8b\xbc"),
               util_.GetInputMethodShortName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc(zhuyin_ime_id, "us", "zh-TW");
+    InputMethodDescriptor desc =
+        GetDesc(zhuyin_ime_id, "us", "zh-TW", "");
     EXPECT_EQ(base::UTF8ToUTF16("\xE6\xB3\xA8"),
               util_.GetInputMethodShortName(desc));
   }
 }
 
 TEST_F(InputMethodUtilTest, GetInputMethodMediumNameTest) {
   {
     // input methods with medium name equal to short name
     const char * input_method_id[] = {
       "xkb:us:altgr-intl:eng",
       "xkb:us:dvorak:eng",
       "xkb:us:intl:eng",
       "xkb:us:colemak:eng",
-      "english-m",
       "xkb:de:neo:ger",
       "xkb:es:cat:cat",
       "xkb:gb:dvorak:eng",
     };
     const int len = ARRAYSIZE_UNSAFE(input_method_id);
     for (int i=0; i<len; ++i) {
-      InputMethodDescriptor desc = GetDesc(input_method_id[i], "", "");
+      InputMethodDescriptor desc = GetDesc(input_method_id[i], "", "", "");
       base::string16 medium_name = util_.GetInputMethodMediumName(desc);
       base::string16 short_name = util_.GetInputMethodShortName(desc);
       EXPECT_EQ(medium_name,short_name);
     }
   }
   {
     // input methods with medium name not equal to short name
     const char * input_method_id[] = {
       "m17n:zh:cangjie",
       "m17n:zh:quick",
       pinyin_ime_id,
       zhuyin_ime_id,
       "mozc-hangul",
       pinyin_ime_id,
       pinyin_ime_id,
     };
     const int len = ARRAYSIZE_UNSAFE(input_method_id);
     for (int i=0; i<len; ++i) {
-      InputMethodDescriptor desc = GetDesc(input_method_id[i], "", "");
+      InputMethodDescriptor desc = GetDesc(input_method_id[i], "", "", "");
       base::string16 medium_name = util_.GetInputMethodMediumName(desc);
       base::string16 short_name = util_.GetInputMethodShortName(desc);
       EXPECT_NE(medium_name,short_name);
     }
   }
 }
 
 TEST_F(InputMethodUtilTest, GetInputMethodLongNameTest) {
   // For most languages input method or keyboard layout name is returned.
   // See below for exceptions.
   {
-    InputMethodDescriptor desc = GetDesc("m17n:fa:isiri", "us", "fa");
+    InputMethodDescriptor desc = GetDesc("m17n:fa:isiri", "us", "fa", "");
     EXPECT_EQ(ASCIIToUTF16("Persian input method (ISIRI 2901 layout)"),
               util_.GetInputMethodLongName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("mozc-hangul", "us", "ko");
+    InputMethodDescriptor desc = GetDesc("mozc-hangul", "us", "ko", "");
     EXPECT_EQ(ASCIIToUTF16("Korean input method"),
               util_.GetInputMethodLongName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("m17n:vi:tcvn", "us", "vi");
+    InputMethodDescriptor desc = GetDesc("m17n:vi:tcvn", "us", "vi", "");
     EXPECT_EQ(ASCIIToUTF16("Vietnamese input method (TCVN6064)"),
               util_.GetInputMethodLongName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("xkb:jp::jpn", "jp", "ja");
+    InputMethodDescriptor desc = GetDesc("xkb:jp::jpn", "jp", "ja", "");
     EXPECT_EQ(ASCIIToUTF16("Japanese keyboard"),
               util_.GetInputMethodLongName(desc));
   }
   {
     InputMethodDescriptor desc =
-        GetDesc("xkb:us:dvorak:eng", "us(dvorak)", "en-US");
+        GetDesc("xkb:us:dvorak:eng", "us(dvorak)", "en-US", "");
     EXPECT_EQ(ASCIIToUTF16("US Dvorak keyboard"),
               util_.GetInputMethodLongName(desc));
   }
   {
     InputMethodDescriptor desc =
-        GetDesc("xkb:gb:dvorak:eng", "gb(dvorak)", "en-US");
+        GetDesc("xkb:gb:dvorak:eng", "gb(dvorak)", "en-US", "");
     EXPECT_EQ(ASCIIToUTF16("UK Dvorak keyboard"),
               util_.GetInputMethodLongName(desc));
   }
 
   // For Arabic, Dutch, French, German and Hindi,
   // "language - keyboard layout" pair is returned.
   {
-    InputMethodDescriptor desc = GetDesc("m17n:ar:kbd", "us", "ar");
+    InputMethodDescriptor desc = GetDesc("m17n:ar:kbd", "us", "ar", "");
     EXPECT_EQ(ASCIIToUTF16("Arabic - Standard input method"),
               util_.GetInputMethodLongName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("xkb:be::nld", "be", "nl");
+    InputMethodDescriptor desc = GetDesc("xkb:be::nld", "be", "nl", "");
     EXPECT_EQ(ASCIIToUTF16("Dutch - Belgian keyboard"),
               util_.GetInputMethodLongName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("xkb:fr::fra", "fr", "fr");
+    InputMethodDescriptor desc = GetDesc("xkb:fr::fra", "fr", "fr", "");
     EXPECT_EQ(ASCIIToUTF16("French - French keyboard"),
               util_.GetInputMethodLongName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("xkb:be::fra", "be", "fr");
+    InputMethodDescriptor desc = GetDesc("xkb:be::fra", "be", "fr", "");
     EXPECT_EQ(ASCIIToUTF16("French - Belgian keyboard"),
               util_.GetInputMethodLongName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("xkb:de::ger", "de", "de");
+    InputMethodDescriptor desc = GetDesc("xkb:de::ger", "de", "de", "");
     EXPECT_EQ(ASCIIToUTF16("German - German keyboard"),
               util_.GetInputMethodLongName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("xkb:be::ger", "be", "de");
+    InputMethodDescriptor desc = GetDesc("xkb:be::ger", "be", "de", "");
     EXPECT_EQ(ASCIIToUTF16("German - Belgian keyboard"),
               util_.GetInputMethodLongName(desc));
   }
   {
-    InputMethodDescriptor desc = GetDesc("m17n:hi:itrans", "us", "hi");
+    InputMethodDescriptor desc = GetDesc("m17n:hi:itrans", "us", "hi", "");
     EXPECT_EQ(ASCIIToUTF16("Hindi - Standard input method"),
               util_.GetInputMethodLongName(desc));
   }
 
   {
-    InputMethodDescriptor desc = GetDesc("invalid-id", "us", "xx");
+    InputMethodDescriptor desc = GetDesc("invalid-id", "us", "xx", "");
     // You can safely ignore the "Resouce ID is not found for: invalid-id"
     // error.
     EXPECT_EQ(ASCIIToUTF16("invalid-id"),
               util_.GetInputMethodLongName(desc));
   }
 }
 
 TEST_F(InputMethodUtilTest, TestIsValidInputMethodId) {
   EXPECT_TRUE(util_.IsValidInputMethodId("xkb:us:colemak:eng"));
   EXPECT_TRUE(util_.IsValidInputMethodId(pinyin_ime_id));
@@ skipping 180 matching lines @@
     EXPECT_FALSE(display_name.empty())
         << "Invalid language code " << language_code;
     // On error, GetDisplayNameForLocale() returns the |language_code| as-is.
     EXPECT_NE(language_code, base::UTF16ToUTF8(display_name))
         << "Invalid language code " << language_code;
   }
 }
 
 }  // namespace input_method
 }  // namespace chromeos