Skip to content

Commit 7663775

Browse files
author
Brent Worden
committed
exclude variation of the sun.nio.cs.ext.COMPOUND_TEXT_Encorder charset name when testing stream availability and skipping.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1535374 13f79535-47bb-0310-9956-ffa450edef68
1 parent 74138fe commit 7663775

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private void testBufferedRead(final String testString, final String charsetName)
9292
public void testBufferedRead_AvailableCharset() throws IOException {
9393
for (final String csName : Charset.availableCharsets().keySet()) {
9494
// prevent java.lang.UnsupportedOperationException at sun.nio.cs.ext.ISO2022_CN.newEncoder.
95-
if (Charset.forName(csName).canEncode() && ! "COMPOUND_TEXT".equalsIgnoreCase(csName)) {
95+
if (isAvailabilityTestableForCharset(csName)) {
9696
testBufferedRead(TEST_STRING, csName);
9797
}
9898
}
@@ -426,10 +426,14 @@ public void testAvailable() throws Exception {
426426
// at org.apache.commons.io.input.CharSequenceInputStreamTest.testAvailableRead(CharSequenceInputStreamTest.java:412)
427427
// at org.apache.commons.io.input.CharSequenceInputStreamTest.testAvailable(CharSequenceInputStreamTest.java:424)
428428

429-
if (Charset.forName(csName).canEncode() && ! "COMPOUND_TEXT".equalsIgnoreCase(csName) && ! "x-COMPOUND_TEXT".equalsIgnoreCase(csName)) {
429+
if (isAvailabilityTestableForCharset(csName)) {
430430
testAvailableSkip(csName);
431431
testAvailableRead(csName);
432432
}
433433
}
434434
}
435+
436+
private boolean isAvailabilityTestableForCharset(final String csName) {
437+
return Charset.forName(csName).canEncode() && ! "COMPOUND_TEXT".equalsIgnoreCase(csName) && ! "x-COMPOUND_TEXT".equalsIgnoreCase(csName);
438+
}
435439
}

0 commit comments

Comments
 (0)