From affecd7714e14fabff011ad61d436df3698bf7eb Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Thu, 13 Aug 2009 21:37:47 -0700 Subject: [PATCH] Cleanup CTS core failing tests. BUG 2053939 --- libcore/luni/src/test/java/tests/api/java/io/FileTest.java | 3 ++- .../luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java | 4 +++- .../luni/src/test/java/tests/api/java/net/MulticastSocketTest.java | 1 - .../src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java | 2 -- 4 files changed, 5 insertions(+), 5 deletions(-) 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 b35e85f28..bde5766a5 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 @@ -691,7 +691,8 @@ public class FileTest extends junit.framework.TestCase { level = TestLevel.PARTIAL_COMPLETE, method = "delete", args = {} - ) + ) + @KnownFailure("Non empty directories are deleted on Android.") public void test_delete() { // Test for method boolean java.io.File.delete() try { 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 3f5fc68bf..cd17907c9 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; @@ -423,7 +424,8 @@ public class OutputStreamWriterTest extends TestCase { 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 f6957e228..86e298c17 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 @@ -531,7 +531,6 @@ public class MulticastSocketTest extends SocketTestCase { 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 bdb9bb112..3c1fb2e2f 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 @@ public class SSLServerSocketTest extends TestCase { args = {} ) }) - @KnownFailure("Wrong check in SSLServerSocket. Has been fixed in Donutburger") public void test_EnabledProtocols() throws Exception { SSLServerSocket sss = getSSLServerSocket(); try { -- 2.11.0