This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
The following commit(s) were added to refs/heads/master by this push:
new 3ec4dc65b Let GzipParametersTest use a null Charset to reset to the
default ISO_8859_1 value
3ec4dc65b is described below
commit 3ec4dc65b0860803b5567bcae0acbdeca578e5a6
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Nov 30 09:12:45 2024 -0500
Let GzipParametersTest use a null Charset to reset to the default
ISO_8859_1 value
---
.../compress/compressors/gzip/GzipParametersTest.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git
a/src/test/java/org/apache/commons/compress/compressors/gzip/GzipParametersTest.java
b/src/test/java/org/apache/commons/compress/compressors/gzip/GzipParametersTest.java
index 0cb90119e..3672321ac 100644
---
a/src/test/java/org/apache/commons/compress/compressors/gzip/GzipParametersTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/gzip/GzipParametersTest.java
@@ -24,9 +24,9 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.nio.charset.Charset;
import java.util.zip.Deflater;
+import org.apache.commons.io.Charsets;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
@@ -53,11 +53,10 @@ public class GzipParametersTest {
"UTF-16BE , helloworld, false"
})
//@formatter:on
- public void testIllegalCommentOrFileName(final Charset charset, final
String text) {
+ public void testIllegalCommentOrFileName(final String charsetName, final
String text) {
final GzipParameters gzipParameters = new GzipParameters();
- if (charset != null) {
- gzipParameters.setFileNameCharset(charset);
- }
+ // null resets to default value
+ gzipParameters.setFileNameCharset(Charsets.toCharset(charsetName,
null));
assertThrows(IllegalArgumentException.class, () ->
gzipParameters.setComment(text));
assertNull(gzipParameters.getComment());
assertThrows(IllegalArgumentException.class, () ->
gzipParameters.setFilename(text));
@@ -77,11 +76,10 @@ public class GzipParametersTest {
"UTF-8 , helloƩworld"
})
//@formatter:on
- public void testLegalCommentOrFileName(final Charset charset, final String
text) {
+ public void testLegalCommentOrFileName(final String charsetName, final
String text) {
final GzipParameters gzipParameters = new GzipParameters();
- if (charset != null) {
- gzipParameters.setFileNameCharset(charset);
- }
+ // null resets to default value
+ gzipParameters.setFileNameCharset(Charsets.toCharset(charsetName,
null));
gzipParameters.setComment(text);
assertEquals(text, gzipParameters.getComment());
gzipParameters.setFilename(text);