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
commit e37d10fd817a4f1cbfdd580433a8391d06640e69 Author: Gary Gregory <[email protected]> AuthorDate: Sat Mar 7 08:19:18 2026 -0500 Reuse ArrayUtils.contains() --- .../java/org/apache/commons/codec/binary/Base64Test.java | 6 +++--- .../java/org/apache/commons/codec/binary/BaseNTestData.java | 13 ------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/test/java/org/apache/commons/codec/binary/Base64Test.java b/src/test/java/org/apache/commons/codec/binary/Base64Test.java index d75589ad..033cbab8 100644 --- a/src/test/java/org/apache/commons/codec/binary/Base64Test.java +++ b/src/test/java/org/apache/commons/codec/binary/Base64Test.java @@ -1555,9 +1555,9 @@ class Base64Test { final byte[] decoded = randomData[0]; final byte[] result = Base64.decodeBase64(encoded); assertArrayEquals(decoded, result, "url-safe i=" + i); - assertFalse(BaseNTestData.bytesContain(encoded, (byte) '='), "url-safe i=" + i + " no '='"); - assertFalse(BaseNTestData.bytesContain(encoded, (byte) '\\'), "url-safe i=" + i + " no '\\'"); - assertFalse(BaseNTestData.bytesContain(encoded, (byte) '+'), "url-safe i=" + i + " no '+'"); + assertFalse(ArrayUtils.contains(encoded, (byte) '='), "url-safe i=" + i + " no '='"); + assertFalse(ArrayUtils.contains(encoded, (byte) '\\'), "url-safe i=" + i + " no '\\'"); + assertFalse(ArrayUtils.contains(encoded, (byte) '+'), "url-safe i=" + i + " no '+'"); } } diff --git a/src/test/java/org/apache/commons/codec/binary/BaseNTestData.java b/src/test/java/org/apache/commons/codec/binary/BaseNTestData.java index 63b992f7..a38e59c2 100644 --- a/src/test/java/org/apache/commons/codec/binary/BaseNTestData.java +++ b/src/test/java/org/apache/commons/codec/binary/BaseNTestData.java @@ -21,8 +21,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.Random; -import org.apache.commons.lang3.ArrayUtils; - /** * Data and functions common to BaseN tests. */ @@ -80,17 +78,6 @@ public class BaseNTestData { private static final int LAST_READ_KEY = 1; - /** - * Tests the supplied byte[] array to see if it contains the specified byte c. - * - * @param bytes byte[] array to test - * @param c byte to look for - * @return true if bytes contains c, false otherwise - */ - static boolean bytesContain(final byte[] bytes, final byte c) { - return ArrayUtils.contains(bytes, c); - } - private static int[] fill(final byte[] buf, final int offset, final InputStream in) throws IOException { int read = in.read(buf, offset, buf.length - offset);
