test: wait for /app

Author: ReaJason

integration-test/docker-compose/tomcat/docker-compose-10.1-jre11-nginx.yaml

@@ -1,20 +1,13 @@
 services:
   tomcat:
     image: tomcat:10.1-jre11
-    networks:
-      - app_network
     volumes:
       - ../../../vul/vul-webapp-jakarta/build/libs/vul-webapp-jakarta.war:/usr/local/tomcat/webapps/app.war
   nginx:
     image: nginx:latest
     ports:
       - "80:80"
-    networks:
-      - app_network
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
     depends_on:
-      - tomcat
-networks:
-  app_network:
-    driver: bridge
+      - tomcat

integration-test/docker-compose/tomcat/docker-compose-8-jre8-nginx.yaml

@@ -1,20 +1,13 @@
 services:
   tomcat:
     image: tomcat:8-jre8
-    networks:
-      - app_network
     volumes:
       - ../../../vul/vul-webapp/build/libs/vul-webapp.war:/usr/local/tomcat/webapps/app.war
   nginx:
     image: nginx:latest
     ports:
       - "80:80"
-    networks:
-      - app_network
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
     depends_on:
-      - tomcat
-networks:
-  app_network:
-    driver: bridge
+      - tomcat

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat10WebSocketBypassNginxTest.java

@@ -11,9 +11,11 @@
 import com.reajason.javaweb.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 import org.objectweb.asm.Opcodes;
 import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -35,6 +37,7 @@ public class Tomcat10WebSocketBypassNginxTest {
     @Container
     public static final ComposeContainer compose =
             new ComposeContainer(new File("docker-compose/tomcat/docker-compose-10.1-jre11-nginx.yaml"))
+                    .withExposedService("tomcat", 8080, Wait.forHttp("/app/"))
                     .withExposedService("nginx", 80);
 
     @Test

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8WebSocketBypassNginxTest.java

@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.Test;
 import org.objectweb.asm.Opcodes;
 import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -36,13 +37,9 @@ public class Tomcat8WebSocketBypassNginxTest {
     @Container
     public static final ComposeContainer compose =
             new ComposeContainer(new File("docker-compose/tomcat/docker-compose-8-jre8-nginx.yaml"))
+                    .withExposedService("tomcat", 8080, Wait.forHttp("/app/"))
                     .withExposedService("nginx", 80);
 
-    @AfterAll
-    static void tearDown() {
-        log.info(compose.getContainerByServiceName("tomcat").get().getLogs());
-    }
-
     public static String getUrl() {
         String host = compose.getServiceHost("nginx", 80);
         int port = compose.getServicePort("nginx", 80);