Java: Update timeout handling in IT. (valkey-io#1217)

Update timeout handling in IT. (#170) Signed-off-by: Yury-Fridlyand <[email protected]>
Bit-Quill · Jun 24, 2024 · c33e0e3 · c33e0e3
1 parent d83a89a
commit c33e0e3
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 34 deletions.
diff --git a/java/integTest/src/test/java/glide/ConnectionTests.java b/java/integTest/src/test/java/glide/ConnectionTests.java
@@ -4,10 +4,11 @@
 import glide.api.RedisClient;
 import glide.api.models.configuration.NodeAddress;
 import glide.api.models.configuration.RedisClientConfiguration;
-import java.util.concurrent.TimeUnit;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
+@Timeout(10) // seconds
 public class ConnectionTests {
 
     @Test
@@ -19,7 +20,7 @@ public void basic_client() {
                                         .address(
                                                 NodeAddress.builder().port(TestConfiguration.STANDALONE_PORTS[0]).build())
                                         .build())
-                        .get(10, TimeUnit.SECONDS);
+                        .get();
         regularClient.close();
     }
 
@@ -31,7 +32,7 @@ public void cluster_client() {
                                 RedisClientConfiguration.builder()
                                         .address(NodeAddress.builder().port(TestConfiguration.CLUSTER_PORTS[0]).build())
                                         .build())
-                        .get(10, TimeUnit.SECONDS);
+                        .get();
         regularClient.close();
     }
 }
diff --git a/java/integTest/src/test/java/glide/ErrorHandlingTests.java b/java/integTest/src/test/java/glide/ErrorHandlingTests.java
@@ -12,10 +12,11 @@
 import glide.api.models.exceptions.RequestException;
 import java.net.ServerSocket;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
+@Timeout(10) // seconds
 public class ErrorHandlingTests {
 
     @Test
@@ -29,7 +30,7 @@ public void basic_client_tries_to_connect_to_wrong_address() {
                                                 RedisClientConfiguration.builder()
                                                         .address(NodeAddress.builder().port(getFreePort()).build())
                                                         .build())
-                                        .get(10, TimeUnit.SECONDS));
+                                        .get());
         assertAll(
                 () -> assertTrue(exception.getCause() instanceof ClosingException),
                 () -> assertTrue(exception.getCause().getMessage().contains("Connection refused")));
@@ -44,11 +45,11 @@ public void basic_client_tries_wrong_command() {
                                         .address(
                                                 NodeAddress.builder().port(TestConfiguration.STANDALONE_PORTS[0]).build())
                                         .build())
-                        .get(10, TimeUnit.SECONDS)) {
+                        .get()) {
             var exception =
                     assertThrows(
                             ExecutionException.class,
-                            () -> regularClient.customCommand(new String[] {"pewpew"}).get(10, TimeUnit.SECONDS));
+                            () -> regularClient.customCommand(new String[] {"pewpew"}).get());
             assertAll(
                     () -> assertTrue(exception.getCause() instanceof RequestException),
                     () -> assertTrue(exception.getCause().getMessage().contains("unknown command")));
@@ -64,14 +65,11 @@ public void basic_client_tries_wrong_command_arguments() {
                                         .address(
                                                 NodeAddress.builder().port(TestConfiguration.STANDALONE_PORTS[0]).build())
                                         .build())
