Skip to content

Commit 3ec4dc6

Browse files
committed
Let GzipParametersTest use a null Charset to reset to the default
ISO_8859_1 value
1 parent 7143c55 commit 3ec4dc6

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

src/test/java/org/apache/commons/compress/compressors/gzip/GzipParametersTest.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import static org.junit.jupiter.api.Assertions.assertThrows;
2525
import static org.junit.jupiter.api.Assertions.assertTrue;
2626

27-
import java.nio.charset.Charset;
2827
import java.util.zip.Deflater;
2928

29+
import org.apache.commons.io.Charsets;
3030
import org.junit.jupiter.api.Test;
3131
import org.junit.jupiter.params.ParameterizedTest;
3232
import org.junit.jupiter.params.provider.CsvSource;
@@ -53,11 +53,10 @@ public void testDeflaterStrategy() {
5353
"UTF-16BE , helloworld, false"
5454
})
5555
//@formatter:on
56-
public void testIllegalCommentOrFileName(final Charset charset, final String text) {
56+
public void testIllegalCommentOrFileName(final String charsetName, final String text) {
5757
final GzipParameters gzipParameters = new GzipParameters();
58-
if (charset != null) {
59-
gzipParameters.setFileNameCharset(charset);
60-
}
58+
// null resets to default value
59+
gzipParameters.setFileNameCharset(Charsets.toCharset(charsetName, null));
6160
assertThrows(IllegalArgumentException.class, () -> gzipParameters.setComment(text));
6261
assertNull(gzipParameters.getComment());
6362
assertThrows(IllegalArgumentException.class, () -> gzipParameters.setFilename(text));
@@ -77,11 +76,10 @@ public void testIllegalCommentOrFileName(final Charset charset, final String tex
7776
"UTF-8 , helloéworld"
7877
})
7978
//@formatter:on
80-
public void testLegalCommentOrFileName(final Charset charset, final String text) {
79+
public void testLegalCommentOrFileName(final String charsetName, final String text) {
8180
final GzipParameters gzipParameters = new GzipParameters();
82-
if (charset != null) {
83-
gzipParameters.setFileNameCharset(charset);
84-
}
81+
// null resets to default value
82+
gzipParameters.setFileNameCharset(Charsets.toCharset(charsetName, null));
8583
gzipParameters.setComment(text);
8684
assertEquals(text, gzipParameters.getComment());
8785
gzipParameters.setFilename(text);

0 commit comments

Comments
 (0)