From 8896eb896b9b282419b1f98aca5f92353d33ea29 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Thu, 25 Jan 2024 15:47:20 -0800 Subject: [PATCH] Address PR feedback. Signed-off-by: Yury-Fridlyand --- java/integTest/build.gradle | 4 +-- .../src/test/java/glide/CommandTests.java | 30 ++++++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/java/integTest/build.gradle b/java/integTest/build.gradle index 6b312c5074..137fb6625c 100644 --- a/java/integTest/build.gradle +++ b/java/integTest/build.gradle @@ -53,7 +53,7 @@ stopAllBeforeTests.finalizedBy 'clearDirs' clearDirs.finalizedBy 'startStandalone' clearDirs.finalizedBy 'startCluster' test.finalizedBy 'stopAllAfterTests' -test.dependsOn ':client:buildRust' +test.dependsOn ':client:buildRustRelease' tasks.withType(Test) { systemProperty 'test.redis.standalone.port', '6380' @@ -64,5 +64,5 @@ tasks.withType(Test) { events "started", "skipped", "passed", "failed" showStandardStreams true } - jvmArgs "-Djava.library.path=${project.rootDir}/target/debug" + jvmArgs "-Djava.library.path=${project.rootDir}/target/release" } diff --git a/java/integTest/src/test/java/glide/CommandTests.java b/java/integTest/src/test/java/glide/CommandTests.java index 91ceffd463..8d57a27e55 100644 --- a/java/integTest/src/test/java/glide/CommandTests.java +++ b/java/integTest/src/test/java/glide/CommandTests.java @@ -5,20 +5,34 @@ import glide.api.models.configuration.RedisClientConfiguration; 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; public class CommandTests { + private static RedisClient regularClient = null; + + @BeforeAll + @SneakyThrows + public static void init() { + regularClient = + RedisClient.CreateClient( + RedisClientConfiguration.builder() + .address(NodeAddress.builder().port(TestConfiguration.STANDALONE_PORT).build()) + .build()) + .get(10, TimeUnit.SECONDS); + } + + @AfterAll + @SneakyThrows + public static void deinit() { + regularClient.close(); + } + @Test @SneakyThrows public void custom_command_info() { - var regularClient = - RedisClient.CreateClient( - RedisClientConfiguration.builder() - .address(NodeAddress.builder().port(TestConfiguration.STANDALONE_PORT).build()) - .build()) - .get(10, TimeUnit.SECONDS); - regularClient.customCommand(new String[] {"info"}).get(); - regularClient.close(); + regularClient.customCommand(new String[] {"info"}).get(10, TimeUnit.SECONDS); } }