Merge "Uncomment some accidentally commented tests."
diff --git a/luni/src/test/java/libcore/java/util/LocaleTest.java b/luni/src/test/java/libcore/java/util/LocaleTest.java
index 9b67025..c6aea9e 100644
--- a/luni/src/test/java/libcore/java/util/LocaleTest.java
+++ b/luni/src/test/java/libcore/java/util/LocaleTest.java
@@ -22,9 +22,14 @@
import java.text.DateFormatSymbols;
import java.text.NumberFormat;
import java.util.Calendar;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.IllformedLocaleException;
import java.util.Locale;
+import java.util.Map;
import java.util.MissingResourceException;
+import java.util.Set;
+import java.util.TreeMap;
public class LocaleTest extends junit.framework.TestCase {
// http://b/2611311; if there's no display language/country/variant, use the raw codes.
@@ -177,7 +182,6 @@
assertEquals("eng", new Locale("en", "CA").getISO3Language());
assertEquals("eng", new Locale("en", "XX").getISO3Language());
}
- /*
public void test_serializeExtensions() {
Map<Character, String> extensions = new TreeMap<Character, String>();
@@ -262,7 +266,6 @@
assertEquals("type1-type1", keywords.get("k1"));
assertEquals("type2", keywords.get("k2"));
}
- */
public void test_Builder_setLanguage() {
Locale.Builder b = new Locale.Builder();