From 3dc6a81182178a8ac9570a7679cf24b6a2665a0b Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Thu, 5 Nov 2009 10:52:02 -0800 Subject: [PATCH] DO NOT MERGE. CTS test cleanup. Mark tests as KnownFailures and BrokenTests. --- .../apache/harmony/logging/tests/java/util/logging/LoggerTest.java | 2 ++ .../test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java | 4 +++- .../org/apache/harmony/luni/tests/java/lang/StrictMathTest.java | 6 ++++-- .../org/apache/harmony/luni/tests/java/net/URLConnectionTest.java | 2 ++ .../luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java | 2 ++ .../src/test/java/tests/api/java/io/SerializationStressTest4.java | 1 + .../luni/src/test/java/tests/api/java/net/MulticastSocketTest.java | 2 ++ .../harmony/nio/tests/java/nio/channels/DatagramChannelTest.java | 2 ++ .../org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java | 1 + 9 files changed, 19 insertions(+), 3 deletions(-) diff --git a/libcore/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java b/libcore/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java index f2bd62d58..8a981bbf8 100644 --- a/libcore/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java +++ b/libcore/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java @@ -37,6 +37,7 @@ import junit.framework.TestCase; import org.apache.harmony.logging.tests.java.util.logging.util.EnvironmentHelper; import tests.util.CallVerificationStack; +import dalvik.annotation.KnownFailure; import dalvik.annotation.SideEffect; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetClass; @@ -4639,6 +4640,7 @@ public class LoggerTest extends TestCase { method = "initHandler", args = {} ) + @KnownFailure(value="bug 2002061O") public void test_initHandler() throws Exception { File logProps = new File(LOGGING_CONFIG_FILE); LogManager lm = LogManager.getLogManager(); diff --git a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java index 02bed3c6a..330e0b505 100644 --- a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java +++ b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java @@ -17,9 +17,10 @@ package org.apache.harmony.luni.tests.java.lang; +import dalvik.annotation.KnownFailure; import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import dalvik.annotation.TestTargetClass; +import dalvik.annotation.TestTargetNew; @TestTargetClass(Math.class) public class MathTest extends junit.framework.TestCase { @@ -1103,6 +1104,7 @@ public class MathTest extends junit.framework.TestCase { method = "tanh", args = {double.class} ) + @KnownFailure(value = "bug 2139334") public void test_tanh_D() { // Test for special situations assertTrue("Should return NaN", Double.isNaN(Math.tanh(Double.NaN))); diff --git a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StrictMathTest.java b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StrictMathTest.java index 137676c18..c6edeb250 100644 --- a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StrictMathTest.java +++ b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StrictMathTest.java @@ -17,10 +17,11 @@ package org.apache.harmony.luni.tests.java.lang; -import dalvik.annotation.TestTargets; +import dalvik.annotation.KnownFailure; import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import dalvik.annotation.TestTargetClass; +import dalvik.annotation.TestTargetNew; +import dalvik.annotation.TestTargets; @TestTargetClass(StrictMath.class) public class StrictMathTest extends junit.framework.TestCase { @@ -1292,6 +1293,7 @@ public class StrictMathTest extends junit.framework.TestCase { method = "tanh", args = {double.class} ) + @KnownFailure(value = "bug 2139334") public void test_tanh_D() { // Test for special situations assertTrue(Double.isNaN(StrictMath.tanh(Double.NaN))); diff --git a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java index 68ccb9160..6077d53aa 100644 --- a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java +++ b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java @@ -17,6 +17,7 @@ package org.apache.harmony.luni.tests.java.net; import dalvik.annotation.BrokenTest; +import dalvik.annotation.KnownFailure; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetClass; import dalvik.annotation.TestTargetNew; @@ -459,6 +460,7 @@ public class URLConnectionTest extends TestCase { } } + @KnownFailure(value="bug 2002061") public void testHttpPostHeaders() throws IOException { String path = "/" + Math.random(); HttpURLConnection connection = (HttpURLConnection) diff --git a/libcore/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java b/libcore/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java index 671bfe919..a6b71ed12 100644 --- a/libcore/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java +++ b/libcore/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.io.PipedInputStream; import java.io.PipedOutputStream; +import dalvik.annotation.BrokenTest; import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetClass; import dalvik.annotation.TestTargetNew; @@ -414,6 +415,7 @@ public class PipedInputStreamTest extends junit.framework.TestCase { method = "receive", args = {int.class} ) + @BrokenTest(value="bug 2002061") public void test_receive() throws IOException { pis = new PipedInputStream(); pos = new PipedOutputStream(); diff --git a/libcore/luni/src/test/java/tests/api/java/io/SerializationStressTest4.java b/libcore/luni/src/test/java/tests/api/java/io/SerializationStressTest4.java index 3b1a063c0..99ea61958 100644 --- a/libcore/luni/src/test/java/tests/api/java/io/SerializationStressTest4.java +++ b/libcore/luni/src/test/java/tests/api/java/io/SerializationStressTest4.java @@ -2667,6 +2667,7 @@ public class SerializationStressTest4 extends SerializationStressTest { method = "!Serialization", args = {} ) + @KnownFailure(value="bug 2188225") public void test_writeObject_Proxy() throws ClassNotFoundException, IOException { 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 14290637d..8c3e7f381 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,6 +536,7 @@ public class MulticastSocketTest extends SocketTestCase { method = "joinGroup", args = {java.net.SocketAddress.class, java.net.NetworkInterface.class} ) + @KnownFailure(value="bug 2155705") public void test_joinGroupLjava_net_SocketAddressLjava_net_NetworkInterface() throws IOException, InterruptedException { // security manager that allows us to check that we only return the @@ -832,6 +833,7 @@ public class MulticastSocketTest extends SocketTestCase { method = "leaveGroup", args = {java.net.SocketAddress.class, java.net.NetworkInterface.class} ) + @KnownFailure(value="bug 2155705") public void test_leaveGroupLjava_net_SocketAddressLjava_net_NetworkInterface() { // security manager that allows us to check that we only return the // addresses that we should diff --git a/libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java b/libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java index 36e008271..8a77b9d62 100644 --- a/libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java +++ b/libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java @@ -17,6 +17,7 @@ package org.apache.harmony.nio.tests.java.nio.channels; +import dalvik.annotation.KnownFailure; import dalvik.annotation.TestTargetNew; import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; @@ -666,6 +667,7 @@ public class DatagramChannelTest extends TestCase { method = "socket", args = {} ) + @KnownFailure(value="bug 2155708") public void testSocket_BasicStatusBeforeConnect() throws SocketException { assertFalse(this.channel1.isConnected());// not connected DatagramSocket s1 = this.channel1.socket(); diff --git a/libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java b/libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java index 68ac6c55b..5552f4fcb 100644 --- a/libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java +++ b/libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java @@ -714,6 +714,7 @@ public class DriverManagerTest extends TestCase { /** * Regression for HARMONY-4303 */ + @KnownFailure(value="bug 2002061") public void test_initClass() throws Exception { String[] arg = new String[1]; arg[0] = "org/apache/harmony/sql/tests/java/sql/TestMainForDriver"; -- 2.11.0