Skip to content

Commit 1639ea1

Browse files
committed
test: container not auto start
1 parent a0a79a6 commit 1639ea1

File tree

9 files changed

+17
-1
lines changed

9 files changed

+17
-1
lines changed

generator/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ dependencies {
3333
implementation 'commons-codec:commons-codec:1.17.1'
3434

3535
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
36+
implementation 'ch.qos.logback:logback-classic:1.5.12'
3637

3738
implementation('org.apache.tomcat:tomcat-catalina:8.5.58') {
3839
exclude group: 'org.apache.tomcat', module: 'tomcat-api'

integration-test/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,9 @@ idea {
4242
test {
4343
dependsOn ":vul-webapp:war", ":vul-webapp-jakarta:war"
4444
useJUnitPlatform()
45+
// maxParallelForks Runtime.runtime.availableProcessors().intdiv(2) ?: 1
46+
// forkEvery = 1
47+
// systemProperty 'junit.jupiter.execution.parallel.enabled', 'true'
48+
// systemProperty 'junit.jupiter.execution.parallel.mode.default', 'concurrent'
4549
finalizedBy jacocoTestReport
4650
}

integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public class ContainerTool {
1717

1818

1919
public static String getUrl(GenericContainer<?> container) {
20-
container.start();
2120
String host = container.getHost();
2221
int port = container.getMappedPort(8080);
2322
String url = "http://" + host + ":" + port + "/app";

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.testcontainers.containers.GenericContainer;
1313
import org.testcontainers.containers.wait.strategy.Wait;
1414
import org.testcontainers.junit.jupiter.Container;
15+
import org.testcontainers.junit.jupiter.Testcontainers;
1516

1617
import java.util.stream.Stream;
1718

@@ -25,6 +26,7 @@
2526
* @since 2024/12/4
2627
*/
2728
@Slf4j
29+
@Testcontainers
2830
public class Tomcat10ContainerTest {
2931
public static final String imageName = "tomcat:10.1-jre11";
3032

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11ContainerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.testcontainers.containers.GenericContainer;
1313
import org.testcontainers.containers.wait.strategy.Wait;
1414
import org.testcontainers.junit.jupiter.Container;
15+
import org.testcontainers.junit.jupiter.Testcontainers;
1516

1617
import java.util.stream.Stream;
1718

@@ -25,6 +26,7 @@
2526
* @since 2024/12/4
2627
*/
2728
@Slf4j
29+
@Testcontainers
2830
public class Tomcat11ContainerTest {
2931

3032
public static final String imageName = "tomcat:11.0-jre17";

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.testcontainers.containers.GenericContainer;
1313
import org.testcontainers.containers.wait.strategy.Wait;
1414
import org.testcontainers.junit.jupiter.Container;
15+
import org.testcontainers.junit.jupiter.Testcontainers;
1516

1617
import java.util.stream.Stream;
1718

@@ -25,6 +26,7 @@
2526
* @since 2024/12/4
2627
*/
2728
@Slf4j
29+
@Testcontainers
2830
public class Tomcat6ContainerTest {
2931
public static final String imageName = "reajason/tomcat:6-jdk6";
3032

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.testcontainers.containers.GenericContainer;
1313
import org.testcontainers.containers.wait.strategy.Wait;
1414
import org.testcontainers.junit.jupiter.Container;
15+
import org.testcontainers.junit.jupiter.Testcontainers;
1516

1617
import java.util.stream.Stream;
1718

@@ -25,6 +26,7 @@
2526
* @since 2024/12/4
2627
*/
2728
@Slf4j
29+
@Testcontainers
2830
public class Tomcat7ContainerTest{
2931
public static final String imageName = "tomcat:7.0.85-jre7";
3032

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.testcontainers.containers.GenericContainer;
1313
import org.testcontainers.containers.wait.strategy.Wait;
1414
import org.testcontainers.junit.jupiter.Container;
15+
import org.testcontainers.junit.jupiter.Testcontainers;
1516

1617
import java.util.stream.Stream;
1718

@@ -25,6 +26,7 @@
2526
* @since 2024/12/4
2627
*/
2728
@Slf4j
29+
@Testcontainers
2830
public class Tomcat8ContainerTest {
2931
public static final String imageName = "tomcat:8-jre8";
3032

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.testcontainers.containers.GenericContainer;
1212
import org.testcontainers.containers.wait.strategy.Wait;
1313
import org.testcontainers.junit.jupiter.Container;
14+
import org.testcontainers.junit.jupiter.Testcontainers;
1415

1516
import java.util.stream.Stream;
1617

@@ -23,6 +24,7 @@
2324
* @author ReaJason
2425
* @since 2024/12/4
2526
*/
27+
@Testcontainers
2628
public class Tomcat9ContainerTest{
2729
public static final String imageName = "tomcat:9-jre9";
2830

0 commit comments

Comments
 (0)