test: container not auto start

This commit is contained in:
ReaJason
2024-12-07 02:15:15 +08:00
parent a0a79a68f7
commit 1639ea1e93
9 changed files with 17 additions and 1 deletions
+1
View File
@@ -33,6 +33,7 @@ dependencies {
implementation 'commons-codec:commons-codec:1.17.1' implementation 'commons-codec:commons-codec:1.17.1'
implementation 'com.squareup.okhttp3:okhttp:4.12.0' 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') { implementation('org.apache.tomcat:tomcat-catalina:8.5.58') {
exclude group: 'org.apache.tomcat', module: 'tomcat-api' exclude group: 'org.apache.tomcat', module: 'tomcat-api'
+4
View File
@@ -42,5 +42,9 @@ idea {
test { test {
dependsOn ":vul-webapp:war", ":vul-webapp-jakarta:war" dependsOn ":vul-webapp:war", ":vul-webapp-jakarta:war"
useJUnitPlatform() 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 finalizedBy jacocoTestReport
} }
@@ -17,7 +17,6 @@ public class ContainerTool {
public static String getUrl(GenericContainer<?> container) { public static String getUrl(GenericContainer<?> container) {
container.start();
String host = container.getHost(); String host = container.getHost();
int port = container.getMappedPort(8080); int port = container.getMappedPort(8080);
String url = "http://" + host + ":" + port + "/app"; String url = "http://" + host + ":" + port + "/app";
@@ -12,6 +12,7 @@ import org.junit.jupiter.params.provider.MethodSource;
import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -25,6 +26,7 @@ import static org.junit.jupiter.params.provider.Arguments.arguments;
* @since 2024/12/4 * @since 2024/12/4
*/ */
@Slf4j @Slf4j
@Testcontainers
public class Tomcat10ContainerTest { public class Tomcat10ContainerTest {
public static final String imageName = "tomcat:10.1-jre11"; public static final String imageName = "tomcat:10.1-jre11";
@@ -12,6 +12,7 @@ import org.junit.jupiter.params.provider.MethodSource;
import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -25,6 +26,7 @@ import static org.junit.jupiter.params.provider.Arguments.arguments;
* @since 2024/12/4 * @since 2024/12/4
*/ */
@Slf4j @Slf4j
@Testcontainers
public class Tomcat11ContainerTest { public class Tomcat11ContainerTest {
public static final String imageName = "tomcat:11.0-jre17"; public static final String imageName = "tomcat:11.0-jre17";
@@ -12,6 +12,7 @@ import org.junit.jupiter.params.provider.MethodSource;
import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -25,6 +26,7 @@ import static org.junit.jupiter.params.provider.Arguments.arguments;
* @since 2024/12/4 * @since 2024/12/4
*/ */
@Slf4j @Slf4j
@Testcontainers
public class Tomcat6ContainerTest { public class Tomcat6ContainerTest {
public static final String imageName = "reajason/tomcat:6-jdk6"; public static final String imageName = "reajason/tomcat:6-jdk6";
@@ -12,6 +12,7 @@ import org.junit.jupiter.params.provider.MethodSource;
import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -25,6 +26,7 @@ import static org.junit.jupiter.params.provider.Arguments.arguments;
* @since 2024/12/4 * @since 2024/12/4
*/ */
@Slf4j @Slf4j
@Testcontainers
public class Tomcat7ContainerTest{ public class Tomcat7ContainerTest{
public static final String imageName = "tomcat:7.0.85-jre7"; public static final String imageName = "tomcat:7.0.85-jre7";
@@ -12,6 +12,7 @@ import org.junit.jupiter.params.provider.MethodSource;
import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -25,6 +26,7 @@ import static org.junit.jupiter.params.provider.Arguments.arguments;
* @since 2024/12/4 * @since 2024/12/4
*/ */
@Slf4j @Slf4j
@Testcontainers
public class Tomcat8ContainerTest { public class Tomcat8ContainerTest {
public static final String imageName = "tomcat:8-jre8"; public static final String imageName = "tomcat:8-jre8";
@@ -11,6 +11,7 @@ import org.junit.jupiter.params.provider.MethodSource;
import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -23,6 +24,7 @@ import static org.junit.jupiter.params.provider.Arguments.arguments;
* @author ReaJason * @author ReaJason
* @since 2024/12/4 * @since 2024/12/4
*/ */
@Testcontainers
public class Tomcat9ContainerTest{ public class Tomcat9ContainerTest{
public static final String imageName = "tomcat:9-jre9"; public static final String imageName = "tomcat:9-jre9";