File tree Expand file tree Collapse file tree 9 files changed +17
-1
lines changed
src/test/java/com/reajason/javaweb/integration Expand file tree Collapse file tree 9 files changed +17
-1
lines changed Original file line number Diff line number Diff 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'
Original file line number Diff line number Diff line change 4242test {
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}
Original file line number Diff line number Diff 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" ;
Original file line number Diff line number Diff line change 1212import org .testcontainers .containers .GenericContainer ;
1313import org .testcontainers .containers .wait .strategy .Wait ;
1414import org .testcontainers .junit .jupiter .Container ;
15+ import org .testcontainers .junit .jupiter .Testcontainers ;
1516
1617import java .util .stream .Stream ;
1718
2526 * @since 2024/12/4
2627 */
2728@ Slf4j
29+ @ Testcontainers
2830public class Tomcat10ContainerTest {
2931 public static final String imageName = "tomcat:10.1-jre11" ;
3032
Original file line number Diff line number Diff line change 1212import org .testcontainers .containers .GenericContainer ;
1313import org .testcontainers .containers .wait .strategy .Wait ;
1414import org .testcontainers .junit .jupiter .Container ;
15+ import org .testcontainers .junit .jupiter .Testcontainers ;
1516
1617import java .util .stream .Stream ;
1718
2526 * @since 2024/12/4
2627 */
2728@ Slf4j
29+ @ Testcontainers
2830public class Tomcat11ContainerTest {
2931
3032 public static final String imageName = "tomcat:11.0-jre17" ;
Original file line number Diff line number Diff line change 1212import org .testcontainers .containers .GenericContainer ;
1313import org .testcontainers .containers .wait .strategy .Wait ;
1414import org .testcontainers .junit .jupiter .Container ;
15+ import org .testcontainers .junit .jupiter .Testcontainers ;
1516
1617import java .util .stream .Stream ;
1718
2526 * @since 2024/12/4
2627 */
2728@ Slf4j
29+ @ Testcontainers
2830public class Tomcat6ContainerTest {
2931 public static final String imageName = "reajason/tomcat:6-jdk6" ;
3032
Original file line number Diff line number Diff line change 1212import org .testcontainers .containers .GenericContainer ;
1313import org .testcontainers .containers .wait .strategy .Wait ;
1414import org .testcontainers .junit .jupiter .Container ;
15+ import org .testcontainers .junit .jupiter .Testcontainers ;
1516
1617import java .util .stream .Stream ;
1718
2526 * @since 2024/12/4
2627 */
2728@ Slf4j
29+ @ Testcontainers
2830public class Tomcat7ContainerTest {
2931 public static final String imageName = "tomcat:7.0.85-jre7" ;
3032
Original file line number Diff line number Diff line change 1212import org .testcontainers .containers .GenericContainer ;
1313import org .testcontainers .containers .wait .strategy .Wait ;
1414import org .testcontainers .junit .jupiter .Container ;
15+ import org .testcontainers .junit .jupiter .Testcontainers ;
1516
1617import java .util .stream .Stream ;
1718
2526 * @since 2024/12/4
2627 */
2728@ Slf4j
29+ @ Testcontainers
2830public class Tomcat8ContainerTest {
2931 public static final String imageName = "tomcat:8-jre8" ;
3032
Original file line number Diff line number Diff line change 1111import org .testcontainers .containers .GenericContainer ;
1212import org .testcontainers .containers .wait .strategy .Wait ;
1313import org .testcontainers .junit .jupiter .Container ;
14+ import org .testcontainers .junit .jupiter .Testcontainers ;
1415
1516import java .util .stream .Stream ;
1617
2324 * @author ReaJason
2425 * @since 2024/12/4
2526 */
27+ @ Testcontainers
2628public class Tomcat9ContainerTest {
2729 public static final String imageName = "tomcat:9-jre9" ;
2830
You can’t perform that action at this time.
0 commit comments