test: container not auto start

ReaJason · Dec 6, 2024 · 1639ea1 · 1639ea1
1 parent a0a79a6
commit 1639ea1
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 1 deletion.
diff --git a/generator/build.gradle b/generator/build.gradle
@@ -33,6 +33,7 @@ dependencies {
     implementation 'commons-codec:commons-codec:1.17.1'
 
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+    implementation 'ch.qos.logback:logback-classic:1.5.12'
 
     implementation('org.apache.tomcat:tomcat-catalina:8.5.58') {
         exclude group: 'org.apache.tomcat', module: 'tomcat-api'

diff --git a/integration-test/build.gradle b/integration-test/build.gradle
@@ -42,5 +42,9 @@ idea {
 test {
     dependsOn ":vul-webapp:war", ":vul-webapp-jakarta:war"
     useJUnitPlatform()
+//    maxParallelForks Runtime.runtime.availableProcessors().intdiv(2) ?: 1
+//    forkEvery = 1
+//    systemProperty 'junit.jupiter.execution.parallel.enabled', 'true'
+//    systemProperty 'junit.jupiter.execution.parallel.mode.default', 'concurrent'
     finalizedBy jacocoTestReport
 }
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java b/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java
@@ -17,7 +17,6 @@ public class ContainerTool {
 
 
     public static String getUrl(GenericContainer<?> container) {
-        container.start();
         String host = container.getHost();
         int port = container.getMappedPort(8080);
         String url = "http://" + host + ":" + port + "/app";

diff --git a/...ion-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java b/...ion-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java
@@ -12,6 +12,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.util.stream.Stream;
 
@@ -25,6 +26,7 @@
  * @since 2024/12/4
  */
 @Slf4j
+@Testcontainers
 public class Tomcat10ContainerTest {
     public static final String imageName = "tomcat:10.1-jre11";
 

diff --git a/...ion-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11ContainerTest.java b/...ion-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11ContainerTest.java
@@ -12,6 +12,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.util.stream.Stream;
 
@@ -25,6 +26,7 @@
  * @since 2024/12/4
  */
 @Slf4j
+@Testcontainers
 public class Tomcat11ContainerTest {
 
     public static final String imageName = "tomcat:11.0-jre17";

diff --git a/...tion-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java b/...tion-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java
@@ -12,6 +12,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.util.stream.Stream;
 
@@ -25,6 +26,7 @@
  * @since 2024/12/4
  */
 @Slf4j
+@Testcontainers
 public class Tomcat6ContainerTest {
     public static final String imageName = "reajason/tomcat:6-jdk6";
 

diff --git a/...tion-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java b/...tion-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java
@@ -12,6 +12,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.util.stream.Stream;
 
@@ -25,6 +26,7 @@
  * @since 2024/12/4
  */
 @Slf4j
+@Testcontainers
 public class Tomcat7ContainerTest{
     public static final String imageName = "tomcat:7.0.85-jre7";
 

diff --git a/...tion-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java b/...tion-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java
@@ -12,6 +12,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.util.stream.Stream;
 
@@ -25,6 +26,7 @@
  * @since 2024/12/4
  */
 @Slf4j
+@Testcontainers
 public class Tomcat8ContainerTest {
     public static final String imageName = "tomcat:8-jre8";
 

diff --git a/...tion-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java b/...tion-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java
@@ -11,6 +11,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.util.stream.Stream;
 
@@ -23,6 +24,7 @@
  * @author ReaJason
  * @since 2024/12/4
  */
+@Testcontainers
 public class Tomcat9ContainerTest{
     public static final String imageName = "tomcat:9-jre9";