(commons-net) 01/05: Refactor Base64 decoding test

[ggregory]

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-net.git

commit e13121e59f61df37943151ecb52c0ad4a6feebcc
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun May 26 14:31:50 2024 -0400

    Refactor Base64 decoding test
    
    Compare results of our Base64 class vs java.util's.
---
 .../org/apache/commons/net/util/Base64Test.java    | 38 ++++++++++++----------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/test/java/org/apache/commons/net/util/Base64Test.java 
b/src/test/java/org/apache/commons/net/util/Base64Test.java
index 576fe00f..f8ce8f5b 100644
--- a/src/test/java/org/apache/commons/net/util/Base64Test.java
+++ b/src/test/java/org/apache/commons/net/util/Base64Test.java
@@ -31,8 +31,22 @@ import java.nio.charset.StandardCharsets;
 import org.junit.Ignore;
 import org.junit.Test;
 
+@SuppressWarnings({ "deprecation" })
 public class Base64Test {
 
+    private void checkDecoders(final String expected, final byte[] actual) {
+        final byte[] decoded = Base64.decodeBase64(actual);
+        assertEquals(expected, new String(decoded, StandardCharsets.UTF_8));
+        assertEquals(expected, new 
String(java.util.Base64.getDecoder().decode(actual), StandardCharsets.UTF_8));
+    }
+
+    private void checkDecoders(final String expected, final String actual) {
+        final byte[] decoded = Base64.decodeBase64(actual);
+        assertEquals(expected, new String(decoded));
+        assertEquals(expected, new String(decoded, StandardCharsets.UTF_8));
+        assertEquals(expected, new 
String(java.util.Base64.getDecoder().decode(actual), StandardCharsets.UTF_8));
+    }
+
     @Test
     public void testBase64() {
         final Base64 b64 = new Base64();
@@ -75,36 +89,28 @@ public class Base64Test {
 
     @Test
     public void testDecodeBase64ByteArray() {
-        final byte[] base64Data = {'b', 'G', 'l', 'n', 'a', 'H', 'Q', 'g', 
'd', 'w', '=', '='};
-        final byte[] decoded = Base64.decodeBase64(base64Data);
-        assertEquals("light w", new String(decoded, StandardCharsets.UTF_8));
+        checkDecoders("light w", new byte[] {'b', 'G', 'l', 'n', 'a', 'H', 
'Q', 'g', 'd', 'w', '=', '='});
     }
 
     @Test
     public void testDecodeBase64String() {
-        final String base64Data = "bGlnaHQgdw==";
-        final byte[] decoded = Base64.decodeBase64(base64Data);
-        assertEquals("light w", new String(decoded, StandardCharsets.UTF_8));
+        checkDecoders("light w", "bGlnaHQgdw==");
     }
 
     @Test
     public void testDecodeByteArray() {
-        final byte[] base64Data = {'Z', 'm', '9', 'v', 'Y', 'm', 'F', 'y'};
-        final byte[] decoded = new Base64().decode(base64Data);
-        assertEquals("foobar", new String(decoded, StandardCharsets.UTF_8));
+        checkDecoders("foobar", new byte[] {'Z', 'm', '9', 'v', 'Y', 'm', 'F', 
'y'});
     }
 
     @Test
     public void testDecodeByteArrayEmpty() {
-        final byte[] base64Data = {};
-        final byte[] decoded = new Base64().decode(base64Data);
-        assertArrayEquals(base64Data, decoded);
+        checkDecoders("", new byte[] {});
+
     }
 
     @Test
     public void testDecodeByteArrayNull() {
-        final byte[] decoded = new Base64().decode((byte[]) null);
-        assertNull(decoded);
+        assertNull(new Base64().decode((byte[]) null));
     }
 
     @Test
@@ -127,9 +133,7 @@ public class Base64Test {
 
     @Test
     public void testDecodeString() {
-        final String base64String = "SGVsbG8gV29ybGQh";
-        final byte[] decoded = new Base64().decode(base64String);
-        assertEquals("Hello World!", new String(decoded));
+        checkDecoders("Hello World!", "SGVsbG8gV29ybGQh");
     }
 
     @Test