fix unit tests failed (#137)

* fix unit tests failed to create socket

* update getReady method

* add await() method

Co-authored-by: Huynh, Tu | RASIA <[email protected]>

Author: TuanHungVU1202

app/src/test/java/dev/keva/app/ApplicationTest.java

@@ -1,6 +1,5 @@
 package dev.keva.app;
 
-import dev.keva.app.Application;
 import lombok.val;
 import org.junit.jupiter.api.Test;
 import redis.clients.jedis.Jedis;

core/src/main/java/dev/keva/core/server/KevaServer.java

@@ -20,12 +20,15 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @Component
 @ComponentScan("dev.keva.core")
 public class KevaServer implements Server {
+    private final CompletableFuture<Void> ready = new CompletableFuture<>();
+
     private static final String KEVA_BANNER = "\n" +
             "  _  __  ___  __   __    _   \n" +
             " | |/ / | __| \\ \\ / /   /_\\  \n" +
@@ -115,18 +118,27 @@ public void run() {
                     stopwatch.elapsed(TimeUnit.MILLISECONDS));
             log.info("Ready to accept connections");
 
+            ready.complete(null);
+
             channel = sync.channel();
             channel.closeFuture().sync();
         } catch (InterruptedException e) {
             log.error("Failed to start server: ", e);
             Thread.currentThread().interrupt();
         } catch (Exception e) {
             log.error("Failed to start server: ", e);
+            // Release err future
+            ready.completeExceptionally(e);
         } finally {
             stopwatch.stop();
         }
     }
 
+    @Override
+    public void await() {
+        this.ready.join();
+    }
+
     @Override
     public void clear() {
         database.flush();

core/src/main/java/dev/keva/core/server/Server.java

@@ -3,6 +3,8 @@
 public interface Server extends Runnable {
     void run();
 
+    void await();
+
     void shutdown();
 
     void clear();

core/src/test/java/dev/keva/core/command/BaseCommandTest.java

@@ -11,8 +11,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import redis.clients.jedis.Jedis;
 
-import java.util.concurrent.TimeUnit;
-
 @Slf4j
 public class BaseCommandTest {
     protected static final String host = "localhost";
@@ -21,7 +19,7 @@ public class BaseCommandTest {
     protected static Server server;
 
     @BeforeAll
-    static void startServer() throws Exception {
+    static void startServer() {
         val config = KevaConfig.builder()
                 .persistence(false)
                 .aof(false)
@@ -41,7 +39,7 @@ static void startServer() throws Exception {
         }).start();
 
         // Wait for server to start
-        TimeUnit.SECONDS.sleep(2);
+        server.await();
 
         jedis = new Jedis(host, port);
         jedis.auth("keva-auth");

core/src/test/java/dev/keva/core/server/AOFTest.java

@@ -41,8 +41,7 @@ Server startServer(int port) throws Exception {
             }
         }).start();
 
-        // Wait for server to start
-        TimeUnit.SECONDS.sleep(2);
+        server.await();
         return server;
     }
 
@@ -74,8 +73,7 @@ void sync(int port) throws InterruptedException {
             fail(e);
         }
         jedis.disconnect();
-        // Wait for the interval to run
-        TimeUnit.SECONDS.sleep(4);
+
         try {
             stop(server);
         } catch (Exception e) {

core/src/test/java/dev/keva/core/server/PersistenceTest.java

@@ -7,8 +7,6 @@
 import org.junit.jupiter.api.Timeout;
 import redis.clients.jedis.Jedis;
 
-import java.util.concurrent.TimeUnit;
-
 import static dev.keva.core.utils.PortUtil.getAvailablePort;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -35,8 +33,7 @@ Server startServer(int port) throws Exception {
             }
         }).start();
 
-        // Wait for server to start
-        TimeUnit.SECONDS.sleep(2);
+        server.await();
         return server;
     }