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 69928bc2 Use JUnit 5 conventions on method visibility
69928bc2 is described below
commit 69928bc25b3d93c09c9ae12f31a88c5addd8c8e5
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Mar 7 08:31:40 2026 -0500
Use JUnit 5 conventions on method visibility
---
.../java/org/apache/commons/codec/binary/Base16Test.java | 2 +-
.../java/org/apache/commons/codec/binary/Base64Test.java | 2 +-
.../java/org/apache/commons/codec/binary/BaseNCodecTest.java | 4 ++--
.../org/apache/commons/codec/binary/BinaryCodecTest.java | 4 ++--
.../apache/commons/codec/digest/Blake3TestVectorsTest.java | 12 ++++++------
.../org/apache/commons/codec/digest/HmacAlgorithmsTest.java | 9 +++++----
.../commons/codec/digest/MessageDigestAlgorithmsTest.java | 8 ++++----
.../java/org/apache/commons/codec/digest/XXHash32Test.java | 8 ++++----
.../apache/commons/codec/language/ColognePhoneticTest.java | 2 +-
.../apache/commons/codec/language/DoubleMetaphoneTest.java | 8 ++++----
.../org/apache/commons/codec/language/MetaphoneTest.java | 4 ++--
.../commons/codec/language/bm/LanguageGuessingTest.java | 2 +-
.../apache/commons/codec/language/bm/PhoneticEngineTest.java | 4 ++--
13 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/src/test/java/org/apache/commons/codec/binary/Base16Test.java
b/src/test/java/org/apache/commons/codec/binary/Base16Test.java
index 7e36f729..7ef4cc6f 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16Test.java
@@ -46,7 +46,7 @@ class Base16Test {
/**
* @return the random.
*/
- public Random getRandom() {
+ Random getRandom() {
return this.random;
}
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 033cbab8..d616c4e2 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64Test.java
@@ -173,7 +173,7 @@ class Base64Test {
/**
* @return the random.
*/
- public Random getRandom() {
+ Random getRandom() {
return this.random;
}
diff --git a/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java
b/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java
index 642abe62..885630da 100644
--- a/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java
@@ -113,9 +113,9 @@ class BaseNCodecTest {
}
BaseNCodec codec;
- @BeforeEach
- public void setUp() {
+ @BeforeEach
+ void setUp() {
codec = new BaseNCodec(0, 0, 0, 0) {
@Override
void decode(final byte[] array, final int i, final int length,
final Context context) {
diff --git a/src/test/java/org/apache/commons/codec/binary/BinaryCodecTest.java
b/src/test/java/org/apache/commons/codec/binary/BinaryCodecTest.java
index 552b87e6..7415da35 100644
--- a/src/test/java/org/apache/commons/codec/binary/BinaryCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/BinaryCodecTest.java
@@ -92,12 +92,12 @@ class BinaryCodecTest {
}
@BeforeEach
- public void setUp() throws Exception {
+ void setUp() throws Exception {
this.instance = new BinaryCodec();
}
@AfterEach
- public void tearDown() throws Exception {
+ void tearDown() throws Exception {
this.instance = null;
}
diff --git
a/src/test/java/org/apache/commons/codec/digest/Blake3TestVectorsTest.java
b/src/test/java/org/apache/commons/codec/digest/Blake3TestVectorsTest.java
index 3453cfc8..0dbed4d5 100644
--- a/src/test/java/org/apache/commons/codec/digest/Blake3TestVectorsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Blake3TestVectorsTest.java
@@ -42,7 +42,7 @@ class Blake3TestVectorsTest {
private static final byte[] CTX =
"BLAKE3 2019-12-27 16:29:52 test vectors
context".getBytes(StandardCharsets.UTF_8);
- public static Stream<Arguments> data() {
+ static Stream<Arguments> data() {
return Stream.of(
Arguments.of(
0,
@@ -268,7 +268,7 @@ class Blake3TestVectorsTest {
@ParameterizedTest
@MethodSource("data")
- public void hashArbitraryOutputLength(final int inputLength, final String
hash, final String keyedHash, final String deriveKey) throws DecoderException {
+ void hashArbitraryOutputLength(final int inputLength, final String hash,
final String keyedHash, final String deriveKey) throws DecoderException {
initData(inputLength, hash, keyedHash, deriveKey);
final byte[] actual =
hasher.update(inputByteArray).doFinalize(hashByteArray.length);
assertArrayEquals(hashByteArray, actual);
@@ -276,7 +276,7 @@ class Blake3TestVectorsTest {
@ParameterizedTest
@MethodSource("data")
- public void hashTruncatedOutput(final int inputLength, final String hash,
final String keyedHash, final String deriveKey) throws DecoderException {
+ void hashTruncatedOutput(final int inputLength, final String hash, final
String keyedHash, final String deriveKey) throws DecoderException {
initData(inputLength, hash, keyedHash, deriveKey);
final byte[] actual = Blake3.hash(inputByteArray);
assertArrayEquals(Arrays.copyOf(this.hashByteArray, 32), actual);
@@ -295,7 +295,7 @@ class Blake3TestVectorsTest {
@ParameterizedTest
@MethodSource("data")
- public void keyDerivation(final int inputLength, final String hash, final
String keyedHash, final String deriveKey) throws DecoderException {
+ void keyDerivation(final int inputLength, final String hash, final String
keyedHash, final String deriveKey) throws DecoderException {
initData(inputLength, hash, keyedHash, deriveKey);
final byte[] actual =
kdfHasher.update(inputByteArray).doFinalize(deriveKeyByteArray.length);
assertArrayEquals(deriveKeyByteArray, actual);
@@ -306,7 +306,7 @@ class Blake3TestVectorsTest {
@ParameterizedTest
@MethodSource("data")
- public void keyedHashArbitraryOutputLength(final int inputLength, final
String hash, final String keyedHash, final String deriveKey) throws
DecoderException {
+ void keyedHashArbitraryOutputLength(final int inputLength, final String
hash, final String keyedHash, final String deriveKey) throws DecoderException {
initData(inputLength, hash, keyedHash, deriveKey);
final byte[] actual =
keyedHasher.update(inputByteArray).doFinalize(keyedHashByteArray.length);
assertArrayEquals(keyedHashByteArray, actual);
@@ -314,7 +314,7 @@ class Blake3TestVectorsTest {
@ParameterizedTest
@MethodSource("data")
- public void keyedHashTruncatedOutput(final int inputLength, final String
hash, final String keyedHash, final String deriveKey) throws DecoderException {
+ void keyedHashTruncatedOutput(final int inputLength, final String hash,
final String keyedHash, final String deriveKey) throws DecoderException {
initData(inputLength, hash, keyedHash, deriveKey);
final byte[] actual = Blake3.keyedHash(KEY, inputByteArray);
assertArrayEquals(Arrays.copyOf(keyedHashByteArray, 32), actual);
diff --git
a/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
b/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
index c51005be..f43001d2 100644
--- a/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
@@ -98,7 +98,7 @@ class HmacAlgorithmsTest {
static Path TempFile;
// TODO HMAC_SHA_224
- public static Stream<Arguments> data() {
+ static Stream<Arguments> data() {
List<Arguments> list = Arrays.asList(
// @formatter:off
Arguments.of(HmacAlgorithms.HMAC_MD5,
STANDARD_MD5_RESULT_BYTES, STANDARD_MD5_RESULT_STRING),
@@ -115,20 +115,21 @@ class HmacAlgorithmsTest {
}
@BeforeAll
- public static void init() throws IOException {
+ static void init() throws IOException {
TempFile =
Files.createFile(TempDir.resolve(HmacAlgorithmsTest.class.getSimpleName()));
Files.write(TempFile, STANDARD_PHRASE_BYTES,
StandardOpenOption.CREATE);
}
private DigestUtilsTest digestUtilsTest;
+
@BeforeEach
- public void setUp() throws Exception {
+ void setUp() throws Exception {
digestUtilsTest = new DigestUtilsTest();
digestUtilsTest.setUp();
}
@AfterEach
- public void tearDown() throws Exception {
+ void tearDown() throws Exception {
digestUtilsTest.tearDown();
digestUtilsTest = null;
}
diff --git
a/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
b/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
index d4c4ce43..f98601fb 100644
---
a/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
+++
b/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
@@ -48,7 +48,7 @@ import org.junit.jupiter.params.provider.MethodSource;
class MessageDigestAlgorithmsTest {
@BeforeAll
- public static void checkValues() throws Exception {
+ static void checkValues() throws Exception {
final Field[] fields =
MessageDigestAlgorithms.class.getDeclaredFields();
boolean ok = true;
int psf = 0;
@@ -89,7 +89,7 @@ class MessageDigestAlgorithmsTest {
return false;
}
- public static String[] data() {
+ static String[] data() {
return MessageDigestAlgorithms.values();
}
@@ -116,13 +116,13 @@ class MessageDigestAlgorithmsTest {
}
@BeforeEach
- public void setUp() throws Exception {
+ void setUp() throws Exception {
digestUtilsTest = new DigestUtilsTest();
digestUtilsTest.setUp();
}
@AfterEach
- public void tearDown() throws Exception {
+ void tearDown() throws Exception {
digestUtilsTest.tearDown();
digestUtilsTest = null;
}
diff --git a/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
b/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
index 4e941ac5..ab29a494 100644
--- a/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
@@ -40,7 +40,7 @@ class XXHash32Test {
return IOUtils.copyLarge(input, output, new byte[bufferSize]);
}
- public static Stream<Arguments> data() {
+ static Stream<Arguments> data() {
// @formatter:off
return Stream.of(
// reference checksums created with xxh32sum
@@ -62,7 +62,7 @@ class XXHash32Test {
private String expectedChecksum;
- public void initData(final String path, final String c) throws Exception {
+ private void initData(final String path, final String c) throws Exception {
final URL url = XXHash32Test.class.getClassLoader().getResource(path);
if (url == null) {
throw new FileNotFoundException("couldn't find " + path);
@@ -73,7 +73,7 @@ class XXHash32Test {
@ParameterizedTest
@MethodSource("data")
- public void verifyChecksum(final String path, final String c) throws
Exception {
+ void verifyChecksum(final String path, final String c) throws Exception {
initData(path, c);
final XXHash32 hasher = new XXHash32();
try (InputStream in = Files.newInputStream(file)) {
@@ -85,7 +85,7 @@ class XXHash32Test {
@ParameterizedTest
@MethodSource("data")
- public void verifyIncrementalChecksum(final String path, final String c)
throws Exception {
+ void verifyIncrementalChecksum(final String path, final String c) throws
Exception {
initData(path, c);
final XXHash32 hasher = new XXHash32();
try (InputStream in = Files.newInputStream(file)) {
diff --git
a/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java
b/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java
index bab6d6a9..0508c64a 100644
--- a/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java
+++ b/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java
@@ -74,7 +74,7 @@ class ColognePhoneticTest extends
AbstractStringEncoderTest<ColognePhonetic> {
@AfterAll
// Check that all possible input sequence conditions are represented
- public static void finishTests() {
+ static void finishTests() {
int errors = 0;
for (final String m : MATCHES) {
if (!hasTestCase(m)) {
diff --git
a/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
b/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
index 813be044..9c8dcaf1 100644
--- a/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+++ b/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
@@ -1021,7 +1021,7 @@ class DoubleMetaphoneTest extends
AbstractStringEncoderTest<DoubleMetaphone> {
/**
* Tests encoding APIs in one place.
*/
- public void assertDoubleMetaphoneAlt(final String expected, final String
source) {
+ private void assertDoubleMetaphoneAlt(final String expected, final String
source) {
assertEquals(expected, getStringEncoder().doubleMetaphone(source,
true));
}
@@ -1030,7 +1030,7 @@ class DoubleMetaphoneTest extends
AbstractStringEncoderTest<DoubleMetaphone> {
return new DoubleMetaphone();
}
- public void doubleMetaphoneEqualTest(final String[][] pairs, final boolean
useAlternate) {
+ private void doubleMetaphoneEqualTest(final String[][] pairs, final
boolean useAlternate) {
validateFixture(pairs);
for (final String[] pair : pairs) {
final String name0 = pair[0];
@@ -1045,7 +1045,7 @@ class DoubleMetaphoneTest extends
AbstractStringEncoderTest<DoubleMetaphone> {
}
}
- public void doubleMetaphoneNotEqualTest(final boolean alternate) {
+ private void doubleMetaphoneNotEqualTest(final boolean alternate) {
assertFalse(getStringEncoder().isDoubleMetaphoneEqual("Brain", "Band",
alternate));
assertFalse(getStringEncoder().isDoubleMetaphoneEqual("Band", "Brain",
alternate));
@@ -1243,7 +1243,7 @@ class DoubleMetaphoneTest extends
AbstractStringEncoderTest<DoubleMetaphone> {
assertEquals("AMP", doubleMetaphone.doubleMetaphone(value, true),
"Max=3 Alternate");
}
- public void validateFixture(final String[][] pairs) {
+ private void validateFixture(final String[][] pairs) {
if (pairs.length == 0) {
fail("Test fixture is empty");
}
diff --git a/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
b/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
index a5f43807..c89bae23 100644
--- a/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
+++ b/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
*/
class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
- public void assertIsMetaphoneEqual(final String source, final String[]
matches) {
+ void assertIsMetaphoneEqual(final String source, final String[] matches) {
// match source to all matches
for (final String matche : matches) {
assertTrue(getStringEncoder().isMetaphoneEqual(source, matche),
"Source: " + source + ", should have same Metaphone as: " + matche);
@@ -41,7 +41,7 @@ class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
}
}
- public void assertMetaphoneEqual(final String[][] pairs) {
+ void assertMetaphoneEqual(final String[][] pairs) {
validateFixture(pairs);
for (final String[] pair : pairs) {
final String name0 = pair[0];
diff --git
a/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
b/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
index cd3bb28f..c6e9ecc2 100644
---
a/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
+++
b/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.params.provider.MethodSource;
*/
class LanguageGuessingTest {
- public static Stream<Arguments> data() {
+ static Stream<Arguments> data() {
return Stream.of(
Arguments.of("Renault", "french"),
Arguments.of("Mickiewicz", "polish"),
diff --git
a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
index e77abefc..edcb87ed 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
@@ -37,7 +37,7 @@ class PhoneticEngineTest {
private static final Pattern PIPE_PATTERN = Pattern.compile("\\|");
private static final Pattern MINUS_PATTERN = Pattern.compile("-");
- public static Stream<Arguments> data() {
+ static Stream<Arguments> data() {
// @formatter:off
return Stream.of(
Arguments.of("Renault",
"rinD|rinDlt|rina|rinalt|rino|rinolt|rinu|rinult", NameType.GENERIC,
RuleType.APPROX, Boolean.TRUE, TEN),
@@ -53,7 +53,7 @@ class PhoneticEngineTest {
// @formatter:on
}
- public static Stream<Arguments> invalidData() {
+ static Stream<Arguments> invalidData() {
// @formatter:off
return Stream.of(
Arguments.of("bar", "bar|bor|var|vor", NameType.ASHKENAZI,
RuleType.APPROX, Boolean.FALSE, TEN),
