1 files changed, 115 insertions, 115 deletions
diff --git a/java/test/com/android/i18n/addressinput/UtilTest.java b/java/test/com/android/i18n/addressinput/UtilTest.java
index d552062..73a7956 100644
--- a/java/test/com/android/i18n/addressinput/UtilTest.java
+++ b/java/test/com/android/i18n/addressinput/UtilTest.java
@@ -26,129 +26,129 @@ import java.util.Map;
  */
 public class UtilTest extends TestCase {
 
-    public void testIsExplicitLatinScript() throws Exception {
-        // Should recognise Latin script in a variety of forms.
-        assertTrue(Util.isExplicitLatinScript("zh-Latn"));
-        assertTrue(Util.isExplicitLatinScript("ja_LATN"));
-        assertTrue(Util.isExplicitLatinScript("und_LATN"));
-        assertTrue(Util.isExplicitLatinScript("ja_LATN-JP"));
-        assertTrue(Util.isExplicitLatinScript("ko-latn_JP"));
-    }
+  public void testIsExplicitLatinScript() throws Exception {
+    // Should recognise Latin script in a variety of forms.
+    assertTrue(Util.isExplicitLatinScript("zh-Latn"));
+    assertTrue(Util.isExplicitLatinScript("ja_LATN"));
+    assertTrue(Util.isExplicitLatinScript("und_LATN"));
+    assertTrue(Util.isExplicitLatinScript("ja_LATN-JP"));
+    assertTrue(Util.isExplicitLatinScript("ko-latn_JP"));
+  }
 
-    public void testIsExplicitLatinScriptNonLatin() throws Exception {
-        assertFalse(Util.isExplicitLatinScript("ko"));
-        assertFalse(Util.isExplicitLatinScript("KO"));
-        assertFalse(Util.isExplicitLatinScript("ja"));
-        assertFalse(Util.isExplicitLatinScript("ja-JP"));
-        assertFalse(Util.isExplicitLatinScript("zh-Hans"));
-        assertFalse(Util.isExplicitLatinScript("zh-Hans-CN"));
-        assertFalse(Util.isExplicitLatinScript("zh-Hant"));
-        assertFalse(Util.isExplicitLatinScript("zh-TW"));
-        assertFalse(Util.isExplicitLatinScript("zh_TW"));
-        assertFalse(Util.isExplicitLatinScript("ko"));
-        assertFalse(Util.isExplicitLatinScript("ko_KR"));
-        assertFalse(Util.isExplicitLatinScript("en"));
-        assertFalse(Util.isExplicitLatinScript("EN"));
-        assertFalse(Util.isExplicitLatinScript("ru"));
-    }
+  public void testIsExplicitLatinScriptNonLatin() throws Exception {
+    assertFalse(Util.isExplicitLatinScript("ko"));
+    assertFalse(Util.isExplicitLatinScript("KO"));
+    assertFalse(Util.isExplicitLatinScript("ja"));
+    assertFalse(Util.isExplicitLatinScript("ja-JP"));
+    assertFalse(Util.isExplicitLatinScript("zh-Hans"));
+    assertFalse(Util.isExplicitLatinScript("zh-Hans-CN"));
+    assertFalse(Util.isExplicitLatinScript("zh-Hant"));
+    assertFalse(Util.isExplicitLatinScript("zh-TW"));
+    assertFalse(Util.isExplicitLatinScript("zh_TW"));
+    assertFalse(Util.isExplicitLatinScript("ko"));
+    assertFalse(Util.isExplicitLatinScript("ko_KR"));
+    assertFalse(Util.isExplicitLatinScript("en"));
+    assertFalse(Util.isExplicitLatinScript("EN"));
+    assertFalse(Util.isExplicitLatinScript("ru"));
+  }
 
-    public void testGetLanguageSubtag() throws Exception {
-        assertEquals("zh", Util.getLanguageSubtag("zh-Latn"));
-        assertEquals("ja", Util.getLanguageSubtag("ja_LATN"));
-        assertEquals("und", Util.getLanguageSubtag("und_LATN"));
-        assertEquals("ja", Util.getLanguageSubtag("ja_LATN-JP"));
-        assertEquals("ko", Util.getLanguageSubtag("ko"));
-        assertEquals("ko", Util.getLanguageSubtag("KO"));
-        assertEquals("ko", Util.getLanguageSubtag("ko-KR"));
-        assertEquals("ko", Util.getLanguageSubtag("ko_kr"));
-        assertEquals("und", Util.getLanguageSubtag("Not a language"));
-    }
+  public void testGetLanguageSubtag() throws Exception {
+    assertEquals("zh", Util.getLanguageSubtag("zh-Latn"));
+    assertEquals("ja", Util.getLanguageSubtag("ja_LATN"));
+    assertEquals("und", Util.getLanguageSubtag("und_LATN"));
+    assertEquals("ja", Util.getLanguageSubtag("ja_LATN-JP"));
+    assertEquals("ko", Util.getLanguageSubtag("ko"));
+    assertEquals("ko", Util.getLanguageSubtag("KO"));
+    assertEquals("ko", Util.getLanguageSubtag("ko-KR"));
+    assertEquals("ko", Util.getLanguageSubtag("ko_kr"));
+    assertEquals("und", Util.getLanguageSubtag("Not a language"));
+  }
 
-    public void testTrimToNull() throws Exception {
-        assertEquals("Trimmed String", Util.trimToNull("  Trimmed String   "));
-        assertEquals("Trimmed String", Util.trimToNull("  Trimmed String"));
-        assertEquals("Trimmed String", Util.trimToNull("Trimmed String"));
-        assertEquals(null, Util.trimToNull("  "));
-        assertEquals(null, Util.trimToNull(null));
-    }
+  public void testTrimToNull() throws Exception {
+    assertEquals("Trimmed String", Util.trimToNull("  Trimmed String   "));
+    assertEquals("Trimmed String", Util.trimToNull("  Trimmed String"));
+    assertEquals("Trimmed String", Util.trimToNull("Trimmed String"));
+    assertEquals(null, Util.trimToNull("  "));
+    assertEquals(null, Util.trimToNull(null));
+  }
 
-    public void testJoinAndSkipNulls() throws Exception {
-        String first = "String 1";
-        String second = "String 2";
-        String expectedString = "String 1-String 2";
-        String nullString = null;
-        assertEquals(expectedString, Util.joinAndSkipNulls("-", first, second));
-        assertEquals(expectedString, Util.joinAndSkipNulls("-", first, second, nullString));
-        assertEquals(expectedString, Util.joinAndSkipNulls("-", first, nullString, second));
-        assertEquals(expectedString, Util.joinAndSkipNulls("-", first, nullString, " ", second));
-        assertEquals(first, Util.joinAndSkipNulls("-", first, nullString));
-        assertEquals(first, Util.joinAndSkipNulls("-", nullString, first));
+  public void testJoinAndSkipNulls() throws Exception {
+    String first = "String 1";
+    String second = "String 2";
+    String expectedString = "String 1-String 2";
+    String nullString = null;
+    assertEquals(expectedString, Util.joinAndSkipNulls("-", first, second));
+    assertEquals(expectedString, Util.joinAndSkipNulls("-", first, second, nullString));
+    assertEquals(expectedString, Util.joinAndSkipNulls("-", first, nullString, second));
+    assertEquals(expectedString, Util.joinAndSkipNulls("-", first, nullString, " ", second));
+    assertEquals(first, Util.joinAndSkipNulls("-", first, nullString));
+    assertEquals(first, Util.joinAndSkipNulls("-", nullString, first));
 
-        assertEquals(null, Util.joinAndSkipNulls("-", nullString));
-        assertEquals(null, Util.joinAndSkipNulls("-", nullString, nullString));
-        assertEquals(null, Util.joinAndSkipNulls("-", nullString, "", nullString));
-    }
+    assertEquals(null, Util.joinAndSkipNulls("-", nullString));
+    assertEquals(null, Util.joinAndSkipNulls("-", nullString, nullString));
+    assertEquals(null, Util.joinAndSkipNulls("-", nullString, "", nullString));
+  }
 
-    public void testGetWidgetCompatibleLanguageCodeCjkCountry() throws Exception {
-        Locale canadianFrench = new Locale("fr", "CA");
-        // Latin language, CJK country. Need explicit Latin tag, and country should be retained.
-        assertEquals("fr_latn_CA", Util.getWidgetCompatibleLanguageCode(canadianFrench, "CN"));
-        Locale canadianFrenchUpper = new Locale("FR", "CA");
-        // Test that the locale returns the same language code, regardless of the case of the
-        // initial input.
-        assertEquals("fr_latn_CA", Util.getWidgetCompatibleLanguageCode(canadianFrenchUpper, "CN"));
-        // No country in the Locale language.
-        assertEquals("fr_latn", Util.getWidgetCompatibleLanguageCode(Locale.FRENCH, "CN"));
-        // CJK language - but wrong country.
-        assertEquals("ko_latn",
-                     Util.getWidgetCompatibleLanguageCode(Locale.KOREAN, "CN"));
-        Locale chineseChina = new Locale("zh", "CN");
-        assertEquals("zh_CN", Util.getWidgetCompatibleLanguageCode(chineseChina, "CN"));
-    }
+  public void testGetWidgetCompatibleLanguageCodeCjkCountry() throws Exception {
+    Locale canadianFrench = new Locale("fr", "CA");
+    // Latin language, CJK country. Need explicit Latin tag, and country should be retained.
+    assertEquals("fr_latn_CA", Util.getWidgetCompatibleLanguageCode(canadianFrench, "CN"));
+    Locale canadianFrenchUpper = new Locale("FR", "CA");
+    // Test that the locale returns the same language code, regardless of the case of the
+    // initial input.
+    assertEquals("fr_latn_CA", Util.getWidgetCompatibleLanguageCode(canadianFrenchUpper, "CN"));
+    // No country in the Locale language.
+    assertEquals("fr_latn", Util.getWidgetCompatibleLanguageCode(Locale.FRENCH, "CN"));
+    // CJK language - but wrong country.
+    assertEquals("ko_latn",
+        Util.getWidgetCompatibleLanguageCode(Locale.KOREAN, "CN"));
+    Locale chineseChina = new Locale("zh", "CN");
+    assertEquals("zh_CN", Util.getWidgetCompatibleLanguageCode(chineseChina, "CN"));
+  }
 
-    public void testGetWidgetCompatibleLanguageCodeThailand() throws Exception {
-      Locale thai = new Locale("th", "TH");
-      assertEquals("th_TH", Util.getWidgetCompatibleLanguageCode(thai, "TH"));
-      // However, we assume Thai users prefer Latin names for China.
-      assertEquals("th_latn_TH", Util.getWidgetCompatibleLanguageCode(thai, "CN"));
-    }
+  public void testGetWidgetCompatibleLanguageCodeThailand() throws Exception {
+    Locale thai = new Locale("th", "TH");
+    assertEquals("th_TH", Util.getWidgetCompatibleLanguageCode(thai, "TH"));
+    // However, we assume Thai users prefer Latin names for China.
+    assertEquals("th_latn_TH", Util.getWidgetCompatibleLanguageCode(thai, "CN"));
+  }
 
-    public void testGetWidgetCompatibleLanguageCodeNonCjkCountry() throws Exception {
-        // Nothing should be changed for non-CJK countries, since their form layout is the same
-        // regardless of language.
-        Locale canadianFrench = new Locale("fr", "CA");
-        assertEquals("fr_CA", Util.getWidgetCompatibleLanguageCode(canadianFrench, "US"));
-        // No country in the Locale language.
-        assertEquals(Locale.FRENCH.toString(),
-                     Util.getWidgetCompatibleLanguageCode(Locale.FRENCH, "US"));
-        // CJK language - should be unaltered too.
-        assertEquals(Locale.KOREAN.toString(),
-                     Util.getWidgetCompatibleLanguageCode(Locale.KOREAN, "US"));
-    }
+  public void testGetWidgetCompatibleLanguageCodeNonCjkCountry() throws Exception {
+    // Nothing should be changed for non-CJK countries, since their form layout is the same
+    // regardless of language.
+    Locale canadianFrench = new Locale("fr", "CA");
+    assertEquals("fr_CA", Util.getWidgetCompatibleLanguageCode(canadianFrench, "US"));
+    // No country in the Locale language.
+    assertEquals(Locale.FRENCH.toString(),
+        Util.getWidgetCompatibleLanguageCode(Locale.FRENCH, "US"));
+    // CJK language - should be unaltered too.
+    assertEquals(Locale.KOREAN.toString(),
+        Util.getWidgetCompatibleLanguageCode(Locale.KOREAN, "US"));
+  }
 
-    public void testBuildNameToKeyMap() throws Exception {
-        String names[] = {"", "", "", "", "NEW PROVIDENCE" };
-        // We have one more key than name here.
-        String keys[] = {"AB", "AC", "AD", "AE", "NP", "XX"};
-        Map<String, String> result = Util.buildNameToKeyMap(keys, names, null);
-        // We should have the six keys, and the one name, in the end result. No empty-string names
-        // should be present.
-        assertEquals(keys.length + 1, result.size());
-        // The empty string should not be present.
-        assertFalse(result.containsKey(""));
+  public void testBuildNameToKeyMap() throws Exception {
+    String names[] = {"", "", "", "", "NEW PROVIDENCE" };
+    // We have one more key than name here.
+    String keys[] = {"AB", "AC", "AD", "AE", "NP", "XX"};
+    Map<String, String> result = Util.buildNameToKeyMap(keys, names, null);
+    // We should have the six keys, and the one name, in the end result. No empty-string names
+    // should be present.
+    assertEquals(keys.length + 1, result.size());
+    // The empty string should not be present.
+    assertFalse(result.containsKey(""));
 
-        // Try with Latin names instead.
-        Map<String, String> resultWithLatin = Util.buildNameToKeyMap(keys, null, names);
-        // We should have the six keys and the one Latin-script name in the end result.
-        assertEquals(keys.length + 1, resultWithLatin.size());
-        String lnames[] = { "Other name" };
-        resultWithLatin = Util.buildNameToKeyMap(keys, names, lnames);
-        // We should have the keys, plus the names in lnames and names.
-        assertEquals(keys.length + 2, resultWithLatin.size());
-        assertTrue(resultWithLatin.containsKey("other name"));
-        assertTrue(resultWithLatin.containsKey("new providence"));
-        assertTrue(resultWithLatin.containsKey("xx"));
-        // The empty string should not be present.
-        assertFalse(resultWithLatin.containsKey(""));
-    }
+    // Try with Latin names instead.
+    Map<String, String> resultWithLatin = Util.buildNameToKeyMap(keys, null, names);
+    // We should have the six keys and the one Latin-script name in the end result.
+    assertEquals(keys.length + 1, resultWithLatin.size());
+    String lnames[] = { "Other name" };
+    resultWithLatin = Util.buildNameToKeyMap(keys, names, lnames);
+    // We should have the keys, plus the names in lnames and names.
+    assertEquals(keys.length + 2, resultWithLatin.size());
+    assertTrue(resultWithLatin.containsKey("other name"));
+    assertTrue(resultWithLatin.containsKey("new providence"));
+    assertTrue(resultWithLatin.containsKey("xx"));
+    // The empty string should not be present.
+    assertFalse(resultWithLatin.containsKey(""));
+  }
 }