Test deployment on server

Author: OndroMih

images/server/7.1.0/docs/content.md

@@ -55,6 +55,14 @@ Follow these steps:
 docker run -p 8080:8080 -p 4848:4848 -v /deployments:/deploy @docker.glassfish.repository@
 ```
 
+Alternatively, you can mount a specific WAR file directly:
+
+```
+docker run -p 8080:8080 -p 4848:4848 -v /deployment/application.war:/deploy/application.war @docker.glassfish.repository@
+```
+
+**Note**: GlassFish Server deploys applications using the WAR filename as the context path (e.g., `application.war` becomes accessible at `/application/`).
+
 Then you can open the application in the browser with:
 
 * http://localhost:9080/application

src/test/java/org/glassfish/main/distributions/docker/embedded/EmbeddedDeploymentIT.java

@@ -26,7 +26,7 @@
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
-import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getEmbeddedApplication;
+import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getApplication;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -43,29 +43,8 @@ public class EmbeddedDeploymentIT {
 
     @Test
     void deployedApplicationIsAccessible() throws Exception {
-        // Wait for the GLASSFISH STARTED message in logs
-        long startTime = System.currentTimeMillis();
-        boolean glassfishStarted = false;
-        while (!glassfishStarted && (System.currentTimeMillis() - startTime) < 120000) { // 2 minutes
-            String logs = server.getLogs();
-            if (logs.contains("GLASSFISH STARTED")) {
-                glassfishStarted = true;
-            } else {
-                Thread.sleep(1000); // Wait 1 second before checking again
-            }
-        }
-
-        if (!glassfishStarted) {
-            System.err.println("Full logs: " + server.getLogs());
-            throw new RuntimeException("GlassFish did not start within 2 minutes");
-        }
-
-        System.err.println("GlassFish started successfully, checking application deployment...");
-
         // Verify the application is deployed by checking if it's accessible
-        final HttpResponse<String> appResponse = getEmbeddedApplication(server, "/index.html");
-        System.err.println("Response status: " + appResponse.statusCode());
-        System.err.println("Response body: " + appResponse.body());
+        final HttpResponse<String> appResponse = getApplication(server, "/index.html");
         assertEquals(200, appResponse.statusCode(), "Application response status code");
         assertTrue(appResponse.body().contains("Hello from test app"), "Application should return Hello message");
     }

…ributions/docker/server/StartServIT.java …ions/docker/server/StartAndDeployIT.javasrc/test/java/org/glassfish/main/distributions/docker/server/StartServIT.java renamed to src/test/java/org/glassfish/main/distributions/docker/server/StartAndDeployIT.java src/test/java/org/glassfish/main/distributions/docker/server/StartServIT.java renamed to src/test/java/org/glassfish/main/distributions/docker/server/StartAndDeployIT.java

@@ -19,22 +19,27 @@
 import java.net.http.HttpResponse;
 
 import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getServerDefaultRoot;
+import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getApplication;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.stringContainsInOrder;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Testcontainers
-public class StartServIT {
+public class StartAndDeployIT {
 
     @SuppressWarnings({"rawtypes", "resource"})
     @Container
     private final GenericContainer server = new GenericContainer<>(System.getProperty("server.docker.glassfish.image"))
-        .withCommand("startserv").withExposedPorts(8080)
+        .withCommand("startserv")
+        .withExposedPorts(8080)
+        .withFileSystemBind("target/test-classes/application-test.war", "/deploy/application-test.war", BindMode.READ_ONLY)
         .withLogConsumer(o -> System.err.print("GF: " + o.getUtf8String()));
 
     @Test
@@ -43,4 +48,11 @@ void rootResourceGivesOkWithDefaultResponse() throws Exception {
         assertEquals(200, defaultRootResponse.statusCode(), "Response status code");
         assertThat(defaultRootResponse.body(), stringContainsInOrder("Eclipse GlassFish", "index.html", "production-quality"));
     }
+
+    @Test
+    void deployedApplicationIsAccessible() throws Exception {
+        final HttpResponse<String> appResponse = getApplication(server, "/application-test/index.html");
+        assertEquals(200, appResponse.statusCode(), "Application response status code");
+        assertTrue(appResponse.body().contains("Hello from test app"), "Application should return Hello message");
+    }
 }

src/test/java/org/glassfish/main/distributions/docker/testutils/HttpUtilities.java

@@ -23,6 +23,7 @@
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.time.Duration;
 import java.util.Base64;
 
 import javax.net.ssl.SSLContext;
@@ -33,6 +34,7 @@
 import org.testcontainers.containers.GenericContainer;
 
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
+import static java.time.Duration.ofSeconds;
 
 /**
  *
@@ -59,12 +61,27 @@ public static HttpResponse<String> getEmbeddedDefaultRoot(GenericContainer serve
         }
     }
 
-    public static HttpResponse<String> getEmbeddedApplication(GenericContainer server, String appPath) throws Exception {
+    public static HttpResponse<String> getApplication(GenericContainer server, String appPath) throws Exception {
         URI uri = URI.create("http://localhost:" + server.getMappedPort(8080) + appPath);
-        try (HttpClient client = newInsecureHttpClient()) {
-            final HttpRequest request = HttpRequest.newBuilder(uri).build();
-            return client.send(request, ofString(StandardCharsets.UTF_8));
+
+        // Wait up to 30 seconds for the application to become available
+        long startTime = System.currentTimeMillis();
+        HttpResponse<String> response = null;
+
+        while ((System.currentTimeMillis() - startTime) < Duration.ofSeconds(30).toMillis()) {
+            try (HttpClient client = newInsecureHttpClient()) {
+                final HttpRequest request = HttpRequest.newBuilder(uri).build();
+                response = client.send(request, ofString(StandardCharsets.UTF_8));
+
+                if (response.statusCode() == 200) {
+                    return response;
+                }
+
+                Thread.sleep(ofSeconds(1)); // Wait 1 second before retrying
+            }
         }
+
+        return response; // Return the last response (likely 404)
     }
 
     public static HttpResponse<String> getAdminResource(GenericContainer server, String resourcePath, UserPassword userPass) throws Exception {