fix: glassfish container not run in expected

ReaJason · Dec 12, 2024 · e1d851b · e1d851b
1 parent d9a7bac
commit e1d851b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...est/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java b/...est/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java
@@ -37,7 +37,8 @@ public class GlassFish3ContainerTest {
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/glassfish3/glassfish/domains/domain1/autodeploy/app.war")
-            .waitingFor(Wait.forLogMessage(".*startup time.*", 1))
+            .waitingFor(Wait.forLogMessage(".*done.*", 1))
+            .waitingFor(Wait.forHttp("/app/"))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
@@ -60,6 +61,7 @@ static Stream<Arguments> casesProvider() {
     @AfterAll
     static void tearDown() {
         String logs = container.getLogs();
+        log.info(logs);
         assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
     }
 

diff --git a/...est/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish4ContainerTest.java b/...est/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish4ContainerTest.java
@@ -37,7 +37,8 @@ public class GlassFish4ContainerTest {
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/glassfish4/glassfish/domains/domain1/autodeploy/app.war")
-            .waitingFor(Wait.forLogMessage(".*startup time.*", 1))
+            .waitingFor(Wait.forLogMessage(".*done.*", 1))
+            .waitingFor(Wait.forHttp("/app/"))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
@@ -60,6 +61,7 @@ static Stream<Arguments> casesProvider() {
     @AfterAll
     static void tearDown() {
         String logs = container.getLogs();
+        log.info(logs);
         assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
     }