organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 07:39:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-21621 Fixing TestCharset/TestInvalidInput failure on Java 16 runtime.

Browse source
This commit is contained in:
Yoshito Umaoka 2021-05-19 16:19:06 -04:00
parent d64e897679
commit 07b7832b1a
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestCharset.java
View file

@ -16,6 +16,7 @@ import java.nio.charset.CharacterCodingException;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderMalfunctionError;
import java.nio.charset.CoderResult;
import java.nio.charset.CodingErrorAction;
import java.nio.charset.UnsupportedCharsetException;
@ -5053,12 +5054,22 @@ public class TestCharset extends TestFmwk {
try {
encoder.encode(CharBuffer.allocate(10), null, true);
errln("Illegal argument exception should have been thrown due to null target.");
} catch (CoderMalfunctionError err) {
// Java 16 updated handling of Exception thrown by encodeLoop(CharBuffer,ByteBuffer).
// Previously when encodeLoop is called with null input/output buffer, it throws
// IllegalArgumentException, and Java CharsetEncoder does not catch the exception.
// In Java 16, a runtime exception thrown by encodeLoop implementation is caught
// and wrapped by CoderMalfunctionError. This block is required because CoderMalfunctionError
// is not an Exception.
} catch (Exception ex) {
// IllegalArgumentException is thrown by encodeLoop(CharBuffer,ByteBuffer) implementation
// is not wrapped by CharsetEncoder up to Java 15.
}
try {
decoder.decode(ByteBuffer.allocate(10), null, true);
errln("Illegal argument exception should have been thrown due to null target.");
} catch (CoderMalfunctionError err) {
} catch (Exception ex) {
}
}