am b6e3df34: Merge "Remove unnecessary test suppression entries"

* commit 'b6e3df34d844a78f807582368faacbde69863869':
  Remove unnecessary test suppression entries

3 files changed, 4 insertions, 717 deletions

diff --git a/expectations/brokentests.txt b/expectations/brokentests.txt
index 9f900a3..bb1c9db 100644
--- a/expectations/brokentests.txt
+++ b/expectations/brokentests.txt
@@ -18,35 +18,13 @@
   bug: 5534202
 },
 {
-  description: "Support digest authentication in HttpURLConnection",
-  name: "libcore.net.http.ParsedHeadersTest#testParseChallengesWithManyParameters",
-  bug: 6156454
-},
-{
-  description: "Without no security manager, we don't care if checkPermission's argument is null",
-  name: "org.apache.harmony.security.tests.java.security.AccessController2Test#test_checkPermission_NullParameter",
-  result: EXEC_FAILED
-},
-{
-  description: "This test and testGetKeepAlive have been failing in our continuous build recently.",
+  description: "This test has been failing in our continuous build recently.",
   names: [
-    "libcore.java.net.URLConnectionTest#testConnectTimeouts",
-    "libcore.java.net.URLConnectionTest#testGetKeepAlive"
+    "libcore.java.net.URLConnectionTest#testConnectTimeouts"
   ],
   bug: 3441111
 },
 {
-  description: "on the RI, writing the two halves of the surrogate pair in separate writes
-          is an error because the CharsetEncoder doesn't remember it's half-way through a
-          surrogate pair across the two calls!",
-  result: EXEC_FAILED,
-  names: [
-    "libcore.java.nio.charset.CharsetEncoderTest#testCharsetEncoderSurrogatesBrokenByDesign_IGNORE_RI",
-    "libcore.java.nio.charset.CharsetEncoderTest#testCharsetEncoderSurrogatesBrokenByDesign_REPLACE_RI",
-    "libcore.java.nio.charset.CharsetEncoderTest#testCharsetEncoderSurrogatesBrokenByDesign_REPORT_RI"
-  ]
-},
-{
   description: "We're retiring the security manager. Unfortunately, tests all over the place
                 need to check that they're secure, so they all fail when we refuse to install
                 a security manager. This suppresses all of these failures.",
@@ -62,544 +40,18 @@
   pattern: ".*\\.java:\\d+: cannot find symbol.*"
 },
 {
-  description: "The RI avoids blocking calls when '\\r' is the last character. We don't
-                bother since that adds complexity to every other read call, and '\\r' as the
-                last character will be diminishingly rare anyway.",
-  result: EXEC_FAILED,
-  name: "java.io.BufferedReader.ReadLine",
-  substring: "java.lang.RuntimeException: Read past limit"
-},
-{
-  description: "The RI avoids blocking calls when '\\r' is the last character. We don't
-                bother since that adds complexity to every other read call, and '\\r' as the
-                last character will be diminishingly rare anyway.",
-  result: EXEC_FAILED,
-  name: "java.io.BufferedReader.Ready",
-  substring: "Hit infinite wait condition"
-},
-{
-  description: "The test is checking that the implementation doesn't read any characters
-                earlier than it absolutely needs to. This is a bogus requirement; streams
-                are allowed to buffer input as necessary.",
-  result: EXEC_FAILED,
-  name: "java.io.StreamTokenizer.Reset",
-  substring: "Test failed: should get token [, but get -1"
-},
-{
-  description: "These tests only pass if the root logger hasn't yet been initialized. They
-                incorrectly assume that resetting the LogManager will clear the root logger's
-                resource bundle; this isn't the case.",
-  result: EXEC_FAILED,
-  name: "org.apache.harmony.logging.tests.java.util.logging.OldLoggerTest#testGetLoggerWithRes_InvalidResourceBundle",
-  substring: "java.lang.IllegalArgumentException: Resource bundle name 'impossible_not_existing' is inconsistent"
-},
-{
-  description: "These tests only pass if the root logger hasn't yet been initialized. They
-                incorrectly assume that resetting the LogManager will clear the root logger's
-                resource bundle; this isn't the case.",
-  result: EXEC_FAILED,
-  name: "org.apache.harmony.logging.tests.java.util.logging.LoggerTest#testGetLogger_Empty",
-  substring: "junit.framework.AssertionFailedError"
-},
-{
-  description: "This tests implementation details",
-  result: UNSUPPORTED,
-  name: "java.util.EnumSet.OneUniverse"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  names: [
-    "com.sun.crypto.provider.Cipher.AES.Test4513830",
-    "com.sun.crypto.provider.Cipher.AES.Test4512704",
-    "com.sun.crypto.provider.Cipher.AES.Test4512524",
-    "com.sun.crypto.provider.Cipher.AES.Test4511676",
-    "com.sun.crypto.provider.Cipher.AES.Test4517355"
-  ],
-  substring: "NoClassDefFoundError: com.sun.crypto.provider.SunJCE"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Cipher.AES.TestISO10126Padding",
-  substring: " java.security.NoSuchProviderException: SunJCE"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Cipher.AES.Test4626070",
-  substring: "NoClassDefFoundError: com.sun.crypto.provider.SunJCE"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  names: [
-    "com.sun.crypto.provider.Cipher.AES.TestShortBuffer",
-    "com.sun.crypto.provider.Cipher.CTS.CTSMode"
-  ],
-  substring: "Provider SunJCE is not available"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  names: [
-    "com.sun.crypto.provider.Cipher.DES.DesAPITest",
-    "com.sun.crypto.provider.Cipher.DES.DoFinalReturnLen",
-    "com.sun.crypto.provider.Cipher.DES.FlushBug"
-  ],
-  substring: "java.lang.NoClassDefFoundError: com.sun.crypto.provider.SunJCE"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Cipher.DES.KeyWrapping",
-  substring: "Provider SunJCE is not available"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  names: [
-    "com.sun.crypto.provider.Cipher.DES.PaddingTest",
-    "com.sun.crypto.provider.Cipher.DES.Sealtest",
-    "com.sun.crypto.provider.Cipher.DES.PerformanceTest"
-  ],
-  substring: "java.lang.NoClassDefFoundError: com.sun.crypto.provider.SunJCE"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  names: [
-    "com.sun.crypto.provider.Cipher.PBE.DecryptWithoutParameters",
-    "com.sun.crypto.provider.Cipher.PBE.PBEInvalidParamsTest"
-  ],
-  substring: "Provider SunJCE is not available"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Cipher.PBE.PBEKeysAlgorithmNames",
-  substring: "java.security.NoSuchProviderException: SunJCE"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  names: [
-    "com.sun.crypto.provider.Cipher.PBE.PBEParametersTest",
-    "com.sun.crypto.provider.Cipher.PBE.PKCS12Oid",
-    "com.sun.crypto.provider.Cipher.UTIL.StrongOrUnlimited",
-    "com.sun.crypto.provider.Cipher.KeyWrap.NISTWrapKAT"
-  ],
-  substring: "Provider SunJCE is not available"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.KeyAgreement.DHGenSecretKey",
-  substring: "java.security.NoSuchProviderException: SunJCE"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  names: [
-    "com.sun.crypto.provider.KeyAgreement.DHGenSharedSecret",
-    "com.sun.crypto.provider.KeyAgreement.DHKeyAgreement3",
-    "com.sun.crypto.provider.KeyAgreement.DHKeyFactory",
-    "com.sun.crypto.provider.KeyAgreement.DHKeyGenSpeed"
-  ],
-  substring: "java.lang.NoClassDefFoundError: com.sun.crypto.provider.SunJCE"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  names: [
-    "com.sun.crypto.provider.KeyAgreement.TestExponentSize",
-    "com.sun.crypto.provider.KeyFactory.TestProviderLeak",
-    "com.sun.crypto.provider.KeyFactory.PBKDF2HmacSHA1FactoryTest"
-  ],
-  substring: "java.security.NoSuchProviderException: SunJCE"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  names: [
-    "com.sun.crypto.provider.KeyGenerator.Test4628062",
-    "com.sun.crypto.provider.KeyGenerator.TestExplicitKeyLength"
-  ],
-  substring: "java.lang.NoClassDefFoundError: com.sun.crypto.provider.SunJCE"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Mac.HmacPBESHA1",
-  substring: "java.security.NoSuchProviderException: SunJCE"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Mac.HmacMD5",
-  substring: "java.lang.NoClassDefFoundError: com.sun.crypto.provider.SunJCE"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Mac.MacClone",
-  substring: "java.security.NoSuchProviderException: SunJCE"
-},
-{
-  description: "Dalvik doesn't include the SunJCE crypto provider",
-  result: EXEC_FAILED,
-  failure: "JKS keystore not found",
-  substring: "KeyStore JKS implementation not found"
-},
-{
-  description: "These NPEs all happen while calling Provider#getName on the result of
-                Security#getProvider(). Unfortunately, that method is permitted to return
-                null if the system has no provider with the requested name. And since we don't
-                have the SunJCE provider, tests fail",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Cipher.PBE.PKCS12Cipher",
-  pattern: ".*PKCS12Cipher.java\\:87\\).*NullPointerException.*"
-},
-{
-  description: "These NPEs all happen while calling Provider#getName on the result of
-                Security#getProvider(). Unfortunately, that method is permitted to return
-                null if the system has no provider with the requested name. And since we don't
-                have the SunJCE provider, tests fail",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Cipher.PBE.PKCS12CipherKAT",
-  pattern: ".*NullPointerException.*PKCS12CipherKAT.java\\:183\\).*"
-},
-{
-  description: "These NPEs all happen while calling Provider#getName on the result of
-                Security#getProvider(). Unfortunately, that method is permitted to return
-                null if the system has no provider with the requested name. And since we don't
-                have the SunJCE provider, tests fail",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Cipher.RC2ArcFour.CipherKAT",
-  pattern: ".*NullPointerException.*CipherKAT.java\\:205\\).*"
-},
-{
-  description: "These NPEs all happen while calling Provider#getName on the result of
-                Security#getProvider(). Unfortunately, that method is permitted to return
-                null if the system has no provider with the requested name. And since we don't
-                have the SunJCE provider, tests fail",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Cipher.RSA.TestOAEP_KAT",
-  pattern: ".*TestOAEP_KAT.java\\:62\\).*NullPointerException.*"
-},
-{
-  description: "These NPEs all happen while calling Provider#getName on the result of
-                Security#getProvider(). Unfortunately, that method is permitted to return
-                null if the system has no provider with the requested name. And since we don't
-                have the SunJCE provider, tests fail",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Cipher.RSA.TestOAEP",
-  pattern: ".*TestOAEP.java\\:50\\).*NullPointerException.*"
-},
-{
-  description: "These NPEs all happen while calling Provider#getName on the result of
-                Security#getProvider(). Unfortunately, that method is permitted to return
-                null if the system has no provider with the requested name. And since we don't
-                have the SunJCE provider, tests fail",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Cipher.RSA.TestOAEPParameterSpec",
-  pattern: ".*TestOAEPParameterSpec.java\\:124\\).*NullPointerException.*"
-},
-{
-  description: "These NPEs all happen while calling Provider#getName on the result of
-                Security#getProvider(). Unfortunately, that method is permitted to return
-                null if the system has no provider with the requested name. And since we don't
-                have the SunJCE provider, tests fail",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Cipher.RSA.TestOAEPWithParams",
-  pattern: ".*TestOAEPWithParams.java\\:58\\).*NullPointerException.*"
-},
-{
-  description: "These NPEs all happen while calling Provider#getName on the result of
-                Security#getProvider(). Unfortunately, that method is permitted to return
-                null if the system has no provider with the requested name. And since we don't
-                have the SunJCE provider, tests fail",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Cipher.RSA.TestRSA",
-  pattern: ".*TestRSA.java\\:171\\).*NullPointerException.*"
-},
-{
-  description: "These NPEs all happen while calling Provider#getName on the result of
-                Security#getProvider(). Unfortunately, that method is permitted to return
-                null if the system has no provider with the requested name. And since we don't
-                have the SunJCE provider, tests fail",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Mac.HmacSaltLengths",
-  pattern: ".*HmacSaltLengths.java\\:83\\).*java.lang.NullPointerException.*"
-},
-{
-  description: "These NPEs all happen while calling Provider#getName on the result of
-                Security#getProvider(). Unfortunately, that method is permitted to return
-                null if the system has no provider with the requested name. And since we don't
-                have the SunJCE provider, tests fail",
-  result: EXEC_FAILED,
-  name: "com.sun.crypto.provider.Mac.MacKAT",
-  pattern: ".*MacKAT.java\\:228\\).*java.lang.NullPointerException.*"
-},
-{
-  description: "These tests call into misc Sun classes that we don't have",
-  result: COMPILE_FAILED,
-  name: "com.sun.crypto.provider.KeyAgreement.DHKeyAgreement2",
-  pattern: ".*cannot find symbol.*sun.misc.HexDumpEncoder.*"
-},
-{
-  description: "These tests call into misc Sun classes that we don't have",
-  result: COMPILE_FAILED,
-  name: "com.sun.crypto.provider.Cipher.KeyWrap.XMLEncKAT",
-  pattern: ".*cannot find symbol.*sun.misc.BASE64Decoder.*"
-},
-{
-  description: "These tests call into misc Sun classes that we don't have",
-  result: COMPILE_FAILED,
-  names: [
-    "com.sun.crypto.provider.TLS.TestKeyMaterial",
-    "com.sun.crypto.provider.TLS.TestMasterSecret",
-    "com.sun.crypto.provider.TLS.TestPremaster",
-    "com.sun.crypto.provider.TLS.TestPRF"
-  ],
-  substring: "package sun.security.internal.spec does not exist"
-},
-{
-  description: "We don't have most com.sun packages.",
-  result: COMPILE_FAILED,
-  failure: "Dalvik doesn't include Sun packages",
-  pattern: ".*package (com\\.)?sun\\.[\\w\\.]+ does not exist.*"
-},
-{
-  description: "We don't have several Java packages either.",
-  result: COMPILE_FAILED,
-  failure: "Dalvik doesn't include applets",
-  substring: "package java.applet does not exist"
-},
-{
-  description: "We don't have several Java packages either.",
-  result: COMPILE_FAILED,
-  failure: "Dalvik doesn't include AWT (bug it has java.awt.font)",
-  pattern: ".*package java.awt(\\.image)? does not exist.*"
-},
-{
-  description: "We don't have several Java packages either.",
-  result: "COMPILE_FAILED",
-  failure: "Dalvik doesn't include NIO.2",
-  substring: "package java.nio.file does not exist"
-},
-{
-  description: "We don't have several Java packages either.",
-  result: "COMPILE_FAILED",
-  failure: "Dalvik doesn't include RMI",
-  substring: "package java.rmi does not exist"
-},
-{
-  description: "We don't have several Java packages either.",
-  result: "COMPILE_FAILED",
-  failure: "Dalvik doesn't include JNDI",
-  substring: "package javax.naming does not exist"
-},
-{
-  description: "We don't have several Java packages either.",
-  result: "COMPILE_FAILED",
-  failure: "Dalvik doesn't include JMX",
-  substring: "package java.lang.management does not exist"
-},
-{
-  description: "We don't have several Java packages either.",
-  result: "COMPILE_FAILED",
-  failure: "Dalvik doesn't include Swing",
-  substring: "package javax.swing.tree does not exist"
-},
-{
-  description: "We don't have several Java packages either.",
-  result: "COMPILE_FAILED",
-  failure: "Dalvik doesn't include javax.crypto",
-  substring: "package javax.xml.crypto does not exist"
-},
-{
-  description: "Dalvik doesn't include a com.sun.net HTTP server",
-  result: UNSUPPORTED,
-  names: [
-    "com.sun.net.httpserver",
-    "sun.net.www"
-  ]
-},
-{
-  description: "Dalvik doesn't include AWT except the font package",
-  result: UNSUPPORTED,
-  name: "java.awt"
-},
-{
-  description: "Dalvik doesn't include AWT except the font package",
-  result: "SUCCESS",
-  names: [
-    "java.awt.FontClass",
-    "java.awt.font"
-  ]
-},
-{
-  description: "Dalvik doesn't include java.beans except for property listeners",
-  result: UNSUPPORTED,
-  name: "java.beans"
-},
-{
-  description: "Dalvik doesn't include java.beans except for property listeners",
-  result: "SUCCESS",
-  name: "java.beans.PropertyChangeSupport"
-},
-{
-  description: "Dalvik doesn't include java.lang.instrument",
-  result: UNSUPPORTED,
-  name: "java.lang.instrument"
-},
-{
-  description: "Dalvik doesn't include java.lang.management",
-  result: UNSUPPORTED,
-  name: "java.lang.management"
-},
-{
-  description: "Dalvik doesn't include RMI",
-  result: UNSUPPORTED,
-  names: [
-    "java.rmi",
-    "sun.rmi"
-  ]
-},
-{
-  description: "Dalvik doesn't include javax.imageio",
-  result: UNSUPPORTED,
-  name: "javax.imageio"
-},
-{
-  description: "Dalvik doesn't include javax.management",
-  result: UNSUPPORTED,
-  name: "javax.management"
-},
-{
-  description: "Dalvik doesn't include javax.naming",
-  result: UNSUPPORTED,
-  name: "javax.naming"
-},
-{
-  description: "Dalvik doesn't include javax.print",
-  result: UNSUPPORTED,
-  name: "javax.print"
-},
-{
-  description: "Dalvik doesn't include javax.script",
-  result: UNSUPPORTED,
-  name: "javax.script"
-},
-{
-  description: "Dalvik doesn't include javax.sound",
-  result: UNSUPPORTED,
-  name: "javax.sound"
-},
-{
-  description: "Dalvik doesn't include javax.swing",
-  result: UNSUPPORTED,
-  name: "javax.swing"
-},
-{
-  description: "Dalvik doesn't include sun.management",
-  result: UNSUPPORTED,
-  name: "sun.management"
-},
-{
-  description: "Dalvik doesn't include javax.smartcardio",
-  result: UNSUPPORTED,
-  name: "sun.security.smartcardio"
-},
-{
-  description: "Our exception messages don't match the RIs",
-  result: EXEC_FAILED,
-  names: [
-    "java.lang.StringBuilder.Exceptions",
-    "java.lang.StringBuffer.Exceptions"
-  ],
-  substring: "got java.lang.StringIndexOutOfBoundsException: null - FAILED"
-},
-{
-  description: "tests that cast to Harmony-specific types",
-  result: EXEC_FAILED,
-  failure: "bogus cast to harmony Hashtable$KeyEnumeration",
-  substring: "java.util.Hashtable$KeyEnumeration"
-},
-{
-  description: "tests that cast to Harmony-specific types",
-  result: EXEC_FAILED,
-  failure: "bogus cast to Hashtable$ValueEnumeration",
-  substring: "java.util.Hashtable$ValueEnumeration"
-},
-{
-  description: "we don't support the CharsetProvider spi, so we don't have \"mockCharset00\".",
-  result: EXEC_FAILED,
-  name: "org.apache.harmony.tests.java.nio.charset.CharsetTest#test_availableCharsets",
-  substring: "junit.framework.AssertionFailedError"
-},
-{
-  description: "we don't support the CharsetProvider spi, so we don't have \"mockCharset00\".",
-  result: EXEC_FAILED,
-  name: "org.apache.harmony.tests.java.nio.charset.CharsetTest#test_forNameLString",
-  substring: "java.nio.charset.UnsupportedCharsetException: mockCharset00"
-},
-{
   description: "the average length of possible UTF-8 sequences is 2 bytes.",
   result: EXEC_FAILED,
   name: "org.apache.harmony.tests.java.nio.charset.UTFCharsetEncoderTest#testSpecificDefaultValue",
   substring: "junit.framework.AssertionFailedError: expected:<1.1> but was:<2.0>"
 },
 {
-  description: "this test needs external interaction",
-  result: UNSUPPORTED,
-  names: [
-    "com.sun.tools.attach.Application",
-    "java.io.SystemInAvailable",
-    "sun.jvmstat.testlibrary.Sleeper"
-  ]
-},
-{
-  description: "these benchmarks take a long time and don't demonstrate correctness",
-  result: UNSUPPORTED,
-  names: [
-    "java.lang.Class.TypeCheckMicroBenchmark",
-    "java.nio.Buffer.SwapMicroBenchmark",
-    "java.util.ArrayList.RangeCheckMicroBenchmark",
-    "java.util.ArrayList.IteratorMicroBenchmark"
-  ]
-},
-{
-  description: "We removed this: we don't support Pack200.",
-  result: UNSUPPORTED,
-  name: "org.apache.harmony.archive.tests.java.util.jar.Pack200Test"
-},
-{
   description: "Some tests (ExcludedProxyTest) connect to a public webserver to check that the HTTP client works",
   result: EXEC_FAILED,
   failure: "connect to the Internet",
   pattern: ".*java.net.UnknownHostException:.*jcltest.apache.org.*"
 },
 {
-  description: "These tests violate visibility rules when trying to unit test internal classes",
-  result: EXEC_FAILED,
-  name: "javax.net.ssl.DefaultSSLSocketFactoryTest",
-  substring: "java.lang.IllegalAccessError: tried to access class javax.net.ssl.DefaultSSLSocketFactory from class javax.net.ssl.DefaultSSLSocketFactoryTest"
-},
-{
-  description: "These tests expect to be called with commandline arguments",
-  result: EXEC_FAILED,
-  name: "java.io.FileOutputStream.FileOpenNeg",
-  substring: "java.lang.ArrayIndexOutOfBoundsException"
-},
-{
-  description: "",
-  result: EXEC_FAILED,
-  name: "java.io.FileOutputStream.FileOpenPos",
-  substring: "java.lang.ArrayIndexOutOfBoundsException"
-},
-{
   description: "Some tests depend on ICU data, which has changed. Others make assumptions about floating point rounding",
   result: EXEC_FAILED,
   names: [
@@ -639,8 +91,7 @@
   description: "Potentially flakey because they rely on a specific local TCP port being free.",
   result: EXEC_FAILED,
   names: [
-      "org.apache.harmony.tests.java.nio.channels.ServerSocketChannelTest#test_bind_explicitPort",
-      "org.apache.harmony.tests.java.nio.channels.SocketChannelTest#testBind_ExplicitFreePort"
+      "org.apache.harmony.tests.java.nio.channels.ServerSocketChannelTest#test_bind_explicitPort"
   ]
 },
 {
diff --git a/expectations/icebox.txt b/expectations/icebox.txt
index 34ffb2b..07449c6 100644
--- a/expectations/icebox.txt
+++ b/expectations/icebox.txt
@@ -87,43 +87,12 @@
   substring: "java.lang.ClassCastException: org.apache.harmony.xml.dom.EntityReferenceImpl"
 },
 {
-  description: "Dalvik doesn't support XML Schemas, DTDs or validation",
-  bug: 3268630,
-  name: "libcore.xml.DeclarationTest.testGetXmlVersion",
-  substring: "This implementation doesn't parse the version from the XML declaration"
-},
-{
-  description: "the lack of schema parsing also extends to XML parsing in prefs",
-  result: EXEC_FAILED,
-  name: "org.apache.harmony.prefs.tests.java.util.prefs.PreferencesTest#testImportPreferences",
-  substring: "junit.framework.AssertionFailedError: should throw InvalidPreferencesFormatException"
-},
-{
   description: "many tests attempt to fork a Java executable, but fork the wrong one",
   result: "EXEC_FAILED",
   failure: "should fork a dalvikvm, not a JVM",
   substring: "/system/bin.*IOException"
 },
 {
-  description: "a low impact bug, we can't produce tiny random, probable prime big integers",
-  result: EXEC_FAILED,
-  name: "org.apache.harmony.tests.java.math.BigIntegerTest#test_ConstructorIILjava_util_Random",
-  substring: "junit.framework.AssertionFailedError: Random number one is too big"
-},
-{
-  description: "we don't support CANON_EQ in regex
-                http://code.google.com/p/android/issues/detail?id=8592",
-  result: EXEC_FAILED,
-  names: [
-    "org.apache.harmony.tests.java.util.regex.PatternTest#testCanonEqFlagWithSupplementaryCharacters",
-    "org.apache.harmony.tests.java.util.regex.PatternTest#testCanonEqFlag",
-    "org.apache.harmony.tests.java.util.regex.PatternErrorTest#testCompileErrors",
-    "org.apache.harmony.tests.java.util.regex.PatternTest#testCompileNonCaptGroup",
-    "org.apache.harmony.tests.java.util.regex.PatternTest#testIndexesCanonicalEq"
-  ],
-  substring: "UnsupportedOperationException: CANON_EQ flag not supported"
-},
-{
   description: "low-impact XML bugs:",
   result: EXEC_FAILED,
   name: "libcore.xml.DomTest#testAttributeNamedIdIsNotAnIdByDefault",
@@ -171,13 +140,6 @@
   substring: "java.lang.UnsupportedOperationException: This parser does not support specification \"Unknown\" version \"0.0\""
 },
 {
-  description: "a low-impact bug: \"Shared FileDescriptors get closed too early\"
-                  http://code.google.com/p/android/issues/detail?id=5923",
-  result: EXEC_FAILED,
-  name: "java.io.FileDescriptor.Finalize",
-  pattern: ".*java.io.IOException.*openCheck.*"
-},
-{
   description: "a low-impact bug, also present in Crockford's implementation of org.json",
   result: EXEC_FAILED,
   name: "org.json.ParsingTest#test64BitHexValues",
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt
index df33aee..2fd2455 100644
--- a/expectations/knownfailures.txt
+++ b/expectations/knownfailures.txt
@@ -6,9 +6,7 @@
   description: "four known CharsetDecoder-/CharsetEncoder-related failures",
   names: [
     "org.apache.harmony.tests.java.nio.charset.ASCIICharsetEncoderTest#testCanEncodeSurrogate",
-    "org.apache.harmony.tests.java.nio.charset.ASCIICharsetEncoderTest#testMultiStepEncode",
-    "org.apache.harmony.tests.java.nio.charset.CharsetDecoderTest#testInvalidDecoding",
-    "org.apache.harmony.tests.java.nio.charset.CharsetDecoderTest#test_decode"
+    "org.apache.harmony.tests.java.nio.charset.ASCIICharsetEncoderTest#testMultiStepEncode"
   ],
   bug: 10729779
 },
@@ -33,14 +31,6 @@
   bug: 4471249
 },
 {
-  description: "Investigate InterruptedIOException + InputStream.read(), OutputStream.write()",
-  names: [
-    "libcore.java.io.InterruptedStreamTest#testInterruptSocketInputStream",
-    "libcore.java.io.InterruptedStreamTest#testInterruptSocketOutputStream"
-  ],
-  bug: 4181738
-},
-{
   description: "SimpleDateFormat assumes DST always uses 60 minute offset; this fails for zones like Lord Howe Daylight Time",
   name: "libcore.java.text.SimpleDateFormatTest#testDstZoneWithNonDstTimestampForNonHourDstZone",
   bug: 4723412
@@ -51,11 +41,6 @@
   bug: 2772628
 },
 {
-  description: "Test fails, Intermediate certificate lacks BasicConstraints",
-  name: "com.android.org.bouncycastle.jce.provider.PKIXCertPathValidatorSpiTest#testTrustAndRemoteCertificatesWithDifferentEncodings",
-  bug: 3474648
-},
-{
   description: "DHParametersHelper.generateSafePrimes sometimes takes long time, other times takes a very long time",
   name: "org.apache.harmony.crypto.tests.javax.crypto.interfaces.DHPrivateKeyTest#test_getParams",
   bug: 3474446
@@ -74,60 +59,11 @@
   bug: 3387758
 },
 {
-  description: "URLConnection fails on URLs containing {}",
-  name: "libcore.java.net.URLConnectionTest#testMalformedUrl",
-  bug: 1158780,
-  substring: "java.net.URISyntaxException"
-},
-{
   description: "KxmlParser doesn't expose DTD text",
   name: "libcore.xml.KxmlPullParserDtdTest#testDoctypeWithNextToken",
   bug: 3241492
 },
 {
-  description: "Expat relaxed is different from Kxml relaxed",
-  names: [
-    "libcore.xml.ExpatPullParserTest#testAttributeNoValueWithRelaxed",
-    "libcore.xml.ExpatPullParserTest#testAttributeUnquotedValueWithRelaxed",
-    "libcore.xml.ExpatPullParserTest#testMissingEntitiesWithRelaxed",
-    "libcore.xml.ExpatPullParserTest#testUnterminatedEntityWithRelaxed"
-  ],
-  bug: 3090550
-},
-{
-  description: "ExpatPullParser doesn't support nextToken() or line numbers",
-  names: [
-    "libcore.xml.ExpatPullParserDtdTest#testDoctypeWithNextToken",
-    "libcore.xml.ExpatPullParserTest#testCdataUsingNextToken",
-    "libcore.xml.ExpatPullParserTest#testCommentUsingNextToken",
-    "libcore.xml.ExpatPullParserTest#testCustomEntitiesAreNotEvaluated",
-    "libcore.xml.ExpatPullParserTest#testCustomEntitiesUsingNext",
-    "libcore.xml.ExpatPullParserTest#testCustomEntitiesUsingNextToken",
-    "libcore.xml.ExpatPullParserTest#testEmptyCdataUsingNextToken",
-    "libcore.xml.ExpatPullParserTest#testEmptyComment",
-    "libcore.xml.ExpatPullParserTest#testEmptyEntityReferenceUsingNext",
-    "libcore.xml.ExpatPullParserTest#testEmptyEntityReferenceUsingNextToken",
-    "libcore.xml.ExpatPullParserTest#testEntityInAttributeUsingNextToken",
-    "libcore.xml.ExpatPullParserTest#testLinesAndColumns",
-    "libcore.xml.ExpatPullParserTest#testMissingEntitiesInAttributesUsingNextToken",
-    "libcore.xml.ExpatPullParserTest#testMissingEntitiesInAttributesUsingNextTokenWithRelaxed",
-    "libcore.xml.ExpatPullParserTest#testMissingEntitiesInAttributesUsingNextWithRelaxed",
-    "libcore.xml.ExpatPullParserTest#testMissingEntitiesUsingNextToken",
-    "libcore.xml.ExpatPullParserTest#testMissingEntitiesUsingNextTokenWithRelaxed",
-    "libcore.xml.ExpatPullParserTest#testProcessingInstructionUsingNextToken",
-    "libcore.xml.ExpatPullParserTest#testRegularNumericEntities",
-    "libcore.xml.ExpatPullParserTest#testWhitespaceUsingNextToken",
-    "libcore.xml.ExpatPullParserTest#testXmlDeclaration",
-    "libcore.xml.ExpatPullParserTest#testXmlDeclarationExtraAttributes"
-  ],
-  bug: 3090550
-},
-{
-  description: "ExpatPullParser doesn't handle surrogates properly",
-  name: "libcore.xml.ExpatPullParserTest#testCharacterReferenceOfLastUtf16Surrogate",
-  bug: 3090550
-},
-{
   description: "RandomAccessFile missing finalizer",
   name: "libcore.java.io.RandomAccessFileTest#testRandomAccessFileHasCleanupFinalizer",
   bug: 3015023
@@ -143,19 +79,6 @@
   bug: 3056617
 },
 {
-  description: "Minimal days in first week is broken",
-  names: [
-    "libcore.java.text.OldSimpleDateFormatTest#testFormattingWeekOfYear",
-    "libcore.java.text.OldSimpleDateFormatTest#testDefaultMinimalDaysInFirstWeek"
-  ],
-  bug: 1613709
-},
-{
-  description: "Custom SimpleTimeZones not honored by SimpleDateFormat",
-  name: "libcore.java.text.OldSimpleDateFormatTest#testFormattingTimezones",
-  bug: 3049014
-},
-{
   description: "NaN character not found when deserializing DecimalFormatSymbols",
   name: "libcore.java.text.OldDecimalFormatSymbolsTest#test_RIHarmony_compatible",
   bug: 3056792
@@ -194,7 +117,6 @@
 {
   description: "Double.parseDouble().toString does wrong rounding",
   names: [
-    "libcore.java.lang.OldDoubleTest#test_parseDoubleLjava_lang_String",
     "libcore.java.lang.DoubleTest#testParseLargestSubnormalDoublePrecision"
   ],
   bug: 1607938
@@ -249,16 +171,6 @@
   modes: [ "host" ]
 },
 {
-  description: "Defining classes from byte[] not supported in Android",
-  result: EXEC_FAILED,
-  name: "libcore.java.lang.OldClassTest#test_getClasses_subtest0"
-},
-{
-  description: "There is no protection domain set in Android.",
-  result: EXEC_FAILED,
-  name: "libcore.java.lang.OldClassTest#test_getProtectionDomain"
-},
-{
   description: "Runtime.getRuntime().traceMethodCalls(true) doesn't return on the host, fails in CTS",
   bug: 3447964,
   name: "libcore.java.lang.OldRuntimeTest#test_traceMethodCalls"
@@ -270,37 +182,16 @@
   name: "org.apache.harmony.tests.java.util.ResourceBundleTest#test_getBundleLjava_lang_StringLjava_util_LocaleLjava_lang_ClassLoader"
 },
 {
-  description: "Fails (probably) because no protection domain is set.",
-  result: EXEC_FAILED,
-  names: [
-    "org.apache.harmony.security.tests.java.security.AccessController2Test#test_checkPermission_InvalidPermission",
-    "org.apache.harmony.security.tests.java.security.AccessController2Test#test_doPrivilegedLjava_security_PrivilegedAction",
-    "org.apache.harmony.security.tests.java.security.AccessController2Test#test_doPrivilegedLjava_security_PrivilegedActionLjava_security_AccessControlContext",
-    "org.apache.harmony.security.tests.java.security.AccessController2Test#test_doPrivilegedLjava_security_PrivilegedExceptionAction",
-    "org.apache.harmony.security.tests.java.security.AccessController2Test#test_doPrivilegedLjava_security_PrivilegedExceptionActionLjava_security_AccessControlContext"
-  ]
-},
-{
   description: "Android throws IllegalArgumentException, RI throws NullPointerException",
   result: EXEC_FAILED,
   name: "org.apache.harmony.security.tests.java.security.SignatureTest#testUpdatebyteArrayintint2"
 },
 {
-  description: "Android doesn't support protection domains.",
-  result: EXEC_FAILED,
-  name: "org.apache.harmony.tests.java.security.PermissionCollectionTest#test_impliesLjava_security_Permission"
-},
-{
   description: "Android doesn't allow null parent.",
   result: EXEC_FAILED,
   name: "tests.java.security.SecureClassLoaderTest#testSecureClassLoaderClassLoader"
 },
 {
-  description: "Not all Drivers are loaded in testsetup. ClassLoader issue in DriverManager.",
-  result: EXEC_FAILED,
-  name: "org.apache.harmony.sql.tests.java.sql.DriverManagerTest#testDeregisterDriver"
-},
-{
   description: "not supported",
   result: EXEC_FAILED,
   names: [
@@ -777,21 +668,11 @@
   ]
 },
 {
-  description: "res.close() does not wrap up",
-  bug: 3403706,
-  name: "libcore.java.sql.OldResultSetTest#testAfterLast"
-},
-{
   description: "statement.close() does not wrap up",
   bug: 3403706,
   name: "libcore.java.sql.OldResultSetTest#testBeforeFirst"
 },
 {
-  description: "Not supported",
-  bug: 3403706,
-  name: "libcore.java.sql.OldResultSetTest#testClearWarnings"
-},
-{
   description: "Resultset.close() does not wrap up",
   bug: 3403706,
   names: [
@@ -1614,13 +1495,6 @@
   ]
 },
 {
-  description: "Known failures in SerializationStressTest",
-  bug: 11668227,
-  names: [
-    "org.apache.harmony.tests.java.io.SerializationStressTest4#test_writeObject_Collections_UnmodifiableMap_UnmodifiableEntrySet"
-  ]
-},
-{
   description: "Known failure in MathTest 1^NAN should be NAN",
   bug: 11669804,
   name: "org.apache.harmony.tests.java.lang.MathTest#test_powDD"