Remove @KnownFailure tags for tests that pass.
Also cleanup tests.api.java.io.SerializationStressTest4#test_writeObject_Proxy
diff --git a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBuffer2Test.java b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBuffer2Test.java
index 8b03ced..6bc1939 100644
--- a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBuffer2Test.java
+++ b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBuffer2Test.java
@@ -414,7 +414,6 @@
method = "ensureCapacity",
args = {int.class}
)
- @KnownFailure("Google TODO 1481226")
public void test_ensureCapacityI() {
// Test for method void java.lang.StringBuffer.ensureCapacity(int)
StringBuffer sb = new StringBuffer(10);
diff --git a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.java b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.java
index b979628..b91ad5f 100644
--- a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.java
+++ b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.java
@@ -324,7 +324,6 @@
method = "!SerializationGolden",
args = {}
)
- @KnownFailure("Problem with deserialization of Localhost vs. localhost")
public void testSerializationCompatibility() throws Exception {
Object[] testCases = {
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 9b589c5..3b1a063 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
@@ -44,6 +44,7 @@
import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
+import java.util.Collections;
import tests.support.Support_Configuration;
import tests.support.Support_Proxy_I1;
@@ -2666,50 +2667,27 @@
method = "!Serialization",
args = {}
)
- @KnownFailure("Proxy support broken when user classloader involved")
- public void test_writeObject_Proxy() {
- // Test for method void
- // java.io.ObjectOutputStream.writeObject(java.security.GuardedObject)
+ public void test_writeObject_Proxy()
+ throws ClassNotFoundException, IOException {
- Object objToSave = null;
- Object objLoaded = null;
+ // serialize class
+ Class<?> proxyClass = Proxy.getProxyClass(Support_Proxy_I1.class
+ .getClassLoader(), new Class[]{Support_Proxy_I1.class});
+ Class<?> proxyClassOut = (Class<?>) dumpAndReload(proxyClass);
- try {
- objToSave = Proxy.getProxyClass(Support_Proxy_I1.class
- .getClassLoader(), new Class[] { Support_Proxy_I1.class });
- if (DEBUG)
- System.out.println("Obj = " + objToSave);
- objLoaded = dumpAndReload(objToSave);
+ assertTrue(Proxy.isProxyClass(proxyClassOut));
+ assertEquals(Collections.<Class>singletonList(Support_Proxy_I1.class),
+ Arrays.asList(proxyClassOut.getInterfaces()));
- assertTrue(MSG_TEST_FAILED + "not a proxy class", Proxy
- .isProxyClass((Class) objLoaded));
- Class[] interfaces = ((Class) objLoaded).getInterfaces();
- assertTrue(MSG_TEST_FAILED + "wrong interfaces length",
- interfaces.length == 1);
- assertTrue(MSG_TEST_FAILED + "wrong interface",
- interfaces[0] == Support_Proxy_I1.class);
+ // serialize instance
+ InvocationHandler handler = new MyInvocationHandler();
+ Object proxyInstance = Proxy.newProxyInstance(Support_Proxy_I1.class
+ .getClassLoader(), new Class[] { Support_Proxy_I1.class },
+ handler);
- InvocationHandler handler = new MyInvocationHandler();
- objToSave = Proxy.newProxyInstance(Support_Proxy_I1.class
- .getClassLoader(), new Class[] { Support_Proxy_I1.class },
- handler);
- if (DEBUG)
- System.out.println("Obj = " + objToSave);
- objLoaded = dumpAndReload(objToSave);
-
- boolean equals = Proxy.getInvocationHandler(objLoaded).getClass() == MyInvocationHandler.class;
- assertTrue(MSG_TEST_FAILED + objToSave, equals);
-
- } catch (IOException e) {
- fail("Exception serializing " + objToSave + " : " + e.getMessage());
- } catch (ClassNotFoundException e) {
- fail("ClassNotFoundException reading Object type: "
- + e.getMessage());
- } catch (Error err) {
- System.out.println("Error when obj = " + objToSave);
- // err.printStackTrace();
- throw err;
- }
+ Object proxyInstanceOut = dumpAndReload(proxyInstance);
+ assertEquals(MyInvocationHandler.class,
+ Proxy.getInvocationHandler(proxyInstanceOut).getClass());
}
@TestTargetNew(
diff --git a/libcore/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java b/libcore/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java
index c515d20..292c2f1 100644
--- a/libcore/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java
+++ b/libcore/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java
@@ -278,7 +278,6 @@
method = "parse",
args = {java.io.File.class}
)
- @KnownFailure("d.getChildNodes returns an unexpected/strange #Text node")
public void test_parseLjava_io_File() throws IOException {
File f = resourceToTmpFile("/simple.xml");
