Merge "Enable SecureClassLoaderTest#testNullParent"
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt
index f246a6d..b128717 100644
--- a/expectations/knownfailures.txt
+++ b/expectations/knownfailures.txt
@@ -100,11 +100,6 @@
name: "org.apache.harmony.security.tests.java.security.SignatureTest#testUpdatebyteArrayintint2"
},
{
- description: "Android doesn't allow null parent.",
- result: EXEC_FAILED,
- name: "tests.java.security.SecureClassLoaderTest#testNullParent"
-},
-{
description: "not supported",
result: EXEC_FAILED,
names: [
diff --git a/luni/src/test/java/tests/java/security/SecureClassLoaderTest.java b/luni/src/test/java/tests/java/security/SecureClassLoaderTest.java
index cb38d8d..c88ff50 100644
--- a/luni/src/test/java/tests/java/security/SecureClassLoaderTest.java
+++ b/luni/src/test/java/tests/java/security/SecureClassLoaderTest.java
@@ -22,15 +22,12 @@
package tests.java.security;
-import dalvik.annotation.KnownFailure;
-
import junit.framework.TestCase;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.ByteBuffer;
import java.security.CodeSource;
-import java.security.Permission;
import java.security.PermissionCollection;
import java.security.ProtectionDomain;
import java.security.SecureClassLoader;
@@ -181,7 +178,6 @@
} catch (UnsupportedOperationException e) {}
}
- @KnownFailure("Android doesn't allow null parent.")
public void testNullParent() {
try {
new MyClassLoader(null);