-                        .get(10, TimeUnit.SECONDS)) {
+                        .get()) {
             var exception =
                     assertThrows(
                             ExecutionException.class,
-                            () ->
-                                    regularClient
-                                            .customCommand(new String[] {"ping", "pang", "pong"})
-                                            .get(10, TimeUnit.SECONDS));
+                            () -> regularClient.customCommand(new String[] {"ping", "pang", "pong"}).get());
             assertAll(
                     () -> assertTrue(exception.getCause() instanceof RequestException),
                     () ->

diff --git a/java/integTest/src/test/java/glide/SharedClientTests.java b/java/integTest/src/test/java/glide/SharedClientTests.java
@@ -25,7 +25,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-@Timeout(25)
+@Timeout(25) // seconds
 public class SharedClientTests {
 
     private static RedisClient standaloneClient = null;

diff --git a/java/integTest/src/test/java/glide/SharedCommandTests.java b/java/integTest/src/test/java/glide/SharedCommandTests.java
@@ -53,7 +53,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-@Timeout(10)
+@Timeout(10) // seconds
 public class SharedCommandTests {
 
     private static RedisClient standaloneClient = null;

diff --git a/java/integTest/src/test/java/glide/cluster/ClusterClientTests.java b/java/integTest/src/test/java/glide/cluster/ClusterClientTests.java
@@ -19,7 +19,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
-@Timeout(10)
+@Timeout(10) // seconds
 public class ClusterClientTests {
 
     @SneakyThrows

diff --git a/java/integTest/src/test/java/glide/cluster/ClusterTransactionTests.java b/java/integTest/src/test/java/glide/cluster/ClusterTransactionTests.java
@@ -17,12 +17,13 @@
 import glide.api.models.configuration.NodeAddress;
 import glide.api.models.configuration.RedisClusterClientConfiguration;
 import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
+@Timeout(10) // seconds
 public class ClusterTransactionTests {
 
     private static RedisClusterClient clusterClient = null;
@@ -36,7 +37,7 @@ public static void init() {
                                         .address(NodeAddress.builder().port(TestConfiguration.CLUSTER_PORTS[0]).build())
                                         .requestTimeout(5000)
                                         .build())
-                        .get(10, TimeUnit.SECONDS);
+                        .get();
     }
 
     @AfterAll
@@ -49,7 +50,7 @@ public static void teardown() {
     @SneakyThrows
     public void custom_command_info() {
         ClusterTransaction transaction = new ClusterTransaction().customCommand(new String[] {"info"});
-        Object[] result = clusterClient.exec(transaction).get(10, TimeUnit.SECONDS);
+        Object[] result = clusterClient.exec(transaction).get();
         assertTrue(((String) result[0]).contains("# Stats"));
     }
 
@@ -68,8 +69,7 @@ public void WATCH_transaction_failure_returns_null() {
     @SneakyThrows
     public void info_simple_route_test() {
         ClusterTransaction transaction = new ClusterTransaction().info().info();
-        ClusterValue<Object>[] result =
-                clusterClient.exec(transaction, RANDOM).get(10, TimeUnit.SECONDS);
+        ClusterValue<Object>[] result = clusterClient.exec(transaction, RANDOM).get();
 
         // check single-value result
         assertTrue(result[0].hasSingleData());
@@ -85,8 +85,7 @@ public void test_cluster_transactions() {
         ClusterTransaction transaction = (ClusterTransaction) transactionTest(new ClusterTransaction());
         Object[] expectedResult = transactionTestResult();
 
-        ClusterValue<Object>[] clusterValues =
-                clusterClient.exec(transaction, RANDOM).get(10, TimeUnit.SECONDS);
+        ClusterValue<Object>[] clusterValues = clusterClient.exec(transaction, RANDOM).get();
         Object[] results =
                 Arrays.stream(clusterValues)
                         .map(v -> v.hasSingleData() ? v.getSingleValue() : v.getMultiValue())

diff --git a/java/integTest/src/test/java/glide/cluster/CommandTests.java b/java/integTest/src/test/java/glide/cluster/CommandTests.java
@@ -40,14 +40,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
-@Timeout(10)
+@Timeout(10) // seconds
 public class CommandTests {
 
     private static RedisClusterClient clusterClient = null;
@@ -129,8 +128,7 @@ public void custom_command_info() {
     @Test
     @SneakyThrows
     public void custom_command_ping() {
-        ClusterValue<Object> data =
-                clusterClient.customCommand(new String[] {"ping"}).get(10, TimeUnit.SECONDS);
+        ClusterValue<Object> data = clusterClient.customCommand(new String[] {"ping"}).get();
         assertEquals("PONG", data.getSingleValue());
     }
 

diff --git a/java/integTest/src/test/java/glide/standalone/CommandTests.java b/java/integTest/src/test/java/glide/standalone/CommandTests.java
@@ -34,7 +34,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
-@Timeout(10)
+@Timeout(10) // seconds
 public class CommandTests {
 
     private static final String INITIAL_VALUE = "VALUE";

diff --git a/java/integTest/src/test/java/glide/standalone/StandaloneClientTests.java b/java/integTest/src/test/java/glide/standalone/StandaloneClientTests.java
@@ -19,7 +19,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
-@Timeout(10)
+@Timeout(10) // seconds
 public class StandaloneClientTests {
 
     @SneakyThrows

diff --git a/java/integTest/src/test/java/glide/standalone/TransactionTests.java b/java/integTest/src/test/java/glide/standalone/TransactionTests.java
@@ -16,13 +16,14 @@
 import glide.api.models.configuration.NodeAddress;
 import glide.api.models.configuration.RedisClientConfiguration;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
+@Timeout(10) // seconds
 public class TransactionTests {
 
     private static RedisClient client = null;
@@ -36,7 +37,7 @@ public static void init() {
                                         .address(
                                                 NodeAddress.builder().port(TestConfiguration.STANDALONE_PORTS[0]).build())
                                         .build())
-                        .get(10, TimeUnit.SECONDS);
+                        .get();
     }
 
     @AfterAll
@@ -49,7 +50,7 @@ public static void teardown() {
     @SneakyThrows
     public void custom_command_info() {
         Transaction transaction = new Transaction().customCommand(new String[] {"info"});
-        Object[] result = client.exec(transaction).get(10, TimeUnit.SECONDS);
+        Object[] result = client.exec(transaction).get();
         assertTrue(((String) result[0]).contains("# Stats"));
     }
 
@@ -60,7 +61,7 @@ public void info_test() {
                 new Transaction()
                         .info()
                         .info(InfoOptions.builder().section(InfoOptions.Section.CLUSTER).build());
-        Object[] result = client.exec(transaction).get(10, TimeUnit.SECONDS);
+        Object[] result = client.exec(transaction).get();
 
         // sanity check
         assertTrue(((String) result[0]).contains("# Stats"));
@@ -79,7 +80,7 @@ public void ping_tests() {
                 transaction.ping(Integer.toString(idx));
             }
         }
-        Object[] result = client.exec(transaction).get(10, TimeUnit.SECONDS);
+        Object[] result = client.exec(transaction).get();
         for (int idx = 0; idx < numberOfPings; idx++) {
             if ((idx % 2) == 0) {
                 assertEquals("PONG", result[idx]);
@@ -106,7 +107,7 @@ public void test_standalone_transactions() {
 
         expectedResult = ArrayUtils.addAll(expectedResult, OK, OK, value, OK, null);
 
-        Object[] result = client.exec(transaction).get(10, TimeUnit.SECONDS);
+        Object[] result = client.exec(transaction).get();
         assertArrayEquals(expectedResult, result);
     }
 }