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-codec.git
The following commit(s) were added to refs/heads/master by this push:
new 50ff2d2 CODEC-298 - Use Standard Charset object (#82)
50ff2d2 is described below
commit 50ff2d24d197ea53c2355d9ca165c43d5f1fc747
Author: Arturo Bernal <[email protected]>
AuthorDate: Sun Aug 8 17:20:51 2021 +0200
CODEC-298 - Use Standard Charset object (#82)
---
.../org/apache/commons/codec/CharsetsTest.java | 3 ++-
.../commons/codec/digest/PureJavaCrc32Test.java | 3 ++-
.../apache/commons/codec/net/PercentCodecTest.java | 26 +++++++++++-----------
.../org/apache/commons/codec/net/URLCodecTest.java | 2 +-
4 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/test/java/org/apache/commons/codec/CharsetsTest.java
b/src/test/java/org/apache/commons/codec/CharsetsTest.java
index b04ebf7..b9e3c19 100644
--- a/src/test/java/org/apache/commons/codec/CharsetsTest.java
+++ b/src/test/java/org/apache/commons/codec/CharsetsTest.java
@@ -18,6 +18,7 @@
package org.apache.commons.codec;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import org.junit.Assert;
import org.junit.Test;
@@ -33,7 +34,7 @@ public class CharsetsTest {
Assert.assertEquals(Charset.defaultCharset(),
Charsets.toCharset((String) null));
Assert.assertEquals(Charset.defaultCharset(),
Charsets.toCharset((Charset) null));
Assert.assertEquals(Charset.defaultCharset(),
Charsets.toCharset(Charset.defaultCharset()));
- Assert.assertEquals(Charset.forName("UTF-8"),
Charsets.toCharset(Charset.forName("UTF-8")));
+ Assert.assertEquals(StandardCharsets.UTF_8,
Charsets.toCharset(StandardCharsets.UTF_8));
}
@SuppressWarnings("deprecation")
diff --git
a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
index 4a226b6..58505de 100644
--- a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
@@ -20,6 +20,7 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.PrintStream;
import java.lang.reflect.Constructor;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -51,7 +52,7 @@ public class PureJavaCrc32Test {
checkOnBytes(new byte[] {40, 60, 97, -70}, false);
- checkOnBytes("hello world!".getBytes("UTF-8"), false);
+ checkOnBytes("hello world!".getBytes(StandardCharsets.UTF_8), false);
final Random random1 = new Random();
final Random random2 = new Random();
diff --git a/src/test/java/org/apache/commons/codec/net/PercentCodecTest.java
b/src/test/java/org/apache/commons/codec/net/PercentCodecTest.java
index 766d0f0..3e2e7f1 100644
--- a/src/test/java/org/apache/commons/codec/net/PercentCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/PercentCodecTest.java
@@ -41,9 +41,9 @@ public class PercentCodecTest {
final PercentCodec percentCodec = new PercentCodec();
final String input = "abcdABCD";
final byte[] encoded =
percentCodec.encode(input.getBytes(StandardCharsets.UTF_8));
- final String encodedS = new String(encoded, "UTF-8");
+ final String encodedS = new String(encoded, StandardCharsets.UTF_8);
final byte[] decoded = percentCodec.decode(encoded);
- final String decodedS = new String(decoded, "UTF-8");
+ final String decodedS = new String(decoded, StandardCharsets.UTF_8);
assertEquals("Basic PercentCodec encoding test", input, encodedS);
assertEquals("Basic PercentCodec decoding test", input, decodedS);
}
@@ -60,19 +60,19 @@ public class PercentCodecTest {
@Test
public void testConfigurablePercentEncoder() throws Exception {
final String input = "abc123_-.*\u03B1\u03B2";
- final PercentCodec percentCodec = new
PercentCodec("abcdef".getBytes("UTF-8"), false);
+ final PercentCodec percentCodec = new
PercentCodec("abcdef".getBytes(StandardCharsets.UTF_8), false);
final byte[] encoded =
percentCodec.encode(input.getBytes(StandardCharsets.UTF_8));
- final String encodedS = new String(encoded, "UTF-8");
+ final String encodedS = new String(encoded, StandardCharsets.UTF_8);
assertEquals("Configurable PercentCodec encoding test",
"%61%62%63123_-.*%CE%B1%CE%B2", encodedS);
final byte[] decoded = percentCodec.decode(encoded);
- assertEquals("Configurable PercentCodec decoding test", new
String(decoded, "UTF-8"), input);
+ assertEquals("Configurable PercentCodec decoding test", new
String(decoded, StandardCharsets.UTF_8), input);
}
@Test
public void testDecodeInvalidEncodedResultDecoding() throws Exception {
final String inputS = "\u03B1\u03B2";
final PercentCodec percentCodec = new PercentCodec();
- final byte[] encoded = percentCodec.encode(inputS.getBytes("UTF-8"));
+ final byte[] encoded =
percentCodec.encode(inputS.getBytes(StandardCharsets.UTF_8));
try {
percentCodec.decode(Arrays.copyOf(encoded, encoded.length-1));
//exclude one byte
} catch (final Exception e) {
@@ -110,7 +110,7 @@ public class PercentCodecTest {
final PercentCodec percentCodec = new PercentCodec(null, true);
assertNull("Null input value encoding test",
percentCodec.encode(null));
assertNull("Null input value decoding test",
percentCodec.decode(null));
- final byte[] emptyInput = "".getBytes("UTF-8");
+ final byte[] emptyInput = "".getBytes(StandardCharsets.UTF_8);
assertEquals("Empty input value encoding test",
percentCodec.encode(emptyInput), emptyInput);
assertArrayEquals("Empty input value decoding test",
percentCodec.decode(emptyInput), emptyInput);
}
@@ -120,10 +120,10 @@ public class PercentCodecTest {
final String input = "a b c d";
final PercentCodec percentCodec = new PercentCodec(null, true);
final byte[] encoded =
percentCodec.encode(input.getBytes(StandardCharsets.UTF_8));
- final String encodedS = new String(encoded, "UTF-8");
+ final String encodedS = new String(encoded, StandardCharsets.UTF_8);
assertEquals("PercentCodec plus for space encoding test", "a+b+c+d",
encodedS);
final byte[] decode = percentCodec.decode(encoded);
- assertEquals("PercentCodec plus for space decoding test", new
String(decode, "UTF-8"), input);
+ assertEquals("PercentCodec plus for space decoding test", new
String(decode, StandardCharsets.UTF_8), input);
}
@Test
@@ -131,9 +131,9 @@ public class PercentCodecTest {
final PercentCodec percentCodec = new PercentCodec(null, true);
final String input = "abc123_-.*";
final Object encoded = percentCodec.encode((Object)
input.getBytes(StandardCharsets.UTF_8));
- final String encodedS = new String((byte[]) encoded, "UTF-8");
+ final String encodedS = new String((byte[]) encoded,
StandardCharsets.UTF_8);
final Object decoded = percentCodec.decode(encoded);
- final String decodedS = new String((byte[]) decoded, "UTF-8");
+ final String decodedS = new String((byte[]) decoded,
StandardCharsets.UTF_8);
assertEquals("Basic PercentCodec safe char encoding test", input,
encodedS);
assertEquals("Basic PercentCodec safe char decoding test", input,
decodedS);
}
@@ -143,9 +143,9 @@ public class PercentCodecTest {
final PercentCodec percentCodec = new PercentCodec();
final String input = "\u03B1\u03B2\u03B3\u03B4\u03B5\u03B6% ";
final byte[] encoded =
percentCodec.encode(input.getBytes(StandardCharsets.UTF_8));
- final String encodedS = new String(encoded, "UTF-8");
+ final String encodedS = new String(encoded, StandardCharsets.UTF_8);
final byte[] decoded = percentCodec.decode(encoded);
- final String decodedS = new String(decoded, "UTF-8");
+ final String decodedS = new String(decoded, StandardCharsets.UTF_8);
assertEquals("Basic PercentCodec unsafe char encoding test",
"%CE%B1%CE%B2%CE%B3%CE%B4%CE%B5%CE%B6%25 ", encodedS);
assertEquals("Basic PercentCodec unsafe char decoding test", input,
decodedS);
}
diff --git a/src/test/java/org/apache/commons/codec/net/URLCodecTest.java
b/src/test/java/org/apache/commons/codec/net/URLCodecTest.java
index 7ecb456..587d20e 100644
--- a/src/test/java/org/apache/commons/codec/net/URLCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/URLCodecTest.java
@@ -164,7 +164,7 @@ public class URLCodecTest {
public void testDecodeInvalidContent() throws
UnsupportedEncodingException, DecoderException {
final String ch_msg = constructString(SWISS_GERMAN_STUFF_UNICODE);
final URLCodec urlCodec = new URLCodec();
- final byte[] input = ch_msg.getBytes("ISO-8859-1");
+ final byte[] input = ch_msg.getBytes(StandardCharsets.ISO_8859_1);
final byte[] output = urlCodec.decode(input);
assertEquals(input.length, output.length);
for (int i = 0; i < input.length; i++) {
