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 2021/08/06 17:03:02 UTC
[commons-codec] branch master updated: CODEC-300 - Simplify
assertion (#84)
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 f4d53c7 CODEC-300 - Simplify assertion (#84)
f4d53c7 is described below
commit f4d53c76b981b0528e6c2833be56db1523282d84
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Fri Aug 6 19:02:55 2021 +0200
CODEC-300 - Simplify assertion (#84)
---
.../commons/codec/StringEncoderComparatorTest.java | 6 +--
.../apache/commons/codec/binary/Base16Test.java | 17 ++++---
.../apache/commons/codec/binary/Base32Test.java | 7 +--
.../apache/commons/codec/binary/Base64Test.java | 49 +++++++++----------
.../org/apache/commons/codec/binary/HexTest.java | 56 +++++++++++-----------
.../commons/codec/binary/StringUtilsTest.java | 15 +++---
.../codec/language/DoubleMetaphoneTest.java | 9 ++--
.../language/MatchRatingApproachEncoderTest.java | 3 +-
.../apache/commons/codec/language/SoundexTest.java | 2 +-
.../codec/language/bm/BeiderMorseEncoderTest.java | 2 +-
.../org/apache/commons/codec/net/BCodecTest.java | 8 ++--
.../apache/commons/codec/net/PercentCodecTest.java | 12 +++--
.../org/apache/commons/codec/net/QCodecTest.java | 8 ++--
.../codec/net/QuotedPrintableCodecTest.java | 13 +++--
.../org/apache/commons/codec/net/URLCodecTest.java | 13 +++--
15 files changed, 110 insertions(+), 110 deletions(-)
diff --git a/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java b/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
index dc6bd0b..ff7c665 100644
--- a/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
+++ b/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
@@ -18,7 +18,6 @@
package org.apache.commons.codec;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.util.Arrays;
import java.util.Collections;
@@ -39,9 +38,8 @@ public class StringEncoderComparatorTest {
final StringEncoderComparator sCompare =
new StringEncoderComparator( new Soundex() );
- assertTrue( "O'Brien and O'Brian didn't come out with " +
- "the same Soundex, something must be wrong here",
- 0 == sCompare.compare( "O'Brien", "O'Brian" ) );
+ assertEquals("O'Brien and O'Brian didn't come out with " +
+ "the same Soundex, something must be wrong here", 0, sCompare.compare("O'Brien", "O'Brian"));
}
@SuppressWarnings("unchecked") // cannot easily avoid this warning
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 15878dc..b6c9629 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16Test.java
@@ -25,7 +25,6 @@ import org.junit.Test;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
import java.util.Random;
import static org.junit.Assert.assertArrayEquals;
@@ -140,15 +139,15 @@ public class Base16Test {
byte[] empty = {};
byte[] result = new Base16().encode(empty);
assertEquals("empty Base16 encode", 0, result.length);
- assertEquals("empty Base16 encode", null, new Base16().encode(null));
+ assertNull("empty Base16 encode", new Base16().encode(null));
result = new Base16().encode(empty, 0, 1);
assertEquals("empty Base16 encode with offset", 0, result.length);
- assertEquals("empty Base16 encode with offset", null, new Base16().encode(null));
+ assertNull("empty Base16 encode with offset", new Base16().encode(null));
empty = new byte[0];
result = new Base16().decode(empty);
assertEquals("empty Base16 decode", 0, result.length);
- assertEquals("empty Base16 encode", null, new Base16().decode((byte[]) null));
+ assertNull("empty Base16 encode", new Base16().decode((byte[]) null));
}
// encode/decode a large random array
@@ -412,7 +411,7 @@ public class Base16Test {
assertEquals("68", new String(new Base16().encode(new byte[] { (byte) 104 })));
for (int i = -128; i <= 127; i++) {
final byte test[] = { (byte) i };
- assertTrue(Arrays.equals(test, new Base16().decode(new Base16().encode(test))));
+ assertArrayEquals(test, new Base16().decode(new Base16().encode(test)));
}
}
@@ -447,8 +446,8 @@ public class Base16Test {
assertEquals("byteToString static Hello World", "48656C6C6F20576F726C64", StringUtils.newStringUtf8(new Base16().encode(b1)));
assertEquals("byteToString \"\"", "", base16.encodeToString(b2));
assertEquals("byteToString static \"\"", "", StringUtils.newStringUtf8(new Base16().encode(b2)));
- assertEquals("byteToString null", null, base16.encodeToString(b3));
- assertEquals("byteToString static null", null, StringUtils.newStringUtf8(new Base16().encode(b3)));
+ assertNull("byteToString null", base16.encodeToString(b3));
+ assertNull("byteToString static null", StringUtils.newStringUtf8(new Base16().encode(b3)));
}
@Test
@@ -465,8 +464,8 @@ public class Base16Test {
StringUtils.newStringUtf8(new Base16().decode(s1)));
assertEquals("StringToByte \"\"", "", StringUtils.newStringUtf8(new Base16().decode(s2)));
assertEquals("StringToByte static \"\"", "", StringUtils.newStringUtf8(new Base16().decode(s2)));
- assertEquals("StringToByte null", null, StringUtils.newStringUtf8(new Base16().decode(s3)));
- assertEquals("StringToByte static null", null, StringUtils.newStringUtf8(new Base16().decode(s3)));
+ assertNull("StringToByte null", StringUtils.newStringUtf8(new Base16().decode(s3)));
+ assertNull("StringToByte static null", StringUtils.newStringUtf8(new Base16().decode(s3)));
}
private String toString(final byte[] data) {
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 291a611..7fdcbb1 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32Test.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -298,15 +299,15 @@ public class Base32Test {
byte[] empty = {};
byte[] result = new Base32().encode(empty);
assertEquals("empty Base32 encode", 0, result.length);
- assertEquals("empty Base32 encode", null, new Base32().encode(null));
+ assertNull("empty Base32 encode", new Base32().encode(null));
result = new Base32().encode(empty, 0, 1);
assertEquals("empty Base32 encode with offset", 0, result.length);
- assertEquals("empty Base32 encode with offset", null, new Base32().encode(null));
+ assertNull("empty Base32 encode with offset", new Base32().encode(null));
empty = new byte[0];
result = new Base32().decode(empty);
assertEquals("empty Base32 decode", 0, result.length);
- assertEquals("empty Base32 encode", null, new Base32().decode((byte[]) null));
+ assertNull("empty Base32 encode", new Base32().decode((byte[]) null));
}
@Test
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 b89a85f..17cb268 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64Test.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -178,7 +179,7 @@ public class Base64Test {
final String content = "SGVsbG8gV29ybGQ=SGVsbG8gV29ybGQ=";
final byte[] result = Base64.decodeBase64(content);
final byte[] shouldBe = StringUtils.getBytesUtf8("Hello World");
- assertTrue("decode should halt at pad (=)", Arrays.equals(result, shouldBe));
+ assertArrayEquals("decode should halt at pad (=)", result, shouldBe);
}
/**
@@ -192,7 +193,7 @@ public class Base64Test {
// in Base64TestData.ENCODED_76_CHARS_PER_LINE:
final String actualResult = Base64TestData.ENCODED_76_CHARS_PER_LINE.replace("\n", "\r\n");
final byte[] actualEncode = StringUtils.getBytesUtf8(actualResult);
- assertTrue("chunkedEncodeMultipleOf76", Arrays.equals(expectedEncode, actualEncode));
+ assertArrayEquals("chunkedEncodeMultipleOf76", expectedEncode, actualEncode);
}
/**
@@ -401,15 +402,15 @@ public class Base64Test {
byte[] empty = {};
byte[] result = Base64.encodeBase64(empty);
assertEquals("empty base64 encode", 0, result.length);
- assertEquals("empty base64 encode", null, Base64.encodeBase64(null));
+ assertNull("empty base64 encode", Base64.encodeBase64(null));
result = new Base64().encode(empty, 0, 1);
assertEquals("empty base64 encode", 0, result.length);
- assertEquals("empty base64 encode", null, new Base64().encode(null, 0, 1));
+ assertNull("empty base64 encode", new Base64().encode(null, 0, 1));
empty = new byte[0];
result = Base64.decodeBase64(empty);
assertEquals("empty base64 decode", 0, result.length);
- assertEquals("empty base64 encode", null, Base64.decodeBase64((byte[]) null));
+ assertNull("empty base64 encode", Base64.decodeBase64((byte[]) null));
}
// encode/decode a large random array
@@ -421,7 +422,7 @@ public class Base64Test {
final byte[] enc = Base64.encodeBase64(data);
assertTrue(Base64.isBase64(enc));
final byte[] data2 = Base64.decodeBase64(enc);
- assertTrue(Arrays.equals(data, data2));
+ assertArrayEquals(data, data2);
}
}
@@ -434,7 +435,7 @@ public class Base64Test {
final byte[] enc = Base64.encodeBase64(data);
assertTrue("\"" + new String(enc) + "\" is Base64 data.", Base64.isBase64(enc));
final byte[] data2 = Base64.decodeBase64(enc);
- assertTrue(toString(data) + " equals " + toString(data2), Arrays.equals(data, data2));
+ assertArrayEquals(toString(data) + " equals " + toString(data2), data, data2);
}
}
@@ -619,7 +620,7 @@ public class Base64Test {
assertEquals("AAA=", new String(Base64.encodeBase64(new byte[] { 0, 0 })));
for (int i = -128; i <= 127; i++) {
final byte test[] = { (byte) i, (byte) i };
- assertTrue(Arrays.equals(test, Base64.decodeBase64(Base64.encodeBase64(test))));
+ assertArrayEquals(test, Base64.decodeBase64(Base64.encodeBase64(test)));
}
}
@@ -628,7 +629,7 @@ public class Base64Test {
*/
@Test
public void testRfc2045Section2Dot1CrLfDefinition() {
- assertTrue(Arrays.equals(new byte[] { 13, 10 }, Base64.CHUNK_SEPARATOR));
+ assertArrayEquals(new byte[]{13, 10}, Base64.CHUNK_SEPARATOR);
}
/**
@@ -899,7 +900,7 @@ public class Base64Test {
assertEquals("aA==", new String(Base64.encodeBase64(new byte[] { (byte) 104 })));
for (int i = -128; i <= 127; i++) {
final byte test[] = { (byte) i };
- assertTrue(Arrays.equals(test, Base64.decodeBase64(Base64.encodeBase64(test))));
+ assertArrayEquals(test, Base64.decodeBase64(Base64.encodeBase64(test)));
}
}
@@ -1160,7 +1161,7 @@ public class Base64Test {
final byte[] encoded = randomData[1];
final byte[] decoded = randomData[0];
final byte[] result = Base64.decodeBase64(encoded);
- assertTrue("url-safe i=" + i, Arrays.equals(decoded, result));
+ assertArrayEquals("url-safe i=" + i, decoded, result);
assertFalse("url-safe i=" + i + " no '='", BaseNTestData.bytesContain(encoded, (byte) '='));
assertFalse("url-safe i=" + i + " no '\\'", BaseNTestData.bytesContain(encoded, (byte) '\\'));
assertFalse("url-safe i=" + i + " no '+'", BaseNTestData.bytesContain(encoded, (byte) '+'));
@@ -1244,12 +1245,12 @@ public class Base64Test {
// + StringUtils.newStringUtf8(urlSafe3[i]) + "]");
// }
- assertTrue("standard encode uuid", Arrays.equals(encodedStandard, standard[i]));
- assertTrue("url-safe encode uuid", Arrays.equals(encodedUrlSafe, urlSafe3[i]));
- assertTrue("standard decode uuid", Arrays.equals(decodedStandard, ids[i]));
- assertTrue("url-safe1 decode uuid", Arrays.equals(decodedUrlSafe1, ids[i]));
- assertTrue("url-safe2 decode uuid", Arrays.equals(decodedUrlSafe2, ids[i]));
- assertTrue("url-safe3 decode uuid", Arrays.equals(decodedUrlSafe3, ids[i]));
+ assertArrayEquals("standard encode uuid", encodedStandard, standard[i]);
+ assertArrayEquals("url-safe encode uuid", encodedUrlSafe, urlSafe3[i]);
+ assertArrayEquals("standard decode uuid", decodedStandard, ids[i]);
+ assertArrayEquals("url-safe1 decode uuid", decodedUrlSafe1, ids[i]);
+ assertArrayEquals("url-safe2 decode uuid", decodedUrlSafe2, ids[i]);
+ assertArrayEquals("url-safe3 decode uuid", decodedUrlSafe3, ids[i]);
}
}
@@ -1267,8 +1268,8 @@ public class Base64Test {
assertEquals("byteToString static Hello World", "SGVsbG8gV29ybGQ=", Base64.encodeBase64String(b1));
assertEquals("byteToString \"\"", "", base64.encodeToString(b2));
assertEquals("byteToString static \"\"", "", Base64.encodeBase64String(b2));
- assertEquals("byteToString null", null, base64.encodeToString(b3));
- assertEquals("byteToString static null", null, Base64.encodeBase64String(b3));
+ assertNull("byteToString null", base64.encodeToString(b3));
+ assertNull("byteToString static null", Base64.encodeBase64String(b3));
assertEquals("byteToString UUID", "K/fMJwH+Q5e0nr7tWsxwkA==", base64.encodeToString(b4));
assertEquals("byteToString static UUID", "K/fMJwH+Q5e0nr7tWsxwkA==", Base64.encodeBase64String(b4));
assertEquals("byteToString static-url-safe UUID", "K_fMJwH-Q5e0nr7tWsxwkA",
@@ -1294,11 +1295,11 @@ public class Base64Test {
StringUtils.newStringUtf8(Base64.decodeBase64(s1)));
assertEquals("StringToByte \"\"", "", StringUtils.newStringUtf8(base64.decode(s2)));
assertEquals("StringToByte static \"\"", "", StringUtils.newStringUtf8(Base64.decodeBase64(s2)));
- assertEquals("StringToByte null", null, StringUtils.newStringUtf8(base64.decode(s3)));
- assertEquals("StringToByte static null", null, StringUtils.newStringUtf8(Base64.decodeBase64(s3)));
- assertTrue("StringToByte UUID", Arrays.equals(b4, base64.decode(s4b)));
- assertTrue("StringToByte static UUID", Arrays.equals(b4, Base64.decodeBase64(s4a)));
- assertTrue("StringToByte static-url-safe UUID", Arrays.equals(b4, Base64.decodeBase64(s4b)));
+ assertNull("StringToByte null", StringUtils.newStringUtf8(base64.decode(s3)));
+ assertNull("StringToByte static null", StringUtils.newStringUtf8(Base64.decodeBase64(s3)));
+ assertArrayEquals("StringToByte UUID", b4, base64.decode(s4b));
+ assertArrayEquals("StringToByte static UUID", b4, Base64.decodeBase64(s4a));
+ assertArrayEquals("StringToByte static-url-safe UUID", b4, Base64.decodeBase64(s4b));
}
private String toString(final byte[] data) {
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 4f4cb31..eb46e48 100644
--- a/src/test/java/org/apache/commons/codec/binary/HexTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/HexTest.java
@@ -19,7 +19,7 @@ package org.apache.commons.codec.binary;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -189,7 +189,7 @@ public class HexTest {
String expectedHexString = Hex.encodeHexString(sourceBytes);
// ... and get the bytes in the expected charset
final byte[] expectedHexStringBytes = expectedHexString.getBytes(name);
- Assert.assertTrue(Arrays.equals(expectedHexStringBytes, actualEncodedBytes));
+ assertArrayEquals(expectedHexStringBytes, actualEncodedBytes);
// test 2
String actualStringFromBytes = new String(actualEncodedBytes, name);
assertEquals(name + ", expectedHexString=" + expectedHexString + ", actualStringFromBytes=" +
@@ -239,12 +239,12 @@ public class HexTest {
@Test
public void testDecodeByteArrayEmpty() throws DecoderException {
- assertTrue(Arrays.equals(new byte[0], new Hex().decode(new byte[0])));
+ assertArrayEquals(new byte[0], new Hex().decode(new byte[0]));
}
@Test
public void testDecodeByteArrayObjectEmpty() throws DecoderException {
- assertTrue(Arrays.equals(new byte[0], (byte[]) new Hex().decode((Object) new byte[0])));
+ assertArrayEquals(new byte[0], (byte[]) new Hex().decode((Object) new byte[0]));
}
@Test
@@ -259,7 +259,7 @@ public class HexTest {
@Test
public void testDecodeByteBufferEmpty() throws DecoderException {
- assertTrue(Arrays.equals(new byte[0], new Hex().decode(allocate(0))));
+ assertArrayEquals(new byte[0], new Hex().decode(allocate(0)));
}
@Test
@@ -267,13 +267,13 @@ public class HexTest {
final ByteBuffer bb = allocate(10);
// Effectively set remaining == 0 => empty
bb.flip();
- assertTrue(Arrays.equals(new byte[0], new Hex().decode(bb)));
+ assertArrayEquals(new byte[0], new Hex().decode(bb));
assertEquals(0, bb.remaining());
}
@Test
public void testDecodeByteBufferObjectEmpty() throws DecoderException {
- assertTrue(Arrays.equals(new byte[0], (byte[]) new Hex().decode((Object) allocate(0))));
+ assertArrayEquals(new byte[0], (byte[]) new Hex().decode((Object) allocate(0)));
}
@Test
@@ -295,12 +295,12 @@ public class HexTest {
@Test
public void testDecodeHexCharArrayEmpty() throws DecoderException {
- assertTrue(Arrays.equals(new byte[0], Hex.decodeHex(new char[0])));
+ assertArrayEquals(new byte[0], Hex.decodeHex(new char[0]));
}
@Test
public void testDecodeHexStringEmpty() throws DecoderException {
- assertTrue(Arrays.equals(new byte[0], Hex.decodeHex("")));
+ assertArrayEquals(new byte[0], Hex.decodeHex(""));
}
@Test
@@ -357,7 +357,7 @@ public class HexTest {
@Test
public void testDecodeStringEmpty() throws DecoderException {
- assertTrue(Arrays.equals(new byte[0], (byte[]) new Hex().decode("")));
+ assertArrayEquals(new byte[0], (byte[]) new Hex().decode(""));
}
@Test
@@ -375,17 +375,17 @@ public class HexTest {
@Test
public void testEncodeByteArrayEmpty() {
- assertTrue(Arrays.equals(new byte[0], new Hex().encode(new byte[0])));
+ assertArrayEquals(new byte[0], new Hex().encode(new byte[0]));
}
@Test
public void testEncodeByteArrayObjectEmpty() throws EncoderException {
- assertTrue(Arrays.equals(new char[0], (char[]) new Hex().encode((Object) new byte[0])));
+ assertArrayEquals(new char[0], (char[]) new Hex().encode((Object) new byte[0]));
}
@Test
public void testEncodeByteBufferEmpty() {
- assertTrue(Arrays.equals(new byte[0], new Hex().encode(allocate(0))));
+ assertArrayEquals(new byte[0], new Hex().encode(allocate(0)));
}
@Test
@@ -393,13 +393,13 @@ public class HexTest {
final ByteBuffer bb = allocate(10);
// Effectively set remaining == 0 => empty
bb.flip();
- assertTrue(Arrays.equals(new byte[0], new Hex().encode(bb)));
+ assertArrayEquals(new byte[0], new Hex().encode(bb));
assertEquals(0, bb.remaining());
}
@Test
public void testEncodeByteBufferObjectEmpty() throws EncoderException {
- assertTrue(Arrays.equals(new char[0], (char[]) new Hex().encode((Object) allocate(0))));
+ assertArrayEquals(new char[0], (char[]) new Hex().encode((Object) allocate(0)));
}
@Test
@@ -423,24 +423,24 @@ public class HexTest {
// static API
final char[] encodedChars = Hex.encodeHex(data);
byte[] decodedBytes = Hex.decodeHex(encodedChars);
- assertTrue(Arrays.equals(data, decodedBytes));
+ assertArrayEquals(data, decodedBytes);
// instance API with array parameter
final byte[] encodedStringBytes = hex.encode(data);
decodedBytes = hex.decode(encodedStringBytes);
- assertTrue(Arrays.equals(data, decodedBytes));
+ assertArrayEquals(data, decodedBytes);
// instance API with char[] (Object) parameter
String dataString = new String(encodedChars);
char[] encodedStringChars = (char[]) hex.encode(dataString);
decodedBytes = (byte[]) hex.decode(encodedStringChars);
- assertTrue(Arrays.equals(StringUtils.getBytesUtf8(dataString), decodedBytes));
+ assertArrayEquals(StringUtils.getBytesUtf8(dataString), decodedBytes);
// instance API with String (Object) parameter
dataString = new String(encodedChars);
encodedStringChars = (char[]) hex.encode(dataString);
decodedBytes = (byte[]) hex.decode(new String(encodedStringChars));
- assertTrue(Arrays.equals(StringUtils.getBytesUtf8(dataString), decodedBytes));
+ assertArrayEquals(StringUtils.getBytesUtf8(dataString), decodedBytes);
}
}
@@ -466,8 +466,8 @@ public class HexTest {
@Test
public void testEncodeHexByteArrayEmpty() {
- assertTrue(Arrays.equals(new char[0], Hex.encodeHex(new byte[0])));
- assertTrue(Arrays.equals(new byte[0], new Hex().encode(new byte[0])));
+ assertArrayEquals(new char[0], Hex.encodeHex(new byte[0]));
+ assertArrayEquals(new byte[0], new Hex().encode(new byte[0]));
}
@Test
@@ -480,7 +480,7 @@ public class HexTest {
actual = Hex.encodeHex(b, true);
assertEquals(expected, new String(actual));
actual = Hex.encodeHex(b, false);
- assertFalse(expected.equals(new String(actual)));
+ assertNotEquals(expected, new String(actual));
}
@Test
@@ -489,11 +489,11 @@ public class HexTest {
final String expected = "48656C6C6F20576F726C64";
char[] actual;
actual = Hex.encodeHex(b);
- assertFalse(expected.equals(new String(actual)));
+ assertNotEquals(expected, new String(actual));
actual = Hex.encodeHex(b, true);
- assertFalse(expected.equals(new String(actual)));
+ assertNotEquals(expected, new String(actual));
actual = Hex.encodeHex(b, false);
- assertTrue(expected.equals(new String(actual)));
+ assertEquals(expected, new String(actual));
}
@Test
@@ -504,8 +504,8 @@ public class HexTest {
@Test
public void testEncodeHexByteBufferEmpty() {
- assertTrue(Arrays.equals(new char[0], Hex.encodeHex(allocate(0))));
- assertTrue(Arrays.equals(new byte[0], new Hex().encode(allocate(0))));
+ assertArrayEquals(new char[0], Hex.encodeHex(allocate(0)));
+ assertArrayEquals(new byte[0], new Hex().encode(allocate(0)));
}
@Test
@@ -697,7 +697,7 @@ public class HexTest {
@Test
public void testEncodeStringEmpty() throws EncoderException {
- assertTrue(Arrays.equals(new char[0], (char[]) new Hex().encode("")));
+ assertArrayEquals(new char[0], (char[]) new Hex().encode(""));
}
@Test
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 67040d4..d671a07 100644
--- a/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
@@ -20,7 +20,6 @@ package org.apache.commons.codec.binary;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
import org.junit.Assert;
import org.junit.Test;
@@ -56,13 +55,13 @@ public class StringUtilsTest {
testGetBytesUnchecked(charsetName);
final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
final byte[] actual = StringUtils.getBytesIso8859_1(STRING_FIXTURE);
- Assert.assertTrue(Arrays.equals(expected, actual));
+ Assert.assertArrayEquals(expected, actual);
}
private void testGetBytesUnchecked(final String charsetName) throws UnsupportedEncodingException {
final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
final byte[] actual = StringUtils.getBytesUnchecked(STRING_FIXTURE, charsetName);
- Assert.assertTrue(Arrays.equals(expected, actual));
+ Assert.assertArrayEquals(expected, actual);
}
@Test
@@ -71,7 +70,7 @@ public class StringUtilsTest {
testGetBytesUnchecked(charsetName);
final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
final byte[] actual = StringUtils.getBytesUsAscii(STRING_FIXTURE);
- Assert.assertTrue(Arrays.equals(expected, actual));
+ Assert.assertArrayEquals(expected, actual);
}
@Test
@@ -80,7 +79,7 @@ public class StringUtilsTest {
testGetBytesUnchecked(charsetName);
final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
final byte[] actual = StringUtils.getBytesUtf16(STRING_FIXTURE);
- Assert.assertTrue(Arrays.equals(expected, actual));
+ Assert.assertArrayEquals(expected, actual);
}
@Test
@@ -89,7 +88,7 @@ public class StringUtilsTest {
testGetBytesUnchecked(charsetName);
final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
final byte[] actual = StringUtils.getBytesUtf16Be(STRING_FIXTURE);
- Assert.assertTrue(Arrays.equals(expected, actual));
+ Assert.assertArrayEquals(expected, actual);
}
@Test
@@ -98,7 +97,7 @@ public class StringUtilsTest {
testGetBytesUnchecked(charsetName);
final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
final byte[] actual = StringUtils.getBytesUtf16Le(STRING_FIXTURE);
- Assert.assertTrue(Arrays.equals(expected, actual));
+ Assert.assertArrayEquals(expected, actual);
}
@Test
@@ -107,7 +106,7 @@ public class StringUtilsTest {
testGetBytesUnchecked(charsetName);
final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
final byte[] actual = StringUtils.getBytesUtf8(STRING_FIXTURE);
- Assert.assertTrue(Arrays.equals(expected, actual));
+ Assert.assertArrayEquals(expected, actual);
}
@Test
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 aff88ec..60ecf01 100644
--- a/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+++ b/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
@@ -19,6 +19,7 @@ package org.apache.commons.codec.language;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -1112,10 +1113,10 @@ public class DoubleMetaphoneTest extends StringEncoderAbstractTest<DoubleMetapho
@Test
public void testEmpty() {
- assertEquals(null, this.getStringEncoder().doubleMetaphone(null));
- assertEquals(null, this.getStringEncoder().doubleMetaphone(""));
- assertEquals(null, this.getStringEncoder().doubleMetaphone(" "));
- assertEquals(null, this.getStringEncoder().doubleMetaphone("\t\n\r "));
+ assertNull(this.getStringEncoder().doubleMetaphone(null));
+ assertNull(this.getStringEncoder().doubleMetaphone(""));
+ assertNull(this.getStringEncoder().doubleMetaphone(" "));
+ assertNull(this.getStringEncoder().doubleMetaphone("\t\n\r "));
}
@Test
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 c955b18..9e8eff7 100644
--- a/src/test/java/org/apache/commons/codec/language/MatchRatingApproachEncoderTest.java
+++ b/src/test/java/org/apache/commons/codec/language/MatchRatingApproachEncoderTest.java
@@ -19,6 +19,7 @@ package org.apache.commons.codec.language;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.apache.commons.codec.StringEncoderAbstractTest;
@@ -79,7 +80,7 @@ public class MatchRatingApproachEncoderTest extends StringEncoderAbstractTest<Ma
@Test
public final void testAccentRemoval_NullValue_ReturnNullSuccessfully() {
- assertEquals(null, this.getStringEncoder().removeAccents(null));
+ assertNull(this.getStringEncoder().removeAccents(null));
}
@Test
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 92c8393..45bd814 100644
--- a/src/test/java/org/apache/commons/codec/language/SoundexTest.java
+++ b/src/test/java/org/apache/commons/codec/language/SoundexTest.java
@@ -331,7 +331,7 @@ public class SoundexTest extends StringEncoderAbstractTest<Soundex> {
@Test
public void testSoundexUtilsNullBehaviour() {
- Assert.assertEquals(null, SoundexUtils.clean(null));
+ Assert.assertNull(SoundexUtils.clean(null));
Assert.assertEquals("", SoundexUtils.clean(""));
Assert.assertEquals(0, SoundexUtils.differenceEncoded(null, ""));
Assert.assertEquals(0, SoundexUtils.differenceEncoded("", null));
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 bd958de..aba399c 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
@@ -36,7 +36,7 @@ public class BeiderMorseEncoderTest extends StringEncoderAbstractTest<StringEnco
private static final char[] TEST_CHARS = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'o', 'u' };
private void assertNotEmpty(final BeiderMorseEncoder bmpm, final String value) throws EncoderException {
- Assert.assertFalse(value, bmpm.encode(value).equals(""));
+ Assert.assertNotEquals(value, "", bmpm.encode(value));
}
private BeiderMorseEncoder createGenericApproxEncoder() {
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 45392a3..d96b044 100644
--- a/src/test/java/org/apache/commons/codec/net/BCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/BCodecTest.java
@@ -104,7 +104,7 @@ public class BCodecTest {
final BCodec bcodec = new BCodec();
final String test = null;
final String result = bcodec.encode(test, "charset");
- assertEquals("Result should be null", null, result);
+ assertNull("Result should be null", result);
}
@Test
@@ -112,7 +112,7 @@ public class BCodecTest {
final BCodec bcodec = new BCodec();
final String test = null;
final String result = bcodec.decode(test);
- assertEquals("Result should be null", null, result);
+ assertNull("Result should be null", result);
}
@Test
@@ -124,7 +124,7 @@ public class BCodecTest {
assertEquals("Basic B encoding test", "=?UTF-8?B?d2hhdCBub3Q=?=", encoded);
final Object result = bcodec.encode((Object) null);
- assertEquals("Encoding a null Object should return null", null, result);
+ assertNull("Encoding a null Object should return null", result);
try {
final Object dObj = Double.valueOf(3.0d);
@@ -148,7 +148,7 @@ public class BCodecTest {
assertEquals("Basic B decoding test", "what not", plain);
final Object result = bcodec.decode((Object) null);
- assertEquals("Decoding a null Object should return null", null, result);
+ assertNull("Decoding a null Object should return null", result);
try {
final Object dObj = Double.valueOf(3.0d);
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 5ea9634..766d0f0 100644
--- a/src/test/java/org/apache/commons/codec/net/PercentCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/PercentCodecTest.java
@@ -17,7 +17,9 @@
package org.apache.commons.codec.net;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.nio.charset.StandardCharsets;
@@ -82,7 +84,7 @@ public class PercentCodecTest {
@Test
public void testDecodeNullObject() throws Exception {
final PercentCodec percentCodec = new PercentCodec();
- assertEquals(percentCodec.decode((Object) null), null);
+ assertNull(percentCodec.decode((Object) null));
}
@Test(expected = DecoderException.class)
@@ -94,7 +96,7 @@ public class PercentCodecTest {
@Test
public void testEncodeNullObject() throws Exception {
final PercentCodec percentCodec = new PercentCodec();
- assertEquals(percentCodec.encode((Object) null), null);
+ assertNull(percentCodec.encode((Object) null));
}
@Test(expected = EncoderException.class)
@@ -106,11 +108,11 @@ public class PercentCodecTest {
@Test
public void testPercentEncoderDecoderWithNullOrEmptyInput() throws Exception {
final PercentCodec percentCodec = new PercentCodec(null, true);
- assertEquals("Null input value encoding test", percentCodec.encode(null), null);
- assertEquals("Null input value decoding test", percentCodec.decode(null), null);
+ assertNull("Null input value encoding test", percentCodec.encode(null));
+ assertNull("Null input value decoding test", percentCodec.decode(null));
final byte[] emptyInput = "".getBytes("UTF-8");
assertEquals("Empty input value encoding test", percentCodec.encode(emptyInput), emptyInput);
- assertTrue("Empty input value decoding test", Arrays.equals(percentCodec.decode(emptyInput), emptyInput));
+ assertArrayEquals("Empty input value decoding test", percentCodec.decode(emptyInput), emptyInput);
}
@Test
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 d44819e..4b258dd 100644
--- a/src/test/java/org/apache/commons/codec/net/QCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/QCodecTest.java
@@ -118,7 +118,7 @@ public class QCodecTest {
final QCodec qcodec = new QCodec();
final String test = null;
final String result = qcodec.encode( test, "charset" );
- assertEquals("Result should be null", null, result);
+ assertNull("Result should be null", result);
}
@Test
@@ -126,7 +126,7 @@ public class QCodecTest {
final QCodec qcodec = new QCodec();
final String test = null;
final String result = qcodec.decode( test );
- assertEquals("Result should be null", null, result);
+ assertNull("Result should be null", result);
}
@@ -139,7 +139,7 @@ public class QCodecTest {
"=?UTF-8?Q?1+1 =3D 2?=", encoded);
final Object result = qcodec.encode((Object) null);
- assertEquals( "Encoding a null Object should return null", null, result);
+ assertNull("Encoding a null Object should return null", result);
try {
final Object dObj = Double.valueOf(3.0d);
@@ -165,7 +165,7 @@ public class QCodecTest {
"1+1 = 2", plain);
final Object result = qcodec.decode((Object) null);
- assertEquals( "Decoding a null Object should return null", null, result);
+ assertNull("Decoding a null Object should return null", result);
try {
final Object dObj = Double.valueOf(3.0d);
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 f41e7f8..8f7005e 100644
--- a/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java
@@ -142,8 +142,7 @@ public class QuotedPrintableCodecTest {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
final byte[] plain = null;
final byte[] encoded = qpcodec.encode(plain);
- assertEquals("Encoding a null string should return null",
- null, encoded);
+ assertNull("Encoding a null string should return null", encoded);
}
@Test
@@ -163,7 +162,7 @@ public class QuotedPrintableCodecTest {
public void testDecodeWithNullArray() throws Exception {
final byte[] plain = null;
final byte[] result = QuotedPrintableCodec.decodeQuotedPrintable( plain );
- assertEquals("Result should be null", null, result);
+ assertNull("Result should be null", result);
}
@Test
@@ -171,7 +170,7 @@ public class QuotedPrintableCodecTest {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
final String test = null;
final String result = qpcodec.encode( test, "charset" );
- assertEquals("Result should be null", null, result);
+ assertNull("Result should be null", result);
}
@Test
@@ -179,7 +178,7 @@ public class QuotedPrintableCodecTest {
final QuotedPrintableCodec qpcodec = new QuotedPrintableCodec();
final String test = null;
final String result = qpcodec.decode( test, "charset" );
- assertEquals("Result should be null", null, result);
+ assertNull("Result should be null", result);
}
@Test
@@ -197,7 +196,7 @@ public class QuotedPrintableCodecTest {
"1+1 =3D 2", encoded);
final Object result = qpcodec.encode((Object) null);
- assertEquals( "Encoding a null Object should return null", null, result);
+ assertNull("Encoding a null Object should return null", result);
try {
final Object dObj = Double.valueOf(3.0d);
@@ -228,7 +227,7 @@ public class QuotedPrintableCodecTest {
"1+1 = 2", decoded);
final Object result = qpcodec.decode((Object) null);
- assertEquals( "Decoding a null Object should return null", null, result);
+ assertNull("Decoding a null Object should return null", result);
try {
final Object dObj = Double.valueOf(3.0d);
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 8ae4f75..7ecb456 100644
--- a/src/test/java/org/apache/commons/codec/net/URLCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/URLCodecTest.java
@@ -178,8 +178,7 @@ public class URLCodecTest {
final URLCodec urlCodec = new URLCodec();
final byte[] plain = null;
final byte[] encoded = urlCodec.encode(plain);
- assertEquals("Encoding a null string should return null",
- null, encoded);
+ assertNull("Encoding a null string should return null", encoded);
this.validateState(urlCodec);
}
@@ -199,7 +198,7 @@ public class URLCodecTest {
public void testDecodeWithNullArray() throws Exception {
final byte[] plain = null;
final byte[] result = URLCodec.decodeUrl( plain );
- assertEquals("Result should be null", null, result);
+ assertNull("Result should be null", result);
}
@Test
@@ -207,7 +206,7 @@ public class URLCodecTest {
final URLCodec urlCodec = new URLCodec();
final String test = null;
final String result = urlCodec.encode( test, "charset" );
- assertEquals("Result should be null", null, result);
+ assertNull("Result should be null", result);
}
@Test
@@ -215,7 +214,7 @@ public class URLCodecTest {
final URLCodec urlCodec = new URLCodec();
final String test = null;
final String result = urlCodec.decode( test, "charset" );
- assertEquals("Result should be null", null, result);
+ assertNull("Result should be null", result);
}
@Test
@@ -233,7 +232,7 @@ public class URLCodecTest {
"Hello+there%21", encoded);
final Object result = urlCodec.encode((Object) null);
- assertEquals( "Encoding a null Object should return null", null, result);
+ assertNull("Encoding a null Object should return null", result);
try {
final Object dObj = Double.valueOf(3.0d);
@@ -279,7 +278,7 @@ public class URLCodecTest {
"Hello there!", decoded);
final Object result = urlCodec.decode((Object) null);
- assertEquals( "Decoding a null Object should return null", null, result);
+ assertNull("Decoding a null Object should return null", result);
try {
final Object dObj = Double.valueOf(3.0d);