Remove more @KnownFailures now I've run tests.AllTests.
A lunchtime run of the full suite turned up more.
diff --git a/libcore/luni/src/test/java/tests/api/java/io/PrintStreamTest.java b/libcore/luni/src/test/java/tests/api/java/io/PrintStreamTest.java
index 2ec5feb..a249b38 100644
--- a/libcore/luni/src/test/java/tests/api/java/io/PrintStreamTest.java
+++ b/libcore/luni/src/test/java/tests/api/java/io/PrintStreamTest.java
@@ -987,7 +987,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_Locale_Ljava_lang_String_$Ljava_lang_Object() {
PrintStream tobj;
@@ -1100,7 +1099,6 @@
method = "printf",
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_printfLjava_util_Locale_Ljava_lang_String_$Ljava_lang_Object() {
PrintStream tobj;
diff --git a/libcore/luni/src/test/java/tests/api/java/io/PrintWriterTest.java b/libcore/luni/src/test/java/tests/api/java/io/PrintWriterTest.java
index c275525..0c17a73 100644
--- a/libcore/luni/src/test/java/tests/api/java/io/PrintWriterTest.java
+++ b/libcore/luni/src/test/java/tests/api/java/io/PrintWriterTest.java
@@ -1107,7 +1107,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_Locale_Ljava_lang_String_$Ljava_lang_Object() {
PrintWriter tobj;
@@ -1219,7 +1218,6 @@
method = "printf",
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_printfLjava_util_Locale_Ljava_lang_String_$Ljava_lang_Object() {
PrintWriter tobj;
diff --git a/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java b/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java
index e7609a8..e636a07 100644
--- a/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java
+++ b/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java
@@ -182,7 +182,6 @@
method = "getAvailableLocales",
args = {}
)
- @KnownFailure("German locales were removed last minute in cupcake")
public void test_getAvailableLocales() {
Locale[] locales = DateFormat.getAvailableLocales();
assertTrue("No locales", locales.length > 0);
diff --git a/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java b/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
index 47107cd..542ad7f 100644
--- a/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
+++ b/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
@@ -146,7 +146,6 @@
method = "getCurrency",
args = {}
)
- @KnownFailure("some locales were removed last minute in cupcake")
public void test_getCurrency() {
Currency currency = Currency.getInstance("USD");
assertEquals("Returned incorrect currency",
diff --git a/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java b/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
index 2b8c267..edab40b 100644
--- a/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
+++ b/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
@@ -1830,7 +1830,6 @@
method = "formatToCharacterIterator",
args = {java.lang.Object.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_formatToCharacterIteratorLjava_lang_Object() {
try {
@@ -2461,7 +2460,6 @@
method = "!SerializationGolden",
args = {}
)
- @KnownFailure("a regression. This didn't fail before")
public void test_serializationHarmonyRICompatible() throws Exception {
NumberFormat nf = NumberFormat.getInstance(Locale.FRANCE);
diff --git a/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatTest.java b/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatTest.java
index 0480704..d1246d3 100644
--- a/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatTest.java
+++ b/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatTest.java
@@ -143,7 +143,6 @@
method = "getIntegerInstance",
args = {java.util.Locale.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getIntegerInstanceLjava_util_Locale()
throws ParseException {
// Test for method java.text.NumberFormat
@@ -319,7 +318,6 @@
method = "parseObject",
args = {java.lang.String.class, java.text.ParsePosition.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_parseObjectLjava_lang_StringLjava_text_ParsePosition() {
// regression test for HARMONY-1003
assertNull(NumberFormat.getInstance().parseObject("0",
@@ -452,7 +450,6 @@
method = "format",
args = {double.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_formatLdouble() {
// BEGIN android-changed
NumberFormat nf1 = NumberFormat.getInstance(Locale.US);
@@ -492,7 +489,6 @@
method = "format",
args = {long.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_formatLlong() {
// BEGIN android-changed
NumberFormat nf1 = NumberFormat.getInstance(Locale.US);
@@ -591,7 +587,6 @@
method = "getCurrencyInstance",
args = {java.util.Locale.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getCurrencyInstanceLjava_util_Locale() {
// BEGIN android-changed
Locale usLocale = Locale.US;
@@ -693,7 +688,6 @@
method = "getInstance",
args = {java.util.Locale.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getInstanceLjava_util_Locale() {
// BEGIN android-changed
Locale.setDefault(Locale.US);
@@ -770,7 +764,6 @@
method = "getNumberInstance",
args = {java.util.Locale.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getNumberInstanceLjava_util_Locale() {
// BEGIN android-changed
Locale.setDefault(Locale.US);
@@ -849,7 +842,6 @@
method = "getPercentInstance",
args = {java.util.Locale.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_getPercentInstanceLjava_util_Locale() {
Locale.setDefault(Locale.US);
NumberFormat format = NumberFormat.getPercentInstance(new Locale("cs",
@@ -1061,7 +1053,6 @@
method = "setGroupingUsed",
args = {boolean.class}
)
- @KnownFailure("Some locales were removed last minute in cupcake")
public void test_setGroupingUsed() {
NumberFormat nf1 = NumberFormat.getInstance(Locale.US);
nf1.setGroupingUsed(false);
