This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-codec.git
commit 0b672eb12df68545c9703e32e9bf74d6993cb464
Author: Adam Retter <adam.ret...@googlemail.com>
AuthorDate: Wed Jun 24 12:33:26 2020 +0200
Imporve array equality assertions in tests
---
.../codec/binary/Base32InputStreamTest.java | 25 ++++++++++----------
.../codec/binary/Base32OutputStreamTest.java | 24 +++++++++----------
.../codec/binary/Base64InputStreamTest.java | 27 +++++++++++-----------
.../codec/binary/Base64OutputStreamTest.java | 26 ++++++++++-----------
4 files changed, 50 insertions(+), 52 deletions(-)
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 164f6c3..03670ae 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
@@ -17,21 +17,20 @@
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.assertTrue;
-import static org.junit.Assert.fail;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
import org.apache.commons.codec.CodecPolicy;
import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class Base32InputStreamTest {
private static final String ENCODED_FOO = "MZXW6===";
@@ -291,7 +290,7 @@ public class Base32InputStreamTest {
assertEquals("EOF", -1, in.read());
assertEquals("Still EOF", -1, in.read());
- assertTrue("Streaming base32 encode", Arrays.equals(output, encoded));
+ assertArrayEquals("Streaming base32 encode", encoded, output);
// Now let's try decode.
in = new Base32InputStream(new ByteArrayInputStream(encoded));
@@ -299,7 +298,7 @@ public class Base32InputStreamTest {
assertEquals("EOF", -1, in.read());
assertEquals("Still EOF", -1, in.read());
- assertTrue("Streaming base32 decode", Arrays.equals(output, decoded));
+ assertArrayEquals("Streaming base32 decode", decoded, output);
// I always wanted to do this! (wrap encoder with decoder etc etc).
in = new ByteArrayInputStream(decoded);
@@ -311,7 +310,7 @@ public class Base32InputStreamTest {
assertEquals("EOF", -1, in.read());
assertEquals("Still EOF", -1, in.read());
- assertTrue("Streaming base32 wrap-wrap-wrap!", Arrays.equals(output,
decoded));
+ assertArrayEquals("Streaming base32 wrap-wrap-wrap!", decoded, output);
in.close();
}
@@ -345,7 +344,7 @@ public class Base32InputStreamTest {
assertEquals("EOF", -1, in.read());
assertEquals("Still EOF", -1, in.read());
- assertTrue("Streaming base32 encode", Arrays.equals(output, encoded));
+ assertArrayEquals("Streaming base32 encode", encoded, output);
in.close();
@@ -358,7 +357,7 @@ public class Base32InputStreamTest {
assertEquals("EOF", -1, in.read());
assertEquals("Still EOF", -1, in.read());
- assertTrue("Streaming base32 decode", Arrays.equals(output, decoded));
+ assertArrayEquals("Streaming base32 decode", decoded, output);
in.close();
@@ -375,7 +374,7 @@ public class Base32InputStreamTest {
assertEquals("EOF", -1, in.read());
assertEquals("Still EOF", -1, in.read());
- assertTrue("Streaming base32 wrap-wrap-wrap!", Arrays.equals(output,
decoded));
+ assertArrayEquals("Streaming base32 wrap-wrap-wrap!", decoded, output);
}
/**
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 5ab7724..ad4c4af 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
@@ -17,17 +17,17 @@
package org.apache.commons.codec.binary;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
-import java.util.Arrays;
import org.apache.commons.codec.CodecPolicy;
import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class Base32OutputStreamTest {
private final static byte[] CR_LF = {(byte) '\r', (byte) '\n'};
@@ -185,7 +185,7 @@ public class Base32OutputStreamTest {
out.write(decoded);
out.close();
byte[] output = byteOut.toByteArray();
- assertTrue("Streaming chunked Base32 encode", Arrays.equals(output,
encoded));
+ assertArrayEquals("Streaming chunked Base32 encode", encoded, output);
// Now let's try decode.
byteOut = new ByteArrayOutputStream();
@@ -193,7 +193,7 @@ public class Base32OutputStreamTest {
out.write(encoded);
out.close();
output = byteOut.toByteArray();
- assertTrue("Streaming chunked Base32 decode", Arrays.equals(output,
decoded));
+ assertArrayEquals("Streaming chunked Base32 decode", decoded, output);
// I always wanted to do this! (wrap encoder with decoder etc etc).
byteOut = new ByteArrayOutputStream();
@@ -206,7 +206,7 @@ public class Base32OutputStreamTest {
out.close();
output = byteOut.toByteArray();
- assertTrue("Streaming chunked Base32 wrap-wrap-wrap!",
Arrays.equals(output, decoded));
+ assertArrayEquals("Streaming chunked Base32 wrap-wrap-wrap!", decoded,
output);
}
/**
@@ -237,7 +237,7 @@ public class Base32OutputStreamTest {
}
out.close();
byte[] output = byteOut.toByteArray();
- assertTrue("Streaming byte-by-byte Base32 encode",
Arrays.equals(output, encoded));
+ assertArrayEquals("Streaming byte-by-byte Base32 encode", encoded,
output);
// Now let's try decode.
byteOut = new ByteArrayOutputStream();
@@ -247,7 +247,7 @@ public class Base32OutputStreamTest {
}
out.close();
output = byteOut.toByteArray();
- assertTrue("Streaming byte-by-byte Base32 decode",
Arrays.equals(output, decoded));
+ assertArrayEquals("Streaming byte-by-byte Base32 decode", decoded,
output);
// Now let's try decode with tonnes of flushes.
byteOut = new ByteArrayOutputStream();
@@ -258,7 +258,7 @@ public class Base32OutputStreamTest {
}
out.close();
output = byteOut.toByteArray();
- assertTrue("Streaming byte-by-byte flush() Base32 decode",
Arrays.equals(output, decoded));
+ assertArrayEquals("Streaming byte-by-byte flush() Base32 decode",
decoded, output);
// I always wanted to do this! (wrap encoder with decoder etc etc).
byteOut = new ByteArrayOutputStream();
@@ -273,7 +273,7 @@ public class Base32OutputStreamTest {
out.close();
output = byteOut.toByteArray();
- assertTrue("Streaming byte-by-byte Base32 wrap-wrap-wrap!",
Arrays.equals(output, decoded));
+ assertArrayEquals("Streaming byte-by-byte Base32 wrap-wrap-wrap!",
decoded, output);
}
/**
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 731457a..1e80dde 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
@@ -17,24 +17,23 @@
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.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.Arrays;
import org.apache.commons.codec.CodecPolicy;
import org.junit.Test;
+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.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* @since 1.4
*/
@@ -304,7 +303,7 @@ public class Base64InputStreamTest {
assertEquals("EOF", -1, in.read());
assertEquals("Still EOF", -1, in.read());
- assertTrue("Streaming base64 encode", Arrays.equals(output, encoded));
+ assertArrayEquals("Streaming base64 encode", encoded, output);
in.close();
@@ -314,7 +313,7 @@ public class Base64InputStreamTest {
assertEquals("EOF", -1, in.read());
assertEquals("Still EOF", -1, in.read());
- assertTrue("Streaming base64 decode", Arrays.equals(output, decoded));
+ assertArrayEquals("Streaming base64 decode", decoded, output);
// I always wanted to do this! (wrap encoder with decoder etc etc).
in = new ByteArrayInputStream(decoded);
@@ -326,7 +325,7 @@ public class Base64InputStreamTest {
assertEquals("EOF", -1, in.read());
assertEquals("Still EOF", -1, in.read());
- assertTrue("Streaming base64 wrap-wrap-wrap!", Arrays.equals(output,
decoded));
+ assertArrayEquals("Streaming base64 wrap-wrap-wrap!", decoded, output);
in.close();
}
@@ -360,7 +359,7 @@ public class Base64InputStreamTest {
assertEquals("EOF", -1, in.read());
assertEquals("Still EOF", -1, in.read());
- assertTrue("Streaming base64 encode", Arrays.equals(output, encoded));
+ assertArrayEquals("Streaming base64 encode", encoded, output);
in.close();
// Now let's try decode.
@@ -372,7 +371,7 @@ public class Base64InputStreamTest {
assertEquals("EOF", -1, in.read());
assertEquals("Still EOF", -1, in.read());
- assertTrue("Streaming base64 decode", Arrays.equals(output, decoded));
+ assertArrayEquals("Streaming base64 decode", decoded, output);
in.close();
@@ -389,7 +388,7 @@ public class Base64InputStreamTest {
assertEquals("EOF", -1, in.read());
assertEquals("Still EOF", -1, in.read());
- assertTrue("Streaming base64 wrap-wrap-wrap!", Arrays.equals(output,
decoded));
+ assertArrayEquals("Streaming base64 wrap-wrap-wrap!", decoded, output);
in.close();
}
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 0b2480f..51a9a5c 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
@@ -17,18 +17,18 @@
package org.apache.commons.codec.binary;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
-import java.util.Arrays;
import org.apache.commons.codec.CodecPolicy;
import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* @since 1.4
*/
@@ -195,7 +195,7 @@ public class Base64OutputStreamTest {
out.write(decoded);
out.close();
byte[] output = byteOut.toByteArray();
- assertTrue("Streaming chunked base64 encode", Arrays.equals(output,
encoded));
+ assertArrayEquals("Streaming chunked base64 encode", encoded, output);
// Now let's try decode.
byteOut = new ByteArrayOutputStream();
@@ -203,7 +203,7 @@ public class Base64OutputStreamTest {
out.write(encoded);
out.close();
output = byteOut.toByteArray();
- assertTrue("Streaming chunked base64 decode", Arrays.equals(output,
decoded));
+ assertArrayEquals("Streaming chunked base64 decode", decoded, output);
// I always wanted to do this! (wrap encoder with decoder etc etc).
byteOut = new ByteArrayOutputStream();
@@ -216,7 +216,7 @@ public class Base64OutputStreamTest {
out.close();
output = byteOut.toByteArray();
- assertTrue("Streaming chunked base64 wrap-wrap-wrap!",
Arrays.equals(output, decoded));
+ assertArrayEquals("Streaming chunked base64 wrap-wrap-wrap!", decoded,
output);
}
/**
@@ -247,7 +247,7 @@ public class Base64OutputStreamTest {
}
out.close();
byte[] output = byteOut.toByteArray();
- assertTrue("Streaming byte-by-byte base64 encode",
Arrays.equals(output, encoded));
+ assertArrayEquals("Streaming byte-by-byte base64 encode", encoded,
output);
// Now let's try decode.
byteOut = new ByteArrayOutputStream();
@@ -257,7 +257,7 @@ public class Base64OutputStreamTest {
}
out.close();
output = byteOut.toByteArray();
- assertTrue("Streaming byte-by-byte base64 decode",
Arrays.equals(output, decoded));
+ assertArrayEquals("Streaming byte-by-byte base64 decode", decoded,
output);
// Now let's try decode with tonnes of flushes.
byteOut = new ByteArrayOutputStream();
@@ -268,7 +268,7 @@ public class Base64OutputStreamTest {
}
out.close();
output = byteOut.toByteArray();
- assertTrue("Streaming byte-by-byte flush() base64 decode",
Arrays.equals(output, decoded));
+ assertArrayEquals("Streaming byte-by-byte flush() base64 decode",
decoded, output);
// I always wanted to do this! (wrap encoder with decoder etc etc).
byteOut = new ByteArrayOutputStream();
@@ -283,7 +283,7 @@ public class Base64OutputStreamTest {
out.close();
output = byteOut.toByteArray();
- assertTrue("Streaming byte-by-byte base64 wrap-wrap-wrap!",
Arrays.equals(output, decoded));
+ assertArrayEquals("Streaming byte-by-byte base64 wrap-wrap-wrap!",
decoded, output);
}
/**
