am affecd77: Cleanup CTS core failing tests.

Merge commit 'affecd7714e14fabff011ad61d436df3698bf7eb' into eclair

* commit 'affecd7714e14fabff011ad61d436df3698bf7eb':
  Cleanup CTS core failing tests.
diff --git a/libcore/luni/src/test/java/tests/api/java/io/FileTest.java b/libcore/luni/src/test/java/tests/api/java/io/FileTest.java
index 9f32fef..2850826 100644
--- a/libcore/luni/src/test/java/tests/api/java/io/FileTest.java
+++ b/libcore/luni/src/test/java/tests/api/java/io/FileTest.java
@@ -687,7 +687,8 @@
         level = TestLevel.PARTIAL_COMPLETE,
         method = "delete",
         args = {}
-    )        
+    )
+    @KnownFailure("Non empty directories are deleted on Android.")
     public void test_delete() {
         // this test passes in the emulator, but it fails on the device
 
diff --git a/libcore/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java b/libcore/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java
index 783478a..b745662 100644
--- a/libcore/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java
+++ b/libcore/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java
@@ -17,6 +17,7 @@
 
 package tests.api.java.io;
 
+import dalvik.annotation.KnownFailure;
 import dalvik.annotation.TestTargets;
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetNew;
@@ -424,7 +425,8 @@
                 args = {},
                 clazz = InputStreamReader.class
         )
-    })    
+    })
+    @KnownFailure("Error when reading bytes in UTF-8 expected:<8916> but was:<8907> ")
     public void test_write$C() throws Exception {
         int upper;
         InputStreamReader isr = null;
diff --git a/libcore/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java b/libcore/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java
index 13141f8..997055b 100644
--- a/libcore/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java
+++ b/libcore/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java
@@ -536,7 +536,6 @@
         method = "joinGroup",
         args = {java.net.SocketAddress.class, java.net.NetworkInterface.class}
     )
-    @KnownFailure("Needs investigation")
     public void test_joinGroupLjava_net_SocketAddressLjava_net_NetworkInterface() 
                                     throws IOException, InterruptedException {
         // security manager that allows us to check that we only return the
diff --git a/libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java b/libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
index bdb9bb1..3c1fb2e 100644
--- a/libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
+++ b/libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
@@ -16,7 +16,6 @@
 
 package tests.api.javax.net.ssl;
 
-import dalvik.annotation.KnownFailure;
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargetNew;
@@ -366,7 +365,6 @@
             args = {}
         )
     })
-    @KnownFailure("Wrong check in SSLServerSocket. Has been fixed in Donutburger")
     public void test_EnabledProtocols() throws Exception {
         SSLServerSocket sss = getSSLServerSocket();
         try {