You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/06/07 13:31:15 UTC
(commons-codec) branch master updated: Use JUnit 5 convention for @Test method visibility
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 264a34f9 Use JUnit 5 convention for @Test method visibility
264a34f9 is described below
commit 264a34f9630aca6fba9cd07630b2189bf201e42c
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Sat Jun 7 09:31:11 2025 -0400
Use JUnit 5 convention for @Test method visibility
---
.../commons/codec/AbstractStringEncoderTest.java | 8 +-
.../commons/codec/BinaryEncoderAbstractTest.java | 4 +-
.../org/apache/commons/codec/CharEncodingTest.java | 14 +-
.../org/apache/commons/codec/CharsetsTest.java | 14 +-
.../apache/commons/codec/DecoderExceptionTest.java | 8 +-
.../apache/commons/codec/EncoderExceptionTest.java | 8 +-
.../commons/codec/StringEncoderComparatorTest.java | 6 +-
.../codec/binary/Base16InputStreamTest.java | 26 +--
.../codec/binary/Base16OutputStreamTest.java | 10 +-
.../apache/commons/codec/binary/Base16Test.java | 62 +++----
.../codec/binary/Base32InputStreamTest.java | 34 ++--
.../codec/binary/Base32OutputStreamTest.java | 14 +-
.../apache/commons/codec/binary/Base32Test.java | 64 +++----
.../commons/codec/binary/Base64Codec13Test.java | 16 +-
.../codec/binary/Base64InputStreamTest.java | 42 ++---
.../codec/binary/Base64OutputStreamTest.java | 16 +-
.../apache/commons/codec/binary/Base64Test.java | 134 +++++++-------
.../commons/codec/binary/BaseNCodecTest.java | 24 +--
.../commons/codec/binary/BinaryCodecTest.java | 26 +--
.../codec/binary/CharSequenceUtilsTest.java | 4 +-
.../org/apache/commons/codec/binary/HexTest.java | 114 ++++++------
.../commons/codec/binary/StringUtilsTest.java | 44 ++---
.../org/apache/commons/codec/cli/DigestTest.java | 4 +-
.../apache/commons/codec/digest/Apr1CryptTest.java | 18 +-
.../org/apache/commons/codec/digest/B64Test.java | 4 +-
.../apache/commons/codec/digest/Blake3Test.java | 2 +-
.../org/apache/commons/codec/digest/CryptTest.java | 18 +-
.../commons/codec/digest/DigestUtilsTest.java | 72 ++++----
.../apache/commons/codec/digest/HmacUtilsTest.java | 46 ++---
.../apache/commons/codec/digest/Md5CryptTest.java | 20 +--
.../commons/codec/digest/MurmurHash2Test.java | 16 +-
.../commons/codec/digest/MurmurHash3Test.java | 54 +++---
.../commons/codec/digest/PureJavaCrc32CTest.java | 8 +-
.../commons/codec/digest/PureJavaCrc32Test.java | 2 +-
.../commons/codec/digest/Sha256CryptTest.java | 18 +-
.../apache/commons/codec/digest/Sha2CryptTest.java | 2 +-
.../commons/codec/digest/Sha512CryptTest.java | 20 +--
.../apache/commons/codec/digest/UnixCryptTest.java | 18 +-
.../commons/codec/digest/XXHash32OverflowTest.java | 2 +-
.../commons/codec/language/Caverphone1Test.java | 10 +-
.../commons/codec/language/Caverphone2Test.java | 18 +-
.../codec/language/ColognePhoneticTest.java | 20 +--
.../codec/language/DaitchMokotoffSoundexTest.java | 18 +-
.../codec/language/DoubleMetaphone2Test.java | 4 +-
.../codec/language/DoubleMetaphoneTest.java | 26 +--
.../language/MatchRatingApproachEncoderTest.java | 192 ++++++++++-----------
.../commons/codec/language/MetaphoneTest.java | 60 +++----
.../apache/commons/codec/language/NysiisTest.java | 38 ++--
.../commons/codec/language/RefinedSoundexTest.java | 14 +-
.../apache/commons/codec/language/SoundexTest.java | 50 +++---
.../codec/language/bm/BeiderMorseEncoderTest.java | 34 ++--
.../bm/CacheSubSequencePerformanceTest.java | 2 +-
.../language/bm/PhoneticEnginePerformanceTest.java | 2 +-
.../language/bm/PhoneticEngineRegressionTest.java | 8 +-
.../apache/commons/codec/language/bm/RuleTest.java | 6 +-
.../org/apache/commons/codec/net/BCodecTest.java | 24 +--
.../apache/commons/codec/net/PercentCodecTest.java | 24 +--
.../org/apache/commons/codec/net/QCodecTest.java | 24 +--
.../codec/net/QuotedPrintableCodecTest.java | 44 ++---
.../apache/commons/codec/net/RFC1522CodecTest.java | 4 +-
.../org/apache/commons/codec/net/URLCodecTest.java | 32 ++--
.../org/apache/commons/codec/net/UtilsTest.java | 2 +-
62 files changed, 836 insertions(+), 836 deletions(-)
diff --git a/src/test/java/org/apache/commons/codec/AbstractStringEncoderTest.java b/src/test/java/org/apache/commons/codec/AbstractStringEncoderTest.java
index 6fa6c887..eabc242c 100644
--- a/src/test/java/org/apache/commons/codec/AbstractStringEncoderTest.java
+++ b/src/test/java/org/apache/commons/codec/AbstractStringEncoderTest.java
@@ -54,7 +54,7 @@ public abstract class AbstractStringEncoderTest<T extends StringEncoder> {
}
@Test
- public void testEncodeEmpty() throws Exception {
+ void testEncodeEmpty() throws Exception {
final Encoder encoder = this.getStringEncoder();
encoder.encode("");
encoder.encode(" ");
@@ -62,19 +62,19 @@ public abstract class AbstractStringEncoderTest<T extends StringEncoder> {
}
@Test
- public void testEncodeNull() throws EncoderException {
+ void testEncodeNull() throws EncoderException {
final StringEncoder encoder = this.getStringEncoder();
encoder.encode(null);
}
@Test
- public void testEncodeWithInvalidObject() throws Exception {
+ void testEncodeWithInvalidObject() throws Exception {
final StringEncoder encoder = this.getStringEncoder();
assertThrows(EncoderException.class, () -> encoder.encode(Float.valueOf(3.4f)),
"An exception was not thrown when we tried to encode a Float object");
}
@Test
- public void testLocaleIndependence() throws Exception {
+ void testLocaleIndependence() throws Exception {
final StringEncoder encoder = this.getStringEncoder();
final String[] data = { "I", "i" };
diff --git a/src/test/java/org/apache/commons/codec/BinaryEncoderAbstractTest.java b/src/test/java/org/apache/commons/codec/BinaryEncoderAbstractTest.java
index 558adf02..b1ef46e9 100644
--- a/src/test/java/org/apache/commons/codec/BinaryEncoderAbstractTest.java
+++ b/src/test/java/org/apache/commons/codec/BinaryEncoderAbstractTest.java
@@ -28,13 +28,13 @@ public abstract class BinaryEncoderAbstractTest {
protected abstract BinaryEncoder makeEncoder();
@Test
- public void testEncodeEmpty() throws Exception {
+ void testEncodeEmpty() throws Exception {
final BinaryEncoder encoder = makeEncoder();
encoder.encode(new byte[0]);
}
@Test
- public void testEncodeNull() {
+ void testEncodeNull() {
assertThrows(EncoderException.class, () -> makeEncoder().encode(null));
}
}
diff --git a/src/test/java/org/apache/commons/codec/CharEncodingTest.java b/src/test/java/org/apache/commons/codec/CharEncodingTest.java
index 13499049..0361be42 100644
--- a/src/test/java/org/apache/commons/codec/CharEncodingTest.java
+++ b/src/test/java/org/apache/commons/codec/CharEncodingTest.java
@@ -32,37 +32,37 @@ public class CharEncodingTest {
* We could make the constructor private in the future, it's a matter a style.
*/
@Test
- public void testConstructor() {
+ void testConstructor() {
new CharEncoding();
}
@Test
- public void testIso8859_1() {
+ void testIso8859_1() {
assertEquals(StandardCharsets.ISO_8859_1.name(), CharEncoding.ISO_8859_1);
}
@Test
- public void testUsAscii() {
+ void testUsAscii() {
assertEquals(StandardCharsets.US_ASCII.name(), CharEncoding.US_ASCII);
}
@Test
- public void testUtf16() {
+ void testUtf16() {
assertEquals(StandardCharsets.UTF_16.name(), CharEncoding.UTF_16);
}
@Test
- public void testUtf16Be() {
+ void testUtf16Be() {
assertEquals(StandardCharsets.UTF_16BE.name(), CharEncoding.UTF_16BE);
}
@Test
- public void testUtf16Le() {
+ void testUtf16Le() {
assertEquals(StandardCharsets.UTF_16LE.name(), CharEncoding.UTF_16LE);
}
@Test
- public void testUtf8() {
+ void testUtf8() {
assertEquals(StandardCharsets.UTF_8.name(), CharEncoding.UTF_8);
}
diff --git a/src/test/java/org/apache/commons/codec/CharsetsTest.java b/src/test/java/org/apache/commons/codec/CharsetsTest.java
index a0f79367..0748b3c2 100644
--- a/src/test/java/org/apache/commons/codec/CharsetsTest.java
+++ b/src/test/java/org/apache/commons/codec/CharsetsTest.java
@@ -45,12 +45,12 @@ public class CharsetsTest {
@SuppressWarnings("deprecation")
@Test
- public void testIso8859_1() {
+ void testIso8859_1() {
assertEquals("ISO-8859-1", Charsets.ISO_8859_1.name());
}
@Test
- public void testToCharset() {
+ void testToCharset() {
assertEquals(Charset.defaultCharset(), Charsets.toCharset((String) null));
assertEquals(Charset.defaultCharset(), Charsets.toCharset((Charset) null));
assertEquals(Charset.defaultCharset(), Charsets.toCharset(Charset.defaultCharset()));
@@ -59,31 +59,31 @@ public class CharsetsTest {
@SuppressWarnings("deprecation")
@Test
- public void testUsAscii() {
+ void testUsAscii() {
assertEquals(StandardCharsets.US_ASCII.name(), Charsets.US_ASCII.name());
}
@SuppressWarnings("deprecation")
@Test
- public void testUtf16() {
+ void testUtf16() {
assertEquals(StandardCharsets.UTF_16.name(), Charsets.UTF_16.name());
}
@SuppressWarnings("deprecation")
@Test
- public void testUtf16Be() {
+ void testUtf16Be() {
assertEquals(StandardCharsets.UTF_16BE.name(), Charsets.UTF_16BE.name());
}
@SuppressWarnings("deprecation")
@Test
- public void testUtf16Le() {
+ void testUtf16Le() {
assertEquals(StandardCharsets.UTF_16LE.name(), Charsets.UTF_16LE.name());
}
@SuppressWarnings("deprecation")
@Test
- public void testUtf8() {
+ void testUtf8() {
assertEquals(StandardCharsets.UTF_8.name(), Charsets.UTF_8.name());
}
diff --git a/src/test/java/org/apache/commons/codec/DecoderExceptionTest.java b/src/test/java/org/apache/commons/codec/DecoderExceptionTest.java
index a9977aca..1c93e58a 100644
--- a/src/test/java/org/apache/commons/codec/DecoderExceptionTest.java
+++ b/src/test/java/org/apache/commons/codec/DecoderExceptionTest.java
@@ -32,28 +32,28 @@ public class DecoderExceptionTest {
private static final Throwable t = new Exception();
@Test
- public void testConstructor0() {
+ void testConstructor0() {
final DecoderException e = new DecoderException();
assertNull(e.getMessage());
assertNull(e.getCause());
}
@Test
- public void testConstructorString() {
+ void testConstructorString() {
final DecoderException e = new DecoderException(MSG);
assertEquals(MSG, e.getMessage());
assertNull(e.getCause());
}
@Test
- public void testConstructorStringThrowable() {
+ void testConstructorStringThrowable() {
final DecoderException e = new DecoderException(MSG, t);
assertEquals(MSG, e.getMessage());
assertEquals(t, e.getCause());
}
@Test
- public void testConstructorThrowable() {
+ void testConstructorThrowable() {
final DecoderException e = new DecoderException(t);
assertEquals(t.getClass().getName(), e.getMessage());
assertEquals(t, e.getCause());
diff --git a/src/test/java/org/apache/commons/codec/EncoderExceptionTest.java b/src/test/java/org/apache/commons/codec/EncoderExceptionTest.java
index cdd129bb..5bfbcd74 100644
--- a/src/test/java/org/apache/commons/codec/EncoderExceptionTest.java
+++ b/src/test/java/org/apache/commons/codec/EncoderExceptionTest.java
@@ -32,28 +32,28 @@ public class EncoderExceptionTest {
private static final Throwable t = new Exception();
@Test
- public void testConstructor0() {
+ void testConstructor0() {
final EncoderException e = new EncoderException();
assertNull(e.getMessage());
assertNull(e.getCause());
}
@Test
- public void testConstructorString() {
+ void testConstructorString() {
final EncoderException e = new EncoderException(MSG);
assertEquals(MSG, e.getMessage());
assertNull(e.getCause());
}
@Test
- public void testConstructorStringThrowable() {
+ void testConstructorStringThrowable() {
final EncoderException e = new EncoderException(MSG, t);
assertEquals(MSG, e.getMessage());
assertEquals(t, e.getCause());
}
@Test
- public void testConstructorThrowable() {
+ void testConstructorThrowable() {
final EncoderException e = new EncoderException(t);
assertEquals(t.getClass().getName(), e.getMessage());
assertEquals(t, e.getCause());
diff --git a/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java b/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
index 1705e0bc..269205e7 100644
--- a/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
+++ b/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
@@ -34,7 +34,7 @@ public class StringEncoderComparatorTest {
@SuppressWarnings("unchecked") // cannot easily avoid this warning
@Test
- public void testComparatorWithDoubleMetaphone() throws Exception {
+ void testComparatorWithDoubleMetaphone() throws Exception {
final StringEncoderComparator sCompare = new StringEncoderComparator(new DoubleMetaphone());
final String[] testArray = { "Jordan", "Sosa", "Prior", "Pryor" };
@@ -52,7 +52,7 @@ public class StringEncoderComparatorTest {
}
@Test
- public void testComparatorWithDoubleMetaphoneAndInvalidInput() throws Exception {
+ void testComparatorWithDoubleMetaphoneAndInvalidInput() throws Exception {
final StringEncoderComparator sCompare = new StringEncoderComparator(new DoubleMetaphone());
final int compare = sCompare.compare(Double.valueOf(3.0d), Long.valueOf(3));
@@ -60,7 +60,7 @@ public class StringEncoderComparatorTest {
}
@Test
- public void testComparatorWithSoundex() throws Exception {
+ void testComparatorWithSoundex() throws Exception {
final StringEncoderComparator sCompare = new StringEncoderComparator(new Soundex());
assertEquals(0, sCompare.compare("O'Brien", "O'Brian"), "O'Brien and O'Brian didn't come out with the same Soundex, something must be wrong here");
diff --git a/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
index e014e88b..42966d60 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
@@ -46,7 +46,7 @@ public class Base16InputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testAvailable() throws IOException {
+ void testAvailable() throws IOException {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B16));
try (Base16InputStream b16Stream = new Base16InputStream(ins)) {
assertEquals(1, b16Stream.available());
@@ -65,7 +65,7 @@ public class Base16InputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testBase16EmptyInputStream() throws IOException {
+ void testBase16EmptyInputStream() throws IOException {
final byte[] emptyEncoded = {};
final byte[] emptyDecoded = {};
testByteByByte(emptyEncoded, emptyDecoded);
@@ -78,7 +78,7 @@ public class Base16InputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testBase16InputStreamByChunk() throws IOException {
+ void testBase16InputStreamByChunk() throws IOException {
// Hello World test.
byte[] encoded = StringUtils.getBytesUtf8("48656C6C6F20576F726C64");
byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
@@ -110,7 +110,7 @@ public class Base16InputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testBase16InputStreamByteByByte() throws IOException {
+ void testBase16InputStreamByteByByte() throws IOException {
// Hello World test.
byte[] encoded = StringUtils.getBytesUtf8("48656C6C6F20576F726C64");
byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
@@ -267,7 +267,7 @@ public class Base16InputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testMarkSupported() throws IOException {
+ void testMarkSupported() throws IOException {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
try (Base16InputStream in = new Base16InputStream(bin, true)) {
@@ -282,7 +282,7 @@ public class Base16InputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testRead0() throws IOException {
+ void testRead0() throws IOException {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final byte[] buf = new byte[1024];
int bytesRead = 0;
@@ -299,7 +299,7 @@ public class Base16InputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testReadNull() throws IOException {
+ void testReadNull() throws IOException {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
try (Base16InputStream in = new Base16InputStream(bin, true)) {
@@ -313,7 +313,7 @@ public class Base16InputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testReadOutOfBounds() throws IOException {
+ void testReadOutOfBounds() throws IOException {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final byte[] buf = new byte[1024];
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
@@ -331,7 +331,7 @@ public class Base16InputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testSkipBig() throws IOException {
+ void testSkipBig() throws IOException {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B16));
try (Base16InputStream b16Stream = new Base16InputStream(ins)) {
assertEquals(6, b16Stream.skip(Integer.MAX_VALUE));
@@ -347,7 +347,7 @@ public class Base16InputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testSkipNone() throws IOException {
+ void testSkipNone() throws IOException {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B16));
try (Base16InputStream b16Stream = new Base16InputStream(ins)) {
final byte[] actualBytes = new byte[6];
@@ -365,7 +365,7 @@ public class Base16InputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testSkipPastEnd() throws IOException {
+ void testSkipPastEnd() throws IOException {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B16));
try (Base16InputStream b16Stream = new Base16InputStream(ins)) {
// due to CODEC-130, skip now skips correctly decoded characters rather than encoded
@@ -382,7 +382,7 @@ public class Base16InputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testSkipToEnd() throws IOException {
+ void testSkipToEnd() throws IOException {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B16));
try (Base16InputStream b16Stream = new Base16InputStream(ins)) {
// due to CODEC-130, skip now skips correctly decoded characters rather than encoded
@@ -399,7 +399,7 @@ public class Base16InputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testSkipWrongArgument() throws IOException {
+ void testSkipWrongArgument() throws IOException {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B16));
try (Base16InputStream b16Stream = new Base16InputStream(ins)) {
assertThrows(IllegalArgumentException.class, () -> b16Stream.skip(-10));
diff --git a/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
index da373445..1d1499e0 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
@@ -39,7 +39,7 @@ public class Base16OutputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testBase16EmptyOutputStream() throws IOException {
+ void testBase16EmptyOutputStream() throws IOException {
final byte[] emptyEncoded = {};
final byte[] emptyDecoded = {};
testByteByByte(emptyEncoded, emptyDecoded);
@@ -52,7 +52,7 @@ public class Base16OutputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testBase16OutputStreamByChunk() throws IOException {
+ void testBase16OutputStreamByChunk() throws IOException {
// Hello World test.
byte[] encoded = StringUtils.getBytesUtf8("48656C6C6F20576F726C64");
byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
@@ -79,7 +79,7 @@ public class Base16OutputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testBase16OutputStreamByteByByte() throws IOException {
+ void testBase16OutputStreamByteByByte() throws IOException {
// Hello World test.
byte[] encoded = StringUtils.getBytesUtf8("48656C6C6F20576F726C64");
byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
@@ -234,7 +234,7 @@ public class Base16OutputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testWriteOutOfBounds() throws IOException {
+ void testWriteOutOfBounds() throws IOException {
final byte[] buf = new byte[1024];
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
try (Base16OutputStream out = new Base16OutputStream(bout)) {
@@ -251,7 +251,7 @@ public class Base16OutputStreamTest {
* @throws IOException for some failure scenarios.
*/
@Test
- public void testWriteToNullCoverage() throws IOException {
+ void testWriteToNullCoverage() throws IOException {
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
try (Base16OutputStream out = new Base16OutputStream(bout)) {
assertThrows(NullPointerException.class, () -> out.write(null, 0, 0));
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 f0378e90..eb63094e 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16Test.java
@@ -54,7 +54,7 @@ public class Base16Test {
* Test the Base16 implementation
*/
@Test
- public void testBase16() {
+ void testBase16() {
final String content = "Hello World";
final byte[] encodedBytes = new Base16().encode(StringUtils.getBytesUtf8(content));
final String encodedContent = StringUtils.newStringUtf8(encodedBytes);
@@ -66,17 +66,17 @@ public class Base16Test {
}
@Test
- public void testBase16AtBufferEnd() {
+ void testBase16AtBufferEnd() {
testBase16InBuffer(100, 0);
}
@Test
- public void testBase16AtBufferMiddle() {
+ void testBase16AtBufferMiddle() {
testBase16InBuffer(100, 100);
}
@Test
- public void testBase16AtBufferStart() {
+ void testBase16AtBufferStart() {
testBase16InBuffer(0, 100);
}
@@ -92,7 +92,7 @@ public class Base16Test {
}
@Test
- public void testByteToStringVariations() {
+ void testByteToStringVariations() {
final Base16 base16 = new Base16();
final byte[] b1 = StringUtils.getBytesUtf8("Hello World");
final byte[] b2 = {};
@@ -107,7 +107,7 @@ public class Base16Test {
}
@Test
- public void testCheckEncodeLengthBounds() {
+ void testCheckEncodeLengthBounds() {
final Base16 base16 = new Base16();
assertThrows(IllegalArgumentException.class, () -> base16.encode(new byte[10], 0, 1 << 30));
}
@@ -116,14 +116,14 @@ public class Base16Test {
* isBase16 throws RuntimeException on some non-Base16 bytes
*/
@Test
- public void testCodec68() {
+ void testCodec68() {
final byte[] x = { 'n', 'H', '=', '=', (byte) 0x9c };
final Base16 b16 = new Base16();
assertThrows(RuntimeException.class, () -> b16.decode(x));
}
@Test
- public void testConstructor_LowerCase() {
+ void testConstructor_LowerCase() {
final Base16 base16 = new Base16(true);
final byte[] encoded = base16.encode(BaseNTestData.DECODED);
final String expectedResult = Base16TestData.ENCODED_UTF8_LOWERCASE;
@@ -132,7 +132,7 @@ public class Base16Test {
}
@Test
- public void testConstructor_LowerCase_DecodingPolicy() {
+ void testConstructor_LowerCase_DecodingPolicy() {
final Base16 base16 = new Base16(false, CodecPolicy.STRICT);
final byte[] encoded = base16.encode(BaseNTestData.DECODED);
final String expectedResult = Base16TestData.ENCODED_UTF8_UPPERCASE;
@@ -141,7 +141,7 @@ public class Base16Test {
}
@Test
- public void testConstructors() {
+ void testConstructors() {
new Base16();
new Base16(false);
new Base16(true);
@@ -150,7 +150,7 @@ public class Base16Test {
}
@Test
- public void testDecodeSingleBytes() {
+ void testDecodeSingleBytes() {
final String encoded = "556E74696C206E6578742074696D6521";
final BaseNCodec.Context context = new BaseNCodec.Context();
@@ -180,7 +180,7 @@ public class Base16Test {
}
@Test
- public void testDecodeSingleBytesOptimization() {
+ void testDecodeSingleBytesOptimization() {
final BaseNCodec.Context context = new BaseNCodec.Context();
assertEquals(0, context.ibitWorkArea);
assertNull(context.buffer);
@@ -205,7 +205,7 @@ public class Base16Test {
* Test encode and decode of empty byte array.
*/
@Test
- public void testEmptyBase16() {
+ void testEmptyBase16() {
byte[] empty = {};
byte[] result = new Base16().encode(empty);
assertEquals(0, result.length, "empty Base16 encode");
@@ -222,7 +222,7 @@ public class Base16Test {
// encode/decode a large random array
@Test
- public void testEncodeDecodeRandom() {
+ void testEncodeDecodeRandom() {
for (int i = 1; i < 5; i++) {
final int len = getRandom().nextInt(10000) + 1;
final byte[] data = new byte[len];
@@ -235,7 +235,7 @@ public class Base16Test {
// encode/decode random arrays from size 0 to size 11
@Test
- public void testEncodeDecodeSmall() {
+ void testEncodeDecodeSmall() {
for (int i = 0; i < 12; i++) {
final byte[] data = new byte[i];
getRandom().nextBytes(data);
@@ -246,7 +246,7 @@ public class Base16Test {
}
@Test
- public void testIsInAlphabet() {
+ void testIsInAlphabet() {
// invalid bounds
Base16 b16 = new Base16(true);
assertFalse(b16.isInAlphabet((byte) 0));
@@ -293,7 +293,7 @@ public class Base16Test {
}
@Test
- public void testKnownDecodings() {
+ void testKnownDecodings() {
assertEquals("The quick brown fox jumped over the lazy dogs.", new String(new Base16(true)
.decode("54686520717569636b2062726f776e20666f78206a756d706564206f76657220746865206c617a7920646f67732e".getBytes(CHARSET_UTF8))));
assertEquals("It was the best of times, it was the worst of times.", new String(new Base16(true)
@@ -308,7 +308,7 @@ public class Base16Test {
}
@Test
- public void testKnownEncodings() {
+ void testKnownEncodings() {
assertEquals("54686520717569636b2062726f776e20666f78206a756d706564206f76657220746865206c617a7920646f67732e",
new String(new Base16(true).encode("The quick brown fox jumped over the lazy dogs.".getBytes(CHARSET_UTF8))));
assertEquals("497420776173207468652062657374206f662074696d65732c206974207761732074686520776f727374206f662074696d65732e",
@@ -323,7 +323,7 @@ public class Base16Test {
}
@Test
- public void testLenientDecoding() {
+ void testLenientDecoding() {
final String encoded = "aabbccdde"; // Note the trailing `e` which does not make up a hex-pair and so is only 1/2 byte
final Base16 b16 = new Base16(true, CodecPolicy.LENIENT);
@@ -334,7 +334,7 @@ public class Base16Test {
}
@Test
- public void testNonBase16Test() {
+ void testNonBase16Test() {
final byte[] invalidEncodedChars = { '/', ':', '@', 'G', '%', '`', 'g' };
final byte[] encoded = new byte[1];
@@ -345,12 +345,12 @@ public class Base16Test {
}
@Test
- public void testObjectDecodeWithInvalidParameter() {
+ void testObjectDecodeWithInvalidParameter() {
assertThrows(DecoderException.class, () -> new Base16().decode(Integer.valueOf(5)));
}
@Test
- public void testObjectDecodeWithValidParameter() throws Exception {
+ void testObjectDecodeWithValidParameter() throws Exception {
final String original = "Hello World!";
final Object o = new Base16().encode(original.getBytes(CHARSET_UTF8));
@@ -363,18 +363,18 @@ public class Base16Test {
}
@Test
- public void testObjectEncode() {
+ void testObjectEncode() {
final Base16 b16 = new Base16();
assertEquals(new String(b16.encode("Hello World".getBytes(CHARSET_UTF8))), "48656C6C6F20576F726C64");
}
@Test
- public void testObjectEncodeWithInvalidParameter() {
+ void testObjectEncodeWithInvalidParameter() {
assertThrows(EncoderException.class, () -> new Base16().encode("Yadayadayada"));
}
@Test
- public void testObjectEncodeWithValidParameter() throws Exception {
+ void testObjectEncodeWithValidParameter() throws Exception {
final String original = "Hello World!";
final Object origObj = original.getBytes(CHARSET_UTF8);
@@ -386,7 +386,7 @@ public class Base16Test {
}
@Test
- public void testOddEvenDecoding() {
+ void testOddEvenDecoding() {
final String encoded = "4142434445";
final BaseNCodec.Context context = new BaseNCodec.Context();
@@ -407,7 +407,7 @@ public class Base16Test {
}
@Test
- public void testPairs() {
+ void testPairs() {
assertEquals("0000", new String(new Base16().encode(new byte[] { (byte) 0, (byte) 0 })));
assertEquals("0001", new String(new Base16().encode(new byte[] { (byte) 0, (byte) 1 })));
assertEquals("0002", new String(new Base16().encode(new byte[] { (byte) 0, (byte) 2 })));
@@ -433,7 +433,7 @@ public class Base16Test {
}
@Test
- public void testSingletons() {
+ void testSingletons() {
assertEquals("00", new String(new Base16().encode(new byte[] { (byte) 0 })));
assertEquals("01", new String(new Base16().encode(new byte[] { (byte) 1 })));
assertEquals("02", new String(new Base16().encode(new byte[] { (byte) 2 })));
@@ -546,7 +546,7 @@ public class Base16Test {
}
@Test
- public void testStrictDecoding() {
+ void testStrictDecoding() {
final String encoded = "aabbccdde"; // Note the trailing `e` which does not make up a hex-pair and so is only 1/2 byte
final Base16 b16 = new Base16(true, CodecPolicy.STRICT);
@@ -555,7 +555,7 @@ public class Base16Test {
}
@Test
- public void testStringToByteVariations() throws DecoderException {
+ void testStringToByteVariations() throws DecoderException {
final Base16 base16 = new Base16();
final String s1 = "48656C6C6F20576F726C64";
final String s2 = "";
@@ -571,7 +571,7 @@ public class Base16Test {
}
@Test
- public void testTriplets() {
+ void testTriplets() {
assertEquals("000000", new String(new Base16().encode(new byte[] { (byte) 0, (byte) 0, (byte) 0 })));
assertEquals("000001", new String(new Base16().encode(new byte[] { (byte) 0, (byte) 0, (byte) 1 })));
assertEquals("000002", new String(new Base16().encode(new byte[] { (byte) 0, (byte) 0, (byte) 2 })));
diff --git a/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
index 2ddd8374..75c7847b 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
@@ -51,7 +51,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testAvailable() throws Throwable {
+ void testAvailable() throws Throwable {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_FOO));
try (Base32InputStream b32stream = new Base32InputStream(ins)) {
assertEquals(1, b32stream.available());
@@ -144,7 +144,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase32EmptyInputStreamMimeChuckSize() throws Exception {
+ void testBase32EmptyInputStreamMimeChuckSize() throws Exception {
testBase32EmptyInputStream(BaseNCodec.MIME_CHUNK_SIZE);
}
@@ -155,7 +155,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase32EmptyInputStreamPemChuckSize() throws Exception {
+ void testBase32EmptyInputStreamPemChuckSize() throws Exception {
testBase32EmptyInputStream(BaseNCodec.PEM_CHUNK_SIZE);
}
@@ -166,7 +166,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase32InputStreamByChunk() throws Exception {
+ void testBase32InputStreamByChunk() throws Exception {
// Hello World test.
byte[] encoded = StringUtils.getBytesUtf8(Base32TestData.BASE32_FIXTURE);
byte[] decoded = StringUtils.getBytesUtf8(Base32TestData.STRING_FIXTURE);
@@ -205,7 +205,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase32InputStreamByteByByte() throws Exception {
+ void testBase32InputStreamByteByByte() throws Exception {
// Hello World test.
byte[] encoded = StringUtils.getBytesUtf8(Base32TestData.BASE32_FIXTURE);
byte[] decoded = StringUtils.getBytesUtf8(Base32TestData.STRING_FIXTURE);
@@ -346,7 +346,7 @@ public class Base32InputStreamTest {
* Tests the bug reported in CODEC-105. Bad interactions with InputStream when reading one byte at a time.
*/
@Test
- public void testCodec105() throws IOException {
+ void testCodec105() throws IOException {
try (Base32InputStream in = new Base32InputStream(new Codec105ErrorInputStream(), true, 0, null)) {
for (int i = 0; i < 5; i++) {
in.read();
@@ -358,7 +358,7 @@ public class Base32InputStreamTest {
* Tests the problem reported in CODEC-130. Missing / wrong implementation of skip.
*/
@Test
- public void testCodec130() throws IOException {
+ void testCodec130() throws IOException {
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
try (Base32OutputStream base32os = new Base32OutputStream(bos)) {
base32os.write(StringUtils.getBytesUtf8(STRING_FIXTURE));
@@ -382,7 +382,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testMarkSupported() throws Exception {
+ void testMarkSupported() throws Exception {
final byte[] decoded = StringUtils.getBytesUtf8(Base32TestData.STRING_FIXTURE);
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
try (Base32InputStream in = new Base32InputStream(bin, true, 4, new byte[] { 0, 0, 0 })) {
@@ -398,7 +398,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testRead0() throws Exception {
+ void testRead0() throws Exception {
final byte[] decoded = StringUtils.getBytesUtf8(Base32TestData.STRING_FIXTURE);
final byte[] buf = new byte[1024];
int bytesRead = 0;
@@ -416,7 +416,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testReadNull() throws Exception {
+ void testReadNull() throws Exception {
final byte[] decoded = StringUtils.getBytesUtf8(Base32TestData.STRING_FIXTURE);
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
try (Base32InputStream in = new Base32InputStream(bin, true, 4, new byte[] {0, 0, 0})) {
@@ -431,7 +431,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testReadOutOfBounds() throws Exception {
+ void testReadOutOfBounds() throws Exception {
final byte[] decoded = StringUtils.getBytesUtf8(Base32TestData.STRING_FIXTURE);
final byte[] buf = new byte[1024];
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
@@ -450,7 +450,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testSkipBig() throws Throwable {
+ void testSkipBig() throws Throwable {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_FOO));
try (Base32InputStream b32stream = new Base32InputStream(ins)) {
assertEquals(3, b32stream.skip(1024));
@@ -467,7 +467,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testSkipNone() throws Throwable {
+ void testSkipNone() throws Throwable {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_FOO));
try (Base32InputStream b32stream = new Base32InputStream(ins)) {
final byte[] actualBytes = new byte[6];
@@ -486,7 +486,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testSkipPastEnd() throws Throwable {
+ void testSkipPastEnd() throws Throwable {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_FOO));
try (Base32InputStream b32stream = new Base32InputStream(ins)) {
// due to CODEC-130, skip now skips correctly decoded characters rather than encoded
@@ -504,7 +504,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testSkipToEnd() throws Throwable {
+ void testSkipToEnd() throws Throwable {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_FOO));
try (Base32InputStream b32stream = new Base32InputStream(ins)) {
// due to CODEC-130, skip now skips correctly decoded characters rather than encoded
@@ -522,7 +522,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testSkipWrongArgument() throws Throwable {
+ void testSkipWrongArgument() throws Throwable {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_FOO));
try (Base32InputStream b32stream = new Base32InputStream(ins)) {
assertThrows(IllegalArgumentException.class, () -> b32stream.skip(-10));
@@ -536,7 +536,7 @@ public class Base32InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testStrictDecoding() throws Exception {
+ void testStrictDecoding() throws Exception {
for (final String s : Base32Test.BASE32_IMPOSSIBLE_CASES) {
final byte[] encoded = StringUtils.getBytesUtf8(s);
final Base32InputStream in = new Base32InputStream(new ByteArrayInputStream(encoded), false);
diff --git a/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
index 87341ea9..cd913b20 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
@@ -74,7 +74,7 @@ public class Base32OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase32EmptyOutputStreamMimeChunkSize() throws Exception {
+ void testBase32EmptyOutputStreamMimeChunkSize() throws Exception {
testBase32EmptyOutputStream(BaseNCodec.MIME_CHUNK_SIZE);
}
@@ -85,7 +85,7 @@ public class Base32OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase32EmptyOutputStreamPemChunkSize() throws Exception {
+ void testBase32EmptyOutputStreamPemChunkSize() throws Exception {
testBase32EmptyOutputStream(BaseNCodec.PEM_CHUNK_SIZE);
}
@@ -96,7 +96,7 @@ public class Base32OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase32OutputStreamByChunk() throws Exception {
+ void testBase32OutputStreamByChunk() throws Exception {
// Hello World test.
byte[] encoded = StringUtils.getBytesUtf8(Base32TestData.BASE32_FIXTURE);
byte[] decoded = StringUtils.getBytesUtf8(Base32TestData.STRING_FIXTURE);
@@ -130,7 +130,7 @@ public class Base32OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase32OutputStreamByteByByte() throws Exception {
+ void testBase32OutputStreamByteByByte() throws Exception {
// Hello World test.
byte[] encoded = StringUtils.getBytesUtf8(Base32TestData.BASE32_FIXTURE);
byte[] decoded = StringUtils.getBytesUtf8(Base32TestData.STRING_FIXTURE);
@@ -281,7 +281,7 @@ public class Base32OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testStrictDecoding() throws Exception {
+ void testStrictDecoding() throws Exception {
for (final String s : Base32Test.BASE32_IMPOSSIBLE_CASES) {
final byte[] encoded = StringUtils.getBytesUtf8(s);
ByteArrayOutputStream bout = new ByteArrayOutputStream();
@@ -309,7 +309,7 @@ public class Base32OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testWriteOutOfBounds() throws Exception {
+ void testWriteOutOfBounds() throws Exception {
final byte[] buf = new byte[1024];
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
try (Base32OutputStream out = new Base32OutputStream(bout)) {
@@ -327,7 +327,7 @@ public class Base32OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testWriteToNullCoverage() throws Exception {
+ void testWriteToNullCoverage() throws Exception {
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
try (Base32OutputStream out = new Base32OutputStream(bout)) {
assertThrows(NullPointerException.class, () -> out.write(null, 0, 0));
diff --git a/src/test/java/org/apache/commons/codec/binary/Base32Test.java b/src/test/java/org/apache/commons/codec/binary/Base32Test.java
index b1880b4a..d5f60598 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32Test.java
@@ -213,22 +213,22 @@ public class Base32Test {
}
@Test
- public void testBase32AtBufferEnd() {
+ void testBase32AtBufferEnd() {
testBase32InBuffer(100, 0);
}
@Test
- public void testBase32AtBufferMiddle() {
+ void testBase32AtBufferMiddle() {
testBase32InBuffer(100, 100);
}
@Test
- public void testBase32AtBufferStart() {
+ void testBase32AtBufferStart() {
testBase32InBuffer(0, 100);
}
@Test
- public void testBase32BinarySamples() throws Exception {
+ void testBase32BinarySamples() throws Exception {
final Base32 codec = new Base32();
for (final Object[] element : BASE32_BINARY_TEST_CASES) {
final String expected;
@@ -242,7 +242,7 @@ public class Base32Test {
}
@Test
- public void testBase32BinarySamplesReverse() throws Exception {
+ void testBase32BinarySamplesReverse() throws Exception {
final Base32 codec = new Base32();
for (final Object[] element : BASE32_BINARY_TEST_CASES) {
assertArrayEquals((byte[]) element[0], codec.decode((String) element[1]));
@@ -250,7 +250,7 @@ public class Base32Test {
}
@Test
- public void testBase32Chunked() throws Exception {
+ void testBase32Chunked() throws Exception {
final Base32 codec = new Base32(20);
for (final String[] element : BASE32_TEST_CASES_CHUNKED) {
assertEquals(element[1], codec.encodeAsString(element[0].getBytes(CHARSET_UTF8)));
@@ -258,42 +258,42 @@ public class Base32Test {
}
@Test
- public void testBase32DecodingOfTrailing10Bits() {
+ void testBase32DecodingOfTrailing10Bits() {
assertBase32DecodingOfTrailingBits(10);
}
@Test
- public void testBase32DecodingOfTrailing15Bits() {
+ void testBase32DecodingOfTrailing15Bits() {
assertBase32DecodingOfTrailingBits(15);
}
@Test
- public void testBase32DecodingOfTrailing20Bits() {
+ void testBase32DecodingOfTrailing20Bits() {
assertBase32DecodingOfTrailingBits(20);
}
@Test
- public void testBase32DecodingOfTrailing25Bits() {
+ void testBase32DecodingOfTrailing25Bits() {
assertBase32DecodingOfTrailingBits(25);
}
@Test
- public void testBase32DecodingOfTrailing30Bits() {
+ void testBase32DecodingOfTrailing30Bits() {
assertBase32DecodingOfTrailingBits(30);
}
@Test
- public void testBase32DecodingOfTrailing35Bits() {
+ void testBase32DecodingOfTrailing35Bits() {
assertBase32DecodingOfTrailingBits(35);
}
@Test
- public void testBase32DecodingOfTrailing5Bits() {
+ void testBase32DecodingOfTrailing5Bits() {
assertBase32DecodingOfTrailingBits(5);
}
@Test
- public void testBase32HexImpossibleSamples() {
+ void testBase32HexImpossibleSamples() {
testImpossibleCases(new Base32(0, null, true, BaseNCodec.PAD_DEFAULT, CodecPolicy.STRICT), BASE32HEX_IMPOSSIBLE_CASES);
// @formatter:off
testImpossibleCases(Base32.builder()
@@ -314,7 +314,7 @@ public class Base32Test {
}
@Test
- public void testBase32HexSamples() throws Exception {
+ void testBase32HexSamples() throws Exception {
final Base32 codec = new Base32(true);
for (final String[] element : BASE32HEX_TEST_CASES) {
assertEquals(element[1], codec.encodeAsString(element[0].getBytes(CHARSET_UTF8)));
@@ -322,7 +322,7 @@ public class Base32Test {
}
@Test
- public void testBase32HexSamplesReverse() throws Exception {
+ void testBase32HexSamplesReverse() throws Exception {
final Base32 codec = new Base32(true);
for (final String[] element : BASE32HEX_TEST_CASES) {
assertEquals(element[0], new String(codec.decode(element[1]), CHARSET_UTF8));
@@ -330,7 +330,7 @@ public class Base32Test {
}
@Test
- public void testBase32HexSamplesReverseLowercase() throws Exception {
+ void testBase32HexSamplesReverseLowercase() throws Exception {
final Base32 codec = new Base32(true);
for (final String[] element : BASE32HEX_TEST_CASES) {
assertEquals(element[0], new String(codec.decode(element[1].toLowerCase()), CHARSET_UTF8));
@@ -338,12 +338,12 @@ public class Base32Test {
}
@Test
- public void testBase32ImpossibleChunked() {
+ void testBase32ImpossibleChunked() {
testImpossibleCases(new Base32(20, BaseNCodec.CHUNK_SEPARATOR, false, BaseNCodec.PAD_DEFAULT, CodecPolicy.STRICT), BASE32_IMPOSSIBLE_CASES_CHUNKED);
}
@Test
- public void testBase32ImpossibleSamples() {
+ void testBase32ImpossibleSamples() {
testImpossibleCases(new Base32(0, null, false, BaseNCodec.PAD_DEFAULT, CodecPolicy.STRICT), BASE32_IMPOSSIBLE_CASES);
}
@@ -358,7 +358,7 @@ public class Base32Test {
}
@Test
- public void testBase32Samples() throws Exception {
+ void testBase32Samples() throws Exception {
final Base32 codec = new Base32();
for (final String[] element : BASE32_TEST_CASES) {
assertEquals(element[1], codec.encodeAsString(element[0].getBytes(CHARSET_UTF8)));
@@ -366,7 +366,7 @@ public class Base32Test {
}
@Test
- public void testBase32SamplesNonDefaultPadding() throws Exception {
+ void testBase32SamplesNonDefaultPadding() throws Exception {
final Base32 codec = new Base32((byte) 0x25); // '%' <=> 0x25
for (final String[] element : BASE32_PAD_TEST_CASES) {
@@ -375,7 +375,7 @@ public class Base32Test {
}
@Test
- public void testBuilderCodecPolicy() {
+ void testBuilderCodecPolicy() {
assertEquals(CodecPolicy.LENIENT, Base32.builder().get().getCodecPolicy());
assertEquals(CodecPolicy.LENIENT, Base32.builder().setDecodingPolicy(CodecPolicy.LENIENT).get().getCodecPolicy());
assertEquals(CodecPolicy.STRICT, Base32.builder().setDecodingPolicy(CodecPolicy.STRICT).get().getCodecPolicy());
@@ -384,7 +384,7 @@ public class Base32Test {
}
@Test
- public void testBuilderLineAttributes() {
+ void testBuilderLineAttributes() {
assertNull(Base32.builder().get().getLineSeparator());
assertNull(Base32.builder().setLineSeparator(BaseNCodec.CHUNK_SEPARATOR).get().getLineSeparator());
assertArrayEquals(BaseNCodec.CHUNK_SEPARATOR, Base32.builder().setLineLength(4).setLineSeparator(BaseNCodec.CHUNK_SEPARATOR).get().getLineSeparator());
@@ -397,7 +397,7 @@ public class Base32Test {
}
@Test
- public void testBuilderPadingByte() {
+ void testBuilderPadingByte() {
assertNull(Base32.builder().get().getLineSeparator());
assertNull(Base32.builder().setLineSeparator(BaseNCodec.CHUNK_SEPARATOR).get().getLineSeparator());
assertArrayEquals(BaseNCodec.CHUNK_SEPARATOR, Base32.builder().setLineLength(4).setLineSeparator(BaseNCodec.CHUNK_SEPARATOR).get().getLineSeparator());
@@ -410,13 +410,13 @@ public class Base32Test {
}
@Test
- public void testCodec200() {
+ void testCodec200() {
final Base32 codec = new Base32(true, (byte) 'W'); // should be allowed
assertNotNull(codec);
}
@Test
- public void testConstructors() {
+ void testConstructors() {
Base32 base32;
base32 = new Base32();
base32 = new Base32(-1);
@@ -442,7 +442,7 @@ public class Base32Test {
* Test encode and decode of empty byte array.
*/
@Test
- public void testEmptyBase32() {
+ void testEmptyBase32() {
byte[] empty = {};
byte[] result = new Base32().encode(empty);
assertEquals(0, result.length, "empty Base32 encode");
@@ -464,7 +464,7 @@ public class Base32Test {
}
@Test
- public void testIsInAlphabet() {
+ void testIsInAlphabet() {
// invalid bounds
Base32 b32 = new Base32(true);
assertFalse(b32.isInAlphabet((byte) 0));
@@ -512,7 +512,7 @@ public class Base32Test {
}
@Test
- public void testRandomBytes() {
+ void testRandomBytes() {
for (int i = 0; i < 20; i++) {
final Base32 codec = new Base32();
final byte[][] b = BaseNTestData.randomData(codec, i);
@@ -522,7 +522,7 @@ public class Base32Test {
}
@Test
- public void testRandomBytesChunked() {
+ void testRandomBytesChunked() {
for (int i = 0; i < 20; i++) {
final Base32 codec = new Base32(10);
final byte[][] b = BaseNTestData.randomData(codec, i);
@@ -532,7 +532,7 @@ public class Base32Test {
}
@Test
- public void testRandomBytesHex() {
+ void testRandomBytesHex() {
for (int i = 0; i < 20; i++) {
final Base32 codec = new Base32(true);
final byte[][] b = BaseNTestData.randomData(codec, i);
@@ -542,7 +542,7 @@ public class Base32Test {
}
@Test
- public void testSingleCharEncoding() {
+ void testSingleCharEncoding() {
for (int i = 0; i < 20; i++) {
Base32 codec = new Base32();
final BaseNCodec.Context context = new BaseNCodec.Context();
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64Codec13Test.java b/src/test/java/org/apache/commons/codec/binary/Base64Codec13Test.java
index f50a51f1..c03d7ca3 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64Codec13Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64Codec13Test.java
@@ -368,7 +368,7 @@ public class Base64Codec13Test {
* @throws DecoderException problem
*/
@Test
- public void testBinaryDecoder() throws DecoderException {
+ void testBinaryDecoder() throws DecoderException {
final BinaryDecoder dec = new Base64();
for (int i = 0; i < STRINGS.length; i++) {
if (STRINGS[i] != null) {
@@ -386,7 +386,7 @@ public class Base64Codec13Test {
* @throws EncoderException problem
*/
@Test
- public void testBinaryEncoder() throws EncoderException {
+ void testBinaryEncoder() throws EncoderException {
final BinaryEncoder enc = new Base64();
for (int i = 0; i < STRINGS.length; i++) {
if (STRINGS[i] != null) {
@@ -404,7 +404,7 @@ public class Base64Codec13Test {
* @throws DecoderException problem
*/
@Test
- public void testDecoder() throws DecoderException {
+ void testDecoder() throws DecoderException {
final Decoder dec = new Base64();
for (int i = 0; i < STRINGS.length; i++) {
if (STRINGS[i] != null) {
@@ -422,7 +422,7 @@ public class Base64Codec13Test {
* @throws EncoderException problem
*/
@Test
- public void testEncoder() throws EncoderException {
+ void testEncoder() throws EncoderException {
final Encoder enc = new Base64();
for (int i = 0; i < STRINGS.length; i++) {
if (STRINGS[i] != null) {
@@ -438,7 +438,7 @@ public class Base64Codec13Test {
* static method is behaving identical to commons-codec-1.3.jar.
*/
@Test
- public void testStaticDecode() {
+ void testStaticDecode() {
for (int i = 0; i < STRINGS.length; i++) {
if (STRINGS[i] != null) {
final byte[] base64 = utf8(STRINGS[i]);
@@ -455,7 +455,7 @@ public class Base64Codec13Test {
* supplied with chunked input.
*/
@Test
- public void testStaticDecodeChunked() {
+ void testStaticDecodeChunked() {
for (int i = 0; i < STRINGS.length; i++) {
if (STRINGS[i] != null) {
final byte[] base64Chunked = utf8(CHUNKED_STRINGS[i]);
@@ -471,7 +471,7 @@ public class Base64Codec13Test {
* static method is behaving identical to commons-codec-1.3.jar.
*/
@Test
- public void testStaticEncode() {
+ void testStaticEncode() {
for (int i = 0; i < STRINGS.length; i++) {
if (STRINGS[i] != null) {
final byte[] base64 = utf8(STRINGS[i]);
@@ -487,7 +487,7 @@ public class Base64Codec13Test {
* static method is behaving identical to commons-codec-1.3.jar.
*/
@Test
- public void testStaticEncodeChunked() {
+ void testStaticEncodeChunked() {
for (int i = 0; i < STRINGS.length; i++) {
if (STRINGS[i] != null) {
final byte[] base64Chunked = utf8(CHUNKED_STRINGS[i]);
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
index 5e33ce19..7eb77537 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
@@ -57,7 +57,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testAvailable() throws Throwable {
+ void testAvailable() throws Throwable {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B64));
try (Base64InputStream b64stream = new Base64InputStream(ins)) {
assertEquals(1, b64stream.available());
@@ -84,7 +84,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase64EmptyInputStreamMimeChuckSize() throws Exception {
+ void testBase64EmptyInputStreamMimeChuckSize() throws Exception {
testBase64EmptyInputStream(BaseNCodec.MIME_CHUNK_SIZE);
}
@@ -95,7 +95,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase64EmptyInputStreamPemChuckSize() throws Exception {
+ void testBase64EmptyInputStreamPemChuckSize() throws Exception {
testBase64EmptyInputStream(BaseNCodec.PEM_CHUNK_SIZE);
}
@@ -106,7 +106,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase64InputStreamByChunk() throws Exception {
+ void testBase64InputStreamByChunk() throws Exception {
// Hello World test.
byte[] encoded = StringUtils.getBytesUtf8("SGVsbG8gV29ybGQ=\r\n");
byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
@@ -145,7 +145,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase64InputStreamByteByByte() throws Exception {
+ void testBase64InputStreamByteByByte() throws Exception {
// Hello World test.
byte[] encoded = StringUtils.getBytesUtf8("SGVsbG8gV29ybGQ=\r\n");
byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
@@ -292,7 +292,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testCodec101() throws Exception {
+ void testCodec101() throws Exception {
final byte[] codec101 = StringUtils.getBytesUtf8(Base64TestData.CODEC_101_INPUT_LENGTH_IS_MULTIPLE_OF_3);
final ByteArrayInputStream bais = new ByteArrayInputStream(codec101);
try (Base64InputStream in = new Base64InputStream(bais)) {
@@ -309,7 +309,7 @@ public class Base64InputStreamTest {
* Tests the bug reported in CODEC-105. Bad interactions with InputStream when reading one byte at a time.
*/
@Test
- public void testCodec105() throws IOException {
+ void testCodec105() throws IOException {
try (Base64InputStream in = new Base64InputStream(new Codec105ErrorInputStream(), true, 0, null)) {
for (int i = 0; i < 5; i++) {
in.read();
@@ -321,7 +321,7 @@ public class Base64InputStreamTest {
* Tests the problem reported in CODEC-130. Missing / wrong implementation of skip.
*/
@Test
- public void testCodec130() throws IOException {
+ void testCodec130() throws IOException {
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
try (Base64OutputStream base64os = new Base64OutputStream(bos)) {
base64os.write(StringUtils.getBytesUtf8(STRING_FIXTURE));
@@ -345,7 +345,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testCodec98NPE() throws Exception {
+ void testCodec98NPE() throws Exception {
final byte[] codec98 = StringUtils.getBytesUtf8(Base64TestData.CODEC_98_NPE);
final ByteArrayInputStream data = new ByteArrayInputStream(codec98);
final Base64InputStream stream = new Base64InputStream(data);
@@ -373,7 +373,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testInputStreamReader() throws Exception {
+ void testInputStreamReader() throws Exception {
final byte[] codec101 = StringUtils.getBytesUtf8(Base64TestData.CODEC_101_INPUT_LENGTH_IS_MULTIPLE_OF_3);
final ByteArrayInputStream bais = new ByteArrayInputStream(codec101);
final Base64InputStream in = new Base64InputStream(bais);
@@ -391,7 +391,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testMarkSupported() throws Exception {
+ void testMarkSupported() throws Exception {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
try (Base64InputStream in = new Base64InputStream(bin, true, 4, new byte[] { 0, 0, 0 })) {
@@ -407,7 +407,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testRead0() throws Exception {
+ void testRead0() throws Exception {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final byte[] buf = new byte[1024];
int bytesRead = 0;
@@ -425,7 +425,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testReadMultipleBufferSizes() throws Exception {
+ void testReadMultipleBufferSizes() throws Exception {
final byte[][] randomData = BaseNTestData.randomData(new Base64(0, null, false), 1024 * 64);
final byte[] encoded = randomData[1];
final byte[] decoded = randomData[0];
@@ -449,7 +449,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testReadNull() throws Exception {
+ void testReadNull() throws Exception {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
try (Base64InputStream in = new Base64InputStream(bin, true, 4, new byte[] { 0, 0, 0 })) {
@@ -464,7 +464,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testReadOutOfBounds() throws Exception {
+ void testReadOutOfBounds() throws Exception {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final byte[] buf = new byte[1024];
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
@@ -483,7 +483,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testSkipBig() throws Throwable {
+ void testSkipBig() throws Throwable {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B64));
try (Base64InputStream b64stream = new Base64InputStream(ins)) {
assertEquals(6, b64stream.skip(Integer.MAX_VALUE));
@@ -500,7 +500,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testSkipNone() throws Throwable {
+ void testSkipNone() throws Throwable {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B64));
try (Base64InputStream b64stream = new Base64InputStream(ins)) {
final byte[] actualBytes = new byte[6];
@@ -519,7 +519,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testSkipPastEnd() throws Throwable {
+ void testSkipPastEnd() throws Throwable {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B64));
try (Base64InputStream b64stream = new Base64InputStream(ins)) {
// due to CODEC-130, skip now skips correctly decoded characters rather than encoded
@@ -537,7 +537,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testSkipToEnd() throws Throwable {
+ void testSkipToEnd() throws Throwable {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B64));
try (Base64InputStream b64stream = new Base64InputStream(ins)) {
// due to CODEC-130, skip now skips correctly decoded characters rather than encoded
@@ -555,7 +555,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testSkipWrongArgument() throws Throwable {
+ void testSkipWrongArgument() throws Throwable {
final InputStream ins = new ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B64));
try (Base64InputStream b64stream = new Base64InputStream(ins)) {
assertThrows(IllegalArgumentException.class, () -> b64stream.skip(-10));
@@ -569,7 +569,7 @@ public class Base64InputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testStrictDecoding() throws Exception {
+ void testStrictDecoding() throws Exception {
for (final String s : Base64Test.BASE64_IMPOSSIBLE_CASES) {
final byte[] encoded = StringUtils.getBytesUtf8(s);
final Base64InputStream in = new Base64InputStream(new ByteArrayInputStream(encoded), false);
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
index d3939ab1..2a2ed465 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
@@ -54,7 +54,7 @@ public class Base64OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase64EmptyOutputStreamMimeChunkSize() throws Exception {
+ void testBase64EmptyOutputStreamMimeChunkSize() throws Exception {
testBase64EmptyOutputStream(BaseNCodec.MIME_CHUNK_SIZE);
}
@@ -65,7 +65,7 @@ public class Base64OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase64EmptyOutputStreamPemChunkSize() throws Exception {
+ void testBase64EmptyOutputStreamPemChunkSize() throws Exception {
testBase64EmptyOutputStream(BaseNCodec.PEM_CHUNK_SIZE);
}
@@ -76,7 +76,7 @@ public class Base64OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase64OutputStreamByChunk() throws Exception {
+ void testBase64OutputStreamByChunk() throws Exception {
// Hello World test.
byte[] encoded = StringUtils.getBytesUtf8("SGVsbG8gV29ybGQ=\r\n");
byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
@@ -115,7 +115,7 @@ public class Base64OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testBase64OutputStreamByteByByte() throws Exception {
+ void testBase64OutputStreamByteByByte() throws Exception {
// Hello World test.
byte[] encoded = StringUtils.getBytesUtf8("SGVsbG8gV29ybGQ=\r\n");
byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
@@ -271,7 +271,7 @@ public class Base64OutputStreamTest {
* @throws Exception for some failure scenarios.
*/
@Test
- public void testCodec98NPE() throws Exception {
+ void testCodec98NPE() throws Exception {
final byte[] codec98 = StringUtils.getBytesUtf8(Base64TestData.CODEC_98_NPE);
final byte[] codec98_1024 = new byte[1024];
System.arraycopy(codec98, 0, codec98_1024, 0, codec98.length);
@@ -292,7 +292,7 @@ public class Base64OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testStrictDecoding() throws Exception {
+ void testStrictDecoding() throws Exception {
for (final String impossibleStr : Base64Test.BASE64_IMPOSSIBLE_CASES) {
final byte[] impossibleEncoded = StringUtils.getBytesUtf8(impossibleStr);
ByteArrayOutputStream bout = new ByteArrayOutputStream();
@@ -322,7 +322,7 @@ public class Base64OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testWriteOutOfBounds() throws Exception {
+ void testWriteOutOfBounds() throws Exception {
final byte[] buf = new byte[1024];
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
try (Base64OutputStream out = new Base64OutputStream(bout)) {
@@ -340,7 +340,7 @@ public class Base64OutputStreamTest {
* for some failure scenarios.
*/
@Test
- public void testWriteToNullCoverage() throws Exception {
+ void testWriteToNullCoverage() throws Exception {
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
try (Base64OutputStream out = new Base64OutputStream(bout)) {
assertThrows(NullPointerException.class, () -> out.write(null, 0, 0));
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 383c93f0..e6cd2f25 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64Test.java
@@ -143,7 +143,7 @@ public class Base64Test {
* Test the Base64 implementation
*/
@Test
- public void testBase64() {
+ void testBase64() {
final String content = "Hello World";
String encodedContent;
byte[] encodedBytes = Base64.encodeBase64(StringUtils.getBytesUtf8(content));
@@ -172,37 +172,37 @@ public class Base64Test {
}
@Test
- public void testBase64AtBufferEnd() {
+ void testBase64AtBufferEnd() {
testBase64InBuffer(100, 0);
}
@Test
- public void testBase64AtBufferMiddle() {
+ void testBase64AtBufferMiddle() {
testBase64InBuffer(100, 100);
}
@Test
- public void testBase64AtBufferStart() {
+ void testBase64AtBufferStart() {
testBase64InBuffer(0, 100);
}
@Test
- public void testBase64DecodingOfTrailing12Bits() {
+ void testBase64DecodingOfTrailing12Bits() {
assertBase64DecodingOfTrailingBits(12);
}
@Test
- public void testBase64DecodingOfTrailing18Bits() {
+ void testBase64DecodingOfTrailing18Bits() {
assertBase64DecodingOfTrailingBits(18);
}
@Test
- public void testBase64DecodingOfTrailing6Bits() {
+ void testBase64DecodingOfTrailing6Bits() {
assertBase64DecodingOfTrailingBits(6);
}
@Test
- public void testBase64ImpossibleSamples() {
+ void testBase64ImpossibleSamples() {
final Base64 codec = new Base64(0, null, false, CodecPolicy.STRICT);
for (final String s : BASE64_IMPOSSIBLE_CASES) {
assertThrows(IllegalArgumentException.class, () -> codec.decode(s));
@@ -221,7 +221,7 @@ public class Base64Test {
}
@Test
- public void testBuilderCodecPolicy() {
+ void testBuilderCodecPolicy() {
assertEquals(CodecPolicy.LENIENT, Base64.builder().get().getCodecPolicy());
assertEquals(CodecPolicy.LENIENT, Base64.builder().setDecodingPolicy(CodecPolicy.LENIENT).get().getCodecPolicy());
assertEquals(CodecPolicy.STRICT, Base64.builder().setDecodingPolicy(CodecPolicy.STRICT).get().getCodecPolicy());
@@ -230,7 +230,7 @@ public class Base64Test {
}
@Test
- public void testBuilderLineAttributes() {
+ void testBuilderLineAttributes() {
assertNull(Base64.builder().get().getLineSeparator());
assertNull(Base64.builder().setLineSeparator(BaseNCodec.CHUNK_SEPARATOR).get().getLineSeparator());
assertArrayEquals(BaseNCodec.CHUNK_SEPARATOR, Base64.builder().setLineLength(4).setLineSeparator(BaseNCodec.CHUNK_SEPARATOR).get().getLineSeparator());
@@ -243,7 +243,7 @@ public class Base64Test {
}
@Test
- public void testBuilderPadingByte() {
+ void testBuilderPadingByte() {
assertNull(Base64.builder().get().getLineSeparator());
assertNull(Base64.builder().setLineSeparator(BaseNCodec.CHUNK_SEPARATOR).get().getLineSeparator());
assertArrayEquals(BaseNCodec.CHUNK_SEPARATOR, Base64.builder().setLineLength(4).setLineSeparator(BaseNCodec.CHUNK_SEPARATOR).get().getLineSeparator());
@@ -257,7 +257,7 @@ public class Base64Test {
}
@Test
- public void testBuilderUrlSafe() {
+ void testBuilderUrlSafe() {
assertFalse(Base64.builder().get().isUrlSafe());
assertFalse(Base64.builder().setUrlSafe(false).get().isUrlSafe());
assertFalse(Base64.builder().setUrlSafe(true).setUrlSafe(false).get().isUrlSafe());
@@ -265,7 +265,7 @@ public class Base64Test {
}
@Test
- public void testByteToStringVariations() throws DecoderException {
+ void testByteToStringVariations() throws DecoderException {
final Base64 base64 = new Base64(0);
final byte[] b1 = StringUtils.getBytesUtf8("Hello World");
final byte[] b2 = {};
@@ -287,7 +287,7 @@ public class Base64Test {
* Tests Base64.encodeBase64().
*/
@Test
- public void testChunkedEncodeMultipleOf76() {
+ void testChunkedEncodeMultipleOf76() {
final byte[] expectedEncode = Base64.encodeBase64(BaseNTestData.DECODED, true);
// convert to "\r\n" so we're equal to the old openssl encoding test
// stored
@@ -298,7 +298,7 @@ public class Base64Test {
}
@Test
- public void testCodec112() { // size calculation assumes always chunked
+ void testCodec112() { // size calculation assumes always chunked
final byte[] in = { 0 };
final byte[] out = Base64.encodeBase64(in);
Base64.encodeBase64(in, false, false, out.length);
@@ -319,7 +319,7 @@ public class Base64Test {
* @see <a href="https://issues.apache.org/jira/projects/CODEC/issues/CODEC-265">CODEC-265</a>
*/
@Test
- public void testCodec265() {
+ void testCodec265() {
// 1GiB file to encode: 2^30 bytes
final int size1GiB = 1 << 30;
@@ -353,13 +353,13 @@ public class Base64Test {
* non-BASE64 bytes
*/
@Test
- public void testCodec68() {
+ void testCodec68() {
final byte[] x = { 'n', 'A', '=', '=', (byte) 0x9c };
Base64.decodeBase64(x);
}
@Test
- public void testCodeInteger1() {
+ void testCodeInteger1() {
final String encodedInt1 = "li7dzDacuo67Jg7mtqEm2TRuOMU=";
final BigInteger bigInt1 = new BigInteger("857393771208094202104259627990318636601332086981");
@@ -368,7 +368,7 @@ public class Base64Test {
}
@Test
- public void testCodeInteger2() {
+ void testCodeInteger2() {
final String encodedInt2 = "9B5ypLY9pMOmtxCeTDHgwdNFeGs=";
final BigInteger bigInt2 = new BigInteger("1393672757286116725466646726891466679477132949611");
@@ -377,7 +377,7 @@ public class Base64Test {
}
@Test
- public void testCodeInteger3() {
+ void testCodeInteger3() {
final String encodedInt3 = "FKIhdgaG5LGKiEtF1vHy4f3y700zaD6QwDS3IrNVGzNp2" +
"rY+1LFWTK6D44AyiC1n8uWz1itkYMZF0/aKDK0Yjg==";
final BigInteger bigInt3 = new BigInteger(
@@ -390,7 +390,7 @@ public class Base64Test {
}
@Test
- public void testCodeInteger4() {
+ void testCodeInteger4() {
final String encodedInt4 = "ctA8YGxrtngg/zKVvqEOefnwmViFztcnPBYPlJsvh6yKI" +
"4iDm68fnp4Mi3RrJ6bZAygFrUIQLxLjV+OJtgJAEto0xAs+Mehuq1DkSFEpP3o" +
"DzCTOsrOiS1DwQe4oIb7zVk/9l7aPtJMHW0LVlMdwZNFNNJoqMcT2ZfCPrfvYv" +
@@ -407,18 +407,18 @@ public class Base64Test {
}
@Test
- public void testCodeIntegerEdgeCases() {
+ void testCodeIntegerEdgeCases() {
// TODO
}
@Test
- public void testCodeIntegerNull() {
+ void testCodeIntegerNull() {
assertThrows(NullPointerException.class, () -> Base64.encodeInteger(null),
"Exception not thrown when passing in null to encodeInteger(BigInteger)");
}
@Test
- public void testConstructor_Int_ByteArray_Boolean() {
+ void testConstructor_Int_ByteArray_Boolean() {
final Base64 base64 = new Base64(65, new byte[] { '\t' }, false);
final byte[] encoded = base64.encode(BaseNTestData.DECODED);
String expectedResult = Base64TestData.ENCODED_64_CHARS_PER_LINE;
@@ -428,7 +428,7 @@ public class Base64Test {
}
@Test
- public void testConstructor_Int_ByteArray_Boolean_UrlSafe() {
+ void testConstructor_Int_ByteArray_Boolean_UrlSafe() {
// url-safe variation
final Base64 base64 = new Base64(64, new byte[] { '\t' }, true);
final byte[] encoded = base64.encode(BaseNTestData.DECODED);
@@ -443,7 +443,7 @@ public class Base64Test {
}
@Test
- public void testConstructors() {
+ void testConstructors() {
Base64 base64;
base64 = new Base64();
base64 = new Base64(-1);
@@ -472,7 +472,7 @@ public class Base64Test {
}
@Test
- public void testCustomEncodingAlphabet() {
+ void testCustomEncodingAlphabet() {
// created a duplicate of STANDARD_ENCODE_TABLE and replaced two chars with
// custom values not already present in table
// A => . B => -
@@ -513,7 +513,7 @@ public class Base64Test {
}
@Test
- public void testCustomEncodingAlphabet_illegal() {
+ void testCustomEncodingAlphabet_illegal() {
final byte[] encodeTable = {
'.', '-', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M'
};
@@ -530,7 +530,7 @@ public class Base64Test {
* Tests conditional true branch for "marker0" test.
*/
@Test
- public void testDecodePadMarkerIndex2() {
+ void testDecodePadMarkerIndex2() {
assertEquals("A", new String(Base64.decodeBase64("QQ==".getBytes(CHARSET_UTF8))));
}
@@ -538,13 +538,13 @@ public class Base64Test {
* Tests conditional branches for "marker1" test.
*/
@Test
- public void testDecodePadMarkerIndex3() {
+ void testDecodePadMarkerIndex3() {
assertEquals("AA", new String(Base64.decodeBase64("QUE=".getBytes(CHARSET_UTF8))));
assertEquals("AAA", new String(Base64.decodeBase64("QUFB".getBytes(CHARSET_UTF8))));
}
@Test
- public void testDecodePadOnly() {
+ void testDecodePadOnly() {
assertEquals(0, Base64.decodeBase64("====".getBytes(CHARSET_UTF8)).length);
assertEquals("", new String(Base64.decodeBase64("====".getBytes(CHARSET_UTF8))));
// Test truncated padding
@@ -555,7 +555,7 @@ public class Base64Test {
}
@Test
- public void testDecodePadOnlyChunked() {
+ void testDecodePadOnlyChunked() {
assertEquals(0, Base64.decodeBase64("====\n".getBytes(CHARSET_UTF8)).length);
assertEquals("", new String(Base64.decodeBase64("====\n".getBytes(CHARSET_UTF8))));
// Test truncated padding
@@ -579,7 +579,7 @@ public class Base64Test {
* unwittingly changed it to current logic.
*/
@Test
- public void testDecodeWithInnerPad() {
+ void testDecodeWithInnerPad() {
final String content = "SGVsbG8gV29ybGQ=SGVsbG8gV29ybGQ=";
final byte[] result = Base64.decodeBase64(content);
final byte[] shouldBe = StringUtils.getBytesUtf8("Hello World");
@@ -587,7 +587,7 @@ public class Base64Test {
}
@Test
- public void testDecodeWithWhitespace() throws Exception {
+ void testDecodeWithWhitespace() throws Exception {
final String orig = "I am a late night coder.";
@@ -611,7 +611,7 @@ public class Base64Test {
* Test encode and decode of empty byte array.
*/
@Test
- public void testEmptyBase64() {
+ void testEmptyBase64() {
byte[] empty = {};
byte[] result = Base64.encodeBase64(empty);
assertEquals(0, result.length, "empty base64 encode");
@@ -634,7 +634,7 @@ public class Base64Test {
// encode/decode a large random array
@Test
- public void testEncodeDecodeRandom() {
+ void testEncodeDecodeRandom() {
for (int i = 1; i < 5; i++) {
final byte[] data = new byte[getRandom().nextInt(10000) + 1];
getRandom().nextBytes(data);
@@ -647,7 +647,7 @@ public class Base64Test {
// encode/decode random arrays from size 0 to size 11
@Test
- public void testEncodeDecodeSmall() {
+ void testEncodeDecodeSmall() {
for (int i = 0; i < 12; i++) {
final byte[] data = new byte[i];
getRandom().nextBytes(data);
@@ -659,7 +659,7 @@ public class Base64Test {
}
@Test
- public void testEncodeOverMaxSize() throws Exception {
+ void testEncodeOverMaxSize() throws Exception {
testEncodeOverMaxSize(-1);
testEncodeOverMaxSize(0);
testEncodeOverMaxSize(1);
@@ -676,7 +676,7 @@ public class Base64Test {
* @see "<a href='https://mail-archives.apache.org/mod_mbox/commons-dev/201202.mbox/%3C4F3C85D7.5060706@snafu.de%3E'>dev@commons.apache.org</a>"
*/
@Test
- public void testHugeLineSeparator() {
+ void testHugeLineSeparator() {
final int BaseNCodec_DEFAULT_BUFFER_SIZE = 8192;
final int Base64_BYTES_PER_ENCODED_BLOCK = 4;
final byte[] baLineSeparator = new byte[BaseNCodec_DEFAULT_BUFFER_SIZE * 4 - 3];
@@ -687,12 +687,12 @@ public class Base64Test {
}
@Test
- public void testIgnoringNonBase64InDecode() throws Exception {
+ void testIgnoringNonBase64InDecode() throws Exception {
assertEquals(FOX_TEXT, new String(Base64.decodeBase64(FOX_BASE64.getBytes(CHARSET_UTF8))));
}
@Test
- public void testIsArrayByteBase64() {
+ void testIsArrayByteBase64() {
assertFalse(Base64.isBase64(new byte[] { Byte.MIN_VALUE }));
assertFalse(Base64.isBase64(new byte[] { -125 }));
assertFalse(Base64.isBase64(new byte[] { -10 }));
@@ -714,7 +714,7 @@ public class Base64Test {
* Test the isStringBase64 method.
*/
@Test
- public void testIsStringBase64() {
+ void testIsStringBase64() {
final String nullString = null;
final String emptyString = "";
final String validString = "abc===defg\n\r123456\r789\r\rABC\n\nDEF==GHI\r\nJKL==============";
@@ -732,7 +732,7 @@ public class Base64Test {
* Tests isUrlSafe.
*/
@Test
- public void testIsUrlSafe() {
+ void testIsUrlSafe() {
final Base64 base64Standard = new Base64(false);
final Base64 base64URLSafe = new Base64(true);
@@ -744,7 +744,7 @@ public class Base64Test {
}
@Test
- public void testKnownDecodings() {
+ void testKnownDecodings() {
assertEquals(FOX_TEXT, new String(Base64.decodeBase64(
"VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wZWQgb3ZlciB0aGUgbGF6eSBkb2dzLg==".getBytes(CHARSET_UTF8))));
assertEquals("It was the best of times, it was the worst of times.", new String(Base64.decodeBase64(
@@ -759,7 +759,7 @@ public class Base64Test {
}
@Test
- public void testKnownEncodings() {
+ void testKnownEncodings() {
assertEquals("VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wZWQgb3ZlciB0aGUgbGF6eSBkb2dzLg==", new String(
Base64.encodeBase64(FOX_TEXT.getBytes(CHARSET_UTF8))));
assertEquals(
@@ -779,7 +779,7 @@ public class Base64Test {
}
@Test
- public void testNonBase64Test() throws Exception {
+ void testNonBase64Test() throws Exception {
final byte[] bArray = { '%' };
@@ -800,13 +800,13 @@ public class Base64Test {
}
@Test
- public void testObjectDecodeWithInvalidParameter() {
+ void testObjectDecodeWithInvalidParameter() {
assertThrows(DecoderException.class, () -> new Base64().decode(Integer.valueOf(5)),
"decode(Object) didn't throw an exception when passed an Integer object");
}
@Test
- public void testObjectDecodeWithValidParameter() throws Exception {
+ void testObjectDecodeWithValidParameter() throws Exception {
final String original = "Hello World!";
final Object o = Base64.encodeBase64(original.getBytes(CHARSET_UTF8));
@@ -820,19 +820,19 @@ public class Base64Test {
}
@Test
- public void testObjectEncode() throws Exception {
+ void testObjectEncode() throws Exception {
final Base64 b64 = new Base64();
assertEquals("SGVsbG8gV29ybGQ=", new String(b64.encode("Hello World".getBytes(CHARSET_UTF8))));
}
@Test
- public void testObjectEncodeWithInvalidParameter() {
+ void testObjectEncodeWithInvalidParameter() {
assertThrows(EncoderException.class, () -> new Base64().encode("Yadayadayada"),
"encode(Object) didn't throw an exception when passed a String object");
}
@Test
- public void testObjectEncodeWithValidParameter() throws Exception {
+ void testObjectEncodeWithValidParameter() throws Exception {
final String original = "Hello World!";
final Object origObj = original.getBytes(CHARSET_UTF8);
@@ -846,7 +846,7 @@ public class Base64Test {
}
@Test
- public void testPairs() {
+ void testPairs() {
assertEquals("AAA=", new String(Base64.encodeBase64(new byte[] { 0, 0 })));
for (int i = -128; i <= 127; i++) {
final byte[] test = { (byte) i, (byte) i };
@@ -858,7 +858,7 @@ public class Base64Test {
* Tests RFC 1421 section 4.3.2.4 chuck size definition.
*/
@Test
- public void testRfc1421Section6Dot8ChunkSizeDefinition() {
+ void testRfc1421Section6Dot8ChunkSizeDefinition() {
assertEquals(64, BaseNCodec.PEM_CHUNK_SIZE);
}
@@ -866,7 +866,7 @@ public class Base64Test {
* Tests RFC 2045 section 2.1 CRLF definition.
*/
@Test
- public void testRfc2045Section2Dot1CrLfDefinition() {
+ void testRfc2045Section2Dot1CrLfDefinition() {
assertArrayEquals(new byte[]{13, 10}, BaseNCodec.CHUNK_SEPARATOR);
}
@@ -874,7 +874,7 @@ public class Base64Test {
* Tests RFC 2045 section 6.8 chuck size definition.
*/
@Test
- public void testRfc2045Section6Dot8ChunkSizeDefinition() {
+ void testRfc2045Section6Dot8ChunkSizeDefinition() {
assertEquals(76, BaseNCodec.MIME_CHUNK_SIZE);
}
@@ -894,7 +894,7 @@ public class Base64Test {
* html/rfc4648</a>
*/
@Test
- public void testRfc4648Section10Decode() {
+ void testRfc4648Section10Decode() {
assertEquals("", StringUtils.newStringUsAscii(Base64.decodeBase64("")));
assertEquals("f", StringUtils.newStringUsAscii(Base64.decodeBase64("Zg==")));
assertEquals("fo", StringUtils.newStringUsAscii(Base64.decodeBase64("Zm8=")));
@@ -920,7 +920,7 @@ public class Base64Test {
* html/rfc4648</a>
*/
@Test
- public void testRfc4648Section10DecodeEncode() {
+ void testRfc4648Section10DecodeEncode() {
testDecodeEncode("");
testDecodeEncode("Zg==");
testDecodeEncode("Zm8=");
@@ -946,7 +946,7 @@ public class Base64Test {
* html/rfc4648</a>
*/
@Test
- public void testRfc4648Section10DecodeWithCrLf() {
+ void testRfc4648Section10DecodeWithCrLf() {
final String CRLF = StringUtils.newStringUsAscii(BaseNCodec.CHUNK_SEPARATOR);
assertEquals("", StringUtils.newStringUsAscii(Base64.decodeBase64("" + CRLF)));
assertEquals("f", StringUtils.newStringUsAscii(Base64.decodeBase64("Zg==" + CRLF)));
@@ -973,7 +973,7 @@ public class Base64Test {
* html/rfc4648</a>
*/
@Test
- public void testRfc4648Section10Encode() {
+ void testRfc4648Section10Encode() {
assertEquals("", Base64.encodeBase64String(StringUtils.getBytesUtf8("")));
assertEquals("Zg==", Base64.encodeBase64String(StringUtils.getBytesUtf8("f")));
assertEquals("Zm8=", Base64.encodeBase64String(StringUtils.getBytesUtf8("fo")));
@@ -999,7 +999,7 @@ public class Base64Test {
* html/rfc4648</a>
*/
@Test
- public void testRfc4648Section10EncodeDecode() {
+ void testRfc4648Section10EncodeDecode() {
testEncodeDecode("");
testEncodeDecode("f");
testEncodeDecode("fo");
@@ -1010,7 +1010,7 @@ public class Base64Test {
}
@Test
- public void testSingletons() {
+ void testSingletons() {
assertEquals("AA==", new String(Base64.encodeBase64(new byte[] { (byte) 0 })));
assertEquals("AQ==", new String(Base64.encodeBase64(new byte[] { (byte) 1 })));
assertEquals("Ag==", new String(Base64.encodeBase64(new byte[] { (byte) 2 })));
@@ -1123,7 +1123,7 @@ public class Base64Test {
}
@Test
- public void testSingletonsChunked() {
+ void testSingletonsChunked() {
assertEquals("AA==\r\n", new String(Base64.encodeBase64Chunked(new byte[] { (byte) 0 })));
assertEquals("AQ==\r\n", new String(Base64.encodeBase64Chunked(new byte[] { (byte) 1 })));
assertEquals("Ag==\r\n", new String(Base64.encodeBase64Chunked(new byte[] { (byte) 2 })));
@@ -1232,7 +1232,7 @@ public class Base64Test {
}
@Test
- public void testStringToByteVariations() throws DecoderException {
+ void testStringToByteVariations() throws DecoderException {
final Base64 base64 = new Base64();
final String s1 = "SGVsbG8gV29ybGQ=\r\n";
final String s2 = "";
@@ -1256,7 +1256,7 @@ public class Base64Test {
}
@Test
- public void testTriplets() {
+ void testTriplets() {
assertEquals("AAAA", new String(Base64.encodeBase64(new byte[] { (byte) 0, (byte) 0, (byte) 0 })));
assertEquals("AAAB", new String(Base64.encodeBase64(new byte[] { (byte) 0, (byte) 0, (byte) 1 })));
assertEquals("AAAC", new String(Base64.encodeBase64(new byte[] { (byte) 0, (byte) 0, (byte) 2 })));
@@ -1324,7 +1324,7 @@ public class Base64Test {
}
@Test
- public void testTripletsChunked() {
+ void testTripletsChunked() {
assertEquals("AAAA\r\n", new String(Base64.encodeBase64Chunked(new byte[] { (byte) 0, (byte) 0, (byte) 0 })));
assertEquals("AAAB\r\n", new String(Base64.encodeBase64Chunked(new byte[] { (byte) 0, (byte) 0, (byte) 1 })));
assertEquals("AAAC\r\n", new String(Base64.encodeBase64Chunked(new byte[] { (byte) 0, (byte) 0, (byte) 2 })));
@@ -1395,7 +1395,7 @@ public class Base64Test {
* Tests URL-safe Base64 against random data, sizes 0 to 150.
*/
@Test
- public void testUrlSafe() {
+ void testUrlSafe() {
// test random data of sizes 0 through 150
final BaseNCodec codec = new Base64(true);
for (int i = 0; i <= 150; i++) {
@@ -1420,7 +1420,7 @@ public class Base64Test {
* from our own commons-codec!
*/
@Test
- public void testUUID() throws DecoderException {
+ void testUUID() throws DecoderException {
// The 4 UUID's below contains mixtures of + and / to help us test the
// URL-SAFE encoding mode.
final byte[][] ids = new byte[4][];
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 589dab93..df33700a 100644
--- a/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java
@@ -158,12 +158,12 @@ public class BaseNCodecTest {
}
@Test
- public void testBaseNCodec() {
+ void testBaseNCodec() {
assertNotNull(codec);
}
@Test
- public void testContainsAlphabetOrPad() {
+ void testContainsAlphabetOrPad() {
assertFalse(codec.containsAlphabetOrPad(null));
assertFalse(codec.containsAlphabetOrPad(new byte[]{}));
assertTrue(codec.containsAlphabetOrPad("OK".getBytes()));
@@ -178,7 +178,7 @@ public class BaseNCodecTest {
* format is updated.
*/
@Test
- public void testContextToString() {
+ void testContextToString() {
final Context context = new Context();
context.buffer = new byte[3];
context.currentLinePos = 13;
@@ -205,7 +205,7 @@ public class BaseNCodecTest {
// }
@Test
- public void testEnsureBufferSize() {
+ void testEnsureBufferSize() {
final BaseNCodec ncodec = new NoOpBaseNCodec();
final Context context = new Context();
assertNull(context.buffer, "Initial buffer should be null");
@@ -246,7 +246,7 @@ public class BaseNCodecTest {
* on all VMs and may have to be annotated with @Ignore.</p>
*/
@Test
- public void testEnsureBufferSizeExpandsToBeyondMaxBufferSize() {
+ void testEnsureBufferSizeExpandsToBeyondMaxBufferSize() {
assertEnsureBufferSizeExpandsToMaxBufferSize(true);
}
@@ -254,12 +254,12 @@ public class BaseNCodecTest {
* Test to expand to the max buffer size.
*/
@Test
- public void testEnsureBufferSizeExpandsToMaxBufferSize() {
+ void testEnsureBufferSizeExpandsToMaxBufferSize() {
assertEnsureBufferSizeExpandsToMaxBufferSize(false);
}
@Test
- public void testEnsureBufferSizeThrowsOnOverflow() {
+ void testEnsureBufferSizeThrowsOnOverflow() {
final BaseNCodec ncodec = new NoOpBaseNCodec();
final Context context = new Context();
@@ -317,7 +317,7 @@ public class BaseNCodecTest {
// }
//
@Test
- public void testIsInAlphabetByte() {
+ void testIsInAlphabetByte() {
assertFalse(codec.isInAlphabet((byte) 0));
assertFalse(codec.isInAlphabet((byte) 'a'));
assertTrue(codec.isInAlphabet((byte) 'O'));
@@ -325,7 +325,7 @@ public class BaseNCodecTest {
}
@Test
- public void testIsInAlphabetByteArrayBoolean() {
+ void testIsInAlphabetByteArrayBoolean() {
assertTrue(codec.isInAlphabet(new byte[] {}, false));
assertTrue(codec.isInAlphabet(new byte[] { 'O' }, false));
assertFalse(codec.isInAlphabet(new byte[] { 'O', ' ' }, false));
@@ -337,7 +337,7 @@ public class BaseNCodecTest {
}
@Test
- public void testIsInAlphabetString() {
+ void testIsInAlphabetString() {
assertTrue(codec.isInAlphabet("OK"));
assertTrue(codec.isInAlphabet("O=K= \t\n\r"));
}
@@ -363,7 +363,7 @@ public class BaseNCodecTest {
// }
//
@Test
- public void testIsWhiteSpace() {
+ void testIsWhiteSpace() {
assertTrue(Character.isWhitespace((byte) ' '));
assertTrue(Character.isWhitespace((byte) '\n'));
assertTrue(Character.isWhitespace((byte) '\r'));
@@ -377,7 +377,7 @@ public class BaseNCodecTest {
}
@Test
- public void testProvidePaddingByte() {
+ void testProvidePaddingByte() {
// Given
codec = new BaseNCodec(0, 0, 0, 0, (byte) 0x25) {
@Override
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 162cc80a..71c79328 100644
--- a/src/test/java/org/apache/commons/codec/binary/BinaryCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/BinaryCodecTest.java
@@ -103,7 +103,7 @@ public class BinaryCodecTest {
* Tests for byte[] decode(byte[])
*/
@Test
- public void testDecodeByteArray() {
+ void testDecodeByteArray() {
// With a single raw binary
byte[] bits = new byte[1];
byte[] decoded = instance.decode("00000000".getBytes(CHARSET_UTF8));
@@ -191,7 +191,7 @@ public class BinaryCodecTest {
* Tests for Object decode(Object)
*/
@Test
- public void testDecodeObject() throws Exception {
+ void testDecodeObject() throws Exception {
byte[] bits;
// With a single raw binary
bits = new byte[1];
@@ -263,7 +263,7 @@ public class BinaryCodecTest {
* Tests for Object decode(Object)
*/
@Test
- public void testDecodeObjectException() {
+ void testDecodeObjectException() {
try {
this.instance.decode(new Object());
} catch (final DecoderException e) {
@@ -277,7 +277,7 @@ public class BinaryCodecTest {
* Tests for byte[] encode(byte[])
*/
@Test
- public void testEncodeByteArray() {
+ void testEncodeByteArray() {
// With a single raw binary
byte[] bits = new byte[1];
String l_encoded = new String(instance.encode(bits));
@@ -398,7 +398,7 @@ public class BinaryCodecTest {
* Tests for Object encode(Object)
*/
@Test
- public void testEncodeObject() throws Exception {
+ void testEncodeObject() throws Exception {
// With a single raw binary
byte[] bits = new byte[1];
String l_encoded = new String((char[]) instance.encode((Object) bits));
@@ -518,7 +518,7 @@ public class BinaryCodecTest {
* Tests for Object encode(Object)
*/
@Test
- public void testEncodeObjectException() {
+ void testEncodeObjectException() {
try {
instance.encode("");
} catch (final EncoderException e) {
@@ -532,7 +532,7 @@ public class BinaryCodecTest {
* Tests for Object encode(Object)
*/
@Test
- public void testEncodeObjectNull() throws Exception {
+ void testEncodeObjectNull() throws Exception {
final Object obj = new byte[0];
assertEquals(0, ((char[]) instance.encode(obj)).length);
}
@@ -541,7 +541,7 @@ public class BinaryCodecTest {
* Tests for byte[] fromAscii(byte[])
*/
@Test
- public void testFromAsciiByteArray() {
+ void testFromAsciiByteArray() {
assertEquals(0, BinaryCodec.fromAscii((byte[]) null).length);
assertEquals(0, BinaryCodec.fromAscii(new byte[0]).length);
// With a single raw binary
@@ -632,7 +632,7 @@ public class BinaryCodecTest {
* Tests for byte[] fromAscii(char[])
*/
@Test
- public void testFromAsciiCharArray() {
+ void testFromAsciiCharArray() {
assertEquals(0, BinaryCodec.fromAscii((char[]) null).length);
assertEquals(0, BinaryCodec.fromAscii(new char[0]).length);
// With a single raw binary
@@ -720,7 +720,7 @@ public class BinaryCodecTest {
}
@Test
- public void testToAsciiBytes() {
+ void testToAsciiBytes() {
// With a single raw binary
byte[] bits = new byte[1];
String l_encoded = new String(BinaryCodec.toAsciiBytes(bits));
@@ -838,7 +838,7 @@ public class BinaryCodecTest {
}
@Test
- public void testToAsciiChars() {
+ void testToAsciiChars() {
// With a single raw binary
byte[] bits = new byte[1];
String l_encoded = new String(BinaryCodec.toAsciiChars(bits));
@@ -959,7 +959,7 @@ public class BinaryCodecTest {
* Tests the toAsciiString(byte[]) method
*/
@Test
- public void testToAsciiString() {
+ void testToAsciiString() {
// With a single raw binary
byte[] bits = new byte[1];
String l_encoded = BinaryCodec.toAsciiString(bits);
@@ -1079,7 +1079,7 @@ public class BinaryCodecTest {
* Tests for byte[] toByteArray(String)
*/
@Test
- public void testToByteArrayFromString() {
+ void testToByteArrayFromString() {
// With a single raw binary
byte[] bits = new byte[1];
byte[] decoded = instance.toByteArray("00000000");
diff --git a/src/test/java/org/apache/commons/codec/binary/CharSequenceUtilsTest.java b/src/test/java/org/apache/commons/codec/binary/CharSequenceUtilsTest.java
index ae6c30ed..9a378fb8 100644
--- a/src/test/java/org/apache/commons/codec/binary/CharSequenceUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/CharSequenceUtilsTest.java
@@ -132,12 +132,12 @@ public class CharSequenceUtilsTest {
*/
@SuppressWarnings("unused")
@Test
- public void testConstructor() {
+ void testConstructor() {
new CharSequenceUtils();
}
@Test
- public void testRegionMatches() {
+ void testRegionMatches() {
for (final TestData data : TEST_DATA) {
new RunTest() {
@Override
diff --git a/src/test/java/org/apache/commons/codec/binary/HexTest.java b/src/test/java/org/apache/commons/codec/binary/HexTest.java
index 99ee2cf4..625dc77d 100644
--- a/src/test/java/org/apache/commons/codec/binary/HexTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/HexTest.java
@@ -192,42 +192,42 @@ public class HexTest {
}
@Test
- public void testCustomCharsetBadName() {
+ void testCustomCharsetBadName() {
assertThrows(UnsupportedCharsetException.class, () -> new Hex(BAD_ENCODING_NAME));
}
@Test
- public void testCustomCharsetToString() {
+ void testCustomCharsetToString() {
assertTrue(new Hex().toString().contains(Hex.DEFAULT_CHARSET_NAME));
}
@Test
- public void testDecodeBadCharacterPos0() {
+ void testDecodeBadCharacterPos0() {
assertThrows(DecoderException.class, () -> new Hex().decode("q0"));
}
@Test
- public void testDecodeBadCharacterPos1() {
+ void testDecodeBadCharacterPos1() {
assertThrows(DecoderException.class, () -> new Hex().decode("0q"));
}
@Test
- public void testDecodeByteArrayEmpty() throws DecoderException {
+ void testDecodeByteArrayEmpty() throws DecoderException {
assertArrayEquals(new byte[0], new Hex().decode(new byte[0]));
}
@Test
- public void testDecodeByteArrayObjectEmpty() throws DecoderException {
+ void testDecodeByteArrayObjectEmpty() throws DecoderException {
assertArrayEquals(new byte[0], (byte[]) new Hex().decode((Object) new byte[0]));
}
@Test
- public void testDecodeByteArrayOddCharacters() {
+ void testDecodeByteArrayOddCharacters() {
assertThrows(DecoderException.class, () -> new Hex().decode(new byte[] { 65 }), "odd number of characters");
}
@Test
- public void testDecodeByteBufferAllocatedButEmpty() throws DecoderException {
+ void testDecodeByteBufferAllocatedButEmpty() throws DecoderException {
final ByteBuffer bb = allocate(10);
// Effectively set remaining == 0 => empty
bb.flip();
@@ -236,17 +236,17 @@ public class HexTest {
}
@Test
- public void testDecodeByteBufferEmpty() throws DecoderException {
+ void testDecodeByteBufferEmpty() throws DecoderException {
assertArrayEquals(new byte[0], new Hex().decode(allocate(0)));
}
@Test
- public void testDecodeByteBufferObjectEmpty() throws DecoderException {
+ void testDecodeByteBufferObjectEmpty() throws DecoderException {
assertArrayEquals(new byte[0], (byte[]) new Hex().decode((Object) allocate(0)));
}
@Test
- public void testDecodeByteBufferOddCharacters() {
+ void testDecodeByteBufferOddCharacters() {
final ByteBuffer bb = allocate(1);
bb.put((byte) 65);
bb.flip();
@@ -254,7 +254,7 @@ public class HexTest {
}
@Test
- public void testDecodeByteBufferWithLimit() throws DecoderException {
+ void testDecodeByteBufferWithLimit() throws DecoderException {
final ByteBuffer bb = getByteBufferUtf8("000102030405060708090a0b0c0d0e0f");
final byte[] expected = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
// Test pairs of bytes
@@ -267,7 +267,7 @@ public class HexTest {
}
@Test
- public void testDecodeByteBufferWithLimitOddCharacters() {
+ void testDecodeByteBufferWithLimitOddCharacters() {
final ByteBuffer bb = allocate(10);
bb.put(1, (byte) 65);
bb.position(1);
@@ -276,76 +276,76 @@ public class HexTest {
}
@Test
- public void testDecodeClassCastException() {
+ void testDecodeClassCastException() {
assertThrows(DecoderException.class, () -> new Hex().decode(new int[] { 65 }), "odd number of characters");
}
@Test
- public void testDecodeHexCharArrayEmpty() throws DecoderException {
+ void testDecodeHexCharArrayEmpty() throws DecoderException {
assertArrayEquals(new byte[0], Hex.decodeHex(new char[0]));
}
@Test
- public void testDecodeHexCharArrayOddCharacters1() {
+ void testDecodeHexCharArrayOddCharacters1() {
checkDecodeHexCharArrayOddCharacters(new char[] { 'A' });
}
@Test
- public void testDecodeHexCharArrayOddCharacters3() {
+ void testDecodeHexCharArrayOddCharacters3() {
checkDecodeHexCharArrayOddCharacters(new char[] { 'A', 'B', 'C' });
}
@Test
- public void testDecodeHexCharArrayOddCharacters5() {
+ void testDecodeHexCharArrayOddCharacters5() {
checkDecodeHexCharArrayOddCharacters(new char[] { 'A', 'B', 'C', 'D', 'E' });
}
@Test
- public void testDecodeHexCharArrayOutBufferUnderSized() {
+ void testDecodeHexCharArrayOutBufferUnderSized() {
final byte[] out = new byte[4];
assertThrows(DecoderException.class, () -> Hex.decodeHex("aabbccddeeff".toCharArray(), out, 0));
}
@Test
- public void testDecodeHexCharArrayOutBufferUnderSizedByOffset() {
+ void testDecodeHexCharArrayOutBufferUnderSizedByOffset() {
final byte[] out = new byte[6];
assertThrows(DecoderException.class, () -> Hex.decodeHex("aabbccddeeff".toCharArray(), out, 1));
}
@Test
- public void testDecodeHexStringEmpty() throws DecoderException {
+ void testDecodeHexStringEmpty() throws DecoderException {
assertArrayEquals(new byte[0], Hex.decodeHex(""));
}
@Test
- public void testDecodeHexStringOddCharacters() {
+ void testDecodeHexStringOddCharacters() {
assertThrows(DecoderException.class, () -> new Hex().decode("6"), "odd number of characters");
}
@Test
- public void testDecodeHexStringOddCharacters1() {
+ void testDecodeHexStringOddCharacters1() {
checkDecodeHexCharArrayOddCharacters("A");
}
@Test
- public void testDecodeStringEmpty() throws DecoderException {
+ void testDecodeStringEmpty() throws DecoderException {
assertArrayEquals(new byte[0], (byte[]) new Hex().decode(""));
}
@Test
- public void testEncodeByteArrayEmpty() {
+ void testEncodeByteArrayEmpty() {
assertArrayEquals(new byte[0], new Hex().encode(new byte[0]));
}
@Test
- public void testEncodeByteArrayObjectEmpty() throws EncoderException {
+ void testEncodeByteArrayObjectEmpty() throws EncoderException {
assertArrayEquals(new char[0], (char[]) new Hex().encode((Object) new byte[0]));
}
@Test
- public void testEncodeByteBufferAllocatedButEmpty() {
+ void testEncodeByteBufferAllocatedButEmpty() {
final ByteBuffer bb = allocate(10);
// Effectively set remaining == 0 => empty
bb.flip();
@@ -354,22 +354,22 @@ public class HexTest {
}
@Test
- public void testEncodeByteBufferEmpty() {
+ void testEncodeByteBufferEmpty() {
assertArrayEquals(new byte[0], new Hex().encode(allocate(0)));
}
@Test
- public void testEncodeByteBufferObjectEmpty() throws EncoderException {
+ void testEncodeByteBufferObjectEmpty() throws EncoderException {
assertArrayEquals(new char[0], (char[]) new Hex().encode((Object) allocate(0)));
}
@Test
- public void testEncodeClassCastException() {
+ void testEncodeClassCastException() {
assertThrows(EncoderException.class, () -> new Hex().encode(new int[] { 65 }));
}
@Test
- public void testEncodeDecodeHexCharArrayRandom() throws DecoderException, EncoderException {
+ void testEncodeDecodeHexCharArrayRandom() throws DecoderException, EncoderException {
final Hex hex = new Hex();
for (int i = 5; i > 0; i--) {
@@ -401,7 +401,7 @@ public class HexTest {
}
@Test
- public void testEncodeDecodeHexCharArrayRandomToOutput() throws DecoderException {
+ void testEncodeDecodeHexCharArrayRandomToOutput() throws DecoderException {
for (int i = 5; i > 0; i--) {
final byte[] data = new byte[ThreadLocalRandom.current().nextInt(10000) + 1];
ThreadLocalRandom.current().nextBytes(data);
@@ -421,13 +421,13 @@ public class HexTest {
}
@Test
- public void testEncodeHex_ByteBufferOfZeroes() {
+ void testEncodeHex_ByteBufferOfZeroes() {
final char[] c = Hex.encodeHex(allocate(36));
assertEquals("000000000000000000000000000000000000000000000000000000000000000000000000", new String(c));
}
@Test
- public void testEncodeHex_ByteBufferWithLimit() {
+ void testEncodeHex_ByteBufferWithLimit() {
final ByteBuffer bb = allocate(16);
for (int i = 0; i < 16; i++) {
bb.put((byte) i);
@@ -444,13 +444,13 @@ public class HexTest {
}
@Test
- public void testEncodeHexByteArrayEmpty() {
+ void testEncodeHexByteArrayEmpty() {
assertArrayEquals(new char[0], Hex.encodeHex(new byte[0]));
assertArrayEquals(new byte[0], new Hex().encode(new byte[0]));
}
@Test
- public void testEncodeHexByteArrayHelloWorldLowerCaseHex() {
+ void testEncodeHexByteArrayHelloWorldLowerCaseHex() {
final byte[] b = StringUtils.getBytesUtf8("Hello World");
final String expected = "48656c6c6f20576f726c64";
char[] actual;
@@ -463,7 +463,7 @@ public class HexTest {
}
@Test
- public void testEncodeHexByteArrayHelloWorldUpperCaseHex() {
+ void testEncodeHexByteArrayHelloWorldUpperCaseHex() {
final byte[] b = StringUtils.getBytesUtf8("Hello World");
final String expected = "48656C6C6F20576F726C64";
char[] actual;
@@ -476,19 +476,19 @@ public class HexTest {
}
@Test
- public void testEncodeHexByteArrayZeroes() {
+ void testEncodeHexByteArrayZeroes() {
final char[] c = Hex.encodeHex(new byte[36]);
assertEquals("000000000000000000000000000000000000000000000000000000000000000000000000", new String(c));
}
@Test
- public void testEncodeHexByteBufferEmpty() {
+ void testEncodeHexByteBufferEmpty() {
assertArrayEquals(new char[0], Hex.encodeHex(allocate(0)));
assertArrayEquals(new byte[0], new Hex().encode(allocate(0)));
}
@Test
- public void testEncodeHexByteBufferHelloWorldLowerCaseHex() {
+ void testEncodeHexByteBufferHelloWorldLowerCaseHex() {
final ByteBuffer b = getByteBufferUtf8("Hello World");
final String expected = "48656c6c6f20576f726c64";
char[] actual;
@@ -509,7 +509,7 @@ public class HexTest {
}
@Test
- public void testEncodeHexByteBufferHelloWorldUpperCaseHex() {
+ void testEncodeHexByteBufferHelloWorldUpperCaseHex() {
final ByteBuffer b = getByteBufferUtf8("Hello World");
final String expected = "48656C6C6F20576F726C64";
char[] actual;
@@ -530,23 +530,23 @@ public class HexTest {
}
@Test
- public void testEncodeHexByteString_ByteArrayBoolean_ToLowerCase() {
+ void testEncodeHexByteString_ByteArrayBoolean_ToLowerCase() {
assertEquals("0a", Hex.encodeHexString(new byte[] { 10 }, true));
}
@Test
- public void testEncodeHexByteString_ByteArrayBoolean_ToUpperCase() {
+ void testEncodeHexByteString_ByteArrayBoolean_ToUpperCase() {
assertEquals("0A", Hex.encodeHexString(new byte[] { 10 }, false));
}
@Test
- public void testEncodeHexByteString_ByteArrayOfZeroes() {
+ void testEncodeHexByteString_ByteArrayOfZeroes() {
final String c = Hex.encodeHexString(new byte[36]);
assertEquals("000000000000000000000000000000000000000000000000000000000000000000000000", c);
}
@Test
- public void testEncodeHexByteString_ByteBufferBoolean_ToLowerCase() {
+ void testEncodeHexByteString_ByteBufferBoolean_ToLowerCase() {
final ByteBuffer bb = allocate(1);
bb.put((byte) 10);
bb.flip();
@@ -554,7 +554,7 @@ public class HexTest {
}
@Test
- public void testEncodeHexByteString_ByteBufferBoolean_ToUpperCase() {
+ void testEncodeHexByteString_ByteBufferBoolean_ToUpperCase() {
final ByteBuffer bb = allocate(1);
bb.put((byte) 10);
bb.flip();
@@ -562,13 +562,13 @@ public class HexTest {
}
@Test
- public void testEncodeHexByteString_ByteBufferOfZeroes() {
+ void testEncodeHexByteString_ByteBufferOfZeroes() {
final String c = Hex.encodeHexString(allocate(36));
assertEquals("000000000000000000000000000000000000000000000000000000000000000000000000", c);
}
@Test
- public void testEncodeHexByteString_ByteBufferOfZeroesWithLimit() {
+ void testEncodeHexByteString_ByteBufferOfZeroesWithLimit() {
final ByteBuffer bb = allocate(36);
bb.limit(3);
assertEquals("000000", Hex.encodeHexString(bb));
@@ -580,7 +580,7 @@ public class HexTest {
}
@Test
- public void testEncodeHexByteString_ByteBufferWithLimitBoolean_ToLowerCase() {
+ void testEncodeHexByteString_ByteBufferWithLimitBoolean_ToLowerCase() {
final ByteBuffer bb = allocate(4);
bb.put(1, (byte) 10);
bb.position(1);
@@ -590,7 +590,7 @@ public class HexTest {
}
@Test
- public void testEncodeHexByteString_ByteBufferWithLimitBoolean_ToUpperCase() {
+ void testEncodeHexByteString_ByteBufferWithLimitBoolean_ToUpperCase() {
final ByteBuffer bb = allocate(4);
bb.put(1, (byte) 10);
bb.position(1);
@@ -600,7 +600,7 @@ public class HexTest {
}
@Test
- public void testEncodeHexPartialInput() {
+ void testEncodeHexPartialInput() {
final byte[] data = "hello world".getBytes(StandardCharsets.UTF_8);
char[] hex = Hex.encodeHex(data, 0, 0, true);
@@ -626,14 +626,14 @@ public class HexTest {
}
@Test
- public void testEncodeHexPartialInputOverbounds() {
+ void testEncodeHexPartialInputOverbounds() {
final byte[] data = "hello world".getBytes(StandardCharsets.UTF_8);
assertThrows(ArrayIndexOutOfBoundsException.class, () -> Hex.encodeHex(data, 9, 10, true));
}
@Test
- public void testEncodeHexPartialInputUnderbounds() {
+ void testEncodeHexPartialInputUnderbounds() {
final byte[] data = "hello world".getBytes(StandardCharsets.UTF_8);
assertThrows(ArrayIndexOutOfBoundsException.class, () -> Hex.encodeHex(data, -2, 10, true));
@@ -644,23 +644,23 @@ public class HexTest {
* See CODEC-261.
*/
@Test
- public void testEncodeHexReadOnlyByteBuffer() {
+ void testEncodeHexReadOnlyByteBuffer() {
final char[] chars = Hex.encodeHex(ByteBuffer.wrap(new byte[]{10}).asReadOnlyBuffer());
assertEquals("0a", String.valueOf(chars));
}
@Test
- public void testEncodeStringEmpty() throws EncoderException {
+ void testEncodeStringEmpty() throws EncoderException {
assertArrayEquals(new char[0], (char[]) new Hex().encode(""));
}
@Test
- public void testGetCharset() {
+ void testGetCharset() {
assertEquals(StandardCharsets.UTF_8, new Hex(StandardCharsets.UTF_8).getCharset());
}
@Test
- public void testGetCharsetName() {
+ void testGetCharsetName() {
assertEquals(StandardCharsets.UTF_8.name(), new Hex(StandardCharsets.UTF_8).getCharsetName());
}
diff --git a/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java b/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
index b6076ea1..0924ca0c 100644
--- a/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
@@ -46,7 +46,7 @@ public class StringUtilsTest {
private static final String STRING_FIXTURE = "ABC";
@Test
- public void testByteBufferUtf8() {
+ void testByteBufferUtf8() {
assertNull(StringUtils.getByteBufferUtf8(null), "Should be null safe");
final String text = "asdhjfhsadiogasdjhagsdygfjasfgsdaksjdhfk";
final ByteBuffer bb = StringUtils.getByteBufferUtf8(text);
@@ -58,12 +58,12 @@ public class StringUtilsTest {
* to restrict instantiation right now.
*/
@Test
- public void testConstructor() {
+ void testConstructor() {
new StringUtils();
}
@Test
- public void testEqualsCS1() {
+ void testEqualsCS1() {
assertFalse(StringUtils.equals(new StringBuilder("abc"), null));
assertFalse(StringUtils.equals(null, new StringBuilder("abc")));
assertTrue(StringUtils.equals(new StringBuilder("abc"), new StringBuilder("abc")));
@@ -73,7 +73,7 @@ public class StringUtilsTest {
}
@Test
- public void testEqualsCS2() {
+ void testEqualsCS2() {
assertTrue(StringUtils.equals("abc", new StringBuilder("abc")));
assertFalse(StringUtils.equals(new StringBuilder("abc"), "abcd"));
assertFalse(StringUtils.equals("abcd", new StringBuilder("abc")));
@@ -81,7 +81,7 @@ public class StringUtilsTest {
}
@Test
- public void testEqualsString() {
+ void testEqualsString() {
assertTrue(StringUtils.equals(null, null));
assertFalse(StringUtils.equals("abc", null));
assertFalse(StringUtils.equals(null, "abc"));
@@ -92,7 +92,7 @@ public class StringUtilsTest {
}
@Test
- public void testGetBytesIso8859_1() throws UnsupportedEncodingException {
+ void testGetBytesIso8859_1() throws UnsupportedEncodingException {
final String charsetName = StandardCharsets.ISO_8859_1.name();
testGetBytesUnchecked(charsetName);
final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
@@ -107,17 +107,17 @@ public class StringUtilsTest {
}
@Test
- public void testGetBytesUncheckedBadName() {
+ void testGetBytesUncheckedBadName() {
assertThrows(IllegalStateException.class, () -> StringUtils.getBytesUnchecked(STRING_FIXTURE, "UNKNOWN"));
}
@Test
- public void testGetBytesUncheckedNullInput() {
+ void testGetBytesUncheckedNullInput() {
assertNull(StringUtils.getBytesUnchecked(null, "UNKNOWN"));
}
@Test
- public void testGetBytesUsAscii() throws UnsupportedEncodingException {
+ void testGetBytesUsAscii() throws UnsupportedEncodingException {
final String charsetName = StandardCharsets.US_ASCII.name();
testGetBytesUnchecked(charsetName);
final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
@@ -126,7 +126,7 @@ public class StringUtilsTest {
}
@Test
- public void testGetBytesUtf16() throws UnsupportedEncodingException {
+ void testGetBytesUtf16() throws UnsupportedEncodingException {
final String charsetName = StandardCharsets.UTF_16.name();
testGetBytesUnchecked(charsetName);
final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
@@ -135,7 +135,7 @@ public class StringUtilsTest {
}
@Test
- public void testGetBytesUtf16Be() throws UnsupportedEncodingException {
+ void testGetBytesUtf16Be() throws UnsupportedEncodingException {
final String charsetName = StandardCharsets.UTF_16BE.name();
testGetBytesUnchecked(charsetName);
final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
@@ -144,7 +144,7 @@ public class StringUtilsTest {
}
@Test
- public void testGetBytesUtf16Le() throws UnsupportedEncodingException {
+ void testGetBytesUtf16Le() throws UnsupportedEncodingException {
final String charsetName = StandardCharsets.UTF_16LE.name();
testGetBytesUnchecked(charsetName);
final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
@@ -153,7 +153,7 @@ public class StringUtilsTest {
}
@Test
- public void testGetBytesUtf8() throws UnsupportedEncodingException {
+ void testGetBytesUtf8() throws UnsupportedEncodingException {
final String charsetName = StandardCharsets.UTF_8.name();
testGetBytesUnchecked(charsetName);
final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
@@ -168,12 +168,12 @@ public class StringUtilsTest {
}
@Test
- public void testNewStringBadEnc() {
+ void testNewStringBadEnc() {
assertThrows(IllegalStateException.class, () -> StringUtils.newString(BYTES_FIXTURE, "UNKNOWN"));
}
@Test
- public void testNewStringIso8859_1() throws UnsupportedEncodingException {
+ void testNewStringIso8859_1() throws UnsupportedEncodingException {
final String charsetName = StandardCharsets.ISO_8859_1.name();
testNewString(charsetName);
final String expected = new String(BYTES_FIXTURE, charsetName);
@@ -182,12 +182,12 @@ public class StringUtilsTest {
}
@Test
- public void testNewStringNullInput() {
+ void testNewStringNullInput() {
assertNull(StringUtils.newString(null, "UNKNOWN"));
}
@Test
- public void testNewStringNullInput_CODEC229() {
+ void testNewStringNullInput_CODEC229() {
assertNull(StringUtils.newStringUtf8(null));
assertNull(StringUtils.newStringIso8859_1(null));
assertNull(StringUtils.newStringUsAscii(null));
@@ -197,7 +197,7 @@ public class StringUtilsTest {
}
@Test
- public void testNewStringUsAscii() throws UnsupportedEncodingException {
+ void testNewStringUsAscii() throws UnsupportedEncodingException {
final String charsetName = StandardCharsets.US_ASCII.name();
testNewString(charsetName);
final String expected = new String(BYTES_FIXTURE, charsetName);
@@ -206,7 +206,7 @@ public class StringUtilsTest {
}
@Test
- public void testNewStringUtf16() throws UnsupportedEncodingException {
+ void testNewStringUtf16() throws UnsupportedEncodingException {
final String charsetName = StandardCharsets.UTF_16.name();
testNewString(charsetName);
final String expected = new String(BYTES_FIXTURE, charsetName);
@@ -215,7 +215,7 @@ public class StringUtilsTest {
}
@Test
- public void testNewStringUtf16Be() throws UnsupportedEncodingException {
+ void testNewStringUtf16Be() throws UnsupportedEncodingException {
final String charsetName = StandardCharsets.UTF_16BE.name();
testNewString(charsetName);
final String expected = new String(BYTES_FIXTURE_16BE, charsetName);
@@ -224,7 +224,7 @@ public class StringUtilsTest {
}
@Test
- public void testNewStringUtf16Le() throws UnsupportedEncodingException {
+ void testNewStringUtf16Le() throws UnsupportedEncodingException {
final String charsetName = StandardCharsets.UTF_16LE.name();
testNewString(charsetName);
final String expected = new String(BYTES_FIXTURE_16LE, charsetName);
@@ -233,7 +233,7 @@ public class StringUtilsTest {
}
@Test
- public void testNewStringUtf8() throws UnsupportedEncodingException {
+ void testNewStringUtf8() throws UnsupportedEncodingException {
final String charsetName = StandardCharsets.UTF_8.name();
testNewString(charsetName);
final String expected = new String(BYTES_FIXTURE, charsetName);
diff --git a/src/test/java/org/apache/commons/codec/cli/DigestTest.java b/src/test/java/org/apache/commons/codec/cli/DigestTest.java
index 04b91e0c..03e97ffa 100644
--- a/src/test/java/org/apache/commons/codec/cli/DigestTest.java
+++ b/src/test/java/org/apache/commons/codec/cli/DigestTest.java
@@ -30,14 +30,14 @@ public class DigestTest {
* Tests if empty arguments are handled correctly.
*/
@Test
- public void testEmptyArguments() {
+ void testEmptyArguments() {
assertThrows(IllegalArgumentException.class, () -> Digest.main(new String[0]));
}
/**
* Tests if null arguments are handled correctly.
*/
@Test
- public void testNullArguments() {
+ void testNullArguments() {
assertThrows(NullPointerException.class, () -> Digest.main(null));
}
}
diff --git a/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java
index db0fd3a7..f5ba7329 100644
--- a/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
public class Apr1CryptTest {
@Test
- public void testApr1CryptBytes() {
+ void testApr1CryptBytes() {
// random salt
final byte[] keyBytes = { '!', 'b', 'c', '.' };
final String hash = Md5Crypt.apr1Crypt(keyBytes);
@@ -44,7 +44,7 @@ public class Apr1CryptTest {
}
@Test
- public void testApr1CryptBytesWithThreadLocalRandom() {
+ void testApr1CryptBytesWithThreadLocalRandom() {
// random salt
final byte[] keyBytes = { '!', 'b', 'c', '.' };
final ThreadLocalRandom threadLocalRandom = ThreadLocalRandom.current();
@@ -60,7 +60,7 @@ public class Apr1CryptTest {
}
@Test
- public void testApr1CryptExplicitCall() {
+ void testApr1CryptExplicitCall() {
// When explicitly called the prefix is optional
assertEquals("$apr1$1234$mAlH7FRST6FiRZ.kcYL.j1", Md5Crypt.apr1Crypt("secret", "1234"));
// When explicitly called without salt, a random one will be used.
@@ -69,12 +69,12 @@ public class Apr1CryptTest {
}
@Test
- public void testApr1CryptNullData() {
+ void testApr1CryptNullData() {
assertThrows(NullPointerException.class, () -> Md5Crypt.apr1Crypt((byte[]) null));
}
@Test
- public void testApr1CryptStrings() {
+ void testApr1CryptStrings() {
// A random example using htpasswd
assertEquals("$apr1$TqI9WECO$LHZB2DqRlk9nObiB6vJG9.", Md5Crypt.apr1Crypt("secret", "$apr1$TqI9WECO"));
// empty data
@@ -89,17 +89,17 @@ public class Apr1CryptTest {
}
@Test
- public void testApr1CryptWithEmptySalt() {
+ void testApr1CryptWithEmptySalt() {
assertThrows(IllegalArgumentException.class, () -> Md5Crypt.apr1Crypt("secret".getBytes(), ""));
}
@Test
- public void testApr1CryptWithInvalidSalt() {
+ void testApr1CryptWithInvalidSalt() {
assertThrows(IllegalArgumentException.class, () -> Md5Crypt.apr1Crypt(new byte[0], "!"));
}
@Test
- public void testApr1CryptWithoutSalt() {
+ void testApr1CryptWithoutSalt() {
// Without salt, a random is generated
final String hash = Md5Crypt.apr1Crypt("secret");
assertTrue(hash.matches("^\\$apr1\\$[a-zA-Z0-9\\./]{8}\\$[a-zA-Z0-9\\./]{22}$"));
@@ -108,7 +108,7 @@ public class Apr1CryptTest {
}
@Test
- public void testApr1LongSalt() {
+ void testApr1LongSalt() {
assertEquals("$apr1$12345678$0lqb/6VUFP8JY/s/jTrIk0", Md5Crypt.apr1Crypt("secret", "12345678901234567890"));
}
}
diff --git a/src/test/java/org/apache/commons/codec/digest/B64Test.java b/src/test/java/org/apache/commons/codec/digest/B64Test.java
index 981ef17c..eca05a6a 100644
--- a/src/test/java/org/apache/commons/codec/digest/B64Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/B64Test.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
public class B64Test {
@Test
- public void testB64from24bit() {
+ void testB64from24bit() {
final StringBuilder buffer = new StringBuilder("");
B64.b64from24bit((byte) 8, (byte) 16, (byte) 64, 2, buffer);
B64.b64from24bit((byte) 7, (byte) 77, (byte) 120, 4, buffer);
@@ -32,7 +32,7 @@ public class B64Test {
}
@Test
- public void testB64T() {
+ void testB64T() {
assertNotNull(new B64()); // for the 100% code coverage :)
assertEquals(64, B64.B64T_ARRAY.length);
}
diff --git a/src/test/java/org/apache/commons/codec/digest/Blake3Test.java b/src/test/java/org/apache/commons/codec/digest/Blake3Test.java
index 62b9c6dd..fed165da 100644
--- a/src/test/java/org/apache/commons/codec/digest/Blake3Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/Blake3Test.java
@@ -26,7 +26,7 @@ public class Blake3Test {
}
@Test
- public void testShouldThrowIllegalArgumentExceptionWhenIncorrectKeySize() {
+ void testShouldThrowIllegalArgumentExceptionWhenIncorrectKeySize() {
for (int i = 0; i < 32; i++) {
assertThrowsProperExceptionWithKeySize(i);
}
diff --git a/src/test/java/org/apache/commons/codec/digest/CryptTest.java b/src/test/java/org/apache/commons/codec/digest/CryptTest.java
index 056ba67a..535ceef4 100644
--- a/src/test/java/org/apache/commons/codec/digest/CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/CryptTest.java
@@ -50,7 +50,7 @@ public class CryptTest {
}
@Test
- public void testBadSalt() {
+ void testBadSalt() {
// No salt
assertThrowsExactly(IllegalArgumentException.class, () -> Crypt.crypt("secret", "$1$"));
assertThrowsExactly(IllegalArgumentException.class, () -> Crypt.crypt("secret", "$5$"));
@@ -62,18 +62,18 @@ public class CryptTest {
}
@Test
- public void testBadType() {
+ void testBadType() {
assertThrowsExactly(IllegalArgumentException.class, () -> Crypt.crypt("secret", "$2$xxxx"));
assertThrowsExactly(IllegalArgumentException.class, () -> Crypt.crypt("secret", "$3$xxxx"));
assertThrowsExactly(IllegalArgumentException.class, () -> Crypt.crypt("secret", "$4$"));
}
@Test
- public void testCrypt() {
+ void testCrypt() {
assertNotNull(new Crypt()); // just for Test Coverage
}
@Test
- public void testCryptWithBytes() {
+ void testCryptWithBytes() {
final byte[] keyBytes = { 'b', 'y', 't', 'e' };
final String hash = Crypt.crypt(keyBytes);
assertEquals(hash, Crypt.crypt("byte", hash));
@@ -87,28 +87,28 @@ public class CryptTest {
* hash would not be verifiable with other implementations of crypt().
*/
@Test
- public void testCryptWithEmptySalt() {
+ void testCryptWithEmptySalt() {
assertThrowsExactly(IllegalArgumentException.class, () -> Crypt.crypt("secret", ""));
}
@Test
- public void testDefaultCryptVariant() {
+ void testDefaultCryptVariant() {
// If salt is null or completely omitted, a random "$6$" is used.
assertTrue(Crypt.crypt("secret").startsWith("$6$"));
assertTrue(Crypt.crypt("secret", null).startsWith("$6$"));
}
@Test
- public void testSamples() { // From Javadoc
+ void testSamples() { // From Javadoc
assertEquals("$1$xxxx$aMkevjfEIpa35Bh3G4bAc.", Crypt.crypt("secret", "$1$xxxx"));
assertEquals("xxWAum7tHdIUw", Crypt.crypt("secret", "xx"));
}
@Test
- public void testStored() { // From Javadoc
+ void testStored() { // From Javadoc
assertEquals("$1$xxxx$aMkevjfEIpa35Bh3G4bAc.", Crypt.crypt("secret", "$1$xxxx$aMkevjfEIpa35Bh3G4bAc."));
assertEquals("xxWAum7tHdIUw", Crypt.crypt("secret", "xxWAum7tHdIUw"));
}
@Test
- public void testType() {
+ void testType() {
startsWith(Crypt.crypt("secret", "xxxx"), "xx");
startsWith(Crypt.crypt("secret", "$1$xxxx"), "$1$xxxx$");
startsWith(Crypt.crypt("secret", "$5$xxxx"), "$5$xxxx$");
diff --git a/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java b/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
index e0b33209..3b258fb2 100644
--- a/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
@@ -108,7 +108,7 @@ public class DigestUtilsTest {
}
@Test
- public void testDigestFileAs() throws IOException {
+ void testDigestFileAs() throws IOException {
final String expected = "d41d8cd98f00b204e9800998ecf8427e";
final String pathName = "src/test/resources/org/apache/commons/codec/empty.bin";
final String algo = MessageDigestAlgorithms.MD5;
@@ -123,26 +123,26 @@ public class DigestUtilsTest {
}
@Test
- public void testGetMessageDigest() {
+ void testGetMessageDigest() {
final DigestUtils digestUtils = new DigestUtils(MessageDigestAlgorithms.MD5);
assertNotNull(digestUtils.getMessageDigest());
assertEquals(MessageDigestAlgorithms.MD5, digestUtils.getMessageDigest().getAlgorithm());
}
@Test
- public void testInternalNoSuchAlgorithmException() {
+ void testInternalNoSuchAlgorithmException() {
assertThrows(IllegalArgumentException.class, () -> DigestUtils.getDigest("Bogus Bogus"));
}
@Test
- public void testIsAvailable() {
+ void testIsAvailable() {
assertTrue(DigestUtils.isAvailable(MessageDigestAlgorithms.MD5));
assertFalse(DigestUtils.isAvailable("FOO"));
assertFalse(DigestUtils.isAvailable(null));
}
@Test
- public void testMd2Hex() throws IOException {
+ void testMd2Hex() throws IOException {
// Examples from RFC 1319
assertEquals("8350e5a3e24c153df2275c9f80692773", DigestUtils.md2Hex(EMPTY_STRING));
@@ -166,7 +166,7 @@ public class DigestUtilsTest {
* An MD2 hash converted to hexadecimal should always be 32 characters.
*/
@Test
- public void testMd2HexLength() {
+ void testMd2HexLength() {
String hashMe = "this is some string that is longer than 32 characters";
String hash = DigestUtils.md2Hex(getBytesUtf8(hashMe));
assertEquals(32, hash.length());
@@ -180,7 +180,7 @@ public class DigestUtilsTest {
* An MD2 hash should always be a 16 element byte[].
*/
@Test
- public void testMd2Length() {
+ void testMd2Length() {
String hashMe = "this is some string that is longer than 16 characters";
byte[] hash = DigestUtils.md2(getBytesUtf8(hashMe));
assertEquals(16, hash.length);
@@ -191,7 +191,7 @@ public class DigestUtilsTest {
}
@Test
- public void testMd5Hex() throws IOException {
+ void testMd5Hex() throws IOException {
// Examples from RFC 1321
assertEquals("d41d8cd98f00b204e9800998ecf8427e", DigestUtils.md5Hex(EMPTY_STRING));
@@ -215,7 +215,7 @@ public class DigestUtilsTest {
* An MD5 hash converted to hexadecimal should always be 32 characters.
*/
@Test
- public void testMd5HexLengthForBytes() {
+ void testMd5HexLengthForBytes() {
String hashMe = "this is some string that is longer than 32 characters";
String hash = DigestUtils.md5Hex(getBytesUtf8(hashMe));
assertEquals(32, hash.length());
@@ -229,7 +229,7 @@ public class DigestUtilsTest {
* An MD5 hash should always be a 16 element byte[].
*/
@Test
- public void testMd5LengthForBytes() {
+ void testMd5LengthForBytes() {
String hashMe = "this is some string that is longer than 16 characters";
byte[] hash = DigestUtils.md5(getBytesUtf8(hashMe));
assertEquals(16, hash.length);
@@ -240,7 +240,7 @@ public class DigestUtilsTest {
}
@Test
- public void testSha1Hex() throws IOException {
+ void testSha1Hex() throws IOException {
// Examples from FIPS 180-1
assertEquals("a9993e364706816aba3e25717850c26c9cd0d89d", DigestUtils.sha1Hex("abc"));
@@ -251,7 +251,7 @@ public class DigestUtilsTest {
}
@Test
- public void testSha1UpdateWithByteArray() {
+ void testSha1UpdateWithByteArray() {
final String d1 = "C'est un homme qui rentre dans un café, et plouf";
final String d2 = "C'est un homme, c'est qu'une tête, on lui offre un cadeau: 'oh... encore un chapeau!'";
@@ -269,7 +269,7 @@ public class DigestUtilsTest {
}
@Test
- public void testSha1UpdateWithByteBuffer() {
+ void testSha1UpdateWithByteBuffer() {
final String d1 = "C'est un homme qui rentre dans un café, et plouf";
final String d2 = "C'est un homme, c'est qu'une tête, on lui offre un cadeau: 'oh... encore un chapeau!'";
@@ -287,7 +287,7 @@ public class DigestUtilsTest {
}
@Test
- public void testSha1UpdateWithString() {
+ void testSha1UpdateWithString() {
final String d1 = "C'est un homme qui rentre dans un café, et plouf";
final String d2 = "C'est un homme, c'est qu'une tête, on lui offre un cadeau: 'oh... encore un chapeau!'";
@@ -305,7 +305,7 @@ public class DigestUtilsTest {
}
@Test
- public void testSha224_FileAsHex() throws IOException {
+ void testSha224_FileAsHex() throws IOException {
assumeJava8();
final String expected = "d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f";
final String pathName = "src/test/resources/org/apache/commons/codec/empty.bin";
@@ -322,14 +322,14 @@ public class DigestUtilsTest {
}
@Test
- public void testSha224_PathAsHex() throws IOException {
+ void testSha224_PathAsHex() throws IOException {
assumeJava8();
assertEquals("d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f",
new DigestUtils(MessageDigestAlgorithms.SHA_224).digestAsHex(Paths.get("src/test/resources/org/apache/commons/codec/empty.bin")));
}
@Test
- public void testSha224_StringAsHex() {
+ void testSha224_StringAsHex() {
assumeJava8();
assertEquals("d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f", new DigestUtils(MessageDigestAlgorithms.SHA_224).digestAsHex(EMPTY_STRING));
assertEquals("730e109bd7a8a32b1cb9d9a09aa2325d2430587ddbc0c38bad911525",
@@ -339,7 +339,7 @@ public class DigestUtilsTest {
}
@Test
- public void testSha256() throws IOException {
+ void testSha256() throws IOException {
// Examples from FIPS 180-2
assertEquals("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad", DigestUtils.sha256Hex("abc"));
assertEquals("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad", DigestUtils.sha256Hex(getBytesUtf8("abc")));
@@ -350,12 +350,12 @@ public class DigestUtilsTest {
}
@Test
- public void testSha256HexInputStream() throws IOException {
+ void testSha256HexInputStream() throws IOException {
assertEquals(DigestUtils.sha256Hex(testData), DigestUtils.sha256Hex(new ByteArrayInputStream(testData)));
}
@Test
- public void testSha3_224() {
+ void testSha3_224() {
assumeJava9();
// Examples from https://csrc.nist.gov/projects/cryptographic-standards-and-guidelines/example-values
//
@@ -364,13 +364,13 @@ public class DigestUtilsTest {
}
@Test
- public void testSha3_224HexInputStream() throws IOException {
+ void testSha3_224HexInputStream() throws IOException {
assumeJava9();
assertEquals(DigestUtils.sha3_224Hex(testData), DigestUtils.sha3_224Hex(new ByteArrayInputStream(testData)));
}
@Test
- public void testSha3_256() {
+ void testSha3_256() {
assumeJava9();
// Examples from https://csrc.nist.gov/projects/cryptographic-standards-and-guidelines/example-values
//
@@ -379,13 +379,13 @@ public class DigestUtilsTest {
}
@Test
- public void testSha3_256HexInputStream() throws IOException {
+ void testSha3_256HexInputStream() throws IOException {
assumeJava9();
assertEquals(DigestUtils.sha3_256Hex(testData), DigestUtils.sha3_256Hex(new ByteArrayInputStream(testData)));
}
@Test
- public void testSha3_384() {
+ void testSha3_384() {
assumeJava9();
// Examples from https://csrc.nist.gov/projects/cryptographic-standards-and-guidelines/example-values
//
@@ -394,13 +394,13 @@ public class DigestUtilsTest {
}
@Test
- public void testSha3_384HexInputStream() throws IOException {
+ void testSha3_384HexInputStream() throws IOException {
assumeJava9();
assertEquals(DigestUtils.sha3_384Hex(testData), DigestUtils.sha3_384Hex(new ByteArrayInputStream(testData)));
}
@Test
- public void testSha3_512() {
+ void testSha3_512() {
assumeJava9();
// Examples from https://csrc.nist.gov/projects/cryptographic-standards-and-guidelines/example-values
//
@@ -410,13 +410,13 @@ public class DigestUtilsTest {
}
@Test
- public void testSha3_512HexInputStream() throws IOException {
+ void testSha3_512HexInputStream() throws IOException {
assumeJava9();
assertEquals(DigestUtils.sha3_512Hex(testData), DigestUtils.sha3_512Hex(new ByteArrayInputStream(testData)));
}
@Test
- public void testSha384() throws IOException {
+ void testSha384() throws IOException {
// Examples from FIPS 180-2
assertEquals("cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed" + "8086072ba1e7cc2358baeca134c825a7", DigestUtils.sha384Hex("abc"));
assertEquals("cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed" + "8086072ba1e7cc2358baeca134c825a7",
@@ -427,12 +427,12 @@ public class DigestUtilsTest {
}
@Test
- public void testSha384HexInputStream() throws IOException {
+ void testSha384HexInputStream() throws IOException {
assertEquals(DigestUtils.sha384Hex(testData), DigestUtils.sha384Hex(new ByteArrayInputStream(testData)));
}
@Test
- public void testSha512() {
+ void testSha512() {
// Examples from FIPS 180-2
assertEquals("ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a" + "2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
DigestUtils.sha512Hex("abc"));
@@ -443,7 +443,7 @@ public class DigestUtilsTest {
}
@Test
- public void testSha512_224() throws Exception {
+ void testSha512_224() throws Exception {
assumeJava9();
// Examples from
// https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/SHA512_224.pdf
@@ -465,7 +465,7 @@ public class DigestUtilsTest {
}
@Test
- public void testSha512_256() throws Exception {
+ void testSha512_256() throws Exception {
assumeJava9();
// Examples from
// https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/SHA512_256.pdf
@@ -487,13 +487,13 @@ public class DigestUtilsTest {
}
@Test
- public void testSha512HexInputStream() throws IOException {
+ void testSha512HexInputStream() throws IOException {
assertEquals(DigestUtils.sha512Hex(testData), DigestUtils.sha512Hex(new ByteArrayInputStream(testData)));
}
@SuppressWarnings("deprecation") // deliberate tests of deprecated code
@Test
- public void testShaHex() throws IOException {
+ void testShaHex() throws IOException {
// Examples from FIPS 180-1
assertEquals("a9993e364706816aba3e25717850c26c9cd0d89d", DigestUtils.shaHex("abc"));
@@ -505,7 +505,7 @@ public class DigestUtilsTest {
@SuppressWarnings("deprecation") // deliberate tests of deprecated code
@Test
- public void testShaUpdateWithByteArray() {
+ void testShaUpdateWithByteArray() {
final String d1 = "C'est un homme qui rentre dans un café, et plouf";
final String d2 = "C'est un homme, c'est qu'une tête, on lui offre un cadeau: 'oh... encore un chapeau!'";
@@ -524,7 +524,7 @@ public class DigestUtilsTest {
@SuppressWarnings("deprecation") // deliberate tests of deprecated code
@Test
- public void testShaUpdateWithString() {
+ void testShaUpdateWithString() {
final String d1 = "C'est un homme qui rentre dans un café, et plouf";
final String d2 = "C'est un homme, c'est qu'une tête, on lui offre un cadeau: 'oh... encore un chapeau!'";
diff --git a/src/test/java/org/apache/commons/codec/digest/HmacUtilsTest.java b/src/test/java/org/apache/commons/codec/digest/HmacUtilsTest.java
index 5e305130..3a400a81 100644
--- a/src/test/java/org/apache/commons/codec/digest/HmacUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/HmacUtilsTest.java
@@ -37,13 +37,13 @@ public class HmacUtilsTest {
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testEmptyKey() {
+ void testEmptyKey() {
assertThrows(IllegalArgumentException.class, () -> HmacUtils.getHmacMd5(new byte[] {}));
}
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testGetHMac() {
+ void testGetHMac() {
assertArrayEquals(HmacAlgorithmsTest.STANDARD_MD5_RESULT_BYTES,
HmacUtils.getHmacMd5(HmacAlgorithmsTest.STANDARD_KEY_BYTES).doFinal(HmacAlgorithmsTest.STANDARD_PHRASE_BYTES));
assertArrayEquals(HmacAlgorithmsTest.STANDARD_SHA1_RESULT_BYTES,
@@ -58,7 +58,7 @@ public class HmacUtilsTest {
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testHmacMd5Hex() throws IOException {
+ void testHmacMd5Hex() throws IOException {
assertEquals(HmacAlgorithmsTest.STANDARD_MD5_RESULT_STRING,
HmacUtils.hmacMd5Hex(HmacAlgorithmsTest.STANDARD_KEY_STRING, "The quick brown fox jumps over the lazy dog"));
assertEquals("750c783e6ab0b503eaa86e310a5db738", HmacUtils.hmacMd5Hex("Jefe", "what do ya want for nothing?"));
@@ -70,7 +70,7 @@ public class HmacUtilsTest {
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testHmacSha1Hex() throws IOException {
+ void testHmacSha1Hex() throws IOException {
assertEquals(HmacAlgorithmsTest.STANDARD_SHA1_RESULT_STRING, HmacUtils.hmacSha1Hex(HmacAlgorithmsTest.STANDARD_KEY_STRING, HmacAlgorithmsTest.STANDARD_PHRASE_STRING));
assertEquals("f42bb0eeb018ebbd4597ae7213711ec60760843f", HmacUtils.hmacSha1Hex(HmacAlgorithmsTest.STANDARD_KEY_STRING, ""));
assertEquals("effcdf6ae5eb2fa2d27416d5f184df9c259a7c79",
@@ -83,7 +83,7 @@ public class HmacUtilsTest {
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testHmacSha1UpdateWithByteArray() {
+ void testHmacSha1UpdateWithByteArray() {
final Mac mac = HmacUtils.getHmacSha1(HmacAlgorithmsTest.STANDARD_KEY_BYTES);
HmacUtils.updateHmac(mac, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES);
assertEquals(HmacAlgorithmsTest.STANDARD_SHA1_RESULT_STRING, Hex.encodeHexString(mac.doFinal()));
@@ -93,7 +93,7 @@ public class HmacUtilsTest {
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testHmacSha1UpdateWithInputStream() throws IOException {
+ void testHmacSha1UpdateWithInputStream() throws IOException {
final Mac mac = HmacUtils.getHmacSha1(HmacAlgorithmsTest.STANDARD_KEY_BYTES);
HmacUtils.updateHmac(mac, new ByteArrayInputStream(HmacAlgorithmsTest.STANDARD_PHRASE_BYTES));
assertEquals(HmacAlgorithmsTest.STANDARD_SHA1_RESULT_STRING, Hex.encodeHexString(mac.doFinal()));
@@ -103,7 +103,7 @@ public class HmacUtilsTest {
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testHmacSha1UpdateWithString() {
+ void testHmacSha1UpdateWithString() {
final Mac mac = HmacUtils.getHmacSha1(HmacAlgorithmsTest.STANDARD_KEY_BYTES);
HmacUtils.updateHmac(mac, HmacAlgorithmsTest.STANDARD_PHRASE_STRING);
assertEquals(HmacAlgorithmsTest.STANDARD_SHA1_RESULT_STRING, Hex.encodeHexString(mac.doFinal()));
@@ -112,7 +112,7 @@ public class HmacUtilsTest {
}
@Test
- public void testInitializedMac() {
+ void testInitializedMac() {
final Mac md5Mac = HmacUtils.getInitializedMac(HmacAlgorithms.HMAC_MD5, HmacAlgorithmsTest.STANDARD_KEY_BYTES);
final Mac md5Mac2 = HmacUtils.getInitializedMac("HmacMD5", HmacAlgorithmsTest.STANDARD_KEY_BYTES);
assertArrayEquals(HmacAlgorithmsTest.STANDARD_MD5_RESULT_BYTES, HmacUtils.updateHmac(md5Mac, HmacAlgorithmsTest.STANDARD_PHRASE_STRING)
@@ -122,23 +122,23 @@ public class HmacUtilsTest {
}
@Test
- public void testInitializedMacNullAlgo() {
+ void testInitializedMacNullAlgo() {
assertThrows(IllegalArgumentException.class, () -> HmacUtils.getInitializedMac((String) null, HmacAlgorithmsTest.STANDARD_KEY_BYTES));
}
@Test
- public void testInitializedMacNullKey() {
+ void testInitializedMacNullKey() {
assertThrows(IllegalArgumentException.class, () -> HmacUtils.getInitializedMac(HmacAlgorithms.HMAC_MD5, null));
}
@Test
- public void testInternalNoSuchAlgorithmException() {
+ void testInternalNoSuchAlgorithmException() {
assertThrows(IllegalArgumentException.class, () -> HmacUtils.getInitializedMac("Bogus Bogus", StringUtils.getBytesUtf8("akey")));
}
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testMd5HMac() throws IOException {
+ void testMd5HMac() throws IOException {
assertArrayEquals(HmacAlgorithmsTest.STANDARD_MD5_RESULT_BYTES,
HmacUtils.hmacMd5(HmacAlgorithmsTest.STANDARD_KEY_BYTES, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES));
assertArrayEquals(HmacAlgorithmsTest.STANDARD_MD5_RESULT_BYTES,
@@ -154,24 +154,24 @@ public class HmacUtilsTest {
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testMd5HMacFail() {
+ void testMd5HMacFail() {
assertThrows(IllegalArgumentException.class, () -> HmacUtils.hmacMd5((byte[]) null, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES));
}
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testNullKey() {
+ void testNullKey() {
assertThrows(IllegalArgumentException.class, () -> HmacUtils.getHmacMd5(null));
}
@Test
- public void testSecretKeySpecAllowsEmptyKeys() {
+ void testSecretKeySpecAllowsEmptyKeys() {
assertThrows(IllegalArgumentException.class, () -> new SecretKeySpec(new byte[] {}, "HmacMD5"));
}
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testSha1HMac() throws IOException {
+ void testSha1HMac() throws IOException {
assertArrayEquals(HmacAlgorithmsTest.STANDARD_SHA1_RESULT_BYTES,
HmacUtils.hmacSha1(HmacAlgorithmsTest.STANDARD_KEY_BYTES, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES));
assertArrayEquals(HmacAlgorithmsTest.STANDARD_SHA1_RESULT_BYTES,
@@ -188,13 +188,13 @@ public class HmacUtilsTest {
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testSha1HMacFail() {
+ void testSha1HMacFail() {
assertThrows(IllegalArgumentException.class, () -> HmacUtils.hmacSha1((byte[]) null, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES));
}
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testSha256HMac() throws IOException {
+ void testSha256HMac() throws IOException {
assertArrayEquals(HmacAlgorithmsTest.STANDARD_SHA256_RESULT_BYTES,
HmacUtils.hmacSha256(HmacAlgorithmsTest.STANDARD_KEY_BYTES, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES));
assertArrayEquals(HmacAlgorithmsTest.STANDARD_SHA256_RESULT_BYTES,
@@ -211,13 +211,13 @@ public class HmacUtilsTest {
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testSha256HMacFail() {
+ void testSha256HMacFail() {
assertThrows(IllegalArgumentException.class, () -> HmacUtils.hmacSha256((byte[]) null, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES));
}
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testSha384HMac() throws IOException {
+ void testSha384HMac() throws IOException {
assertArrayEquals(HmacAlgorithmsTest.STANDARD_SHA384_RESULT_BYTES,
HmacUtils.hmacSha384(HmacAlgorithmsTest.STANDARD_KEY_BYTES, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES));
assertArrayEquals(HmacAlgorithmsTest.STANDARD_SHA384_RESULT_BYTES,
@@ -234,13 +234,13 @@ public class HmacUtilsTest {
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testSha384HMacFail() {
+ void testSha384HMacFail() {
assertThrows(IllegalArgumentException.class, () -> HmacUtils.hmacSha384((byte[]) null, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES));
}
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testSha512HMac() throws IOException {
+ void testSha512HMac() throws IOException {
assertArrayEquals(HmacAlgorithmsTest.STANDARD_SHA512_RESULT_BYTES,
HmacUtils.hmacSha512(HmacAlgorithmsTest.STANDARD_KEY_BYTES, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES));
assertArrayEquals(HmacAlgorithmsTest.STANDARD_SHA512_RESULT_BYTES,
@@ -257,7 +257,7 @@ public class HmacUtilsTest {
@SuppressWarnings("deprecation") // most of the static methods are deprecated
@Test
- public void testSha512HMacFail() {
+ void testSha512HMacFail() {
assertThrows(IllegalArgumentException.class, () -> HmacUtils.hmacSha512((byte[]) null, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES));
}
}
diff --git a/src/test/java/org/apache/commons/codec/digest/Md5CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Md5CryptTest.java
index 54819fd9..a4937547 100644
--- a/src/test/java/org/apache/commons/codec/digest/Md5CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Md5CryptTest.java
@@ -33,12 +33,12 @@ import org.junit.jupiter.api.Timeout;
public class Md5CryptTest {
@Test
- public void testCtor() {
+ void testCtor() {
assertNotNull(new Md5Crypt());
}
@Test
- public void testInvalidPrefix() {
+ void testInvalidPrefix() {
assertThrows(IllegalArgumentException.class, () -> Md5Crypt.md5Crypt(new byte[] { 1, 2, 3, 4, 5 },
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!", "(.*a){10000}"));
assertThrows(IllegalArgumentException.class, () -> Md5Crypt.md5Crypt(new byte[] { 1, 2, 3, 4, 5 },
@@ -48,7 +48,7 @@ public class Md5CryptTest {
}
@Test
- public void testMd5CryptBytes() {
+ void testMd5CryptBytes() {
// An empty Bytearray equals an empty String
assertEquals("$1$foo$9mS5ExwgIECGE5YKlD5o91", Crypt.crypt(new byte[0], "$1$foo"));
// UTF-8 stores \u00e4 "a with dieresis" as two bytes 0xc3 0xa4.
@@ -58,30 +58,30 @@ public class Md5CryptTest {
}
@Test
- public void testMd5CryptExplicitCall() {
+ void testMd5CryptExplicitCall() {
assertTrue(Md5Crypt.md5Crypt("secret".getBytes()).matches("^\\$1\\$[a-zA-Z0-9./]{0,8}\\$.{1,}$"));
assertTrue(Md5Crypt.md5Crypt("secret".getBytes(), (String) null).matches("^\\$1\\$[a-zA-Z0-9./]{0,8}\\$.{1,}$"));
}
@Test
- public void testMd5CryptExplicitCallWithThreadLocalRandom() {
+ void testMd5CryptExplicitCallWithThreadLocalRandom() {
final ThreadLocalRandom threadLocalRandom = ThreadLocalRandom.current();
assertTrue(Md5Crypt.md5Crypt("secret".getBytes(), threadLocalRandom).matches("^\\$1\\$[a-zA-Z0-9./]{0,8}\\$.{1,}$"));
assertTrue(Md5Crypt.md5Crypt("secret".getBytes(), (String) null).matches("^\\$1\\$[a-zA-Z0-9./]{0,8}\\$.{1,}$"));
}
@Test
- public void testMd5CryptLongInput() {
+ void testMd5CryptLongInput() {
assertEquals("$1$1234$MoxekaNNUgfPRVqoeYjCD/", Crypt.crypt("12345678901234567890", "$1$1234"));
}
@Test
- public void testMd5CryptNullData() {
+ void testMd5CryptNullData() {
assertThrows(NullPointerException.class, () -> Md5Crypt.md5Crypt((byte[]) null));
}
@Test
- public void testMd5CryptStrings() {
+ void testMd5CryptStrings() {
// empty data
assertEquals("$1$foo$9mS5ExwgIECGE5YKlD5o91", Crypt.crypt("", "$1$foo"));
// salt gets cut at dollar sign
@@ -94,12 +94,12 @@ public class Md5CryptTest {
}
@Test
- public void testMd5CryptWithEmptySalt() {
+ void testMd5CryptWithEmptySalt() {
assertThrows(IllegalArgumentException.class, () -> Md5Crypt.md5Crypt("secret".getBytes(), ""));
}
@Test
- public void testZeroOutInput() {
+ void testZeroOutInput() {
final byte[] buffer = new byte[200];
Arrays.fill(buffer, (byte) 'A');
Md5Crypt.md5Crypt(buffer);
diff --git a/src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java b/src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java
index a216cce9..6f3e5a11 100644
--- a/src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java
@@ -81,7 +81,7 @@ public class MurmurHash2Test {
static final String text = "Lorem ipsum dolor sit amet, consectetur adipisicing elit";
@Test
- public void testHash32ByteArrayInt() {
+ void testHash32ByteArrayInt() {
for (int i = 0; i < input.length; i++) {
final int hash = MurmurHash2.hash32(input[i], input[i].length);
if (hash != results32_standard[i]) {
@@ -92,7 +92,7 @@ public class MurmurHash2Test {
}
@Test
- public void testHash32ByteArrayIntInt() {
+ void testHash32ByteArrayIntInt() {
for (int i = 0; i < input.length; i++) {
final int hash = MurmurHash2.hash32(input[i], input[i].length, 0x71b4954d);
if (hash != results32_seed[i]) {
@@ -103,19 +103,19 @@ public class MurmurHash2Test {
}
@Test
- public void testHash32String() {
+ void testHash32String() {
final int hash = MurmurHash2.hash32(text);
assertEquals(0xb3bf597e, hash);
}
@Test
- public void testHash32StringIntInt() {
+ void testHash32StringIntInt() {
final int hash = MurmurHash2.hash32(text, 2, text.length() - 4);
assertEquals(0x4d666d90, hash);
}
@Test
- public void testHash64ByteArrayInt() {
+ void testHash64ByteArrayInt() {
for (int i = 0; i < input.length; i++) {
final long hash = MurmurHash2.hash64(input[i], input[i].length);
if (hash != results64_standard[i]) {
@@ -126,7 +126,7 @@ public class MurmurHash2Test {
}
@Test
- public void testHash64ByteArrayIntInt() {
+ void testHash64ByteArrayIntInt() {
for (int i = 0; i < input.length; i++) {
final long hash = MurmurHash2.hash64(input[i], input[i].length, 0x344d1f5c);
if (hash != results64_seed[i]) {
@@ -137,13 +137,13 @@ public class MurmurHash2Test {
}
@Test
- public void testHash64String() {
+ void testHash64String() {
final long hash = MurmurHash2.hash64(text);
assertEquals(0x0920e0c1b7eeb261L, hash);
}
@Test
- public void testHash64StringIntInt() {
+ void testHash64StringIntInt() {
final long hash = MurmurHash2.hash64(text, 2, text.length() - 4);
assertEquals(0xa8b33145194985a2L, hash);
}
diff --git a/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java b/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
index cd88da92..30d08697 100644
--- a/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
@@ -213,7 +213,7 @@ public class MurmurHash3Test {
* @see <a href="https://pypi.org/project/mmh3/">mmh3</a>
*/
@Test
- public void testHash128() {
+ void testHash128() {
// mmh3.hash64(bytes, 104729)
assertArrayEquals(new long[] {-5614308156300707300L, -4165733009867452172L},
MurmurHash3.hash128(RANDOM_BYTES));
@@ -254,7 +254,7 @@ public class MurmurHash3Test {
* <p>The test uses random strings created with random unicode code points.</p>
*/
@Test
- public void testHash128String() {
+ void testHash128String() {
final int seed = 104729;
// Range is end exclusive so this is random strings of length 1-10
final int minSize = 1;
@@ -285,7 +285,7 @@ public class MurmurHash3Test {
* broken deprecated method.
*/
@Test
- public void testHash128WithOffsetLengthAndNegativeSeed() {
+ void testHash128WithOffsetLengthAndNegativeSeed() {
// Seed can be negative
final int seed = -42;
final int offset = 13;
@@ -324,7 +324,7 @@ public class MurmurHash3Test {
* @see <a href="https://pypi.org/project/mmh3/">mmh3</a>
*/
@Test
- public void testHash128WithOffsetLengthAndSeed() {
+ void testHash128WithOffsetLengthAndSeed() {
// Seed must be positive
final int seed = 42;
final int offset = 13;
@@ -365,7 +365,7 @@ public class MurmurHash3Test {
* @see <a href="https://pypi.org/project/mmh3/">mmh3</a>
*/
@Test
- public void testHash128x64() {
+ void testHash128x64() {
// Note: Default seed is zero.
// mmh3.hash64(bytes, 0)
@@ -411,7 +411,7 @@ public class MurmurHash3Test {
* @see <a href="https://pypi.org/project/mmh3/">mmh3</a>
*/
@Test
- public void testHash128x64WithOffsetLengthAndNegativeSeed() {
+ void testHash128x64WithOffsetLengthAndNegativeSeed() {
// Seed can be negative
final int seed = -42;
final int offset = 13;
@@ -452,7 +452,7 @@ public class MurmurHash3Test {
* @see <a href="https://pypi.org/project/mmh3/">mmh3</a>
*/
@Test
- public void testHash128x64WithOffsetLengthAndSeed() {
+ void testHash128x64WithOffsetLengthAndSeed() {
// Seed can be positive
final int seed = 42;
final int offset = 13;
@@ -495,7 +495,7 @@ public class MurmurHash3Test {
* @see <a href="https://pypi.org/project/mmh3/">mmh3</a>
*/
@Test
- public void testHash32() {
+ void testHash32() {
// mmh3.hash(bytes, 104729)
assertEquals(1905657630, MurmurHash3.hash32(RANDOM_BYTES));
@@ -522,7 +522,7 @@ public class MurmurHash3Test {
* Test the convenience method {@link MurmurHash3#hash32(long)} works as documented.
*/
@Test
- public void testHash32Long() {
+ void testHash32Long() {
// As described in the Javadoc
final int offset = 0;
final int seed = 104729;
@@ -541,7 +541,7 @@ public class MurmurHash3Test {
* Test the convenience method {@link MurmurHash3#hash32(long, long)} works as documented.
*/
@Test
- public void testHash32LongLong() {
+ void testHash32LongLong() {
// As described in the Javadoc
final int offset = 0;
final int seed = 104729;
@@ -563,7 +563,7 @@ public class MurmurHash3Test {
* Test the convenience method {@link MurmurHash3#hash32(long, long, int)} works as documented.
*/
@Test
- public void testHash32LongLongSeed() {
+ void testHash32LongLongSeed() {
// As described in the Javadoc
final int offset = 0;
final int seed = 104729;
@@ -585,7 +585,7 @@ public class MurmurHash3Test {
* Test the convenience method {@link MurmurHash3#hash32(long, int)} works as documented.
*/
@Test
- public void testHash32LongSeed() {
+ void testHash32LongSeed() {
// As described in the Javadoc
final int offset = 0;
final int seed = 104729;
@@ -609,7 +609,7 @@ public class MurmurHash3Test {
* </p>
*/
@Test
- public void testHash32String() {
+ void testHash32String() {
final int seed = 104729;
// Range is end exclusive so this is random strings of length 1-10
final int minSize = 1;
@@ -642,7 +642,7 @@ public class MurmurHash3Test {
* @see <a href="https://pypi.org/project/mmh3/">mmh3</a>
*/
@Test
- public void testHash32WithLength() {
+ void testHash32WithLength() {
// mmh3.hash(bytes, 104729)
assertEquals(1905657630, MurmurHash3.hash32(RANDOM_BYTES, RANDOM_BYTES.length));
@@ -674,7 +674,7 @@ public class MurmurHash3Test {
* @see <a href="https://pypi.org/project/mmh3/">mmh3</a>
*/
@Test
- public void testHash32WithLengthAndSeed() {
+ void testHash32WithLengthAndSeed() {
final int seed = -42;
// mmh3.hash(bytes, -42)
assertEquals(1693958011, MurmurHash3.hash32(RANDOM_BYTES, RANDOM_BYTES.length, seed));
@@ -707,7 +707,7 @@ public class MurmurHash3Test {
* @see <a href="https://pypi.org/project/mmh3/">mmh3</a>
*/
@Test
- public void testHash32WithOffsetLengthAndSeed() {
+ void testHash32WithOffsetLengthAndSeed() {
final int seed = -42;
final int offset = 13;
@@ -733,7 +733,7 @@ public class MurmurHash3Test {
* Test to demonstrate the errors in {@link MurmurHash3#hash32(byte[], int, int, int)} if the final 1, 2, or 3 bytes are negative.
*/
@Test
- public void testHash32WithTrailingNegativeSignedBytesIsInvalid() {
+ void testHash32WithTrailingNegativeSignedBytesIsInvalid() {
// import mmh3
// import numpy as np
// mmh3.hash(np.uint8([-1]))
@@ -760,7 +760,7 @@ public class MurmurHash3Test {
* @see <a href="https://pypi.org/project/mmh3/">mmh3</a>
*/
@Test
- public void testHash32x86() {
+ void testHash32x86() {
// Note: Default seed is zero.
// mmh3.hash(bytes, 0)
@@ -789,7 +789,7 @@ public class MurmurHash3Test {
* @see <a href="https://pypi.org/project/mmh3/">mmh3</a>
*/
@Test
- public void testHash32x86WithOffsetLengthAndSeed() {
+ void testHash32x86WithOffsetLengthAndSeed() {
// Data as above for testing MurmurHash3.hash32(byte[], int, int, int).
final int seed = -42;
final int offset = 13;
@@ -805,7 +805,7 @@ public class MurmurHash3Test {
* Test to demonstrate {@link MurmurHash3#hash32x86(byte[], int, int, int)} is OK if the final 1, 2, or 3 bytes are negative.
*/
@Test
- public void testHash32x86WithTrailingNegativeSignedBytes() {
+ void testHash32x86WithTrailingNegativeSignedBytes() {
// Data as above for testing MurmurHash3.hash32(byte[], int, int, int).
// This test uses assertEquals().
assertEquals(-43192051, MurmurHash3.hash32x86(new byte[] { -1 }, 0, 1, 0));
@@ -820,7 +820,7 @@ public class MurmurHash3Test {
* Test the {@link MurmurHash3#hash64(byte[])} algorithm. Unknown origin of test data. It may be from the Apache Hive project.
*/
@Test
- public void testHash64() {
+ void testHash64() {
final byte[] origin = StringUtils.getBytesUtf8(TEST_HASH64);
final long hash = MurmurHash3.hash64(origin);
assertEquals(5785358552565094607L, hash);
@@ -834,7 +834,7 @@ public class MurmurHash3Test {
* <p>
*/
@Test
- public void testHash64InNotEqualToHash128() {
+ void testHash64InNotEqualToHash128() {
for (int i = 0; i < 32; i++) {
final byte[] bytes = Arrays.copyOf(RANDOM_BYTES, i);
final long h1 = MurmurHash3.hash64(bytes);
@@ -848,7 +848,7 @@ public class MurmurHash3Test {
* Test the {@link MurmurHash3#hash64(byte[], int, int)} algorithm. Unknown origin of test data. It may be from the Apache Hive project.
*/
@Test
- public void testHash64WithOffsetAndLength() {
+ void testHash64WithOffsetAndLength() {
final byte[] origin = StringUtils.getBytesUtf8(TEST_HASH64);
final byte[] originOffset = new byte[origin.length + 150];
Arrays.fill(originOffset, (byte) 123);
@@ -862,7 +862,7 @@ public class MurmurHash3Test {
* {@link MurmurHash3#hash64(byte[])} with the byte[] created from the same primitive data via a {@link ByteBuffer}.
*/
@Test
- public void testHash64WithPrimitives() {
+ void testHash64WithPrimitives() {
// As described in the Javadoc
final int offset = 0;
final int seed = 104729;
@@ -892,7 +892,7 @@ public class MurmurHash3Test {
* Test {@link IncrementalHash32} returns the same values as {@link MurmurHash3#hash32(byte[], int, int, int)}.
*/
@Test
- public void testIncrementalHash32() {
+ void testIncrementalHash32() {
final byte[] bytes = new byte[1023];
ThreadLocalRandom.current().nextBytes(bytes);
// The seed does not matter
@@ -923,7 +923,7 @@ public class MurmurHash3Test {
* Test {@link IncrementalHash32x86} returns the same values as {@link MurmurHash3#hash32x86(byte[], int, int, int)}.
*/
@Test
- public void testIncrementalHash32x86() {
+ void testIncrementalHash32x86() {
final byte[] bytes = new byte[1023];
ThreadLocalRandom.current().nextBytes(bytes);
// The seed does not matter
@@ -956,7 +956,7 @@ public class MurmurHash3Test {
* array.
*/
@Test
- public void testIncrementalHashWithUnprocessedBytesAndHugeLengthArray() {
+ void testIncrementalHashWithUnprocessedBytesAndHugeLengthArray() {
// Assert the test precondition that a large array added to unprocessed bytes
// will overflow an integer counter. We use the smallest hugeLength possible
// as some VMs cannot allocate maximum length arrays.
diff --git a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32CTest.java b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32CTest.java
index 0f150de9..7eaa7a0f 100644
--- a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32CTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32CTest.java
@@ -40,7 +40,7 @@ public class PureJavaCrc32CTest {
}
@Test
- public void testDecreasing() {
+ void testDecreasing() {
for (int i = 0; i < data.length; i++) {
data[i] = (byte) (31 - i);
}
@@ -48,7 +48,7 @@ public class PureJavaCrc32CTest {
}
@Test
- public void testIncreasing() {
+ void testIncreasing() {
for (int i = 0; i < data.length; i++) {
data[i] = (byte) i;
}
@@ -56,13 +56,13 @@ public class PureJavaCrc32CTest {
}
@Test
- public void testOnes() {
+ void testOnes() {
Arrays.fill(data, (byte) 0xFF);
check(0x62a8ab43); // 43 ab a8 62
}
@Test
- public void testZeros() {
+ void testZeros() {
Arrays.fill(data, (byte) 0);
check(0x8a9136aa); // aa 36 91 8a
}
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 bee13271..cec887c2 100644
--- a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
@@ -350,7 +350,7 @@ public class PureJavaCrc32Test {
}
@Test
- public void testCorrectness() throws Exception {
+ void testCorrectness() throws Exception {
checkSame();
theirs.update(104);
diff --git a/src/test/java/org/apache/commons/codec/digest/Sha256CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Sha256CryptTest.java
index e3836051..67967304 100644
--- a/src/test/java/org/apache/commons/codec/digest/Sha256CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Sha256CryptTest.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
public class Sha256CryptTest {
@Test
- public void testSha256CryptBytes() {
+ void testSha256CryptBytes() {
// An empty Bytearray equals an empty String
assertEquals("$5$foo$Fq9CX624QIfnCAmlGiPKLlAasdacKCRxZztPoeo7o0B", Crypt.crypt(new byte[0], "$5$foo"));
// UTF-8 stores \u00e4 "a with dieresis" as two bytes 0xc3 0xa4.
@@ -40,18 +40,18 @@ public class Sha256CryptTest {
}
@Test
- public void testSha256CryptExplicitCall() {
+ void testSha256CryptExplicitCall() {
assertTrue(Sha2Crypt.sha256Crypt("secret".getBytes()).matches("^\\$5\\$[a-zA-Z0-9./]{0,16}\\$.{1,}$"));
assertTrue(Sha2Crypt.sha256Crypt("secret".getBytes(), null).matches("^\\$5\\$[a-zA-Z0-9./]{0,16}\\$.{1,}$"));
}
@Test
- public void testSha256CryptNullData() {
+ void testSha256CryptNullData() {
assertThrows(NullPointerException.class, () -> Sha2Crypt.sha256Crypt((byte[]) null));
}
@Test
- public void testSha256CryptStrings() {
+ void testSha256CryptStrings() {
// empty data
assertEquals("$5$foo$Fq9CX624QIfnCAmlGiPKLlAasdacKCRxZztPoeo7o0B", Crypt.crypt("", "$5$foo"));
// salt gets cut at dollar sign
@@ -64,12 +64,12 @@ public class Sha256CryptTest {
}
@Test
- public void testSha256CryptWithEmptySalt() {
+ void testSha256CryptWithEmptySalt() {
assertThrows(IllegalArgumentException.class, () -> Sha2Crypt.sha256Crypt("secret".getBytes(), ""));
}
@Test
- public void testSha256LargestThanBlocksize() {
+ void testSha256LargestThanBlocksize() {
final byte[] buffer = new byte[200];
Arrays.fill(buffer, 0, 200, (byte) 'A');
assertEquals("$5$abc$HbF3RRc15OwNKB/RZZ5F.1I6zsLcKXHQoSdB9Owx/Q8", Sha2Crypt.sha256Crypt(buffer, "$5$abc"));
@@ -78,7 +78,7 @@ public class Sha256CryptTest {
}
@Test
- public void testSha2CryptRounds() {
+ void testSha2CryptRounds() {
// minimum rounds?
assertEquals("$5$rounds=1000$abcd$b8MCU4GEeZIekOy5ahQ8EWfT330hvYGVeDYkBxXBva.", Sha2Crypt.sha256Crypt("secret".getBytes(StandardCharsets.UTF_8), "$5$rounds=50$abcd$"));
assertEquals("$5$rounds=1001$abcd$SQsJZs7KXKdd2DtklI3TY3tkD7UYA99RD0FBLm4Sk48", Sha2Crypt.sha256Crypt("secret".getBytes(StandardCharsets.UTF_8), "$5$rounds=1001$abcd$"));
@@ -86,7 +86,7 @@ public class Sha256CryptTest {
}
@Test
- public void testSha2CryptRoundsThreadLocalRandom() {
+ void testSha2CryptRoundsThreadLocalRandom() {
final ThreadLocalRandom random = ThreadLocalRandom.current();
// minimum rounds?
assertEquals("$5$rounds=1000$abcd$b8MCU4GEeZIekOy5ahQ8EWfT330hvYGVeDYkBxXBva.", Sha2Crypt.sha256Crypt("secret".getBytes(StandardCharsets.UTF_8), "$5$rounds=50$abcd$", random));
@@ -95,7 +95,7 @@ public class Sha256CryptTest {
}
@Test
- public void testZeroOutInput() {
+ void testZeroOutInput() {
final byte[] buffer = new byte[200];
Arrays.fill(buffer, (byte) 'A');
Sha2Crypt.sha256Crypt(buffer);
diff --git a/src/test/java/org/apache/commons/codec/digest/Sha2CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Sha2CryptTest.java
index 040b7a80..e222405c 100644
--- a/src/test/java/org/apache/commons/codec/digest/Sha2CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Sha2CryptTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
public class Sha2CryptTest {
@Test
- public void testCtor() {
+ void testCtor() {
assertNotNull(new Sha2Crypt());
}
diff --git a/src/test/java/org/apache/commons/codec/digest/Sha512CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Sha512CryptTest.java
index f4811397..fd0f099f 100644
--- a/src/test/java/org/apache/commons/codec/digest/Sha512CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Sha512CryptTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
public class Sha512CryptTest {
@Test
- public void testSha256LargetThanBlocksize() {
+ void testSha256LargetThanBlocksize() {
final byte[] buffer = new byte[200];
Arrays.fill(buffer, 0, 200, (byte) 'A');
assertEquals("$6$abc$oP/h8PRhCKIA66KSTjGwNsQMSLLZnuFOTjOhrqNrDkKgjTlpePSqibB0qtmDapMbP/zN1cUEYSeHFrpgqZ.GG1", Sha2Crypt.sha512Crypt(buffer, "$6$abc"));
@@ -40,7 +40,7 @@ public class Sha512CryptTest {
}
@Test
- public void testSha2CryptRounds() {
+ void testSha2CryptRounds() {
// minimum rounds?
assertEquals("$5$rounds=1000$abcd$b8MCU4GEeZIekOy5ahQ8EWfT330hvYGVeDYkBxXBva.", Sha2Crypt.sha256Crypt("secret".getBytes(StandardCharsets.UTF_8), "$5$rounds=50$abcd$"));
assertEquals("$5$rounds=1001$abcd$SQsJZs7KXKdd2DtklI3TY3tkD7UYA99RD0FBLm4Sk48", Sha2Crypt.sha256Crypt("secret".getBytes(StandardCharsets.UTF_8), "$5$rounds=1001$abcd$"));
@@ -48,12 +48,12 @@ public class Sha512CryptTest {
}
@Test
- public void testSha2CryptWrongSalt() {
+ void testSha2CryptWrongSalt() {
assertThrows(IllegalArgumentException.class, () -> Sha2Crypt.sha512Crypt("secret".getBytes(StandardCharsets.UTF_8), "xx"));
}
@Test
- public void testSha512CryptBytes() {
+ void testSha512CryptBytes() {
// An empty Bytearray equals an empty String
assertEquals("$6$foo$Nywkte7LPWjaJhWjNeGJN.dFdY3pN1wYlGifyRLYOVlGS9EMSiZaDDe/BGSOYQ327q9.32I4UqQ5odsqvsBLX/", Crypt.crypt(new byte[0], "$6$foo"));
// UTF-8 stores \u00e4 "a with dieresis" as two bytes 0xc3 0xa4.
@@ -63,19 +63,19 @@ public class Sha512CryptTest {
}
@Test
- public void testSha512CryptExplicitCall() {
+ void testSha512CryptExplicitCall() {
assertTrue(Sha2Crypt.sha512Crypt("secret".getBytes()).matches("^\\$6\\$[a-zA-Z0-9./]{0,16}\\$.{1,}$"));
assertTrue(Sha2Crypt.sha512Crypt("secret".getBytes(), null).matches("^\\$6\\$[a-zA-Z0-9./]{0,16}\\$.{1,}$"));
}
@Test
- public void testSha512CryptExplicitCallThreadLocalRandom() {
+ void testSha512CryptExplicitCallThreadLocalRandom() {
final ThreadLocalRandom threadLocalRandom = ThreadLocalRandom.current();
assertTrue(Sha2Crypt.sha512Crypt("secret".getBytes(), null, threadLocalRandom).matches("^\\$6\\$[a-zA-Z0-9./]{0,16}\\$.{1,}$"));
}
@Test
- public void testSha512CryptNullData() {
+ void testSha512CryptNullData() {
assertThrows(NullPointerException.class, () -> Sha2Crypt.sha512Crypt((byte[]) null));
}
@@ -86,7 +86,7 @@ public class Sha512CryptTest {
}
@Test
- public void testSha512CryptStrings() {
+ void testSha512CryptStrings() {
// empty data
assertEquals("$6$foo$Nywkte7LPWjaJhWjNeGJN.dFdY3pN1wYlGifyRLYOVlGS9EMSiZaDDe/BGSOYQ327q9.32I4UqQ5odsqvsBLX/", Crypt.crypt("", "$6$foo"));
// salt gets cut at dollar sign
@@ -99,12 +99,12 @@ public class Sha512CryptTest {
}
@Test
- public void testSha512CryptWithEmptySalt() {
+ void testSha512CryptWithEmptySalt() {
assertThrows(IllegalArgumentException.class, () -> Sha2Crypt.sha512Crypt("secret".getBytes(), ""));
}
@Test
- public void testZeroOutInput() {
+ void testZeroOutInput() {
final byte[] buffer = new byte[200];
Arrays.fill(buffer, (byte) 'A');
Sha2Crypt.sha512Crypt(buffer);
diff --git a/src/test/java/org/apache/commons/codec/digest/UnixCryptTest.java b/src/test/java/org/apache/commons/codec/digest/UnixCryptTest.java
index 1bc07b44..7f3d1d45 100644
--- a/src/test/java/org/apache/commons/codec/digest/UnixCryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/UnixCryptTest.java
@@ -32,12 +32,12 @@ import org.junit.jupiter.api.Test;
public class UnixCryptTest {
@Test
- public void testCtor() {
+ void testCtor() {
assertNotNull(new UnixCrypt());
}
@Test
- public void testUnixCryptBytes() {
+ void testUnixCryptBytes() {
// An empty Bytearray equals an empty String
assertEquals("12UFlHxel6uMM", Crypt.crypt(new byte[0], "12"));
// UTF-8 stores \u00e4 "a with dieresis" as two bytes 0xc3 0xa4.
@@ -51,7 +51,7 @@ public class UnixCryptTest {
* Some salts are invalid for crypt(3) but not for unixCrypt().
*/
@Test
- public void testUnixCryptExplicitCall() {
+ void testUnixCryptExplicitCall() {
// A call to crypt() with an empty salt would result in a "$6$" hash.
// Using unixCrypt() explicitly results in a random salt.
assertTrue(UnixCrypt.crypt("secret".getBytes()).matches("^[a-zA-Z0-9./]{13}$"));
@@ -62,17 +62,17 @@ public class UnixCryptTest {
* Unimplemented "$foo$" salt prefixes would be treated as UnixCrypt salt.
*/
@Test
- public void testUnixCryptInvalidSalt() {
+ void testUnixCryptInvalidSalt() {
assertThrows(IllegalArgumentException.class, () -> UnixCrypt.crypt("secret", "$a"));
}
@Test
- public void testUnixCryptNullData() {
+ void testUnixCryptNullData() {
assertThrows(NullPointerException.class, () -> UnixCrypt.crypt((byte[]) null));
}
@Test
- public void testUnixCryptStrings() {
+ void testUnixCryptStrings() {
// trivial test
assertEquals("xxWAum7tHdIUw", Crypt.crypt("secret", "xx"));
// empty data
@@ -83,7 +83,7 @@ public class UnixCryptTest {
}
@Test
- public void testUnixCryptWithEmptySalt() {
+ void testUnixCryptWithEmptySalt() {
assertThrows(IllegalArgumentException.class, () -> UnixCrypt.crypt("secret", ""));
}
@@ -93,12 +93,12 @@ public class UnixCryptTest {
* crypt("secret", "xx") = "xxWAum7tHdIUw" which makes it unverifiable.
*/
@Test
- public void testUnixCryptWithHalfSalt() {
+ void testUnixCryptWithHalfSalt() {
assertThrows(IllegalArgumentException.class, () -> UnixCrypt.crypt("secret", "x"));
}
@Test
- public void testUnixCryptWithoutSalt() {
+ void testUnixCryptWithoutSalt() {
final String hash = UnixCrypt.crypt("foo");
assertTrue(hash.matches("^[a-zA-Z0-9./]{13}$"));
final String hash2 = UnixCrypt.crypt("foo");
diff --git a/src/test/java/org/apache/commons/codec/digest/XXHash32OverflowTest.java b/src/test/java/org/apache/commons/codec/digest/XXHash32OverflowTest.java
index c900dda8..cf86740c 100644
--- a/src/test/java/org/apache/commons/codec/digest/XXHash32OverflowTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/XXHash32OverflowTest.java
@@ -30,7 +30,7 @@ public class XXHash32OverflowTest {
* copies more data into the unprocessed bytes array.
*/
@Test
- public void testIncrementalHashWithUnprocessedBytesAndHugeLengthArray() {
+ void testIncrementalHashWithUnprocessedBytesAndHugeLengthArray() {
// Assert the test precondition that a large array added to unprocessed bytes
// will overflow an integer counter. We use the smallest hugeLength possible
// as some VMs cannot allocate maximum length arrays.
diff --git a/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java b/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java
index 12b0001b..af7bea01 100644
--- a/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java
+++ b/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java
@@ -42,7 +42,7 @@ public class Caverphone1Test extends AbstractStringEncoderTest<Caverphone1> {
* @throws EncoderException for some failure scenarios.
*/
@Test
- public void testCaverphoneRevisitedCommonCodeAT1111() throws EncoderException {
+ void testCaverphoneRevisitedCommonCodeAT1111() throws EncoderException {
checkEncodingVariations("AT1111", new String[]{
"add",
"aid",
@@ -62,7 +62,7 @@ public class Caverphone1Test extends AbstractStringEncoderTest<Caverphone1> {
}
@Test
- public void testEndMb() throws EncoderException {
+ void testEndMb() throws EncoderException {
final String[][] data = {{"mb", "M11111"}, {"mbmb", "MPM111"}};
checkEncodings(data);
}
@@ -73,7 +73,7 @@ public class Caverphone1Test extends AbstractStringEncoderTest<Caverphone1> {
* @throws EncoderException for some failure scenarios.
*/
@Test
- public void testIsCaverphoneEquals() throws EncoderException {
+ void testIsCaverphoneEquals() throws EncoderException {
final Caverphone1 caverphone = new Caverphone1();
assertFalse(caverphone.isEncodeEqual("Peter", "Stevenson"), "Caverphone encodings should not be equal");
assertTrue(caverphone.isEncodeEqual("Peter", "Peady"), "Caverphone encodings should be equal");
@@ -85,7 +85,7 @@ public class Caverphone1Test extends AbstractStringEncoderTest<Caverphone1> {
* @throws EncoderException for some failure scenarios.
*/
@Test
- public void testSpecificationV1Examples() throws EncoderException {
+ void testSpecificationV1Examples() throws EncoderException {
final String[][] data = {{"David", "TFT111"}, {"Whittle", "WTL111"}};
checkEncodings(data);
}
@@ -96,7 +96,7 @@ public class Caverphone1Test extends AbstractStringEncoderTest<Caverphone1> {
* @throws EncoderException for some failure scenarios.
*/
@Test
- public void testWikipediaExamples() throws EncoderException {
+ void testWikipediaExamples() throws EncoderException {
final String[][] data = {{"Lee", "L11111"}, {"Thompson", "TMPSN1"}};
checkEncodings(data);
}
diff --git a/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java b/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java
index 597a7bda..c37721fd 100644
--- a/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java
+++ b/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java
@@ -41,7 +41,7 @@ public class Caverphone2Test extends AbstractStringEncoderTest<Caverphone2> {
*
* @throws EncoderException for some failure scenarios */
@Test
- public void testCaverphoneRevisitedCommonCodeAT11111111() throws EncoderException {
+ void testCaverphoneRevisitedCommonCodeAT11111111() throws EncoderException {
checkEncodingVariations("AT11111111", new String[]{
"add",
"aid",
@@ -65,7 +65,7 @@ public class Caverphone2Test extends AbstractStringEncoderTest<Caverphone2> {
*
* @throws EncoderException for some failure scenarios */
@Test
- public void testCaverphoneRevisitedExamples() throws EncoderException {
+ void testCaverphoneRevisitedExamples() throws EncoderException {
final String[][] data = {{"Stevenson", "STFNSN1111"}, {"Peter", "PTA1111111"}};
checkEncodings(data);
}
@@ -75,7 +75,7 @@ public class Caverphone2Test extends AbstractStringEncoderTest<Caverphone2> {
*
* @throws EncoderException for some failure scenarios */
@Test
- public void testCaverphoneRevisitedRandomNameKLN1111111() throws EncoderException {
+ void testCaverphoneRevisitedRandomNameKLN1111111() throws EncoderException {
checkEncodingVariations("KLN1111111", new String[]{
"Cailean",
"Calan",
@@ -166,7 +166,7 @@ public class Caverphone2Test extends AbstractStringEncoderTest<Caverphone2> {
*
* @throws EncoderException for some failure scenarios */
@Test
- public void testCaverphoneRevisitedRandomNameTN11111111() throws EncoderException {
+ void testCaverphoneRevisitedRandomNameTN11111111() throws EncoderException {
checkEncodingVariations("TN11111111", new String[]{
"Dan",
"Dane",
@@ -244,7 +244,7 @@ public class Caverphone2Test extends AbstractStringEncoderTest<Caverphone2> {
*
* @throws EncoderException for some failure scenarios */
@Test
- public void testCaverphoneRevisitedRandomNameTTA1111111() throws EncoderException {
+ void testCaverphoneRevisitedRandomNameTTA1111111() throws EncoderException {
checkEncodingVariations("TTA1111111", new String[]{
"Darda",
"Datha",
@@ -321,28 +321,28 @@ public class Caverphone2Test extends AbstractStringEncoderTest<Caverphone2> {
*
* @throws EncoderException for some failure scenarios */
@Test
- public void testCaverphoneRevisitedRandomWords() throws EncoderException {
+ void testCaverphoneRevisitedRandomWords() throws EncoderException {
checkEncodingVariations("RTA1111111", new String[]{"rather", "ready", "writer"});
checkEncoding("SSA1111111", "social");
checkEncodingVariations("APA1111111", new String[]{"able", "appear"});
}
@Test
- public void testEndMb() throws EncoderException {
+ void testEndMb() throws EncoderException {
final String[][] data = {{"mb", "M111111111"}, {"mbmb", "MPM1111111"}};
checkEncodings(data);
}
// Caverphone Revisited
@Test
- public void testIsCaverphoneEquals() throws EncoderException {
+ void testIsCaverphoneEquals() throws EncoderException {
final Caverphone2 caverphone = new Caverphone2();
assertFalse(caverphone.isEncodeEqual("Peter", "Stevenson"), "Caverphone encodings should not be equal");
assertTrue(caverphone.isEncodeEqual("Peter", "Peady"), "Caverphone encodings should be equal");
}
@Test
- public void testSpecificationExamples() throws EncoderException {
+ void testSpecificationExamples() throws EncoderException {
final String[][] data = {
{"Peter", "PTA1111111"},
{"ready", "RTA1111111"},
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 2d59494b..e608f37d 100644
--- a/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java
+++ b/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java
@@ -113,12 +113,12 @@ public class ColognePhoneticTest extends AbstractStringEncoderTest<ColognePhonet
}
@Test
- public void testAabjoe() throws EncoderException {
+ void testAabjoe() throws EncoderException {
checkEncoding("01", "Aabjoe");
}
@Test
- public void testAaclan() throws EncoderException {
+ void testAaclan() throws EncoderException {
checkEncoding("0856", "Aaclan");
}
@@ -128,7 +128,7 @@ public class ColognePhoneticTest extends AbstractStringEncoderTest<ColognePhonet
* @throws EncoderException for some failure scenarios
*/
@Test
- public void testAychlmajrForCodec122() throws EncoderException {
+ void testAychlmajrForCodec122() throws EncoderException {
checkEncoding("04567", "Aychlmajr");
}
@@ -139,7 +139,7 @@ public class ColognePhoneticTest extends AbstractStringEncoderTest<ColognePhonet
}
@Test
- public void testEdgeCases() throws EncoderException {
+ void testEdgeCases() throws EncoderException {
// @formatter:off
final String[][] data = {
{ "a", "0" },
@@ -179,7 +179,7 @@ public class ColognePhoneticTest extends AbstractStringEncoderTest<ColognePhonet
}
@Test
- public void testExamples() throws EncoderException {
+ void testExamples() throws EncoderException {
// @formatter:off
final String[][] data = {
{ "m\u00DCller", "657" }, // mÜller - why upper case U-umlaut?
@@ -222,13 +222,13 @@ public class ColognePhoneticTest extends AbstractStringEncoderTest<ColognePhonet
}
@Test
- public void testHyphen() throws EncoderException {
+ void testHyphen() throws EncoderException {
final String[][] data = { { "bergisch-gladbach", "174845214" }, { "M\u00fcller-L\u00fcdenscheidt", "65752682" } }; // Müller-Lüdenscheidt
checkEncodings(data);
}
@Test
- public void testIsEncodeEquals() {
+ void testIsEncodeEquals() {
//@formatter:off
final String[][] data = {
{ "Muller", "M\u00fcller" }, // Müller
@@ -248,19 +248,19 @@ public class ColognePhoneticTest extends AbstractStringEncoderTest<ColognePhonet
}
@Test
- public void testSpecialCharsBetweenSameLetters() throws EncoderException {
+ void testSpecialCharsBetweenSameLetters() throws EncoderException {
final String[] data = { "Test test", "Testtest", "Test-test", "TesT#Test", "TesT?test" };
checkEncodingVariations("28282", data);
}
@Test
- public void testVariationsMella() throws EncoderException {
+ void testVariationsMella() throws EncoderException {
final String[] data = { "mella", "milah", "moulla", "mellah", "muehle", "mule" };
checkEncodingVariations("65", data);
}
@Test
- public void testVariationsMeyer() throws EncoderException {
+ void testVariationsMeyer() throws EncoderException {
final String[] data = { "Meier", "Maier", "Mair", "Meyer", "Meyr", "Mejer", "Major" };
checkEncodingVariations("67", data);
}
diff --git a/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java b/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java
index bc7ee5e0..278087ec 100644
--- a/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java
+++ b/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java
@@ -44,7 +44,7 @@ public class DaitchMokotoffSoundexTest extends AbstractStringEncoderTest<DaitchM
}
@Test
- public void testAccentedCharacterFolding() {
+ void testAccentedCharacterFolding() {
assertEquals("294795", soundex("Straßburg"));
assertEquals("294795", soundex("Strasburg"));
@@ -53,7 +53,7 @@ public class DaitchMokotoffSoundexTest extends AbstractStringEncoderTest<DaitchM
}
@Test
- public void testAdjacentCodes() {
+ void testAdjacentCodes() {
// AKSSOL
// A-KS-S-O-L
// 0-54-4---8 -> wrong
@@ -80,7 +80,7 @@ public class DaitchMokotoffSoundexTest extends AbstractStringEncoderTest<DaitchM
}
@Test
- public void testEncodeIgnoreApostrophes() throws EncoderException {
+ void testEncodeIgnoreApostrophes() throws EncoderException {
checkEncodingVariations("079600", new String[] { "OBrien", "'OBrien", "O'Brien", "OB'rien", "OBr'ien",
"OBri'en", "OBrie'n", "OBrien'" });
}
@@ -90,13 +90,13 @@ public class DaitchMokotoffSoundexTest extends AbstractStringEncoderTest<DaitchM
*
* @throws EncoderException for some failure scenarios */
@Test
- public void testEncodeIgnoreHyphens() throws EncoderException {
+ void testEncodeIgnoreHyphens() throws EncoderException {
checkEncodingVariations("565463", new String[] { "KINGSMITH", "-KINGSMITH", "K-INGSMITH", "KI-NGSMITH",
"KIN-GSMITH", "KING-SMITH", "KINGS-MITH", "KINGSM-ITH", "KINGSMI-TH", "KINGSMIT-H", "KINGSMITH-" });
}
@Test
- public void testEncodeIgnoreTrimmable() {
+ void testEncodeIgnoreTrimmable() {
assertEquals("746536", encode(" \t\n\r Washington \t\n\r "));
assertEquals("746536", encode("Washington"));
}
@@ -105,7 +105,7 @@ public class DaitchMokotoffSoundexTest extends AbstractStringEncoderTest<DaitchM
* Examples from http://www.jewishgen.org/infofiles/soundex.html
*/
@Test
- public void testSoundexBasic() {
+ void testSoundexBasic() {
assertEquals("583600", soundex("GOLDEN"));
assertEquals("087930", soundex("Alpert"));
assertEquals("791900", soundex("Breuer"));
@@ -130,7 +130,7 @@ public class DaitchMokotoffSoundexTest extends AbstractStringEncoderTest<DaitchM
* Examples from http://www.avotaynu.com/soundex.htm
*/
@Test
- public void testSoundexBasic2() {
+ void testSoundexBasic2() {
assertEquals("467000|567000", soundex("Ceniow"));
assertEquals("467000", soundex("Tsenyuv"));
assertEquals("587400|587500", soundex("Holubica"));
@@ -145,7 +145,7 @@ public class DaitchMokotoffSoundexTest extends AbstractStringEncoderTest<DaitchM
* Examples from https://en.wikipedia.org/wiki/Daitch%E2%80%93Mokotoff_Soundex
*/
@Test
- public void testSoundexBasic3() {
+ void testSoundexBasic3() {
assertEquals("734000|739400", soundex("Peters"));
assertEquals("734600|739460", soundex("Peterson"));
assertEquals("645740", soundex("Moskowitz"));
@@ -161,7 +161,7 @@ public class DaitchMokotoffSoundexTest extends AbstractStringEncoderTest<DaitchM
}
@Test
- public void testSpecialRomanianCharacters() {
+ void testSpecialRomanianCharacters() {
assertEquals("364000|464000", soundex("ţamas")); // t-cedilla
assertEquals("364000|464000", soundex("țamas")); // t-comma
}
diff --git a/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java b/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java
index bff3a088..71a9b99a 100644
--- a/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java
+++ b/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java
@@ -1276,7 +1276,7 @@ public class DoubleMetaphone2Test extends AbstractStringEncoderTest<DoubleMetaph
* Test alternative encoding.
*/
@Test
- public void testDoubleMetaphoneAlternate() {
+ void testDoubleMetaphoneAlternate() {
checkDoubleMetaphone(ALTERNATE_INDEX, true);
}
@@ -1284,7 +1284,7 @@ public class DoubleMetaphone2Test extends AbstractStringEncoderTest<DoubleMetaph
* Test primary encoding.
*/
@Test
- public void testDoubleMetaphonePrimary() {
+ void testDoubleMetaphonePrimary() {
checkDoubleMetaphone(PRIMARY_INDEX, false);
}
}
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 1000e434..37a76103 100644
--- a/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+++ b/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
@@ -1056,12 +1056,12 @@ public class DoubleMetaphoneTest extends AbstractStringEncoderTest<DoubleMetapho
}
@Test
- public void testCCedilla() {
+ void testCCedilla() {
assertTrue(getStringEncoder().isDoubleMetaphoneEqual("\u00e7", "S")); // c-cedilla
}
@Test
- public void testCodec184() {
+ void testCodec184() {
assertTrue(new DoubleMetaphone().isDoubleMetaphoneEqual("", "", false));
assertTrue(new DoubleMetaphone().isDoubleMetaphoneEqual("", "", true));
assertFalse(new DoubleMetaphone().isDoubleMetaphoneEqual("aa", "", false));
@@ -1071,12 +1071,12 @@ public class DoubleMetaphoneTest extends AbstractStringEncoderTest<DoubleMetapho
}
@Test
- public void testCodec320() {
+ void testCodec320() {
assertTrue(new DoubleMetaphone().isDoubleMetaphoneEqual("ANGHELINA", "ANKL", false));
}
@Test
- public void testDoubleMetaphone() {
+ void testDoubleMetaphone() {
assertDoubleMetaphone("TSTN", "testing");
assertDoubleMetaphone("0", "The");
assertDoubleMetaphone("KK", "quick");
@@ -1117,7 +1117,7 @@ public class DoubleMetaphoneTest extends AbstractStringEncoderTest<DoubleMetapho
}
@Test
- public void testEmpty() {
+ void testEmpty() {
assertNull(getStringEncoder().doubleMetaphone(null));
assertNull(getStringEncoder().doubleMetaphone(""));
assertNull(getStringEncoder().doubleMetaphone(" "));
@@ -1125,7 +1125,7 @@ public class DoubleMetaphoneTest extends AbstractStringEncoderTest<DoubleMetapho
}
@Test
- public void testIsDoubleMetaphoneEqualBasic() {
+ void testIsDoubleMetaphoneEqualBasic() {
final String[][] testFixture = { {
"", "" }, {
"Case", "case" }, {
@@ -1146,7 +1146,7 @@ public class DoubleMetaphoneTest extends AbstractStringEncoderTest<DoubleMetapho
* Example in the original article but failures in this Java impl:
*/
@Test
- public void testIsDoubleMetaphoneEqualExtended1() {
+ void testIsDoubleMetaphoneEqualExtended1() {
// String[][] testFixture = new String[][] { { "Smith", "Schmidt" }
// };
// doubleMetaphoneEqualTest(testFixture, false);
@@ -1154,7 +1154,7 @@ public class DoubleMetaphoneTest extends AbstractStringEncoderTest<DoubleMetapho
}
@Test
- public void testIsDoubleMetaphoneEqualExtended2() {
+ void testIsDoubleMetaphoneEqualExtended2() {
final String[][] testFixture = { { "Jablonski", "Yablonsky" }
};
//doubleMetaphoneEqualTest(testFixture, false);
@@ -1166,7 +1166,7 @@ public class DoubleMetaphoneTest extends AbstractStringEncoderTest<DoubleMetapho
* FIXTURE array.
*/
@Test
- public void testIsDoubleMetaphoneEqualExtended3() {
+ void testIsDoubleMetaphoneEqualExtended3() {
validateFixture(FIXTURE);
final StringBuilder failures = new StringBuilder();
final StringBuilder matches = new StringBuilder();
@@ -1198,7 +1198,7 @@ public class DoubleMetaphoneTest extends AbstractStringEncoderTest<DoubleMetapho
}
@Test
- public void testIsDoubleMetaphoneEqualWithMATCHES() {
+ void testIsDoubleMetaphoneEqualWithMATCHES() {
validateFixture(MATCHES);
for (int i = 0; i < MATCHES.length; i++) {
final String name0 = MATCHES[i][0];
@@ -1212,13 +1212,13 @@ public class DoubleMetaphoneTest extends AbstractStringEncoderTest<DoubleMetapho
}
@Test
- public void testIsDoubleMetaphoneNotEqual() {
+ void testIsDoubleMetaphoneNotEqual() {
doubleMetaphoneNotEqualTest(false);
doubleMetaphoneNotEqualTest(true);
}
@Test
- public void testNTilde() {
+ void testNTilde() {
assertTrue(getStringEncoder().isDoubleMetaphoneEqual("\u00f1", "N")); // n-tilde
}
@@ -1226,7 +1226,7 @@ public class DoubleMetaphoneTest extends AbstractStringEncoderTest<DoubleMetapho
* Test setting maximum length
*/
@Test
- public void testSetMaxCodeLength() {
+ void testSetMaxCodeLength() {
final String value = "jumped";
final DoubleMetaphone doubleMetaphone = new DoubleMetaphone();
diff --git a/src/test/java/org/apache/commons/codec/language/MatchRatingApproachEncoderTest.java b/src/test/java/org/apache/commons/codec/language/MatchRatingApproachEncoderTest.java
index f1c85762..b4ebeffb 100644
--- a/src/test/java/org/apache/commons/codec/language/MatchRatingApproachEncoderTest.java
+++ b/src/test/java/org/apache/commons/codec/language/MatchRatingApproachEncoderTest.java
@@ -41,272 +41,272 @@ public class MatchRatingApproachEncoderTest extends AbstractStringEncoderTest<Ma
}
@Test
- public final void testAccentRemoval_AllLower_SuccessfullyRemoved() {
+ final void testAccentRemoval_AllLower_SuccessfullyRemoved() {
assertEquals("aeiou", getStringEncoder().removeAccents("áéíóú"));
}
@Test
- public final void testAccentRemoval_ComprehensiveAccentMix_AllSuccessfullyRemoved() {
+ final void testAccentRemoval_ComprehensiveAccentMix_AllSuccessfullyRemoved() {
assertEquals("E,E,E,E,U,U,I,I,A,A,O,e,e,e,e,u,u,i,i,a,a,o,c", getStringEncoder().removeAccents("È,É,Ê,Ë,Û,Ù,Ï,Î,À,Â,Ô,è,é,ê,ë,û,ù,ï,î,à,â,ô,ç"));
}
@Test
- public final void testAccentRemoval_GerSpanFrenMix_SuccessfullyRemoved() {
+ final void testAccentRemoval_GerSpanFrenMix_SuccessfullyRemoved() {
assertEquals("aeoußAEOUnNa", getStringEncoder().removeAccents("äëöüßÄËÖÜñÑà"));
}
@Test
- public final void testAccentRemoval_MixedWithUnusualChars_SuccessfullyRemovedAndUnusualCharactersInvariant() {
+ final void testAccentRemoval_MixedWithUnusualChars_SuccessfullyRemovedAndUnusualCharactersInvariant() {
assertEquals("A-e'i.,o&u", getStringEncoder().removeAccents("Á-e'í.,ó&ú"));
}
@Test
- public final void testAccentRemoval_NINO_NoChange() {
+ final void testAccentRemoval_NINO_NoChange() {
assertEquals("", getStringEncoder().removeAccents(""));
}
@Test
- public final void testAccentRemoval_NullValue_ReturnNullSuccessfully() {
+ final void testAccentRemoval_NullValue_ReturnNullSuccessfully() {
assertNull(getStringEncoder().removeAccents(null));
}
@Test
- public final void testAccentRemoval_UpperAndLower_SuccessfullyRemovedAndCaseInvariant() {
+ final void testAccentRemoval_UpperAndLower_SuccessfullyRemovedAndCaseInvariant() {
assertEquals("AeiOuu", getStringEncoder().removeAccents("ÁeíÓuu"));
}
@Test
- public final void testAccentRemoval_WithSpaces_SuccessfullyRemovedAndSpacesInvariant() {
+ final void testAccentRemoval_WithSpaces_SuccessfullyRemovedAndSpacesInvariant() {
assertEquals("ae io u", getStringEncoder().removeAccents("áé íó ú"));
}
@Test
- public final void testAccentRemovalNormalString_NoChange() {
+ final void testAccentRemovalNormalString_NoChange() {
assertEquals("Colorless green ideas sleep furiously", getStringEncoder().removeAccents("Colorless green ideas sleep furiously"));
}
@Test
- public final void testCleanNameSuccessfullyClean() {
+ final void testCleanNameSuccessfullyClean() {
assertEquals("THISISATEST", getStringEncoder().cleanName("This-ís a t.,es &t"));
}
@Test
- public final void testCompare_BRIAN_BRYAN_SuccessfullyMatched() {
+ final void testCompare_BRIAN_BRYAN_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Brian", "Bryan"));
}
@Test
- public final void testCompare_BURNS_BOURNE_SuccessfullyMatched() {
+ final void testCompare_BURNS_BOURNE_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Burns", "Bourne"));
}
@Test
- public final void testCompare_CATHERINE_KATHRYN_SuccessfullyMatched() {
+ final void testCompare_CATHERINE_KATHRYN_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Catherine", "Kathryn"));
}
@Test
- public final void testCompare_COLM_COLIN_WithAccentsAndSymbolsAndSpaces_SuccessfullyMatched() {
+ final void testCompare_COLM_COLIN_WithAccentsAndSymbolsAndSpaces_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Cólm. ", "C-olín"));
}
@Test
- public final void testCompare_Forenames_SEAN_JOHN_MatchExpected() {
+ final void testCompare_Forenames_SEAN_JOHN_MatchExpected() {
assertTrue(getStringEncoder().isEncodeEquals("Sean", "John"));
}
@Test
- public final void testCompare_Forenames_SEAN_PETE_NoMatchExpected() {
+ final void testCompare_Forenames_SEAN_PETE_NoMatchExpected() {
assertFalse(getStringEncoder().isEncodeEquals("Sean", "Pete"));
}
@Test
- public final void testCompare_Forenames_UNA_OONAGH_ShouldSuccessfullyMatchButDoesNot() {
+ final void testCompare_Forenames_UNA_OONAGH_ShouldSuccessfullyMatchButDoesNot() {
assertFalse(getStringEncoder().isEncodeEquals("Úna", "Oonagh")); // Disappointing
}
@Test
- public final void testCompare_FRANCISZEK_FRANCES_SuccessfullyMatched() {
+ final void testCompare_FRANCISZEK_FRANCES_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Franciszek", "Frances"));
}
@Test
- public final void testCompare_KARL_ALESSANDRO_DoesNotMatch() {
+ final void testCompare_KARL_ALESSANDRO_DoesNotMatch() {
assertFalse(getStringEncoder().isEncodeEquals("Karl", "Alessandro"));
}
@Test
- public final void testCompare_LongSurnames_MORIARTY_OMUIRCHEARTAIGH_DoesNotSuccessfulMatch() {
+ final void testCompare_LongSurnames_MORIARTY_OMUIRCHEARTAIGH_DoesNotSuccessfulMatch() {
assertFalse(getStringEncoder().isEncodeEquals("Moriarty", "OMuircheartaigh"));
}
@Test
- public final void testCompare_LongSurnames_OMUIRCHEARTAIGH_OMIREADHAIGH_SuccessfulMatch() {
+ final void testCompare_LongSurnames_OMUIRCHEARTAIGH_OMIREADHAIGH_SuccessfulMatch() {
assertTrue(getStringEncoder().isEncodeEquals("o'muireadhaigh", "Ó 'Muircheartaigh "));
}
@Test
- public final void testCompare_MCGOWAN_MCGEOGHEGAN_SuccessfullyMatched() {
+ final void testCompare_MCGOWAN_MCGEOGHEGAN_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("McGowan", "Mc Geoghegan"));
}
@Test
- public final void testCompare_MICKY_MICHAEL_SuccessfullyMatched() {
+ final void testCompare_MICKY_MICHAEL_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Micky", "Michael"));
}
@Test
- public final void testCompare_OONA_OONAGH_SuccessfullyMatched() {
+ final void testCompare_OONA_OONAGH_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Oona", "Oonagh"));
}
@Test
- public final void testCompare_PETERSON_PETERS_SuccessfullyMatched() {
+ final void testCompare_PETERSON_PETERS_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Peterson", "Peters"));
}
@Test
- public final void testCompare_SAM_SAMUEL_SuccessfullyMatched() {
+ final void testCompare_SAM_SAMUEL_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Sam", "Samuel"));
}
@Test
- public final void testCompare_SEAN_SHAUN_SuccessfullyMatched() {
+ final void testCompare_SEAN_SHAUN_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Séan", "Shaun"));
}
@Test
- public final void testCompare_ShortNames_AL_ED_WorksButNoMatch() {
+ final void testCompare_ShortNames_AL_ED_WorksButNoMatch() {
assertFalse(getStringEncoder().isEncodeEquals("Al", "Ed"));
}
@Test
- public final void testCompare_SmallInput_CARK_Kl_SuccessfullyMatched() {
+ final void testCompare_SmallInput_CARK_Kl_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Kl", "Karl"));
}
@Test
- public final void testCompare_SMITH_SMYTH_SuccessfullyMatched() {
+ final void testCompare_SMITH_SMYTH_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("smith", "smyth"));
}
@Test
- public final void testCompare_SOPHIE_SOFIA_SuccessfullyMatched() {
+ final void testCompare_SOPHIE_SOFIA_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Sophie", "Sofia"));
}
@Test
- public final void testCompare_STEPHEN_STEFAN_SuccessfullyMatched() {
+ final void testCompare_STEPHEN_STEFAN_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Stephen", "Stefan"));
}
@Test
- public final void testCompare_STEPHEN_STEVEN_SuccessfullyMatched() {
+ final void testCompare_STEPHEN_STEVEN_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Stephen", "Steven"));
}
@Test
- public final void testCompare_STEVEN_STEFAN_SuccessfullyMatched() {
+ final void testCompare_STEVEN_STEFAN_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Steven", "Stefan"));
}
@Test
- public final void testCompare_Surname_AUERBACH_UHRBACH_SuccessfullyMatched() {
+ final void testCompare_Surname_AUERBACH_UHRBACH_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Auerbach", "Uhrbach"));
}
@Test
- public final void testCompare_Surname_COOPERFLYNN_SUPERLYN_SuccessfullyMatched() {
+ final void testCompare_Surname_COOPERFLYNN_SUPERLYN_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Cooper-Flynn", "Super-Lyn"));
}
@Test
- public final void testCompare_Surname_HAILEY_HALLEY_SuccessfullyMatched() {
+ final void testCompare_Surname_HAILEY_HALLEY_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Hailey", "Halley"));
}
@Test
- public final void testCompare_Surname_LEWINSKY_LEVINSKI_SuccessfullyMatched() {
+ final void testCompare_Surname_LEWINSKY_LEVINSKI_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("LEWINSKY", "LEVINSKI"));
}
@Test
- public final void testCompare_Surname_LIPSHITZ_LIPPSZYC_SuccessfullyMatched() {
+ final void testCompare_Surname_LIPSHITZ_LIPPSZYC_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("LIPSHITZ", "LIPPSZYC"));
}
@Test
- public final void testCompare_Surname_MOSKOWITZ_MOSKOVITZ_SuccessfullyMatched() {
+ final void testCompare_Surname_MOSKOWITZ_MOSKOVITZ_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Moskowitz", "Moskovitz"));
}
@Test
- public final void testCompare_Surname_OSULLIVAN_OSUILLEABHAIN_SuccessfulMatch() {
+ final void testCompare_Surname_OSULLIVAN_OSUILLEABHAIN_SuccessfulMatch() {
assertTrue(getStringEncoder().isEncodeEquals("O'Sullivan", "Ó ' Súilleabháin"));
}
@Test
- public final void testCompare_Surname_PRZEMYSL_PSHEMESHIL_SuccessfullyMatched() {
+ final void testCompare_Surname_PRZEMYSL_PSHEMESHIL_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals(" P rz e m y s l", " P sh e m e sh i l"));
}
@Test
- public final void testCompare_Surname_ROSOCHOWACIEC_ROSOKHOVATSETS_SuccessfullyMatched() {
+ final void testCompare_Surname_ROSOCHOWACIEC_ROSOKHOVATSETS_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("R o s o ch o w a c ie c", " R o s o k ho v a ts e ts"));
}
@Test
- public final void testCompare_Surname_SZLAMAWICZ_SHLAMOVITZ_SuccessfullyMatched() {
+ final void testCompare_Surname_SZLAMAWICZ_SHLAMOVITZ_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("SZLAMAWICZ", "SHLAMOVITZ"));
}
@Test
- public final void testCompare_SurnameCornerCase_Nulls_NoMatch() {
+ final void testCompare_SurnameCornerCase_Nulls_NoMatch() {
assertFalse(getStringEncoder().isEncodeEquals(null, null));
}
@Test
- public final void testCompare_Surnames_MURPHY_LYNCH_NoMatchExpected() {
+ final void testCompare_Surnames_MURPHY_LYNCH_NoMatchExpected() {
assertFalse(getStringEncoder().isEncodeEquals("Murphy", "Lynch"));
}
@Test
- public final void testCompare_SurnamesCornerCase_MURPHY_NoSpace_NoMatch() {
+ final void testCompare_SurnamesCornerCase_MURPHY_NoSpace_NoMatch() {
assertFalse(getStringEncoder().isEncodeEquals("Murphy", ""));
}
@Test
- public final void testCompare_SurnamesCornerCase_MURPHY_Space_NoMatch() {
+ final void testCompare_SurnamesCornerCase_MURPHY_Space_NoMatch() {
assertFalse(getStringEncoder().isEncodeEquals("Murphy", " "));
}
@Test
- public final void testCompare_TOMASZ_TOM_SuccessfullyMatched() {
+ final void testCompare_TOMASZ_TOM_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Tomasz", "tom"));
}
@Test
- public final void testCompare_ZACH_ZAKARIA_SuccessfullyMatched() {
+ final void testCompare_ZACH_ZAKARIA_SuccessfullyMatched() {
assertTrue(getStringEncoder().isEncodeEquals("Zach", "Zacharia"));
}
@Test
- public final void testCompareNameNullSpace_ReturnsFalseSuccessfully() {
+ final void testCompareNameNullSpace_ReturnsFalseSuccessfully() {
assertFalse(getStringEncoder().isEncodeEquals(null, " "));
}
@Test
- public final void testCompareNameSameNames_ReturnsFalseSuccessfully() {
+ final void testCompareNameSameNames_ReturnsFalseSuccessfully() {
assertTrue(getStringEncoder().isEncodeEquals("John", "John"));
}
@Test
- public final void testCompareNameToSingleLetter_KARL_C_DoesNotMatch() {
+ final void testCompareNameToSingleLetter_KARL_C_DoesNotMatch() {
assertFalse(getStringEncoder().isEncodeEquals("Karl", "C"));
}
@Test
- public final void testCompareWithWhitespace() {
+ final void testCompareWithWhitespace() {
// sanity check
assertTrue(getStringEncoder().isEncodeEquals("Brian", "Bryan"));
// whitespace
@@ -319,216 +319,216 @@ public class MatchRatingApproachEncoderTest extends AbstractStringEncoderTest<Ma
}
@Test
- public final void testGetEncoding_HARPER_HRPR() {
+ final void testGetEncoding_HARPER_HRPR() {
assertEquals("HRPR", getStringEncoder().encode("HARPER"));
}
@Test
- public final void testGetEncoding_NoSpace_to_Nothing() {
+ final void testGetEncoding_NoSpace_to_Nothing() {
assertEquals("", getStringEncoder().encode(""));
}
@Test
- public final void testGetEncoding_Null_to_Nothing() {
+ final void testGetEncoding_Null_to_Nothing() {
assertEquals("", getStringEncoder().encode(null));
}
@Test
- public final void testGetEncoding_One_Letter_to_Nothing() {
+ final void testGetEncoding_One_Letter_to_Nothing() {
assertEquals("", getStringEncoder().encode("E"));
}
@Test
- public final void testGetEncoding_SMITH_to_SMTH() {
+ final void testGetEncoding_SMITH_to_SMTH() {
assertEquals("SMTH", getStringEncoder().encode("Smith"));
}
@Test
- public final void testGetEncoding_SMYTH_to_SMYTH() {
+ final void testGetEncoding_SMYTH_to_SMYTH() {
assertEquals("SMYTH", getStringEncoder().encode("Smyth"));
}
@Test
- public final void testGetEncoding_Space_to_Nothing() {
+ final void testGetEncoding_Space_to_Nothing() {
assertEquals("", getStringEncoder().encode(" "));
}
@Test
- public final void testGetFirstLast3__ALEXANDER_Returns_Aleder() {
+ final void testGetFirstLast3__ALEXANDER_Returns_Aleder() {
assertEquals("Aleder", getStringEncoder().getFirst3Last3("Alexzander"));
}
@Test
- public final void testGetFirstLast3_PETE_Returns_PETE() {
+ final void testGetFirstLast3_PETE_Returns_PETE() {
assertEquals("PETE", getStringEncoder().getFirst3Last3("PETE"));
}
@Test
- public final void testGetMinRating_1_Returns5_Successfully() {
+ final void testGetMinRating_1_Returns5_Successfully() {
assertEquals(5, getStringEncoder().getMinRating(1));
}
@Test
- public final void testgetMinRating_10_Returns3_Successfully() {
+ final void testgetMinRating_10_Returns3_Successfully() {
assertEquals(3, getStringEncoder().getMinRating(10));
}
@Test
- public final void testgetMinRating_11_Returns_3_Successfully() {
+ final void testgetMinRating_11_Returns_3_Successfully() {
assertEquals(3, getStringEncoder().getMinRating(11));
}
@Test
- public final void testGetMinRating_13_Returns_1_Successfully() {
+ final void testGetMinRating_13_Returns_1_Successfully() {
assertEquals(1, getStringEncoder().getMinRating(13));
}
@Test
- public final void testGetMinRating_2_Returns5_Successfully() {
+ final void testGetMinRating_2_Returns5_Successfully() {
assertEquals(5, getStringEncoder().getMinRating(2));
}
@Test
- public final void testgetMinRating_5_Returns4_Successfully() {
+ final void testgetMinRating_5_Returns4_Successfully() {
assertEquals(4, getStringEncoder().getMinRating(5));
}
@Test
- public final void testgetMinRating_5_Returns4_Successfully2() {
+ final void testgetMinRating_5_Returns4_Successfully2() {
assertEquals(4, getStringEncoder().getMinRating(5));
}
@Test
- public final void testgetMinRating_6_Returns4_Successfully() {
+ final void testgetMinRating_6_Returns4_Successfully() {
assertEquals(4, getStringEncoder().getMinRating(6));
}
@Test
- public final void testGetMinRating_7_Return4_Successfully() {
+ final void testGetMinRating_7_Return4_Successfully() {
assertEquals(4, getStringEncoder().getMinRating(7));
}
// ***** Begin Region - Test Get Encoding - Surnames
@Test
- public final void testgetMinRating_7_Returns4_Successfully() {
+ final void testgetMinRating_7_Returns4_Successfully() {
assertEquals(4, getStringEncoder().getMinRating(7));
}
@Test
- public final void testgetMinRating_8_Returns3_Successfully() {
+ final void testgetMinRating_8_Returns3_Successfully() {
assertEquals(3, getStringEncoder().getMinRating(8));
}
@Test
- public final void testIsEncodeEquals_CornerCase_FirstNameJust1Letter_ReturnsFalse() {
+ final void testIsEncodeEquals_CornerCase_FirstNameJust1Letter_ReturnsFalse() {
assertFalse(getStringEncoder().isEncodeEquals("t", "test"));
}
@Test
- public final void testIsEncodeEquals_CornerCase_FirstNameJustSpace_ReturnsFalse() {
+ final void testIsEncodeEquals_CornerCase_FirstNameJustSpace_ReturnsFalse() {
assertFalse(getStringEncoder().isEncodeEquals(" ", "test"));
}
@Test
- public final void testIsEncodeEquals_CornerCase_FirstNameNothing_ReturnsFalse() {
+ final void testIsEncodeEquals_CornerCase_FirstNameNothing_ReturnsFalse() {
assertFalse(getStringEncoder().isEncodeEquals("", "test"));
}
@Test
- public final void testIsEncodeEquals_CornerCase_FirstNameNull_ReturnsFalse() {
+ final void testIsEncodeEquals_CornerCase_FirstNameNull_ReturnsFalse() {
assertFalse(getStringEncoder().isEncodeEquals(null, "test"));
}
@Test
- public final void testIsEncodeEquals_CornerCase_SecondNameJustSpace_ReturnsFalse() {
+ final void testIsEncodeEquals_CornerCase_SecondNameJustSpace_ReturnsFalse() {
assertFalse(getStringEncoder().isEncodeEquals("test", " "));
}
@Test
- public final void testIsEncodeEquals_CornerCase_SecondNameNothing_ReturnsFalse() {
+ final void testIsEncodeEquals_CornerCase_SecondNameNothing_ReturnsFalse() {
assertFalse(getStringEncoder().isEncodeEquals("test", ""));
}
@Test
- public final void testIsEncodeEquals_CornerCase_SecondNameNull_ReturnsFalse() {
+ final void testIsEncodeEquals_CornerCase_SecondNameNull_ReturnsFalse() {
assertFalse(getStringEncoder().isEncodeEquals("test", null));
}
@Test
- public final void testIsEncodeEqualsSecondNameJust1Letter_ReturnsFalse() {
+ final void testIsEncodeEqualsSecondNameJust1Letter_ReturnsFalse() {
assertFalse(getStringEncoder().isEncodeEquals("test", "t"));
}
@Test
- public final void testIsVowel_CapitalA_ReturnsTrue() {
+ final void testIsVowel_CapitalA_ReturnsTrue() {
assertTrue(getStringEncoder().isVowel("A"));
}
@Test
- public final void testIsVowel_SingleVowel_ReturnsTrue() {
+ final void testIsVowel_SingleVowel_ReturnsTrue() {
assertTrue(getStringEncoder().isVowel("I"));
}
@Test
- public final void testIsVowel_SmallD_ReturnsFalse() {
+ final void testIsVowel_SmallD_ReturnsFalse() {
assertFalse(getStringEncoder().isVowel("d"));
}
@Test
- public final void testLeftToRightThenRightToLeft_ALEXANDER_ALEXANDRA_Returns4() {
+ final void testLeftToRightThenRightToLeft_ALEXANDER_ALEXANDRA_Returns4() {
assertEquals(4, getStringEncoder().leftToRightThenRightToLeftProcessing("ALEXANDER", "ALEXANDRA"));
}
@Test
- public final void testLeftToRightThenRightToLeft_EINSTEIN_MICHAELA_Returns0() {
+ final void testLeftToRightThenRightToLeft_EINSTEIN_MICHAELA_Returns0() {
assertEquals(0, getStringEncoder().leftToRightThenRightToLeftProcessing("EINSTEIN", "MICHAELA"));
}
@Test
- public final void testPunctuationOnly() {
+ final void testPunctuationOnly() {
assertEquals(getStringEncoder().encode(".,-"), "");
}
@Test
- public final void testRemoveDoubleConsonants_MISSISSIPPI_RemovedSuccessfully() {
+ final void testRemoveDoubleConsonants_MISSISSIPPI_RemovedSuccessfully() {
assertEquals("MISISIPI", getStringEncoder().removeDoubleConsonants("MISSISSIPPI"));
}
@Test
- public final void testRemoveDoubleDoubleVowel_BEETLE_NotRemoved() {
+ final void testRemoveDoubleDoubleVowel_BEETLE_NotRemoved() {
assertEquals("BEETLE", getStringEncoder().removeDoubleConsonants("BEETLE"));
}
@Test
- public final void testRemoveSingleDoubleConsonants_BUBLE_RemovedSuccessfully() {
+ final void testRemoveSingleDoubleConsonants_BUBLE_RemovedSuccessfully() {
assertEquals("BUBLE", getStringEncoder().removeDoubleConsonants("BUBBLE"));
}
@Test
- public final void testRemoveVowel__AIDAN_Returns_ADN() {
+ final void testRemoveVowel__AIDAN_Returns_ADN() {
assertEquals("ADN", getStringEncoder().removeVowels("AIDAN"));
}
@Test
- public final void testRemoveVowel__DECLAN_Returns_DCLN() {
+ final void testRemoveVowel__DECLAN_Returns_DCLN() {
assertEquals("DCLN", getStringEncoder().removeVowels("DECLAN"));
}
// ***** END REGION - TEST GET MRA COMPARISONS
@Test
- public final void testRemoveVowel_ALESSANDRA_Returns_ALSSNDR() {
+ final void testRemoveVowel_ALESSANDRA_Returns_ALSSNDR() {
assertEquals("ALSSNDR", getStringEncoder().removeVowels("ALESSANDRA"));
}
@Test
- public final void testVowelAndPunctuationOnly() {
+ final void testVowelAndPunctuationOnly() {
assertEquals(getStringEncoder().encode("uoiea.,-AEIOU"), "U");
}
@Test
- public final void testVowelOnly() {
+ final void testVowelOnly() {
assertEquals(getStringEncoder().encode("aeiouAEIOU"), "A");
}
}
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 825ccd94..963d59f9 100644
--- a/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
+++ b/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
@@ -58,14 +58,14 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
}
@Test
- public void testDiscardOfSCEOrSCIOrSCY() {
+ void testDiscardOfSCEOrSCIOrSCY() {
assertEquals("SNS", getStringEncoder().metaphone("SCIENCE"));
assertEquals("SN", getStringEncoder().metaphone("SCENE"));
assertEquals("S", getStringEncoder().metaphone("SCY"));
}
@Test
- public void testDiscardOfSilentGN() {
+ void testDiscardOfSilentGN() {
// NOTE: This does not test for silent GN, but for starting with GN
assertEquals("N", getStringEncoder().metaphone("GNU"));
@@ -74,19 +74,19 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
}
@Test
- public void testDiscardOfSilentHAfterG() {
+ void testDiscardOfSilentHAfterG() {
assertEquals("KNT", getStringEncoder().metaphone("GHENT"));
assertEquals("B", getStringEncoder().metaphone("BAUGH"));
}
@Test
- public void testExceedLength() {
+ void testExceedLength() {
// should be AKSKS, but is truncated by Max Code Length
assertEquals("AKSK", getStringEncoder().metaphone("AXEAXE"));
}
@Test
- public void testIsMetaphoneEqual1() {
+ void testIsMetaphoneEqual1() {
assertMetaphoneEqual(new String[][] { { "Case", "case" }, { "CASE", "Case" }, { "caSe", "cAsE" }, { "quick", "cookie" } });
}
@@ -94,7 +94,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Matches computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqual2() {
+ void testIsMetaphoneEqual2() {
assertMetaphoneEqual(new String[][] { { "Lawrence", "Lorenza" }, { "Gary", "Cahra" }, });
}
@@ -104,7 +104,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqualAero() {
+ void testIsMetaphoneEqualAero() {
assertIsMetaphoneEqual("Aero", new String[] { "Eure" });
}
@@ -114,7 +114,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqualAlbert() {
+ void testIsMetaphoneEqualAlbert() {
assertIsMetaphoneEqual("Albert", new String[] { "Ailbert", "Alberik", "Albert", "Alberto", "Albrecht" });
}
@@ -122,7 +122,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqualGary() {
+ void testIsMetaphoneEqualGary() {
assertIsMetaphoneEqual("Gary",
new String[] { "Cahra", "Cara", "Carey", "Cari", "Caria", "Carie", "Caro", "Carree", "Carri", "Carrie", "Carry", "Cary", "Cora", "Corey",
"Cori", "Corie", "Correy", "Corri", "Corrie", "Corry", "Cory", "Gray", "Kara", "Kare", "Karee", "Kari", "Karia", "Karie", "Karrah",
@@ -133,7 +133,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqualJohn() {
+ void testIsMetaphoneEqualJohn() {
assertIsMetaphoneEqual("John",
new String[] { "Gena", "Gene", "Genia", "Genna", "Genni", "Gennie", "Genny", "Giana", "Gianna", "Gina", "Ginni", "Ginnie", "Ginny", "Jaine",
"Jan", "Jana", "Jane", "Janey", "Jania", "Janie", "Janna", "Jany", "Jayne", "Jean", "Jeana", "Jeane", "Jeanie", "Jeanna", "Jeanne",
@@ -148,7 +148,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqualKnight() {
+ void testIsMetaphoneEqualKnight() {
assertIsMetaphoneEqual("Knight", new String[] { "Hynda", "Nada", "Nadia", "Nady", "Nat", "Nata", "Natty", "Neda", "Nedda", "Nedi", "Netta",
"Netti", "Nettie", "Netty", "Nita", "Nydia" });
}
@@ -157,7 +157,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqualMary() {
+ void testIsMetaphoneEqualMary() {
assertIsMetaphoneEqual("Mary", new String[] { "Mair", "Maire", "Mara", "Mareah", "Mari", "Maria", "Marie", "Mary", "Maura", "Maure", "Meara",
"Merrie", "Merry", "Mira", "Moira", "Mora", "Moria", "Moyra", "Muire", "Myra", "Myrah" });
}
@@ -166,7 +166,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqualParis() {
+ void testIsMetaphoneEqualParis() {
assertIsMetaphoneEqual("Paris", new String[] { "Pearcy", "Perris", "Piercy", "Pierz", "Pryse" });
}
@@ -174,7 +174,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqualPeter() {
+ void testIsMetaphoneEqualPeter() {
assertIsMetaphoneEqual("Peter", new String[] { "Peadar", "Peder", "Pedro", "Peter", "Petr", "Peyter", "Pieter", "Pietro", "Piotr" });
}
@@ -182,7 +182,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqualRay() {
+ void testIsMetaphoneEqualRay() {
assertIsMetaphoneEqual("Ray", new String[] { "Ray", "Rey", "Roi", "Roy", "Ruy" });
}
@@ -190,7 +190,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqualSusan() {
+ void testIsMetaphoneEqualSusan() {
assertIsMetaphoneEqual("Susan",
new String[] { "Siusan", "Sosanna", "Susan", "Susana", "Susann", "Susanna", "Susannah", "Susanne", "Suzann", "Suzanna", "Suzanne", "Zuzana" });
}
@@ -201,7 +201,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqualWhite() {
+ void testIsMetaphoneEqualWhite() {
assertIsMetaphoneEqual("White",
new String[] { "Wade", "Wait", "Waite", "Wat", "Whit", "Wiatt", "Wit", "Wittie", "Witty", "Wood", "Woodie", "Woody" });
}
@@ -212,7 +212,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqualWright() {
+ void testIsMetaphoneEqualWright() {
assertIsMetaphoneEqual("Wright", new String[] { "Rota", "Rudd", "Ryde" });
}
@@ -220,12 +220,12 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
- public void testIsMetaphoneEqualXalan() {
+ void testIsMetaphoneEqualXalan() {
assertIsMetaphoneEqual("Xalan", new String[] { "Celene", "Celina", "Celine", "Selena", "Selene", "Selina", "Seline", "Suellen", "Xylina" });
}
@Test
- public void testMetaphone() {
+ void testMetaphone() {
assertEquals("HL", getStringEncoder().metaphone("howl"));
assertEquals("TSTN", getStringEncoder().metaphone("testing"));
assertEquals("0", getStringEncoder().metaphone("The"));
@@ -240,38 +240,38 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
}
@Test
- public void testPHTOF() {
+ void testPHTOF() {
assertEquals("FX", getStringEncoder().metaphone("PHISH"));
}
@Test
- public void testSetMaxLengthWithTruncation() {
+ void testSetMaxLengthWithTruncation() {
// should be AKSKS, but istruncated by Max Code Length
getStringEncoder().setMaxCodeLen(6);
assertEquals("AKSKSK", getStringEncoder().metaphone("AXEAXEAXE"));
}
@Test
- public void testSHAndSIOAndSIAToX() {
+ void testSHAndSIOAndSIAToX() {
assertEquals("XT", getStringEncoder().metaphone("SHOT"));
assertEquals("OTXN", getStringEncoder().metaphone("ODSIAN"));
assertEquals("PLXN", getStringEncoder().metaphone("PULSION"));
}
@Test
- public void testTCH() {
+ void testTCH() {
assertEquals("RX", getStringEncoder().metaphone("RETCH"));
assertEquals("WX", getStringEncoder().metaphone("WATCH"));
}
@Test
- public void testTIOAndTIAToX() {
+ void testTIOAndTIAToX() {
assertEquals("OX", getStringEncoder().metaphone("OTIA"));
assertEquals("PRXN", getStringEncoder().metaphone("PORTION"));
}
@Test
- public void testTranslateOfSCHAndCH() {
+ void testTranslateOfSCHAndCH() {
assertEquals("SKTL", getStringEncoder().metaphone("SCHEDULE"));
assertEquals("SKMT", getStringEncoder().metaphone("SCHEMATIC"));
@@ -280,7 +280,7 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
}
@Test
- public void testTranslateToJOfDGEOrDGIOrDGY() {
+ void testTranslateToJOfDGEOrDGIOrDGY() {
assertEquals("TJ", getStringEncoder().metaphone("DODGY"));
assertEquals("TJ", getStringEncoder().metaphone("DODGE"));
assertEquals("AJMT", getStringEncoder().metaphone("ADGIEMTI"));
@@ -290,20 +290,20 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
* Tests (CODEC-57) Metaphone.metaphone(String) returns an empty string when passed the word "why"
*/
@Test
- public void testWhy() {
+ void testWhy() {
// PHP returns "H". The original metaphone returns an empty string.
assertEquals("", getStringEncoder().metaphone("WHY"));
}
@Test
- public void testWordEndingInMB() {
+ void testWordEndingInMB() {
assertEquals("KM", getStringEncoder().metaphone("COMB"));
assertEquals("TM", getStringEncoder().metaphone("TOMB"));
assertEquals("WM", getStringEncoder().metaphone("WOMB"));
}
@Test
- public void testWordsWithCIA() {
+ void testWordsWithCIA() {
assertEquals("XP", getStringEncoder().metaphone("CIAPO"));
}
diff --git a/src/test/java/org/apache/commons/codec/language/NysiisTest.java b/src/test/java/org/apache/commons/codec/language/NysiisTest.java
index a06209a2..801b64cc 100644
--- a/src/test/java/org/apache/commons/codec/language/NysiisTest.java
+++ b/src/test/java/org/apache/commons/codec/language/NysiisTest.java
@@ -56,24 +56,24 @@ public class NysiisTest extends AbstractStringEncoderTest<Nysiis> {
}
@Test
- public void testBran() {
+ void testBran() {
encodeAll(new String[] { "Brian", "Brown", "Brun" }, "BRAN");
}
@Test
- public void testCap() {
+ void testCap() {
encodeAll(new String[] { "Capp", "Cope", "Copp", "Kipp" }, "CAP");
}
@Test
- public void testDad() {
+ void testDad() {
// Data Quality and Record Linkage Techniques P.121 claims this is DAN,
// but it should be DAD, verified also with dropby.com
encodeAll(new String[] { "Dent" }, "DAD");
}
@Test
- public void testDan() {
+ void testDan() {
encodeAll(new String[] { "Dane", "Dean", "Dionne" }, "DAN");
}
@@ -82,7 +82,7 @@ public class NysiisTest extends AbstractStringEncoderTest<Nysiis> {
*
* @see <a href="http://www.dropby.com/NYSIISTextStrings.html">http://www.dropby.com/NYSIISTextStrings.html</a>*/
@Test
- public void testDropBy() {
+ void testDropBy() {
// Explanation of differences between this implementation and the one at dropby.com is
// prepended to the test string. The referenced rules refer to the outlined steps the
// class description for Nysiis.
@@ -140,14 +140,14 @@ public class NysiisTest extends AbstractStringEncoderTest<Nysiis> {
}
@Test
- public void testFal() {
+ void testFal() {
encodeAll(new String[] { "Phil" }, "FAL");
}
/**
* Tests data gathered from around the internets.*/
@Test
- public void testOthers() {
+ void testOthers() {
assertEncodings(
new String[] { "O'Daniel", "ODANAL" },
new String[] { "O'Donnel", "ODANAL" },
@@ -161,7 +161,7 @@ public class NysiisTest extends AbstractStringEncoderTest<Nysiis> {
/**
* Tests rule 1: Translate first characters of name: MAC → MCC, KN → N, K → C, PH, PF → FF, SCH → SSS*/
@Test
- public void testRule1() {
+ void testRule1() {
assertEncodings(
new String[] { "MACX", "MCX" },
new String[] { "KNX", "NX" },
@@ -174,7 +174,7 @@ public class NysiisTest extends AbstractStringEncoderTest<Nysiis> {
/**
* Tests rule 2: Translate last characters of name: EE → Y, IE → Y, DT, RT, RD, NT, ND → D*/
@Test
- public void testRule2() {
+ void testRule2() {
assertEncodings(
new String[] { "XEE", "XY" },
new String[] { "XIE", "XY" },
@@ -188,7 +188,7 @@ public class NysiisTest extends AbstractStringEncoderTest<Nysiis> {
/**
* Tests rule 4.1: EV → AF else A, E, I, O, U → A*/
@Test
- public void testRule4Dot1() {
+ void testRule4Dot1() {
assertEncodings(
new String[] { "XEV", "XAF" },
new String[] { "XAX", "XAX" },
@@ -201,7 +201,7 @@ public class NysiisTest extends AbstractStringEncoderTest<Nysiis> {
/**
* Tests rule 4.2: Q → G, Z → S, M → N*/
@Test
- public void testRule4Dot2() {
+ void testRule4Dot2() {
assertEncodings(
new String[] { "XQ", "XG" },
new String[] { "XZ", "X" },
@@ -211,7 +211,7 @@ public class NysiisTest extends AbstractStringEncoderTest<Nysiis> {
/**
* Tests rule 5: If last character is S, remove it.*/
@Test
- public void testRule5() {
+ void testRule5() {
assertEncodings(
new String[] { "XS", "X" },
new String[] { "XSS", "X" });
@@ -220,7 +220,7 @@ public class NysiisTest extends AbstractStringEncoderTest<Nysiis> {
/**
* Tests rule 6: If last characters are AY, replace with Y.*/
@Test
- public void testRule6() {
+ void testRule6() {
assertEncodings(
new String[] { "XAY", "XY" },
new String[] { "XAYS", "XY" }); // Rules 5, 6
@@ -229,25 +229,25 @@ public class NysiisTest extends AbstractStringEncoderTest<Nysiis> {
/**
* Tests rule 7: If last character is A, remove it.*/
@Test
- public void testRule7() {
+ void testRule7() {
assertEncodings(
new String[] { "XA", "X" },
new String[] { "XAS", "X" }); // Rules 5, 7
}
@Test
- public void testSnad() {
+ void testSnad() {
// Data Quality and Record Linkage Techniques P.121 claims this is SNAT,
// but it should be SNAD
encodeAll(new String[] { "Schmidt" }, "SNAD");
}
@Test
- public void testSnat() {
+ void testSnat() {
encodeAll(new String[] { "Smith", "Schmit" }, "SNAT");
}
@Test
- public void testSpecialBranches() {
+ void testSpecialBranches() {
encodeAll(new String[] { "Kobwick" }, "CABWAC");
encodeAll(new String[] { "Kocher" }, "CACAR");
encodeAll(new String[] { "Fesca" }, "FASC");
@@ -258,12 +258,12 @@ public class NysiisTest extends AbstractStringEncoderTest<Nysiis> {
}
@Test
- public void testTranan() {
+ void testTranan() {
encodeAll(new String[] { "Trueman", "Truman" }, "TRANAN");
}
@Test
- public void testTrueVariant() {
+ void testTrueVariant() {
final Nysiis encoder = new Nysiis(true);
final String encoded = encoder.encode("WESTERLUND");
diff --git a/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java b/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java
index ea67a06d..12abfdd9 100644
--- a/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java
+++ b/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java
@@ -34,7 +34,7 @@ public class RefinedSoundexTest extends AbstractStringEncoderTest<RefinedSoundex
}
@Test
- public void testDifference() throws EncoderException {
+ void testDifference() throws EncoderException {
// Edge cases
assertEquals(0, getStringEncoder().difference(null, null));
assertEquals(0, getStringEncoder().difference("", ""));
@@ -56,7 +56,7 @@ public class RefinedSoundexTest extends AbstractStringEncoderTest<RefinedSoundex
}
@Test
- public void testEncode() {
+ void testEncode() {
assertEquals("T6036084", getStringEncoder().encode("testing"));
assertEquals("T6036084", getStringEncoder().encode("TESTING"));
assertEquals("T60", getStringEncoder().encode("The"));
@@ -74,13 +74,13 @@ public class RefinedSoundexTest extends AbstractStringEncoderTest<RefinedSoundex
}
@Test
- public void testGetMappingCodeNonLetter() {
+ void testGetMappingCodeNonLetter() {
final char code = getStringEncoder().getMappingCode('#');
assertEquals(0, code, "Code does not equals zero");
}
@Test
- public void testInvalidSoundexCharacter() {
+ void testInvalidSoundexCharacter() {
final char[] invalid = new char[256];
for (int i = 0; i < invalid.length; i++) {
invalid[i] = (char) i;
@@ -90,17 +90,17 @@ public class RefinedSoundexTest extends AbstractStringEncoderTest<RefinedSoundex
}
@Test
- public void testNewInstance() {
+ void testNewInstance() {
assertEquals("D6043", new RefinedSoundex().soundex("dogs"));
}
@Test
- public void testNewInstance2() {
+ void testNewInstance2() {
assertEquals("D6043", new RefinedSoundex(RefinedSoundex.US_ENGLISH_MAPPING_STRING.toCharArray()).soundex("dogs"));
}
@Test
- public void testNewInstance3() {
+ void testNewInstance3() {
assertEquals("D6043", new RefinedSoundex(RefinedSoundex.US_ENGLISH_MAPPING_STRING).soundex("dogs"));
}
}
diff --git a/src/test/java/org/apache/commons/codec/language/SoundexTest.java b/src/test/java/org/apache/commons/codec/language/SoundexTest.java
index b8b9be1a..afebc3e3 100644
--- a/src/test/java/org/apache/commons/codec/language/SoundexTest.java
+++ b/src/test/java/org/apache/commons/codec/language/SoundexTest.java
@@ -40,7 +40,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
}
@Test
- public void testB650() throws EncoderException {
+ void testB650() throws EncoderException {
checkEncodingVariations("B650", new String[]{
"BARHAM",
"BARONE",
@@ -85,13 +85,13 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
}
@Test
- public void testBadCharacters() {
+ void testBadCharacters() {
assertEquals("H452", getStringEncoder().encode("HOL>MES"));
}
@Test
- public void testDifference() throws EncoderException {
+ void testDifference() throws EncoderException {
// Edge cases
assertEquals(0, getStringEncoder().difference(null, null));
assertEquals(0, getStringEncoder().difference("", ""));
@@ -111,7 +111,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
}
@Test
- public void testEncodeBasic() {
+ void testEncodeBasic() {
assertEquals("T235", getStringEncoder().encode("testing"));
assertEquals("T000", getStringEncoder().encode("The"));
assertEquals("Q200", getStringEncoder().encode("quick"));
@@ -128,7 +128,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
* Examples from http://www.bradandkathy.com/genealogy/overviewofsoundex.html
*/
@Test
- public void testEncodeBatch2() {
+ void testEncodeBatch2() {
assertEquals("A462", getStringEncoder().encode("Allricht"));
assertEquals("E166", getStringEncoder().encode("Eberhard"));
assertEquals("E521", getStringEncoder().encode("Engebrethson"));
@@ -151,7 +151,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
* Examples from http://www.archives.gov/research_room/genealogy/census/soundex.html
*/
@Test
- public void testEncodeBatch3() {
+ void testEncodeBatch3() {
assertEquals("W252", getStringEncoder().encode("Washington"));
assertEquals("L000", getStringEncoder().encode("Lee"));
assertEquals("G362", getStringEncoder().encode("Gutierrez"));
@@ -167,7 +167,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
* Examples from: http://www.myatt.demon.co.uk/sxalg.htm
*/
@Test
- public void testEncodeBatch4() {
+ void testEncodeBatch4() {
assertEquals("H452", getStringEncoder().encode("HOLMES"));
assertEquals("A355", getStringEncoder().encode("ADOMOMI"));
assertEquals("V536", getStringEncoder().encode("VONDERLEHR"));
@@ -180,7 +180,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
}
@Test
- public void testEncodeIgnoreApostrophes() throws EncoderException {
+ void testEncodeIgnoreApostrophes() throws EncoderException {
checkEncodingVariations("O165", new String[]{
"OBrien",
"'OBrien",
@@ -197,7 +197,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
*
* @throws EncoderException for some failure scenarios */
@Test
- public void testEncodeIgnoreHyphens() throws EncoderException {
+ void testEncodeIgnoreHyphens() throws EncoderException {
checkEncodingVariations("K525", new String[]{
"KINGSMITH",
"-KINGSMITH",
@@ -213,7 +213,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
}
@Test
- public void testEncodeIgnoreTrimmable() {
+ void testEncodeIgnoreTrimmable() {
assertEquals("W252", getStringEncoder().encode(" \t\n\r Washington \t\n\r "));
}
@@ -235,7 +235,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
* Consonants from the same code group separated by W or H are treated as one.
*/
@Test
- public void testHWRuleEx1() {
+ void testHWRuleEx1() {
// From
// http://www.archives.gov/research_room/genealogy/census/soundex.html:
// Ashcraft is coded A-261 (A, 2 for the S, C ignored, 6 for the R, 1
@@ -252,7 +252,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
* Test data from http://www.myatt.demon.co.uk/sxalg.htm
*/
@Test
- public void testHWRuleEx2() {
+ void testHWRuleEx2() {
assertEquals("B312", getStringEncoder().encode("BOOTHDAVIS"));
assertEquals("B312", getStringEncoder().encode("BOOTH-DAVIS"));
}
@@ -262,7 +262,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
*
* @throws EncoderException for some failure scenarios */
@Test
- public void testHWRuleEx3() throws EncoderException {
+ void testHWRuleEx3() throws EncoderException {
assertEquals("S460", getStringEncoder().encode("Sgler"));
assertEquals("S460", getStringEncoder().encode("Swhgler"));
// Also S460:
@@ -290,7 +290,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
* https://msdn.microsoft.com/library/default.asp?url=/library/en-us/tsqlref/ts_setu-sus_3o6w.asp
*/
@Test
- public void testMsSqlServer1() {
+ void testMsSqlServer1() {
assertEquals("S530", getStringEncoder().encode("Smith"));
assertEquals("S530", getStringEncoder().encode("Smythe"));
}
@@ -302,7 +302,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
*
* @throws EncoderException for some failure scenarios */
@Test
- public void testMsSqlServer2() throws EncoderException {
+ void testMsSqlServer2() throws EncoderException {
checkEncodingVariations("E625", new String[]{"Erickson", "Erickson", "Erikson", "Ericson", "Ericksen", "Ericsen"});
}
@@ -310,7 +310,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
* Examples for MS SQLServer from https://databases.about.com/library/weekly/aa042901a.htm
*/
@Test
- public void testMsSqlServer3() {
+ void testMsSqlServer3() {
assertEquals("A500", getStringEncoder().encode("Ann"));
assertEquals("A536", getStringEncoder().encode("Andrew"));
assertEquals("J530", getStringEncoder().encode("Janet"));
@@ -326,17 +326,17 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
* https://issues.apache.org/jira/browse/CODEC-54 https://issues.apache.org/jira/browse/CODEC-56
*/
@Test
- public void testNewInstance() {
+ void testNewInstance() {
assertEquals("W452", new Soundex().soundex("Williams"));
}
@Test
- public void testNewInstance2() {
+ void testNewInstance2() {
assertEquals("W452", new Soundex(Soundex.US_ENGLISH_MAPPING_STRING.toCharArray()).soundex("Williams"));
}
@Test
- public void testNewInstance3() {
+ void testNewInstance3() {
assertEquals("W452", new Soundex(Soundex.US_ENGLISH_MAPPING_STRING).soundex("Williams"));
}
@@ -356,12 +356,12 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
}
@Test
- public void testSoundexUtilsConstructable() {
+ void testSoundexUtilsConstructable() {
new SoundexUtils();
}
@Test
- public void testSoundexUtilsNullBehaviour() {
+ void testSoundexUtilsNullBehaviour() {
assertNull(SoundexUtils.clean(null));
assertEquals("", SoundexUtils.clean(""));
assertEquals(0, SoundexUtils.differenceEncoded(null, ""));
@@ -372,7 +372,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
* https://issues.apache.org/jira/browse/CODEC-54 https://issues.apache.org/jira/browse/CODEC-56
*/
@Test
- public void testUsEnglishStatic() {
+ void testUsEnglishStatic() {
assertEquals("W452", Soundex.US_ENGLISH.soundex("Williams"));
}
@@ -382,7 +382,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
* https://issues.apache.org/jira/browse/CODEC-30
*/
@Test
- public void testUsMappingEWithAcute() {
+ void testUsMappingEWithAcute() {
assertEquals("E000", getStringEncoder().encode("e"));
if (Character.isLetter('\u00e9')) { // e-acute
// uppercase E-acute
@@ -398,7 +398,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
* https://issues.apache.org/jira/browse/CODEC-30
*/
@Test
- public void testUsMappingOWithDiaeresis() {
+ void testUsMappingOWithDiaeresis() {
assertEquals("O000", getStringEncoder().encode("o"));
if (Character.isLetter('\u00f6')) { // o-umlaut
// uppercase O-umlaut
@@ -412,7 +412,7 @@ public class SoundexTest extends AbstractStringEncoderTest<Soundex> {
* Tests example from https://en.wikipedia.org/wiki/Soundex#American_Soundex as of 2015-03-22.
*/
@Test
- public void testWikipediaAmericanSoundex() {
+ void testWikipediaAmericanSoundex() {
assertEquals("R163", getStringEncoder().encode("Robert"));
assertEquals("R163", getStringEncoder().encode("Rupert"));
assertEquals("A261", getStringEncoder().encode("Ashcraft"));
diff --git a/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java b/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
index c45b18df..b394b161 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
@@ -58,7 +58,7 @@ public class BeiderMorseEncoderTest extends AbstractStringEncoderTest<StringEnco
*
* @throws EncoderException for some failure scenarios */
@Test
- public void testAllChars() throws EncoderException {
+ void testAllChars() throws EncoderException {
final BeiderMorseEncoder bmpm = createGenericApproxEncoder();
for (char c = Character.MIN_VALUE; c < Character.MAX_VALUE; c++) {
bmpm.encode(Character.toString(c));
@@ -66,7 +66,7 @@ public class BeiderMorseEncoderTest extends AbstractStringEncoderTest<StringEnco
}
@Test
- public void testAsciiEncodeNotEmpty1Letter() throws EncoderException {
+ void testAsciiEncodeNotEmpty1Letter() throws EncoderException {
final BeiderMorseEncoder bmpm = createGenericApproxEncoder();
for (char c = 'a'; c <= 'z'; c++) {
final String value = Character.toString(c);
@@ -77,7 +77,7 @@ public class BeiderMorseEncoderTest extends AbstractStringEncoderTest<StringEnco
}
@Test
- public void testAsciiEncodeNotEmpty2Letters() throws EncoderException {
+ void testAsciiEncodeNotEmpty2Letters() throws EncoderException {
final BeiderMorseEncoder bmpm = createGenericApproxEncoder();
for (char c1 = 'a'; c1 <= 'z'; c1++) {
for (char c2 = 'a'; c2 <= 'z'; c2++) {
@@ -90,7 +90,7 @@ public class BeiderMorseEncoderTest extends AbstractStringEncoderTest<StringEnco
}
@Test
- public void testEncodeAtzNotEmpty() throws EncoderException {
+ void testEncodeAtzNotEmpty() throws EncoderException {
final BeiderMorseEncoder bmpm = createGenericApproxEncoder();
//String[] names = { "ácz", "átz", "Ignácz", "Ignátz", "Ignác" };
final String[] names = { "\u00e1cz", "\u00e1tz", "Ign\u00e1cz", "Ign\u00e1tz", "Ign\u00e1c" };
@@ -105,40 +105,40 @@ public class BeiderMorseEncoderTest extends AbstractStringEncoderTest<StringEnco
*
* @throws EncoderException for some failure scenarios */
@Test
- public void testEncodeGna() throws EncoderException {
+ void testEncodeGna() throws EncoderException {
final BeiderMorseEncoder bmpm = createGenericApproxEncoder();
bmpm.encode("gna");
}
@Test
- public void testInvalidLangIllegalArgumentException() {
+ void testInvalidLangIllegalArgumentException() {
assertThrows(IllegalArgumentException.class, () -> Rule.getInstance(NameType.GENERIC, RuleType.APPROX, "noSuchLanguage"));
}
@Test
- public void testInvalidLangIllegalStateException() {
+ void testInvalidLangIllegalStateException() {
assertThrows(IllegalArgumentException.class, () -> Lang.loadFromResource("thisIsAMadeUpResourceName", Languages.getInstance(NameType.GENERIC)));
}
@Test
- public void testInvalidLanguageIllegalArgumentException() {
+ void testInvalidLanguageIllegalArgumentException() {
assertThrows(IllegalArgumentException.class, () -> Languages.getInstance("thereIsNoSuchLanguage"));
}
@Test
- public void testLongestEnglishSurname() {
+ void testLongestEnglishSurname() {
final BeiderMorseEncoder bmpm = createGenericApproxEncoder();
assertTimeout(Duration.ofMillis(10000L), () -> bmpm.encode("MacGhilleseatheanaich"));
}
@Test
- public void testNegativeIndexForRuleMatchIndexOutOfBoundsException() {
+ void testNegativeIndexForRuleMatchIndexOutOfBoundsException() {
final Rule r = new Rule("a", "", "", new Rule.Phoneme("", Languages.ANY_LANGUAGE));
assertThrows(IndexOutOfBoundsException.class, () -> r.patternAndContextMatches("bob", -1));
}
@Test
- public void testOOM() throws EncoderException {
+ void testOOM() throws EncoderException {
final String phrase = "200697900'-->�</ bceaeef >aadaabcf\"aedfbff<!--\'-->?>cae" +
"cfaaa><?&#<!--</script>&lang&fc;aadeaf?>>&bdquo< cc =\"abff\" /></ afe >" +
"<script><!-- f(';< cf aefbeef = \"bfabadcf\" ebbfeedd = fccabeb >";
@@ -156,28 +156,28 @@ public class BeiderMorseEncoderTest extends AbstractStringEncoderTest<StringEnco
}
@Test
- public void testSetConcat() {
+ void testSetConcat() {
final BeiderMorseEncoder bmpm = new BeiderMorseEncoder();
bmpm.setConcat(false);
assertFalse(bmpm.isConcat(), "Should be able to set concat to false");
}
@Test
- public void testSetNameTypeAsh() {
+ void testSetNameTypeAsh() {
final BeiderMorseEncoder bmpm = new BeiderMorseEncoder();
bmpm.setNameType(NameType.ASHKENAZI);
assertEquals(NameType.ASHKENAZI, bmpm.getNameType(), "Name type should have been set to ash");
}
@Test
- public void testSetRuleTypeExact() {
+ void testSetRuleTypeExact() {
final BeiderMorseEncoder bmpm = new BeiderMorseEncoder();
bmpm.setRuleType(RuleType.EXACT);
assertEquals(RuleType.EXACT, bmpm.getRuleType(), "Rule type should have been set to exact");
}
@Test
- public void testSetRuleTypeToRulesIllegalArgumentException() {
+ void testSetRuleTypeToRulesIllegalArgumentException() {
final BeiderMorseEncoder bmpm = new BeiderMorseEncoder();
assertThrows(IllegalArgumentException.class, () -> bmpm.setRuleType(RuleType.RULES));
}
@@ -202,7 +202,7 @@ public class BeiderMorseEncoderTest extends AbstractStringEncoderTest<StringEnco
}
@Test
- public void testSpeedCheck2() throws EncoderException {
+ void testSpeedCheck2() throws EncoderException {
final BeiderMorseEncoder bmpm = createGenericApproxEncoder();
final String phrase = "ItstheendoftheworldasweknowitandIfeelfine";
@@ -212,7 +212,7 @@ public class BeiderMorseEncoderTest extends AbstractStringEncoderTest<StringEnco
}
@Test
- public void testSpeedCheck3() throws EncoderException {
+ void testSpeedCheck3() throws EncoderException {
final BeiderMorseEncoder bmpm = createGenericApproxEncoder();
final String phrase = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz";
diff --git a/src/test/java/org/apache/commons/codec/language/bm/CacheSubSequencePerformanceTest.java b/src/test/java/org/apache/commons/codec/language/bm/CacheSubSequencePerformanceTest.java
index a8e61ebb..6e934f82 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/CacheSubSequencePerformanceTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/CacheSubSequencePerformanceTest.java
@@ -50,7 +50,7 @@ public class CacheSubSequencePerformanceTest {
}
@Test
- public void test() {
+ void test() {
final int times = 10000000;
System.out.print("Test with String : ");
test("Angelo", times);
diff --git a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEnginePerformanceTest.java b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEnginePerformanceTest.java
index 5abaf824..dbed0cd6 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEnginePerformanceTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEnginePerformanceTest.java
@@ -123,7 +123,7 @@ public class PhoneticEnginePerformanceTest {
private static final int LOOP = 80000;
@Test
- public void test() {
+ void test() {
final PhoneticEngine engine = new PhoneticEngine(NameType.GENERIC, RuleType.APPROX, true);
final String input = "Angelo";
final long startMillis = System.currentTimeMillis();
diff --git a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineRegressionTest.java b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineRegressionTest.java
index cdec584a..6e43f8f6 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineRegressionTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineRegressionTest.java
@@ -76,7 +76,7 @@ public class PhoneticEngineRegressionTest {
}
@Test
- public void testCompatibilityWithOriginalVersion() {
+ void testCompatibilityWithOriginalVersion() {
// see CODEC-187
// comparison: https://stevemorse.org/census/soundex.html
@@ -100,7 +100,7 @@ public class PhoneticEngineRegressionTest {
}
@Test
- public void testSolrASHKENAZI() {
+ void testSolrASHKENAZI() {
Map<String, String> args;
// concat is true, ruleType is EXACT
@@ -165,7 +165,7 @@ public class PhoneticEngineRegressionTest {
}
@Test
- public void testSolrGENERIC() {
+ void testSolrGENERIC() {
Map<String, String> args;
// concat is true, ruleType is EXACT
@@ -227,7 +227,7 @@ public class PhoneticEngineRegressionTest {
}
@Test
- public void testSolrSEPHARDIC() {
+ void testSolrSEPHARDIC() {
Map<String, String> args;
// concat is true, ruleType is EXACT
diff --git a/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java b/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
index bd52b240..a8d9a40b 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
@@ -44,7 +44,7 @@ public class RuleTest {
}
@Test
- public void testPhonemeComparedToLaterIsNegative() {
+ void testPhonemeComparedToLaterIsNegative() {
for (final Rule.Phoneme[] phs : makePhonemes()) {
for (int i = 0; i < phs.length; i++) {
for (int j = i + 1; j < phs.length; j++) {
@@ -58,7 +58,7 @@ public class RuleTest {
}
@Test
- public void testPhonemeComparedToSelfIsZero() {
+ void testPhonemeComparedToSelfIsZero() {
for (final Rule.Phoneme[] phs : makePhonemes()) {
for (final Rule.Phoneme ph : phs) {
assertEquals(0, Rule.Phoneme.COMPARATOR.compare(ph, ph),
@@ -68,7 +68,7 @@ public class RuleTest {
}
@Test
- public void testSubSequenceWorks() {
+ void testSubSequenceWorks() {
// AppendableCharSequence is private to Rule. We can only make it through a Phoneme.
final Rule.Phoneme a = new Rule.Phoneme("a", null);
diff --git a/src/test/java/org/apache/commons/codec/net/BCodecTest.java b/src/test/java/org/apache/commons/codec/net/BCodecTest.java
index b46743ad..68040267 100644
--- a/src/test/java/org/apache/commons/codec/net/BCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/BCodecTest.java
@@ -62,7 +62,7 @@ public class BCodecTest {
}
@Test
- public void testBase64ImpossibleSamplesDefault() throws DecoderException {
+ void testBase64ImpossibleSamplesDefault() throws DecoderException {
final BCodec codec = new BCodec();
// Default encoding is lenient
assertFalse(codec.isStrictDecoding());
@@ -72,7 +72,7 @@ public class BCodecTest {
}
@Test
- public void testBase64ImpossibleSamplesLenient() throws DecoderException {
+ void testBase64ImpossibleSamplesLenient() throws DecoderException {
final BCodec codec = new BCodec(StandardCharsets.UTF_8, CodecPolicy.LENIENT);
// Default encoding is lenient
assertFalse(codec.isStrictDecoding());
@@ -82,7 +82,7 @@ public class BCodecTest {
}
@Test
- public void testBase64ImpossibleSamplesStrict() {
+ void testBase64ImpossibleSamplesStrict() {
final BCodec codec = new BCodec(StandardCharsets.UTF_8, CodecPolicy.STRICT);
assertTrue(codec.isStrictDecoding());
for (final String s : BASE64_IMPOSSIBLE_CASES) {
@@ -91,7 +91,7 @@ public class BCodecTest {
}
@Test
- public void testBasicEncodeDecode() throws Exception {
+ void testBasicEncodeDecode() throws Exception {
final BCodec bcodec = new BCodec();
final String plain = "Hello there";
final String encoded = bcodec.encode(plain);
@@ -100,7 +100,7 @@ public class BCodecTest {
}
@Test
- public void testDecodeObjects() throws Exception {
+ void testDecodeObjects() throws Exception {
final BCodec bcodec = new BCodec();
final String decoded = "=?UTF-8?B?d2hhdCBub3Q=?=";
final String plain = (String) bcodec.decode((Object) decoded);
@@ -112,7 +112,7 @@ public class BCodecTest {
}
@Test
- public void testDecodeStringWithNull() throws Exception {
+ void testDecodeStringWithNull() throws Exception {
final BCodec bcodec = new BCodec();
final String test = null;
final String result = bcodec.decode(test);
@@ -120,14 +120,14 @@ public class BCodecTest {
}
@Test
- public void testEncodeDecodeNull() throws Exception {
+ void testEncodeDecodeNull() throws Exception {
final BCodec bcodec = new BCodec();
assertNull(bcodec.encode((String) null), "Null string B encoding test");
assertNull(bcodec.decode((String) null), "Null string B decoding test");
}
@Test
- public void testEncodeObjects() throws Exception {
+ void testEncodeObjects() throws Exception {
final BCodec bcodec = new BCodec();
final String plain = "what not";
final String encoded = (String) bcodec.encode((Object) plain);
@@ -142,7 +142,7 @@ public class BCodecTest {
}
@Test
- public void testEncodeStringWithNull() throws Exception {
+ void testEncodeStringWithNull() throws Exception {
final BCodec bcodec = new BCodec();
final String test = null;
final String result = bcodec.encode(test, "charset");
@@ -150,19 +150,19 @@ public class BCodecTest {
}
@Test
- public void testInvalidEncoding() {
+ void testInvalidEncoding() {
assertThrows(UnsupportedCharsetException.class, () -> new BCodec("NONSENSE"));
}
@Test
- public void testNullInput() throws Exception {
+ void testNullInput() throws Exception {
final BCodec bcodec = new BCodec();
assertNull(bcodec.doDecoding(null));
assertNull(bcodec.doEncoding(null));
}
@Test
- public void testUTF8RoundTrip() throws Exception {
+ void testUTF8RoundTrip() throws Exception {
final String ru_msg = constructString(RUSSIAN_STUFF_UNICODE);
final String ch_msg = constructString(SWISS_GERMAN_STUFF_UNICODE);
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 ab68753e..faebda47 100644
--- a/src/test/java/org/apache/commons/codec/net/PercentCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/PercentCodecTest.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
public class PercentCodecTest {
@Test
- public void testBasicEncodeDecode() throws Exception {
+ void testBasicEncodeDecode() throws Exception {
final PercentCodec percentCodec = new PercentCodec();
final String input = "abcdABCD";
final byte[] encoded = percentCodec.encode(input.getBytes(StandardCharsets.UTF_8));
@@ -58,7 +58,7 @@ public class PercentCodecTest {
}
@Test
- public void testConfigurablePercentEncoder() throws Exception {
+ void testConfigurablePercentEncoder() throws Exception {
final String input = "abc123_-.*\u03B1\u03B2";
final PercentCodec percentCodec = new PercentCodec("abcdef".getBytes(StandardCharsets.UTF_8), false);
final byte[] encoded = percentCodec.encode(input.getBytes(StandardCharsets.UTF_8));
@@ -69,7 +69,7 @@ public class PercentCodecTest {
}
@Test
- public void testDecodeInvalidEncodedResultDecoding() throws Exception {
+ void testDecodeInvalidEncodedResultDecoding() throws Exception {
final String inputS = "\u03B1\u03B2";
final PercentCodec percentCodec = new PercentCodec();
final byte[] encoded = percentCodec.encode(inputS.getBytes(StandardCharsets.UTF_8));
@@ -81,37 +81,37 @@ public class PercentCodecTest {
}
@Test
- public void testDecodeNullObject() throws Exception {
+ void testDecodeNullObject() throws Exception {
final PercentCodec percentCodec = new PercentCodec();
assertNull(percentCodec.decode((Object) null));
}
@Test
- public void testDecodeUnsupportedObject() {
+ void testDecodeUnsupportedObject() {
final PercentCodec percentCodec = new PercentCodec();
assertThrows(DecoderException.class, () -> percentCodec.decode("test"));
}
@Test
- public void testEncodeNullObject() throws Exception {
+ void testEncodeNullObject() throws Exception {
final PercentCodec percentCodec = new PercentCodec();
assertNull(percentCodec.encode((Object) null));
}
@Test
- public void testEncodeUnsupportedObject() {
+ void testEncodeUnsupportedObject() {
final PercentCodec percentCodec = new PercentCodec();
assertThrows(EncoderException.class, () -> percentCodec.encode("test"));
}
@Test
- public void testInvalidByte() throws Exception {
+ void testInvalidByte() throws Exception {
final byte[] invalid = { (byte) -1, (byte) 'A' };
assertThrows(IllegalArgumentException.class, () -> new PercentCodec(invalid, true));
}
@Test
- public void testPercentEncoderDecoderWithNullOrEmptyInput() throws Exception {
+ void testPercentEncoderDecoderWithNullOrEmptyInput() throws Exception {
final PercentCodec percentCodec = new PercentCodec(null, true);
assertNull(percentCodec.encode(null), "Null input value encoding test");
assertNull(percentCodec.decode(null), "Null input value decoding test");
@@ -121,7 +121,7 @@ public class PercentCodecTest {
}
@Test
- public void testPercentEncoderDecoderWithPlusForSpace() throws Exception {
+ void testPercentEncoderDecoderWithPlusForSpace() throws Exception {
final String input = "a b c d";
final PercentCodec percentCodec = new PercentCodec(null, true);
final byte[] encoded = percentCodec.encode(input.getBytes(StandardCharsets.UTF_8));
@@ -132,7 +132,7 @@ public class PercentCodecTest {
}
@Test
- public void testSafeCharEncodeDecodeObject() throws Exception {
+ void testSafeCharEncodeDecodeObject() throws Exception {
final PercentCodec percentCodec = new PercentCodec(null, true);
final String input = "abc123_-.*";
final Object encoded = percentCodec.encode((Object) input.getBytes(StandardCharsets.UTF_8));
@@ -144,7 +144,7 @@ public class PercentCodecTest {
}
@Test
- public void testUnsafeCharEncodeDecode() throws Exception {
+ void testUnsafeCharEncodeDecode() throws Exception {
final PercentCodec percentCodec = new PercentCodec();
final String input = "\u03B1\u03B2\u03B3\u03B4\u03B5\u03B6% ";
final byte[] encoded = percentCodec.encode(input.getBytes(StandardCharsets.UTF_8));
diff --git a/src/test/java/org/apache/commons/codec/net/QCodecTest.java b/src/test/java/org/apache/commons/codec/net/QCodecTest.java
index 99470063..f10c5473 100644
--- a/src/test/java/org/apache/commons/codec/net/QCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/QCodecTest.java
@@ -50,7 +50,7 @@ public class QCodecTest {
}
@Test
- public void testBasicEncodeDecode() throws Exception {
+ void testBasicEncodeDecode() throws Exception {
final QCodec qcodec = new QCodec();
final String plain = "= Hello there =\r\n";
final String encoded = qcodec.encode(plain);
@@ -59,7 +59,7 @@ public class QCodecTest {
}
@Test
- public void testDecodeObjects() throws Exception {
+ void testDecodeObjects() throws Exception {
final QCodec qcodec = new QCodec();
final String decoded = "=?UTF-8?Q?1+1 =3D 2?=";
final String plain = (String) qcodec.decode((Object) decoded);
@@ -71,7 +71,7 @@ public class QCodecTest {
}
@Test
- public void testDecodeStringWithNull() throws Exception {
+ void testDecodeStringWithNull() throws Exception {
final QCodec qcodec = new QCodec();
final String test = null;
final String result = qcodec.decode(test);
@@ -79,7 +79,7 @@ public class QCodecTest {
}
@Test
- public void testEncodeDecodeBlanks() throws Exception {
+ void testEncodeDecodeBlanks() throws Exception {
final String plain = "Mind those pesky blanks";
final String encoded1 = "=?UTF-8?Q?Mind those pesky blanks?=";
final String encoded2 = "=?UTF-8?Q?Mind_those_pesky_blanks?=";
@@ -97,14 +97,14 @@ public class QCodecTest {
}
@Test
- public void testEncodeDecodeNull() throws Exception {
+ void testEncodeDecodeNull() throws Exception {
final QCodec qcodec = new QCodec();
assertNull(qcodec.encode((String) null), "Null string Q encoding test");
assertNull(qcodec.decode((String) null), "Null string Q decoding test");
}
@Test
- public void testEncodeObjects() throws Exception {
+ void testEncodeObjects() throws Exception {
final QCodec qcodec = new QCodec();
final String plain = "1+1 = 2";
final String encoded = (String) qcodec.encode((Object) plain);
@@ -116,7 +116,7 @@ public class QCodecTest {
}
@Test
- public void testEncodeStringWithNull() throws Exception {
+ void testEncodeStringWithNull() throws Exception {
final QCodec qcodec = new QCodec();
final String test = null;
final String result = qcodec.encode(test, "charset");
@@ -124,12 +124,12 @@ public class QCodecTest {
}
@Test
- public void testInvalidEncoding() {
+ void testInvalidEncoding() {
assertThrows(UnsupportedCharsetException.class, () -> new QCodec("NONSENSE"));
}
@Test
- public void testLetUsMakeCloverHappy() throws Exception {
+ void testLetUsMakeCloverHappy() throws Exception {
final QCodec qcodec = new QCodec();
qcodec.setEncodeBlanks(true);
assertTrue(qcodec.isEncodeBlanks());
@@ -138,14 +138,14 @@ public class QCodecTest {
}
@Test
- public void testNullInput() throws Exception {
+ void testNullInput() throws Exception {
final QCodec qcodec = new QCodec();
assertNull(qcodec.doDecoding(null));
assertNull(qcodec.doEncoding(null));
}
@Test
- public void testUnsafeEncodeDecode() throws Exception {
+ void testUnsafeEncodeDecode() throws Exception {
final QCodec qcodec = new QCodec();
final String plain = "?_=\r\n";
final String encoded = qcodec.encode(plain);
@@ -154,7 +154,7 @@ public class QCodecTest {
}
@Test
- public void testUTF8RoundTrip() throws Exception {
+ void testUTF8RoundTrip() throws Exception {
final String ru_msg = constructString(RUSSIAN_STUFF_UNICODE);
final String ch_msg = constructString(SWISS_GERMAN_STUFF_UNICODE);
diff --git a/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java b/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java
index cc903fc5..e2a0aa1b 100644
--- a/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java
@@ -49,7 +49,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testBasicEncodeDecode() throws Exception {
+ void testBasicEncodeDecode() throws Exception {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
final String plain = "= Hello there =\r\n";
final String encoded = qpcodec.encode(plain);
@@ -58,7 +58,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testDecodeInvalid() {
+ void testDecodeInvalid() {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
assertThrows(DecoderException.class, () -> qpcodec.decode("="));
assertThrows(DecoderException.class, () -> qpcodec.decode("=A"));
@@ -66,7 +66,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testDecodeObjects() throws Exception {
+ void testDecodeObjects() throws Exception {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
final String plain = "1+1 =3D 2";
String decoded = (String) qpcodec.decode((Object) plain);
@@ -84,7 +84,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testDecodeStringWithNull() throws Exception {
+ void testDecodeStringWithNull() throws Exception {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
final String test = null;
final String result = qpcodec.decode(test, "charset");
@@ -92,14 +92,14 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testDecodeWithNullArray() throws Exception {
+ void testDecodeWithNullArray() throws Exception {
final byte[] plain = null;
final byte[] result = QuotedPrintableCodec.decodeQuotedPrintable(plain);
assertNull(result, "Result should be null");
}
@Test
- public void testDefaultEncoding() throws Exception {
+ void testDefaultEncoding() throws Exception {
final String plain = "Hello there!";
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec("UnicodeBig");
qpcodec.encode(plain); // To work around a weird quirk in Java 1.2.2
@@ -109,14 +109,14 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testEncodeDecodeNull() throws Exception {
+ void testEncodeDecodeNull() throws Exception {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
assertNull(qpcodec.encode((String) null), "Null string quoted-printable encoding test");
assertNull(qpcodec.decode((String) null), "Null string quoted-printable decoding test");
}
@Test
- public void testEncodeNull() throws Exception {
+ void testEncodeNull() throws Exception {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
final byte[] plain = null;
final byte[] encoded = qpcodec.encode(plain);
@@ -124,7 +124,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testEncodeObjects() throws Exception {
+ void testEncodeObjects() throws Exception {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
final String plain = "1+1 = 2";
String encoded = (String) qpcodec.encode((Object) plain);
@@ -142,7 +142,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testEncodeStringWithNull() throws Exception {
+ void testEncodeStringWithNull() throws Exception {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
final String test = null;
final String result = qpcodec.encode(test, "charset");
@@ -150,7 +150,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testEncodeUrlWithNullBitSet() throws Exception {
+ void testEncodeUrlWithNullBitSet() throws Exception {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
final String plain = "1+1 = 2";
final String encoded = new String(QuotedPrintableCodec.encodeQuotedPrintable(null, plain.getBytes(StandardCharsets.UTF_8)));
@@ -159,7 +159,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testFinalBytes() throws Exception {
+ void testFinalBytes() throws Exception {
// whitespace, but does not need to be encoded
final String plain = "This is a example of a quoted=printable text file. There is no tt";
final String expected = "This is a example of a quoted=3Dprintable text file. There is no tt";
@@ -168,12 +168,12 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testInvalidEncoding() {
+ void testInvalidEncoding() {
assertThrows(UnsupportedCharsetException.class, () -> new QuotedPrintableCodec("NONSENSE"));
}
@Test
- public void testSafeCharEncodeDecode() throws Exception {
+ void testSafeCharEncodeDecode() throws Exception {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
final String plain = "abc123_-.*~!@#$%^&()+{}\"\\;:`,/[]";
final String encoded = qpcodec.encode(plain);
@@ -182,7 +182,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testSkipNotEncodedCRLF() throws Exception {
+ void testSkipNotEncodedCRLF() throws Exception {
final String qpdata = "CRLF in an\n encoded text should be=20=\r\n\rskipped in the\r decoding.";
final String expected = "CRLF in an encoded text should be skipped in the decoding.";
@@ -194,7 +194,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testSoftLineBreakDecode() throws Exception {
+ void testSoftLineBreakDecode() throws Exception {
final String qpdata = "If you believe that truth=3Dbeauty, then surely=20=\r\nmathematics is the most beautiful branch of philosophy.";
final String expected = "If you believe that truth=beauty, then surely mathematics is the most beautiful branch of philosophy.";
@@ -206,7 +206,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testSoftLineBreakEncode() throws Exception {
+ void testSoftLineBreakEncode() throws Exception {
final String qpdata = "If you believe that truth=3Dbeauty, then surely mathematics is the most b=\r\neautiful branch of philosophy.";
final String expected = "If you believe that truth=beauty, then surely mathematics is the most beautiful branch of philosophy.";
@@ -218,13 +218,13 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testTooShortByteArray() throws Exception {
+ void testTooShortByteArray() throws Exception {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec(true);
assertNull(qpcodec.encode("AA"), "Result should be null.");
}
@Test
- public void testTrailingSpecial() throws Exception {
+ void testTrailingSpecial() throws Exception {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec(true);
String plain = "This is a example of a quoted-printable text file. This might contain sp=cial chars.";
@@ -237,7 +237,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testUltimateSoftBreak() throws Exception {
+ void testUltimateSoftBreak() throws Exception {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec(true);
String plain = "This is a example of a quoted-printable text file. There is no end to it\t";
@@ -264,7 +264,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testUnsafeEncodeDecode() throws Exception {
+ void testUnsafeEncodeDecode() throws Exception {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
final String plain = "=\r\n";
final String encoded = qpcodec.encode(plain);
@@ -273,7 +273,7 @@ public class QuotedPrintableCodecTest {
}
@Test
- public void testUTF8RoundTrip() throws Exception {
+ void testUTF8RoundTrip() throws Exception {
final String ru_msg = constructString(RUSSIAN_STUFF_UNICODE);
final String ch_msg = constructString(SWISS_GERMAN_STUFF_UNICODE);
diff --git a/src/test/java/org/apache/commons/codec/net/RFC1522CodecTest.java b/src/test/java/org/apache/commons/codec/net/RFC1522CodecTest.java
index 6c60f2e8..c7b84411 100644
--- a/src/test/java/org/apache/commons/codec/net/RFC1522CodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/RFC1522CodecTest.java
@@ -59,7 +59,7 @@ public class RFC1522CodecTest {
}
@Test
- public void testDecodeInvalid() throws Exception {
+ void testDecodeInvalid() throws Exception {
assertExpectedDecoderException("whatever");
assertExpectedDecoderException("=?");
assertExpectedDecoderException("?=");
@@ -75,7 +75,7 @@ public class RFC1522CodecTest {
}
@Test
- public void testNullInput() throws Exception {
+ void testNullInput() throws Exception {
final RFC1522TestCodec testCodec = new RFC1522TestCodec();
assertNull(testCodec.decodeText(null));
assertNull(testCodec.encodeText(null, CharEncoding.UTF_8));
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 03f31fba..9e5944c2 100644
--- a/src/test/java/org/apache/commons/codec/net/URLCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/URLCodecTest.java
@@ -48,7 +48,7 @@ public class URLCodecTest {
}
@Test
- public void testBasicEncodeDecode() throws Exception {
+ void testBasicEncodeDecode() throws Exception {
final URLCodec urlCodec = new URLCodec();
final String plain = "Hello there!";
final String encoded = urlCodec.encode(plain);
@@ -58,7 +58,7 @@ public class URLCodecTest {
}
@Test
- public void testDecodeInvalid() throws Exception {
+ void testDecodeInvalid() throws Exception {
final URLCodec urlCodec = new URLCodec();
assertThrows(DecoderException.class, () -> urlCodec.decode("%"));
assertThrows(DecoderException.class, () -> urlCodec.decode("%A"));
@@ -70,7 +70,7 @@ public class URLCodecTest {
}
@Test
- public void testDecodeInvalidContent() throws DecoderException {
+ void testDecodeInvalidContent() throws DecoderException {
final String ch_msg = constructString(SWISS_GERMAN_STUFF_UNICODE);
final URLCodec urlCodec = new URLCodec();
final byte[] input = ch_msg.getBytes(StandardCharsets.ISO_8859_1);
@@ -83,7 +83,7 @@ public class URLCodecTest {
}
@Test
- public void testDecodeObjects() throws Exception {
+ void testDecodeObjects() throws Exception {
final URLCodec urlCodec = new URLCodec();
final String plain = "Hello+there%21";
String decoded = (String) urlCodec.decode((Object) plain);
@@ -101,7 +101,7 @@ public class URLCodecTest {
}
@Test
- public void testDecodeStringWithNull() throws Exception {
+ void testDecodeStringWithNull() throws Exception {
final URLCodec urlCodec = new URLCodec();
final String test = null;
final String result = urlCodec.decode(test, "charset");
@@ -109,14 +109,14 @@ public class URLCodecTest {
}
@Test
- public void testDecodeWithNullArray() throws Exception {
+ void testDecodeWithNullArray() throws Exception {
final byte[] plain = null;
final byte[] result = URLCodec.decodeUrl(plain);
assertNull(result, "Result should be null");
}
@Test
- public void testDefaultEncoding() throws Exception {
+ void testDefaultEncoding() throws Exception {
final String plain = "Hello there!";
final URLCodec urlCodec = new URLCodec("UnicodeBig");
urlCodec.encode(plain); // To work around a weird quirk in Java 1.2.2
@@ -127,7 +127,7 @@ public class URLCodecTest {
}
@Test
- public void testEncodeDecodeNull() throws Exception {
+ void testEncodeDecodeNull() throws Exception {
final URLCodec urlCodec = new URLCodec();
assertNull(urlCodec.encode((String) null), "Null string URL encoding test");
assertNull(urlCodec.decode((String) null), "Null string URL decoding test");
@@ -135,7 +135,7 @@ public class URLCodecTest {
}
@Test
- public void testEncodeNull() throws Exception {
+ void testEncodeNull() throws Exception {
final URLCodec urlCodec = new URLCodec();
final byte[] plain = null;
final byte[] encoded = urlCodec.encode(plain);
@@ -144,7 +144,7 @@ public class URLCodecTest {
}
@Test
- public void testEncodeObjects() throws Exception {
+ void testEncodeObjects() throws Exception {
final URLCodec urlCodec = new URLCodec();
final String plain = "Hello there!";
String encoded = (String) urlCodec.encode((Object) plain);
@@ -163,7 +163,7 @@ public class URLCodecTest {
}
@Test
- public void testEncodeStringWithNull() throws Exception {
+ void testEncodeStringWithNull() throws Exception {
final URLCodec urlCodec = new URLCodec();
final String test = null;
final String result = urlCodec.encode(test, "charset");
@@ -171,7 +171,7 @@ public class URLCodecTest {
}
@Test
- public void testEncodeUrlWithNullBitSet() throws Exception {
+ void testEncodeUrlWithNullBitSet() throws Exception {
final URLCodec urlCodec = new URLCodec();
final String plain = "Hello there!";
final String encoded = new String(URLCodec.encodeUrl(null, plain.getBytes(StandardCharsets.UTF_8)));
@@ -181,7 +181,7 @@ public class URLCodecTest {
}
@Test
- public void testInvalidEncoding() {
+ void testInvalidEncoding() {
final URLCodec urlCodec = new URLCodec("NONSENSE");
final String plain = "Hello there!";
assertThrows(EncoderException.class, () -> urlCodec.encode(plain), "We set the encoding to a bogus NONSENSE value");
@@ -190,7 +190,7 @@ public class URLCodecTest {
}
@Test
- public void testSafeCharEncodeDecode() throws Exception {
+ void testSafeCharEncodeDecode() throws Exception {
final URLCodec urlCodec = new URLCodec();
final String plain = "abc123_-.*";
final String encoded = urlCodec.encode(plain);
@@ -200,7 +200,7 @@ public class URLCodecTest {
}
@Test
- public void testUnsafeEncodeDecode() throws Exception {
+ void testUnsafeEncodeDecode() throws Exception {
final URLCodec urlCodec = new URLCodec();
final String plain = "~!@#$%^&()+{}\"\\;:`,/[]";
final String encoded = urlCodec.encode(plain);
@@ -210,7 +210,7 @@ public class URLCodecTest {
}
@Test
- public void testUTF8RoundTrip() throws Exception {
+ void testUTF8RoundTrip() throws Exception {
final String ru_msg = constructString(RUSSIAN_STUFF_UNICODE);
final String ch_msg = constructString(SWISS_GERMAN_STUFF_UNICODE);
diff --git a/src/test/java/org/apache/commons/codec/net/UtilsTest.java b/src/test/java/org/apache/commons/codec/net/UtilsTest.java
index e65daff8..e236fd80 100644
--- a/src/test/java/org/apache/commons/codec/net/UtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/net/UtilsTest.java
@@ -32,7 +32,7 @@ public class UtilsTest {
* to restrict instantiation right now.
*/
@Test
- public void testConstructor() {
+ void testConstructor() {
new Utils();
}