test: wait for condition instead of fixed delay (#21218) (#21295)

Author: mcollovati

pom.xml

@@ -281,6 +281,11 @@
                 <artifactId>hamcrest-all</artifactId>
                 <version>1.3</version>
             </dependency>
+            <dependency>
+                <groupId>org.awaitility</groupId>
+                <artifactId>awaitility</artifactId>
+                <version>4.3.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

vaadin-dev-server/pom.xml

@@ -97,6 +97,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

vaadin-dev-server/src/main/java/com/vaadin/base/devserver/ExternalDependencyWatcher.java

@@ -23,7 +23,6 @@
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

vaadin-dev-server/src/main/java/com/vaadin/base/devserver/viteproxy/ViteWebsocketConnection.java

@@ -15,8 +15,6 @@
  */
 package com.vaadin.base.devserver.viteproxy;
 
-import jakarta.websocket.CloseReason.CloseCodes;
-
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.WebSocket;
@@ -30,6 +28,7 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
+import jakarta.websocket.CloseReason.CloseCodes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -153,6 +152,10 @@ public void send(String message)
      *             if there is a problem with the connection
      */
     public void close() throws InterruptedException, ExecutionException {
+        if (clientWebsocket == null) {
+            getLogger().debug("Connection already closed");
+            return;
+        }
         getLogger().debug("Closing the connection");
         if (clientWebsocket.isDone()) {
             WebSocket client = clientWebsocket.get();

vaadin-dev-server/src/test/java/com/vaadin/base/devserver/FileWatcherTest.java

@@ -3,8 +3,11 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.awaitility.Awaitility;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.MockedStatic;
@@ -76,10 +79,14 @@ public void externalDependencyWatcher_setViaParameter_TriggeredForModification()
             createFile(subProjectLegacyFrontend + "/somejs.js");
             assertFileCountFound(jarFrontendResources, 2);
 
-            Assert.assertEquals("somestyles.css",
-                    jarFrontendResources.listFiles()[0].getName());
-            Assert.assertEquals("somejs.js",
-                    jarFrontendResources.listFiles()[1].getName());
+            // Map files as listFiles makes no promises on ordering
+            List<String> frontendFiles = Arrays
+                    .stream(jarFrontendResources.listFiles()).map(File::getName)
+                    .toList();
+            Assert.assertTrue("No 'somestyles.css' file found",
+                    frontendFiles.contains("somestyles.css"));
+            Assert.assertTrue("No 'somejs.js' file found",
+                    frontendFiles.contains("somejs.js"));
         }
     }
 
@@ -130,13 +137,14 @@ public void externalDependencyWatcher_setAsDefaultForRunnerProjectButNotSubProje
         }
     }
 
-    private void assertFileCountFound(File directory, int count)
-            throws InterruptedException {
-        Thread.sleep(100);
-        Assert.assertEquals(
-                "Wrong amount of copied files found when there should be "
-                        + count + ".",
-                count, directory.listFiles().length);
+    private void assertFileCountFound(File directory, int count) {
+        Awaitility.await().untilAsserted(directory::listFiles, files -> {
+            Assert.assertEquals(
+                    "Wrong amount of copied files found when there should be "
+                            + count + ". Current files were: "
+                            + Arrays.toString(files),
+                    count, files.length);
+        });
 
     }
 

vaadin-dev-server/src/test/java/com/vaadin/base/devserver/viteproxy/ViteWebsocketConnectionTest.java

@@ -35,6 +35,7 @@
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpServer;
+import org.awaitility.Awaitility;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -136,7 +137,7 @@ public void close_clientWebsocketNotAvailable_dontBlock()
     }
 
     @SuppressWarnings("unchecked")
-    @Test(timeout = 2000)
+    @Test
     public void close_clientWebsocketClose_dontBlockIndefinitely()
             throws ExecutionException, InterruptedException,
             NoSuchFieldException, InvocationTargetException,
@@ -170,7 +171,11 @@ public void close_clientWebsocketClose_dontBlockIndefinitely()
                 });
         ReflectTools.setJavaFieldValue(connection, clientWebsocketField,
                 CompletableFuture.completedFuture(mockWebSocket));
-        connection.close();
+        Awaitility.await().atMost(2, TimeUnit.SECONDS).until(() -> {
+            connection.close();
+            return ReflectTools.getJavaFieldValue(connection,
+                    clientWebsocketField) == null;
+        });
         Assert.assertNull("Websocket connection failed", connectionError.get());
     }