Fix test

Author: arturobernalg

httpclient5/src/test/java/org/apache/hc/client5/http/Rfc6724AddressSelectingDnsResolverTest.java

@@ -1,9 +1,34 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
 package org.apache.hc.client5.http;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.when;
 
 import java.net.Inet4Address;
@@ -19,17 +44,17 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-public class Rfc6724AddressSelectingDnsResolverTest {
+class Rfc6724AddressSelectingDnsResolverTest {
 
     private DnsResolver delegate;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         delegate = Mockito.mock(DnsResolver.class);
     }
 
     @Test
-    public void ipv4Only_filtersOutIPv6() throws Exception {
+    void ipv4Only_filtersOutIPv6() throws Exception {
         final InetAddress v4 = InetAddress.getByName("203.0.113.10"); // TEST-NET-3
         final InetAddress v6 = InetAddress.getByName("2001:db8::10"); // documentation prefix
 
@@ -39,13 +64,14 @@ public void ipv4Only_filtersOutIPv6() throws Exception {
                 new Rfc6724AddressSelectingDnsResolver(delegate, ProtocolFamilyPreference.IPV4_ONLY);
 
         final InetAddress[] ordered = r.resolve("dual.example");
+        Assertions.assertNotNull(ordered);
         assertEquals(1, ordered.length);
-        assertTrue(ordered[0] instanceof Inet4Address);
+        assertInstanceOf(Inet4Address.class, ordered[0]);
         assertEquals(v4, ordered[0]);
     }
 
     @Test
-    public void ipv6Only_filtersOutIPv4() throws Exception {
+    void ipv6Only_filtersOutIPv4() throws Exception {
         final InetAddress v4 = InetAddress.getByName("192.0.2.1");     // TEST-NET-1
         final InetAddress v6 = InetAddress.getByName("2001:db8::1");
 
@@ -62,7 +88,7 @@ public void ipv6Only_filtersOutIPv4() throws Exception {
     }
 
     @Test
-    public void ipv4Only_emptyWhenNoIPv4Candidates() throws Exception {
+    void ipv4Only_emptyWhenNoIPv4Candidates() throws Exception {
         final InetAddress v6a = InetAddress.getByName("2001:db8::1");
         final InetAddress v6b = InetAddress.getByName("2001:db8::2");
 
@@ -77,7 +103,7 @@ public void ipv4Only_emptyWhenNoIPv4Candidates() throws Exception {
     }
 
     @Test
-    public void preferIpv6_groupsAllV6First_preservingRelativeOrder() throws Exception {
+    void preferIpv6_groupsAllV6First_preservingRelativeOrder() throws Exception {
         final InetAddress v4a = InetAddress.getByName("192.0.2.1");
         final InetAddress v6a = InetAddress.getByName("2001:db8::1");
         final InetAddress v4b = InetAddress.getByName("203.0.113.10");
@@ -93,7 +119,8 @@ public void preferIpv6_groupsAllV6First_preservingRelativeOrder() throws Excepti
         // all v6 first, in original relative order
         final List<InetAddress> v6Seen = new ArrayList<>();
         final List<InetAddress> v4Seen = new ArrayList<>();
-        for (InetAddress a : out) {
+        Assertions.assertNotNull(out);
+        for (final InetAddress a : out) {
             if (a instanceof Inet6Address) {
                 v6Seen.add(a);
             } else {
@@ -104,11 +131,11 @@ public void preferIpv6_groupsAllV6First_preservingRelativeOrder() throws Excepti
         assertEquals(Arrays.asList(v4a, v4b), v4Seen);
 
         // ensure first element is IPv6 (grouping actually happened)
-        assertTrue(out[0] instanceof Inet6Address);
+        assertInstanceOf(Inet6Address.class, out[0]);
     }
 
     @Test
-    public void interleave_alternatesFamilies_and_preservesRelativeOrder() throws Exception {
+    void interleave_alternatesFamilies_and_preservesRelativeOrder() throws Exception {
         final InetAddress v6a = InetAddress.getByName("2001:db8::1");
         final InetAddress v6b = InetAddress.getByName("2001:db8::2");
         final InetAddress v4a = InetAddress.getByName("192.0.2.1");
@@ -122,9 +149,10 @@ public void interleave_alternatesFamilies_and_preservesRelativeOrder() throws Ex
         final InetAddress[] out = r.resolve("dual.example");
 
         // Preserve per-family relative order
-        final List<InetAddress> v6Seen = new ArrayList<InetAddress>();
-        final List<InetAddress> v4Seen = new ArrayList<InetAddress>();
-        for (InetAddress a : out) {
+        final List<InetAddress> v6Seen = new ArrayList<>();
+        final List<InetAddress> v4Seen = new ArrayList<>();
+        Assertions.assertNotNull(out);
+        for (final InetAddress a : out) {
             if (a instanceof Inet6Address) {
                 v6Seen.add(a);
             } else {
@@ -135,15 +163,15 @@ public void interleave_alternatesFamilies_and_preservesRelativeOrder() throws Ex
         assertEquals(Arrays.asList(v4a, v4b), v4Seen);
 
         // Alternation (as far as both families have remaining items)
-        int pairs = Math.min(v6Seen.size(), v4Seen.size());
+        final int pairs = Math.min(v6Seen.size(), v4Seen.size());
         for (int i = 1; i < pairs * 2; i++) {
             assertNotEquals(out[i - 1] instanceof Inet6Address, out[i] instanceof Inet6Address,
                     "adjacent entries should alternate family under INTERLEAVE");
         }
     }
 
     @Test
-    public void canonicalHostname_delegates() throws Exception {
+    void canonicalHostname_delegates() throws Exception {
         when(delegate.resolveCanonicalHostname("example.org")).thenReturn("canon.example.org");
         final Rfc6724AddressSelectingDnsResolver r =
                 new Rfc6724AddressSelectingDnsResolver(delegate, ProtocolFamilyPreference.INTERLEAVE);

httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHappyEyeballs.java

@@ -219,7 +219,11 @@ public void cancelled() {
                         }
                     });
 
-            future.get();
+            try {
+                future.get();
+            } catch (java.util.concurrent.ExecutionException e) {
+                System.out.println(request + " -> " + e.getCause());
+            }
         }
 
         System.out.println("Shutting down");

httpclient5/src/test/java/org/apache/hc/client5/http/impl/nio/MultihomeIOSessionRequesterTest.java

@@ -1,6 +1,33 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
 package org.apache.hc.client5.http.impl.nio;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -35,21 +62,21 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-public class MultihomeIOSessionRequesterTest {
+class MultihomeIOSessionRequesterTest {
 
     private DnsResolver dnsResolver;
     private ConnectionInitiator connectionInitiator;
     private NamedEndpoint namedEndpoint;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         dnsResolver = Mockito.mock(DnsResolver.class);
         connectionInitiator = Mockito.mock(ConnectionInitiator.class);
         namedEndpoint = Mockito.mock(NamedEndpoint.class);
     }
 
     @Test
-    public void testConnectWithMultipleAddresses_allFail_surfaceLastFailure() throws Exception {
+    void testConnectWithMultipleAddresses_allFail_surfaceLastFailure() throws Exception {
         final MultihomeIOSessionRequester sessionRequester =
                 new MultihomeIOSessionRequester(dnsResolver, ConnectionConfig.custom()
                         .setStaggeredConnectEnabled(false)
@@ -69,7 +96,7 @@ public void testConnectWithMultipleAddresses_allFail_surfaceLastFailure() throws
         when(connectionInitiator.connect(any(), any(), any(), any(), any(), any()))
                 .thenAnswer(invocation -> {
                     final FutureCallback<IOSession> cb = invocation.getArgument(5);
-                    final CompletableFuture<IOSession> f = new CompletableFuture<IOSession>();
+                    final CompletableFuture<IOSession> f = new CompletableFuture<>();
                     final IOException io = new IOException("Simulated connection failure");
                     cb.failed(io);
                     f.completeExceptionally(io);
@@ -82,12 +109,12 @@ public void testConnectWithMultipleAddresses_allFail_surfaceLastFailure() throws
 
         assertTrue(future.isDone());
         final ExecutionException ex = assertThrows(ExecutionException.class, future::get);
-        assertTrue(ex.getCause() instanceof IOException);
+        assertInstanceOf(IOException.class, ex.getCause());
         assertEquals("Simulated connection failure", ex.getCause().getMessage());
     }
 
     @Test
-    public void testConnectSuccessfulAfterRetries() throws Exception {
+    void testConnectSuccessfulAfterRetries() throws Exception {
         final MultihomeIOSessionRequester sessionRequester =
                 new MultihomeIOSessionRequester(dnsResolver, ConnectionConfig.custom()
                         .setStaggeredConnectEnabled(false)
@@ -108,7 +135,7 @@ public void testConnectSuccessfulAfterRetries() throws Exception {
                 .thenAnswer(invocation -> {
                     final FutureCallback<IOSession> cb = invocation.getArgument(5);
                     final InetSocketAddress remoteAddress = invocation.getArgument(1);
-                    final CompletableFuture<IOSession> f = new CompletableFuture<IOSession>();
+                    final CompletableFuture<IOSession> f = new CompletableFuture<>();
                     if (remoteAddress.getAddress().equals(address1)) {
                         final IOException io = new IOException("Simulated connection failure");
                         cb.failed(io);
@@ -130,7 +157,7 @@ public void testConnectSuccessfulAfterRetries() throws Exception {
     }
 
     @Test
-    public void testHappyEyeballs_fastV4BeatsSlowerV6() throws Exception {
+    void testHappyEyeballs_fastV4BeatsSlowerV6() throws Exception {
         final MultihomeIOSessionRequester sessionRequester =
                 new MultihomeIOSessionRequester(dnsResolver, ConnectionConfig.custom()
                         .setStaggeredConnectEnabled(true)
@@ -155,25 +182,19 @@ public void testHappyEyeballs_fastV4BeatsSlowerV6() throws Exception {
                 .thenAnswer(invocation -> {
                     final InetSocketAddress remote = invocation.getArgument(1);
                     final FutureCallback<IOSession> cb = invocation.getArgument(5);
-                    final CompletableFuture<IOSession> f = new CompletableFuture<IOSession>();
+                    final CompletableFuture<IOSession> f = new CompletableFuture<>();
                     final ScheduledExecutorService ses = Executors.newSingleThreadScheduledExecutor();
                     if (remote.equals(aV6)) {
-                        ses.schedule(new Runnable() {
-                            @Override
-                            public void run() {
-                                cb.completed(v6Session);
-                                f.complete(v6Session);
-                                ses.shutdown();
-                            }
+                        ses.schedule(() -> {
+                            cb.completed(v6Session);
+                            f.complete(v6Session);
+                            ses.shutdown();
                         }, 200, TimeUnit.MILLISECONDS);
                     } else {
-                        ses.schedule(new Runnable() {
-                            @Override
-                            public void run() {
-                                cb.completed(v4Session);
-                                f.complete(v4Session);
-                                ses.shutdown();
-                            }
+                        ses.schedule(() -> {
+                            cb.completed(v4Session);
+                            f.complete(v4Session);
+                            ses.shutdown();
                         }, 50, TimeUnit.MILLISECONDS);
                     }
                     return f;
@@ -189,7 +210,7 @@ public void run() {
     }
 
     @Test
-    public void testHappyEyeballs_v6Fails_v4Succeeds() throws Exception {
+    void testHappyEyeballs_v6Fails_v4Succeeds() throws Exception {
         final MultihomeIOSessionRequester sessionRequester =
                 new MultihomeIOSessionRequester(dnsResolver, ConnectionConfig.custom()
                         .setStaggeredConnectEnabled(true)
@@ -213,26 +234,20 @@ public void testHappyEyeballs_v6Fails_v4Succeeds() throws Exception {
                 .thenAnswer(invocation -> {
                     final InetSocketAddress remote = invocation.getArgument(1);
                     final FutureCallback<IOSession> cb = invocation.getArgument(5);
-                    final CompletableFuture<IOSession> f = new CompletableFuture<IOSession>();
+                    final CompletableFuture<IOSession> f = new CompletableFuture<>();
                     final ScheduledExecutorService ses = Executors.newSingleThreadScheduledExecutor();
                     if (remote.equals(aV6)) {
-                        ses.schedule(new Runnable() {
-                            @Override
-                            public void run() {
-                                final IOException io = new IOException("v6 down");
-                                cb.failed(io);
-                                f.completeExceptionally(io);
-                                ses.shutdown();
-                            }
+                        ses.schedule(() -> {
+                            final IOException io = new IOException("v6 down");
+                            cb.failed(io);
+                            f.completeExceptionally(io);
+                            ses.shutdown();
                         }, 30, TimeUnit.MILLISECONDS);
                     } else {
-                        ses.schedule(new Runnable() {
-                            @Override
-                            public void run() {
-                                cb.completed(v4Session);
-                                f.complete(v4Session);
-                                ses.shutdown();
-                            }
+                        ses.schedule(() -> {
+                            cb.completed(v4Session);
+                            f.complete(v4Session);
+                            ses.shutdown();
                         }, 60, TimeUnit.MILLISECONDS);
                     }
                     return f;