Better JUnit API usage

Author: garydgregory

src/test/java/org/apache/commons/io/input/UnsynchronizedBufferedInputStreamTest.java

@@ -88,7 +88,7 @@ protected void tearDown() throws IOException {
      */
     @Test
     public void test_available() throws IOException {
-        assertTrue(is.available() == DATA.length(), "Returned incorrect number of available bytes");
+        assertEquals(DATA.length(), is.available(), "Returned incorrect number of available bytes");
 
         // Test that a closed stream throws an IOE for available()
         final BufferedInputStream bis = new BufferedInputStream(new ByteArrayInputStream(new byte[] { 'H', 'e', 'l', 'l', 'o', ' ', 'W', 'o', 'r', 'l', 'd' }));
@@ -272,7 +272,7 @@ public void test_markSupported() {
     public void test_read() throws IOException {
         final InputStreamReader isr = new InputStreamReader(is);
         final int c = isr.read();
-        assertTrue(c == DATA.charAt(0), "read returned incorrect char");
+        assertEquals(DATA.charAt(0), c, "read returned incorrect char");
 
         final byte[] bytes = new byte[256];
         for (int i = 0; i < 256; i++) {
@@ -333,7 +333,7 @@ public int read(final byte[] buf, final int off, final int len) throws IOExcepti
         })) {
             bufin.read();
             final int result = bufin.read(new byte[2], 0, 2);
-            assertTrue(result == 1, () -> "Incorrect result: " + result);
+            assertEquals(1, result, () -> "Incorrect result: " + result);
         }
     }
 

src/test/java/org/apache/commons/io/input/UnsynchronizedFilterInputStreamTest.java

@@ -1,5 +1,6 @@
 package org.apache.commons.io.input;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -79,7 +80,7 @@ protected void tearDown() throws IOException {
      */
     @Test
     public void test_available() throws IOException {
-        assertTrue(is.available() == DATA.length(), "Returned incorrect number of available bytes");
+        assertEquals(DATA.length(), is.available(), "Returned incorrect number of available bytes");
     }
 
     /**
@@ -117,7 +118,7 @@ public void test_markSupported() {
     @Test
     public void test_read() throws IOException {
         final int c = is.read();
-        assertTrue(c == DATA.charAt(0), "read returned incorrect char");
+        assertEquals(DATA.charAt(0), c, "read returned incorrect char");
     }
 
     /**

src/test/java/org/apache/commons/io/test/TestUtils.java

@@ -132,7 +132,7 @@ private static void assertEqualContent(final File f0, final File f1)
                 while (-1 != n0) {
                     n0 = is0.read(buf0);
                     n1 = is1.read(buf1);
-                    assertTrue(n0 == n1,
+                    assertEquals(n0, n1,
                             "The files " + f0 + " and " + f1 +
                             " have differing number of bytes available (" + n0 + " vs " + n1 + ")");