Remove @KnownFailure from a bunch of tests that now pass.
Looks like we got some of our Locales back.
diff --git a/luni/src/test/java/tests/api/java/util/CalendarTest.java b/luni/src/test/java/tests/api/java/util/CalendarTest.java
index af43096..285fa56 100644
--- a/luni/src/test/java/tests/api/java/util/CalendarTest.java
+++ b/luni/src/test/java/tests/api/java/util/CalendarTest.java
@@ -900,7 +900,6 @@
args = {}
)
})
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getFirstDayOfWeek() {
Calendar cal = Calendar.getInstance();
@@ -917,7 +916,6 @@
method = "getInstance",
args = {java.util.Locale.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getInstanceLjava_util_Locale() {
Calendar cal1 = Calendar.getInstance(Locale.FRANCE);
Locale.setDefault(Locale.FRANCE);
@@ -946,7 +944,6 @@
method = "getInstance",
args = {java.util.TimeZone.class, java.util.Locale.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getInstanceLjava_util_TimeZoneLjava_util_Locale() {
Calendar cal1 = Calendar.getInstance(TimeZone.getTimeZone("GMT-6"), Locale.FRANCE);
Locale.setDefault(Locale.FRANCE);
@@ -965,7 +962,6 @@
method = "getMinimalDaysInFirstWeek",
args = {}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getMinimalDaysInFirstWeek() {
Calendar cal = Calendar.getInstance();
assertTrue(cal.getMinimalDaysInFirstWeek()==1);
@@ -1011,7 +1007,6 @@
method = "hashCode",
args = {}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_hashCode() {
Calendar cal1 = Calendar.getInstance();
Locale.setDefault(Locale.FRANCE);
diff --git a/luni/src/test/java/tests/api/java/util/FormatterTest.java b/luni/src/test/java/tests/api/java/util/FormatterTest.java
index 5a29fdc..94113e1 100644
--- a/luni/src/test/java/tests/api/java/util/FormatterTest.java
+++ b/luni/src/test/java/tests/api/java/util/FormatterTest.java
@@ -1794,7 +1794,6 @@
method = "format",
args = {java.lang.String.class, java.lang.Object[].class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_formatLjava_lang_String$Ljava_lang_Object_ByteShortIntegerLongConversionD() {
final Object[][] triple = {
{ 0, "%d", "0" },
@@ -2059,7 +2058,6 @@
args = {java.lang.String.class, java.lang.Object[].class}
)
@AndroidOnly("ICU data is different from RI data")
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_formatLjava_lang_String$Ljava_lang_Object_DateTimeConversion() {
/*
* Implementation note: For a millisecond date based on Long.MAX_VALUE,
@@ -2837,7 +2835,6 @@
method = "format",
args = {java.lang.String.class, java.lang.Object[].class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_formatLjava_lang_String$LBigInteger() {
final Object[][] tripleD = {
{new BigInteger("123456789012345678901234567890"), "%d", "123456789012345678901234567890"}, //$NON-NLS-2$
@@ -2940,7 +2937,6 @@
method = "format",
args = {java.lang.String.class, java.lang.Object[].class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_formatLjava_lang_String$Ljava_lang_Object_BigIntegerPaddingConversion() {
Formatter f = null;
@@ -4057,7 +4053,6 @@
method = "format",
args = {java.lang.String.class, java.lang.Object[].class}
)
- @KnownFailure("Formatting of BigDecimal lost precission sometimes")
public void test_formatLjava_lang_String$Ljava_lang_Object_BigDecimalConversionE() {
Formatter f = null;
final Object[][] tripleE = {
@@ -4646,7 +4641,6 @@
method = "format",
args = {java.util.Locale.class, java.lang.String.class, java.lang.Object[].class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_formatLjava_util_LocaleLjava_lang_StringLjava_lang_Object() {
Double val = new Double(3.14);
Calendar cal = Calendar.getInstance();
diff --git a/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java b/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
index c5ccde1..6d2ef74 100644
--- a/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
+++ b/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
@@ -148,7 +148,6 @@
method = "GregorianCalendar",
args = {java.util.Locale.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_ConstructorLjava_util_Locale() {
// Test for method java.util.GregorianCalendar(java.util.Locale)
Date date = new Date();
diff --git a/luni/src/test/java/tests/api/java/util/LocaleTest.java b/luni/src/test/java/tests/api/java/util/LocaleTest.java
index d45c5be..01203a3 100644
--- a/luni/src/test/java/tests/api/java/util/LocaleTest.java
+++ b/luni/src/test/java/tests/api/java/util/LocaleTest.java
@@ -258,7 +258,6 @@
method = "getDisplayCountry",
args = {java.util.Locale.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getDisplayCountryLjava_util_Locale() {
// Test for method java.lang.String
// java.util.Locale.getDisplayCountry(java.util.Locale)
@@ -296,7 +295,6 @@
method = "getDisplayLanguage",
args = {java.util.Locale.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getDisplayLanguageLjava_util_Locale() {
// Test for method java.lang.String
// java.util.Locale.getDisplayLanguage(java.util.Locale)
@@ -329,7 +327,6 @@
method = "getDisplayName",
args = {java.util.Locale.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getDisplayNameLjava_util_Locale() {
// Test for method java.lang.String
// java.util.Locale.getDisplayName(java.util.Locale)
@@ -646,5 +643,3 @@
Locale.setDefault(defaultLocale);
}
}
-
-
diff --git a/luni/src/test/java/tests/api/java/util/ScannerTest.java b/luni/src/test/java/tests/api/java/util/ScannerTest.java
index 84f41d6..ce35005 100644
--- a/luni/src/test/java/tests/api/java/util/ScannerTest.java
+++ b/luni/src/test/java/tests/api/java/util/ScannerTest.java
@@ -2146,7 +2146,6 @@
method = "nextShort",
args = {int.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_nextShortI() throws IOException {
s = new Scanner("123 456");
assertEquals(123, s.nextShort(10));
@@ -2304,7 +2303,6 @@
method = "nextShort",
args = {}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_nextShort() throws IOException {
s = new Scanner("123 456");
assertEquals(123, s.nextShort());
@@ -2465,7 +2463,6 @@
method = "nextLong",
args = {int.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_nextLongI() throws IOException {
s = new Scanner("123 456");
assertEquals(123, s.nextLong(10));
@@ -2623,7 +2620,6 @@
method = "nextLong",
args = {}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_nextLong() throws IOException {
s = new Scanner("123 456");
assertEquals(123, s.nextLong());
@@ -4287,7 +4283,6 @@
method = "hasNextShort",
args = {int.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_hasNextShortI() throws IOException {
s = new Scanner("123 456");
assertTrue(s.hasNextShort(10));
@@ -4464,7 +4459,6 @@
method = "hasNextShort",
args = {}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_hasNextShort() throws IOException {
s = new Scanner("123 456");
assertTrue(s.hasNextShort());
@@ -4692,7 +4686,6 @@
method = "hasNextLong",
args = {int.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_hasNextLongI() throws IOException {
s = new Scanner("123 456");
assertTrue(s.hasNextLong(10));
@@ -4910,7 +4903,6 @@
method = "hasNextLong",
args = {}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_hasNextLong() throws IOException {
s = new Scanner("123 456");
assertTrue(s.hasNextLong());
@@ -5097,7 +5089,6 @@
method = "hasNextDouble",
args = {}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_hasNextDouble() throws IOException {
s = new Scanner("123 45\u0666. 123.4 .123 ");
s.useLocale(Locale.ENGLISH);
@@ -5211,7 +5202,6 @@
method = "hasNextBigDecimal",
args = {}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_hasNextBigDecimal() throws IOException {
s = new Scanner("123 45\u0666. 123.4 .123 ");
s.useLocale(Locale.ENGLISH);
@@ -6344,7 +6334,6 @@
method = "nextDouble",
args = {}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_nextDouble() throws IOException {
s = new Scanner("123 45\u0666. 123.4 .123 ");
s.useLocale(Locale.ENGLISH);
@@ -6437,7 +6426,6 @@
method = "nextBigDecimal",
args = {}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_nextBigDecimal() throws IOException {
s = new Scanner("123 45\u0666. 123.4 .123 ");
s.useLocale(Locale.ENGLISH);
diff --git a/luni/src/test/java/tests/api/java/util/TimeZoneTest.java b/luni/src/test/java/tests/api/java/util/TimeZoneTest.java
index 75e9ae3..86f5b9e 100644
--- a/luni/src/test/java/tests/api/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/tests/api/java/util/TimeZoneTest.java
@@ -306,7 +306,6 @@
method = "getDisplayName",
args = {java.util.Locale.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getDisplayNameLjava_util_Locale() {
TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles");
assertEquals("Pacific Standard Time", tz.getDisplayName(new Locale("US")));
@@ -333,7 +332,6 @@
args = {boolean.class, int.class, java.util.Locale.class}
)
@AndroidOnly("fail on RI. See comment below")
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getDisplayNameZILjava_util_Locale() {
TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles");
assertEquals("PST", tz.getDisplayName(false, 0, Locale.US));