From b5ed7704e3f18fc869d7fb9610e73e230133db82 Mon Sep 17 00:00:00 2001
From: Stefan Kalscheuer <stefan@stklcode.de>
Date: Mon, 29 Aug 2022 09:42:23 +0200
Subject: [PATCH] test: scan for "Vault server started" instead of fixed delay

---
 pom.xml                                       | 10 ++-
 .../connector/HTTPVaultConnectorIT.java       | 61 ++++++++-----------
 2 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8eae470..eadeed4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.6.1</version>
+            <version>4.7.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -155,6 +155,12 @@
             <version>3.10.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.2.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -300,7 +306,7 @@
                     <plugin>
                         <groupId>org.owasp</groupId>
                         <artifactId>dependency-check-maven</artifactId>
-                        <version>7.1.1</version>
+                        <version>7.1.2</version>
                         <executions>
                             <execution>
                                 <goals>
diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java
index 73c6fb3..0e729fe 100644
--- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java
+++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java
@@ -37,6 +37,7 @@ import java.util.regex.Pattern;
 
 import static java.util.Collections.singletonMap;
 import static org.apache.commons.io.FileUtils.copyDirectory;
+import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -80,11 +81,6 @@ class HTTPVaultConnectorIT {
 
         // Initialize Vault.
         VaultConfiguration config = initializeVault(tempDir, isTls);
-        try {
-            TimeUnit.SECONDS.sleep(1);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
 
         // Initialize connector.
         HTTPVaultConnectorBuilder builder = HTTPVaultConnector.builder()
@@ -1222,30 +1218,37 @@ class HTTPVaultConnectorIT {
         }
 
         // Write configuration file.
-        BufferedWriter bw = null;
-        File configFile;
-        try {
-            configFile = new File(dir, "vault.conf");
-            bw = new BufferedWriter(new FileWriter(configFile));
+        File configFile = new File(dir, "vault.conf");
+        try (BufferedWriter bw = new BufferedWriter(new FileWriter(configFile))) {
             bw.write(config.toString());
         } catch (IOException e) {
             throw new IllegalStateException("Unable to generate config file", e);
-        } finally {
-            try {
-                if (bw != null)
-                    bw.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
         }
 
         // Start vault process.
         try {
-            vaultProcess = Runtime.getRuntime().exec("vault server -config " + configFile.toString());
+            vaultProcess = Runtime.getRuntime().exec("vault server -config " + configFile);
         } catch (IOException e) {
             throw new IllegalStateException("Unable to start vault. Make sure vault binary is in your executable path", e);
         }
 
+        await().atMost(5, TimeUnit.SECONDS).until(() -> {
+            try (InputStream stdout = vaultProcess.getInputStream();
+                 InputStreamReader reader = new InputStreamReader(stdout);
+                 BufferedReader br = new BufferedReader(reader)) {
+                String line = br.readLine();
+                while (line != null) {
+                    if (line.contains("Vault server started")) {
+                        return true;
+                    } else {
+                        line = br.readLine();
+                    }
+                }
+
+                return false;
+            }
+        });
+
         return config;
     }
 
@@ -1270,28 +1273,14 @@ class HTTPVaultConnectorIT {
      * @return port number
      */
     private static Integer getFreePort() {
-        ServerSocket socket = null;
-        try {
-            socket = new ServerSocket(0);
+        try (ServerSocket socket = new ServerSocket(0)) {
             socket.setReuseAddress(true);
-            int port = socket.getLocalPort();
-            try {
-                socket.close();
-            } catch (IOException e) {
-                // Ignore IOException on close()
-            }
-            return port;
+
+            return socket.getLocalPort();
         } catch (IOException e) {
             e.printStackTrace();
-        } finally {
-            if (socket != null) {
-                try {
-                    socket.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
         }
+
         throw new IllegalStateException("Unable to find a free TCP port");
     }