low level client tests to junit 5

Author: l-trotta

java-client/build.gradle.kts

@@ -278,10 +278,6 @@ dependencies {
     // https://github.com/mockito/mockito
     testImplementation("org.mockito","mockito-core","5.12.0")
 
-    // Apache-2.0
-    // https://github.com/randomizedtesting/randomizedtesting
-    testImplementation("com.carrotsearch.randomizedtesting","randomizedtesting-runner","2.8.1")
-
     // Apache-2.0
     // https://github.com/elastic/mocksocket
     testImplementation("org.elasticsearch","mocksocket","1.2")

java-client/src/test/java/co/elastic/clients/transport/rest5_client/low_level/BasicAsyncResponseConsumerTests.java

@@ -28,6 +28,7 @@
 import org.apache.hc.core5.http.nio.ContentDecoder;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.junit.Assert;
+import org.junit.jupiter.api.Test;
 
 import java.nio.ByteBuffer;
 
@@ -38,6 +39,7 @@ public class BasicAsyncResponseConsumerTests extends RestClientTestCase {
     // maximum buffer that this test ends up allocating is 50MB
     private static final int MAX_TEST_BUFFER_SIZE = 50 * 1024 * 1024;
 
+    @Test
     public void testResponseProcessing() throws Exception {
         ContentDecoder contentDecoder = mock(ContentDecoder.class);
         HttpContext httpContext = mock(HttpContext.class);
@@ -55,6 +57,7 @@ public void testResponseProcessing() throws Exception {
         consumer.consume(ByteBuffer.wrap("test".getBytes()));
     }
 
+    @Test
     public void testBufferLimit() throws Exception {
         HttpContext httpContext = mock(HttpContext.class);
 

java-client/src/test/java/co/elastic/clients/transport/rest5_client/low_level/ClientsGraalVMThreadsFilter.java

@@ -19,6 +19,8 @@
 
 package co.elastic.clients.transport.rest5_client.low_level;
 
+import org.junit.jupiter.api.Test;
+
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -36,13 +38,15 @@ public class DeadHostStateTests extends RestClientTestCase {
     private static long[] EXPECTED_TIMEOUTS_SECONDS = new long[]{60, 84, 120, 169, 240, 339, 480, 678, 960,
         1357, 1800};
 
+    @Test
     public void testInitialDeadHostStateDefaultTimeSupplier() {
         DeadHostState deadHostState = new DeadHostState(DeadHostState.DEFAULT_TIME_SUPPLIER);
         long currentTime = System.nanoTime();
         assertThat(deadHostState.getDeadUntilNanos(), greaterThanOrEqualTo(currentTime));
         assertThat(deadHostState.getFailedAttempts(), equalTo(1));
     }
 
+    @Test
     public void testDeadHostStateFromPreviousDefaultTimeSupplier() {
         DeadHostState previous = new DeadHostState(DeadHostState.DEFAULT_TIME_SUPPLIER);
         int iters = randomIntBetween(5, 30);
@@ -54,6 +58,7 @@ public void testDeadHostStateFromPreviousDefaultTimeSupplier() {
         }
     }
 
+    @Test
     public void testCompareToTimeSupplier() {
         int numObjects = randomIntBetween(EXPECTED_TIMEOUTS_SECONDS.length, 30);
         DeadHostState[] deadHostStates = new DeadHostState[numObjects];
@@ -77,6 +82,7 @@ public void testCompareToTimeSupplier() {
         }
     }
 
+    @Test
     public void testCompareToDifferingTimeSupplier() {
         try {
             new DeadHostState(DeadHostState.DEFAULT_TIME_SUPPLIER).compareTo(new DeadHostState(() -> 0L));
@@ -90,6 +96,7 @@ public void testCompareToDifferingTimeSupplier() {
         }
     }
 
+    @Test
     public void testShallBeRetried() {
         final AtomicLong time = new AtomicLong(0);
         DeadHostState deadHostState = null;
@@ -112,6 +119,7 @@ public void testShallBeRetried() {
         }
     }
 
+    @Test
     public void testDeadHostStateTimeouts() {
         DeadHostState previous = new DeadHostState(() -> 0L);
         for (long expectedTimeoutsSecond : EXPECTED_TIMEOUTS_SECONDS) {

java-client/src/test/java/co/elastic/clients/transport/rest5_client/low_level/DeadHostStateTests.java

@@ -23,6 +23,7 @@
 import org.apache.hc.core5.http.ProtocolVersion;
 import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
 import org.apache.hc.core5.http.message.RequestLine;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -33,6 +34,7 @@
 
 public class FailureTrackingResponseListenerTests extends RestClientTestCase {
 
+    @Test
     public void testOnSuccess() {
         MockResponseListener responseListener = new MockResponseListener();
         Rest5Client.FailureTrackingResponseListener listener =
@@ -44,6 +46,7 @@ public void testOnSuccess() {
         assertNull(responseListener.lastException.get());
     }
 
+    @Test
     public void testOnFailure() {
         MockResponseListener responseListener = new MockResponseListener();
         Rest5Client.FailureTrackingResponseListener listener =

java-client/src/test/java/co/elastic/clients/transport/rest5_client/low_level/FailureTrackingResponseListenerTests.java

@@ -20,6 +20,7 @@
 package co.elastic.clients.transport.rest5_client.low_level;
 
 import org.apache.hc.core5.http.HttpHost;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,6 +35,8 @@
 import static org.junit.Assert.assertEquals;
 
 public class HasAttributeNodeSelectorTests extends RestClientTestCase {
+
+    @Test
     public void testHasAttribute() {
         Node hasAttributeValue = dummyNode(singletonMap("attr", singletonList("val")));
         Node hasAttributeButNotValue = dummyNode(singletonMap("attr", singletonList("notval")));

java-client/src/test/java/co/elastic/clients/transport/rest5_client/low_level/HasAttributeNodeSelectorTests.java

@@ -20,19 +20,23 @@
 package co.elastic.clients.transport.rest5_client.low_level;
 
 import org.apache.hc.core5.http.HttpHost;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Random;
 import java.util.Set;
 import java.util.TreeSet;
 
 import static org.junit.Assert.assertEquals;
 
 public class NodeSelectorTests extends RestClientTestCase {
+
+    @Test
     public void testAny() {
         List<Node> nodes = new ArrayList<>();
-        int size = between(2, 5);
+        int size = randomIntBetween(2, 5);
         for (int i = 0; i < size; i++) {
             nodes.add(dummyNode(randomBoolean(), randomBoolean(), randomBoolean()));
         }
@@ -41,6 +45,7 @@ public void testAny() {
         assertEquals(expected, nodes);
     }
 
+    @Test
     public void testNotMasterOnly() {
         Node masterOnly = dummyNode(true, false, false);
         Node all = dummyNode(true, true, true);
@@ -67,7 +72,7 @@ public void testNotMasterOnly() {
         nodes.add(dataWarm);
         nodes.add(dataCold);
         nodes.add(dataFrozen);
-        Collections.shuffle(nodes, getRandom());
+        Collections.shuffle(nodes, new Random());
         List<Node> expected = new ArrayList<>(nodes);
         expected.remove(masterOnly);
         NodeSelector.SKIP_DEDICATED_MASTERS.select(nodes);

java-client/src/test/java/co/elastic/clients/transport/rest5_client/low_level/NodeSelectorTests.java

@@ -20,6 +20,7 @@
 package co.elastic.clients.transport.rest5_client.low_level;
 
 import org.apache.hc.core5.http.HttpHost;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -37,6 +38,8 @@
 import static org.junit.Assert.assertTrue;
 
 public class NodeTests extends RestClientTestCase {
+
+    @Test
     public void testToString() {
         Map<String, List<String>> attributes = new HashMap<>();
         attributes.put("foo", singletonList("bar"));
@@ -72,6 +75,7 @@ public void testToString() {
         );
     }
 
+    @Test
     public void testEqualsAndHashCode() {
         HttpHost host = new HttpHost(randomAsciiAlphanumOfLength(5));
         Node node = new Node(
@@ -148,6 +152,7 @@ public void testEqualsAndHashCode() {
         );
     }
 
+    @Test
     public void testDataRole() {
         Node.Roles roles = new Node.Roles(new TreeSet<>(Arrays.asList("data_hot")));
         assertTrue(roles.hasDataHotRole());

java-client/src/test/java/co/elastic/clients/transport/rest5_client/low_level/NodeTests.java

@@ -20,6 +20,7 @@
 package co.elastic.clients.transport.rest5_client.low_level;
 
 import org.apache.hc.core5.http.HttpHost;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,6 +35,8 @@
 import static org.junit.Assert.assertEquals;
 
 public class PreferHasAttributeNodeSelectorTests extends RestClientTestCase {
+
+    @Test
     public void testFoundPreferHasAttribute() {
         Node hasAttributeValue = dummyNode(singletonMap("attr", singletonList("val")));
         Node hasAttributeButNotValue = dummyNode(singletonMap("attr", singletonList("notval")));
@@ -51,6 +54,7 @@ public void testFoundPreferHasAttribute() {
         assertEquals(expected, nodes);
     }
 
+    @Test
     public void testNotFoundPreferHasAttribute() {
         Node notHasAttribute = dummyNode(singletonMap("notattr", singletonList("val")));
         List<Node> nodes = new ArrayList<>();

java-client/src/test/java/co/elastic/clients/transport/rest5_client/low_level/PreferHasAttributeNodeSelectorTests.java

@@ -39,6 +39,7 @@
 import org.apache.hc.core5.http.io.entity.StringEntity;
 import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
 import org.apache.hc.core5.http.message.BasicHeader;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -53,6 +54,8 @@
 import static org.junit.Assert.assertThat;
 
 public class RequestLoggerTests extends RestClientTestCase {
+
+    @Test
     public void testTraceRequest() throws IOException, URISyntaxException, ParseException {
         HttpHost host = new HttpHost(randomBoolean() ? "http" : "https", "localhost", 9200);
         String expectedEndpoint = "/index/type/_api";
@@ -104,6 +107,7 @@ public void testTraceRequest() throws IOException, URISyntaxException, ParseExce
         }
     }
 
+    @Test
     public void testTraceResponse() throws IOException, ParseException {
         int statusCode = randomIntBetween(200, 599);
         String reasonPhrase = "REASON";
@@ -115,7 +119,7 @@ public void testTraceResponse() throws IOException, ParseException {
             expected += "\n# header" + i + ": value";
         }
         expected += "\n#";
-        boolean hasBody = getRandom().nextBoolean();
+        boolean hasBody = randomBoolean();
         String responseBody = "{\n  \"field\": \"value\"\n}";
         if (hasBody) {
             expected += "\n# {";
@@ -152,6 +156,7 @@ public void testTraceResponse() throws IOException, ParseException {
         }
     }
 
+    @Test
     public void testResponseWarnings() throws Exception {
         HttpHost host = new HttpHost("localhost", 9200);
         HttpUriRequest request = randomHttpRequest(new URI("/index/type/_api"));