diff options
author | Narayan Kamath <narayan@google.com> | 2013-11-15 09:47:32 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-15 09:47:32 -0800 |
commit | 0dc74ed485c718ee69ba84ca522dc4e0930feb30 (patch) | |
tree | 053054c8ac894be27e7558e206a1b643d920bc69 /expectations | |
parent | 43c3807b67e9e05da50d19882274498995f46bed (diff) | |
parent | 643f400d45af3ea66a5481c20be33dc09c457999 (diff) | |
download | libcore-0dc74ed485c718ee69ba84ca522dc4e0930feb30.zip libcore-0dc74ed485c718ee69ba84ca522dc4e0930feb30.tar.gz libcore-0dc74ed485c718ee69ba84ca522dc4e0930feb30.tar.bz2 |
am 643f400d: am 118b75ff: Merge "Use a consistent package path for harmony tests."
* commit '643f400d45af3ea66a5481c20be33dc09c457999':
Use a consistent package path for harmony tests.
Diffstat (limited to 'expectations')
-rw-r--r-- | expectations/brokentests.txt | 6 | ||||
-rw-r--r-- | expectations/knownfailures.txt | 26 |
2 files changed, 16 insertions, 16 deletions
diff --git a/expectations/brokentests.txt b/expectations/brokentests.txt index 6579d01..43e6ed2 100644 --- a/expectations/brokentests.txt +++ b/expectations/brokentests.txt @@ -752,19 +752,19 @@ { description: "we don't support the CharsetProvider spi, so we don't have \"mockCharset00\".", result: EXEC_FAILED, - name: "tests.api.java.nio.charset.CharsetTest#test_availableCharsets", + 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: "tests.api.java.nio.charset.CharsetTest#test_forNameLString", + 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: "tests.api.java.nio.charset.UTFCharsetEncoderTest#testSpecificDefaultValue", + name: "org.apache.harmony.tests.java.nio.charset.UTFCharsetEncoderTest#testSpecificDefaultValue", substring: "junit.framework.AssertionFailedError: expected:<1.1> but was:<2.0>" }, { diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt index e2d173b..ae17a01 100644 --- a/expectations/knownfailures.txt +++ b/expectations/knownfailures.txt @@ -5,10 +5,10 @@ { description: "four known CharsetDecoder-/CharsetEncoder-related failures", names: [ - "org.apache.harmony.nio_char.tests.java.nio.charset.ASCIICharsetEncoderTest#testCanEncodeSurrogate", - "org.apache.harmony.nio_char.tests.java.nio.charset.ASCIICharsetEncoderTest#testMultiStepEncode", - "org.apache.harmony.nio_char.tests.java.nio.charset.CharsetDecoderTest#testInvalidDecoding", - "org.apache.harmony.nio_char.tests.java.nio.charset.CharsetDecoderTest#test_decode" + "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" ], bug: 10729779 }, @@ -234,15 +234,15 @@ names: [ "libcore.java.nio.charset.CharsetEncoderTest#test_defaultReplacementBytesUtf_16", "libcore.java.nio.charset.OldCharset_MultiByte_UTF_16#test_Encode", - "tests.api.java.nio.charset.CharsetTest#test_UTF_16", - "tests.api.java.nio.charset.CharsetTest#test_UTF_16BE", - "tests.api.java.nio.charset.CharsetTest#test_UTF_16LE", - "tests.api.java.nio.charset.CharsetTest#test_UTF_32", - "tests.api.java.nio.charset.CharsetTest#test_UTF_32BE", - "tests.api.java.nio.charset.CharsetTest#test_UTF_32LE", - "tests.api.java.nio.charset.CharsetTest#test_x_UTF_16LE_BOM", - "tests.api.java.nio.charset.CharsetTest#test_X_UTF_32BE_BOM", - "tests.api.java.nio.charset.CharsetTest#test_X_UTF_32LE_BOM" + "org.apache.harmony.tests.java.nio.charset.CharsetTest#test_UTF_16", + "org.apache.harmony.tests.java.nio.charset.CharsetTest#test_UTF_16BE", + "org.apache.harmony.tests.java.nio.charset.CharsetTest#test_UTF_16LE", + "org.apache.harmony.tests.java.nio.charset.CharsetTest#test_UTF_32", + "org.apache.harmony.tests.java.nio.charset.CharsetTest#test_UTF_32BE", + "org.apache.harmony.tests.java.nio.charset.CharsetTest#test_UTF_32LE", + "org.apache.harmony.tests.java.nio.charset.CharsetTest#test_x_UTF_16LE_BOM", + "org.apache.harmony.tests.java.nio.charset.CharsetTest#test_X_UTF_32BE_BOM", + "org.apache.harmony.tests.java.nio.charset.CharsetTest#test_X_UTF_32LE_BOM" ], bug: 2702411 }, |