Simplify Assertions (#614)

Author: arturobernalg

httpcore5-reactive/src/test/java/org/apache/hc/core5/reactive/TestReactiveDataProducer.java

@@ -80,7 +80,7 @@ void testStreamThatEndsWithError() throws Exception {
 
         final HttpStreamResetException exception = Assertions.assertThrows(HttpStreamResetException.class, () ->
                 producer.produce(streamChannel));
-        Assertions.assertTrue(exception.getCause() instanceof RuntimeException, "Expected published exception to be rethrown");
+        Assertions.assertInstanceOf(RuntimeException.class, exception.getCause(), "Expected published exception to be rethrown");
         Assertions.assertEquals("", byteChannel.dump(StandardCharsets.US_ASCII));
     }
 }

httpcore5-reactive/src/test/java/org/apache/hc/core5/reactive/TestReactiveEntityProducer.java

@@ -97,7 +97,7 @@ void testStreamThatEndsWithError() throws Exception {
 
         final HttpStreamResetException exception = Assertions.assertThrows(HttpStreamResetException.class, () ->
                 entityProducer.produce(streamChannel));
-        Assertions.assertTrue(exception.getCause() instanceof RuntimeException, "Expected published exception to be rethrown");
+        Assertions.assertInstanceOf(RuntimeException.class, exception.getCause(), "Expected published exception to be rethrown");
         Assertions.assertEquals("", byteChannel.dump(StandardCharsets.US_ASCII));
         entityProducer.failed(exception);
         Assertions.assertEquals(1, entityProducer.available());

httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java

@@ -30,6 +30,7 @@
 import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.InetAddress;
@@ -130,7 +131,7 @@ void testALPN() throws Exception {
         } catch (final ExecutionException e) {
             final Throwable cause = e.getCause();
             assertFalse(h2Allowed, "h2 negotiation was enabled, but h2 was not negotiated");
-            assertTrue(cause instanceof ProtocolNegotiationException);
+            assertInstanceOf(ProtocolNegotiationException.class, cause);
             assertEquals("ALPN: missing application protocol", cause.getMessage());
             assertTrue(strictALPN, "strict ALPN mode was not enabled, but the client negotiator still threw");
             return;

httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java

@@ -335,12 +335,12 @@ public void failed(final Exception cause) {
 
         final Object result2 = pushResultQueue.poll();
         Assertions.assertNotNull(result2);
-        Assertions.assertTrue(result2 instanceof H2StreamResetException);
+        Assertions.assertInstanceOf(H2StreamResetException.class, result2);
         Assertions.assertEquals(H2Error.REFUSED_STREAM.getCode(), ((H2StreamResetException) result2).getCode());
 
         final Object result3 = pushResultQueue.poll();
         Assertions.assertNotNull(result3);
-        Assertions.assertTrue(result3 instanceof H2StreamResetException);
+        Assertions.assertInstanceOf(H2StreamResetException.class, result3);
         Assertions.assertEquals(H2Error.REFUSED_STREAM.getCode(), ((H2StreamResetException) result3).getCode());
     }
 

httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java

@@ -863,7 +863,7 @@ public void releaseResources() {
         final ExecutionException exception = Assertions.assertThrows(ExecutionException.class, () ->
                 future1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit()));
         final Throwable cause = exception.getCause();
-        Assertions.assertTrue(cause instanceof MalformedChunkCodingException);
+        Assertions.assertInstanceOf(MalformedChunkCodingException.class, cause);
         Assertions.assertEquals("garbage", entityConsumer.generateContent());
     }
 

httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java

@@ -232,9 +232,9 @@ void testRequestTimeout() throws Exception {
         Assertions.assertTrue(requestPublisherCancellation.await(RESULT_TIMEOUT.getDuration(), RESULT_TIMEOUT.getTimeUnit()));
         final Throwable cause = exception.getCause();
         if (versionPolicy == HttpVersionPolicy.FORCE_HTTP_1) {
-            Assertions.assertTrue(cause instanceof SocketTimeoutException, "Expected SocketTimeoutException, but got " + cause.getClass().getName());
+            Assertions.assertInstanceOf(SocketTimeoutException.class, cause, "Expected SocketTimeoutException, but got " + cause.getClass().getName());
         } else if (versionPolicy == HttpVersionPolicy.FORCE_HTTP_2) {
-            Assertions.assertTrue(cause instanceof HttpStreamResetException, format("Expected RST_STREAM, but %s was thrown", cause.getClass().getName()));
+            Assertions.assertInstanceOf(HttpStreamResetException.class, cause, format("Expected RST_STREAM, but %s was thrown", cause.getClass().getName()));
         } else {
             Assertions.fail("Unknown HttpVersionPolicy: " + versionPolicy);
         }

httpcore5/src/test/java/org/apache/hc/core5/http/HeaderMatcher.java

@@ -26,8 +26,6 @@
  */
 package org.apache.hc.core5.http;
 
-import java.util.Objects;
-
 import org.junit.jupiter.api.Assertions;
 
 public final class HeaderMatcher {
@@ -39,8 +37,7 @@ public static void assertSame(final Header actual, final String headerName, fina
         Assertions.assertNotNull(actual, "header should not be null");
         Assertions.assertTrue(headerName.equalsIgnoreCase(actual.getName()),
                 "header name mismatch: expected=" + headerName + ", actual=" + actual.getName());
-        Assertions.assertTrue(Objects.equals(headerValue, actual.getValue()),
-                "header value mismatch: expected=" + headerValue + ", actual=" + actual.getValue());
+        Assertions.assertEquals(headerValue, actual.getValue(), "header value mismatch: expected=" + headerValue + ", actual=" + actual.getValue());
     }
 
     public static void assertSame(final Header actual, final Header expected) {

httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java

@@ -149,7 +149,7 @@ void testReadResponseEntityWithContentLength() throws Exception {
         Assertions.assertEquals(1, conn.getEndpointDetails().getResponseCount());
         final InputStream content = entity.getContent();
         Assertions.assertNotNull(content);
-        Assertions.assertTrue(content instanceof ContentLengthInputStream);
+        Assertions.assertInstanceOf(ContentLengthInputStream.class, content);
     }
 
     @Test
@@ -179,7 +179,7 @@ void testReadResponseEntityChunkCoded() throws Exception {
         Assertions.assertEquals(1, conn.getEndpointDetails().getResponseCount());
         final InputStream content = entity.getContent();
         Assertions.assertNotNull(content);
-        Assertions.assertTrue(content instanceof ChunkedInputStream);
+        Assertions.assertInstanceOf(ChunkedInputStream.class, content);
     }
 
     @Test
@@ -226,7 +226,7 @@ void testReadResponseNoEntity() throws Exception {
         Assertions.assertNotNull(entity);
         final InputStream content = entity.getContent();
         Assertions.assertNotNull(content);
-        Assertions.assertTrue(content instanceof IdentityInputStream);
+        Assertions.assertInstanceOf(IdentityInputStream.class, content);
     }
 
     @Test

httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java

@@ -125,7 +125,7 @@ void testReadRequestEntityWithContentLength() throws Exception {
         Assertions.assertEquals(1, conn.getEndpointDetails().getRequestCount());
         final InputStream content = entity.getContent();
         Assertions.assertNotNull(content);
-        Assertions.assertTrue(content instanceof ContentLengthInputStream);
+        Assertions.assertInstanceOf(ContentLengthInputStream.class, content);
     }
 
     @Test
@@ -157,7 +157,7 @@ void testReadRequestEntityChunckCoded() throws Exception {
         Assertions.assertEquals(1, conn.getEndpointDetails().getRequestCount());
         final InputStream content = entity.getContent();
         Assertions.assertNotNull(content);
-        Assertions.assertTrue(content instanceof ChunkedInputStream);
+        Assertions.assertInstanceOf(ChunkedInputStream.class, content);
     }
 
     @Test

httpcore5/src/test/java/org/apache/hc/core5/http/message/TestNameValuePair.java

@@ -68,7 +68,7 @@ void testNullNotEqual() {
     void testObjectNotEqual() {
         final NameValuePair NameValuePair = new BasicNameValuePair("name", "value");
 
-        Assertions.assertNotEquals(NameValuePair, new Object());
+        Assertions.assertNotEquals(new Object(), NameValuePair);
     }
 
     @Test