test: add tomcat5 container

ReaJason · ReaJason · commit 742b63890a8e · 2024-12-08T23:26:32.000+08:00
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty61ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty61ContainerTest.java
@@ -6,7 +6,6 @@
 import com.reajason.javaweb.memsell.packer.Packer;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -33,7 +32,7 @@ public class Jetty61ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
+//                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP), // 不支持，初始化 Filter 时 jdk6 下会抛 Caused by: java.lang.NoClassDefFoundError: java/lang/ReflectiveOperationException
                 arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
                 arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
                 arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP)
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty76ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty76ContainerTest.java
@@ -30,7 +30,7 @@ public class Jetty76ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
+//                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP), // 不支持，初始化 Filter 时 jdk6 下会抛 Caused by: java.lang.NoClassDefFoundError: java/lang/ReflectiveOperationException
                 arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
                 arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
                 arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP)
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java
@@ -43,14 +43,14 @@ static Stream<Arguments> casesProvider() {
     }
 
     @Container
-    public final static GenericContainer<?> tomcat = new GenericContainer<>(imageName)
+    public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warJakartaFile, "/usr/local/tomcat/webapps/app.war")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
-        testShellInjectAssertOk(getUrl(tomcat), Server.TOMCAT, shellType, shellTool, Opcodes.V11, packer);
+        testShellInjectAssertOk(getUrl(container), Server.TOMCAT, shellType, shellTool, Opcodes.V11, packer);
     }
 }
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11ContainerTest.java
@@ -44,14 +44,14 @@ static Stream<Arguments> casesProvider() {
     }
 
     @Container
-    public final static GenericContainer<?> tomcat = new GenericContainer<>(imageName)
+    public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warJakartaFile, "/usr/local/tomcat/webapps/app.war")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
-        testShellInjectAssertOk(getUrl(tomcat), Server.TOMCAT, shellType, shellTool, Opcodes.V17, packer);
+        testShellInjectAssertOk(getUrl(container), Server.TOMCAT, shellType, shellTool, Opcodes.V17, packer);
     }
 }
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat5ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat5ContainerTest.java
@@ -0,0 +1,62 @@
+package com.reajason.javaweb.integration.tomcat;
+
+import com.reajason.javaweb.config.Constants;
+import com.reajason.javaweb.config.Server;
+import com.reajason.javaweb.config.ShellTool;
+import com.reajason.javaweb.memsell.packer.Packer;
+import lombok.extern.slf4j.Slf4j;
+import net.bytebuddy.jar.asm.Opcodes;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+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;
+
+import static com.reajason.javaweb.integration.ContainerTool.getUrl;
+import static com.reajason.javaweb.integration.ContainerTool.warFile;
+import static com.reajason.javaweb.integration.ShellAssertionTool.testShellInjectAssertOk;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/4
+ */
+@Slf4j
+@Testcontainers
+public class Tomcat5ContainerTest {
+    public static final String imageName = "reajason/tomcat:5-jdk6";
+
+    static Stream<Arguments> casesProvider() {
+        return Stream.of(
+//                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP), // 不支持，初始化 Filter 时 jdk6 下会抛 Caused by: java.lang.NoClassDefFoundError: java/lang/ReflectiveOperationException
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP)
+//                arguments(imageName, TomcatShell.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP), // 不支持，Caused by: java.lang.NoClassDefFoundError: org/apache/catalina/Valve
+//                arguments(imageName, TomcatShell.VALVE, ShellTool.Command, Packer.INSTANCE.JSP)
+        );
+    }
+
+    @Container
+    public final static GenericContainer<?> container = new GenericContainer<>(imageName)
+            .withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")
+            .waitingFor(Wait.forHttp("/app"))
+            .withExposedPorts(8080);
+
+
+    @ParameterizedTest(name = "{0}|{1}{2}|{3}")
+    @MethodSource("casesProvider")
+    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+        testShellInjectAssertOk(getUrl(container), Server.TOMCAT, shellType, shellTool, Opcodes.V1_6, packer);
+    }
+
+//    @AfterAll
+//    static void tearDown() {
+//        log.info(container.getLogs());
+//    }
+}
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java
@@ -7,7 +7,6 @@
 import com.reajason.javaweb.memsell.tomcat.TomcatShell;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -34,7 +33,7 @@ public class Tomcat6ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
+//                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP), // 不支持，初始化 Filter 时 jdk6 下会抛 Caused by: java.lang.NoClassDefFoundError: java/lang/ReflectiveOperationException
                 arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
                 arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
                 arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java
@@ -43,14 +43,14 @@ static Stream<Arguments> casesProvider() {
     }
 
     @Container
-    public final static GenericContainer<?> tomcat = new GenericContainer<>(imageName)
+    public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
-        testShellInjectAssertOk(getUrl(tomcat), Server.TOMCAT, shellType, shellTool, Opcodes.V1_7, packer);
+        testShellInjectAssertOk(getUrl(container), Server.TOMCAT, shellType, shellTool, Opcodes.V1_7, packer);
     }
 }
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java
@@ -49,14 +49,14 @@ static Stream<Arguments> casesProvider() {
     }
 
     @Container
-    public final static GenericContainer<?> tomcat = new GenericContainer<>(imageName)
+    public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
-        testShellInjectAssertOk(getUrl(tomcat), Server.TOMCAT, shellType, shellTool, Opcodes.V1_8, packer);
+        testShellInjectAssertOk(getUrl(container), Server.TOMCAT, shellType, shellTool, Opcodes.V1_8, packer);
     }
 }
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java
@@ -41,14 +41,14 @@ static Stream<Arguments> casesProvider() {
     }
 
     @Container
-    public final static GenericContainer<?> tomcat = new GenericContainer<>(imageName)
+    public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
-        testShellInjectAssertOk(getUrl(tomcat), Server.TOMCAT, shellType, shellTool, Opcodes.V9, packer);
+        testShellInjectAssertOk(getUrl(container), Server.TOMCAT, shellType, shellTool, Opcodes.V9, packer);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,14 @@ static Stream<Arguments> casesProvider() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Container`
`46`		`- public final static GenericContainer<?> tomcat = new GenericContainer<>(imageName)`
	`46`	`+ public final static GenericContainer<?> container = new GenericContainer<>(imageName)`
`47`	`47`	`.withCopyToContainer(warJakartaFile, "/usr/local/tomcat/webapps/app.war")`
`48`	`48`	`.waitingFor(Wait.forHttp("/app"))`
`49`	`49`	`.withExposedPorts(8080);`
`50`	`50`
`51`	`51`	`@ParameterizedTest(name = "{0}\|{1}{2}\|{3}")`
`52`	`52`	`@MethodSource("casesProvider")`
`53`	`53`	`void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {`
`54`		`- testShellInjectAssertOk(getUrl(tomcat), Server.TOMCAT, shellType, shellTool, Opcodes.V11, packer);`
	`54`	`+ testShellInjectAssertOk(getUrl(container), Server.TOMCAT, shellType, shellTool, Opcodes.V11, packer);`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,14 +44,14 @@ static Stream<Arguments> casesProvider() {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Container`
`47`		`- public final static GenericContainer<?> tomcat = new GenericContainer<>(imageName)`
	`47`	`+ public final static GenericContainer<?> container = new GenericContainer<>(imageName)`
`48`	`48`	`.withCopyToContainer(warJakartaFile, "/usr/local/tomcat/webapps/app.war")`
`49`	`49`	`.waitingFor(Wait.forHttp("/app"))`
`50`	`50`	`.withExposedPorts(8080);`
`51`	`51`
`52`	`52`	`@ParameterizedTest(name = "{0}\|{1}{2}\|{3}")`
`53`	`53`	`@MethodSource("casesProvider")`
`54`	`54`	`void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {`
`55`		`- testShellInjectAssertOk(getUrl(tomcat), Server.TOMCAT, shellType, shellTool, Opcodes.V17, packer);`
	`55`	`+ testShellInjectAssertOk(getUrl(container), Server.TOMCAT, shellType, shellTool, Opcodes.V17, packer);`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,14 +49,14 @@ static Stream<Arguments> casesProvider() {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Container`
`52`		`- public final static GenericContainer<?> tomcat = new GenericContainer<>(imageName)`
	`52`	`+ public final static GenericContainer<?> container = new GenericContainer<>(imageName)`
`53`	`53`	`.withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")`
`54`	`54`	`.waitingFor(Wait.forHttp("/app"))`
`55`	`55`	`.withExposedPorts(8080);`
`56`	`56`
`57`	`57`	`@ParameterizedTest(name = "{0}\|{1}{2}\|{3}")`
`58`	`58`	`@MethodSource("casesProvider")`
`59`	`59`	`void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {`
`60`		`- testShellInjectAssertOk(getUrl(tomcat), Server.TOMCAT, shellType, shellTool, Opcodes.V1_8, packer);`
	`60`	`+ testShellInjectAssertOk(getUrl(container), Server.TOMCAT, shellType, shellTool, Opcodes.V1_8, packer);`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,14 @@ static Stream<Arguments> casesProvider() {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Container`
`44`		`- public final static GenericContainer<?> tomcat = new GenericContainer<>(imageName)`
	`44`	`+ public final static GenericContainer<?> container = new GenericContainer<>(imageName)`
`45`	`45`	`.withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")`
`46`	`46`	`.waitingFor(Wait.forHttp("/app"))`
`47`	`47`	`.withExposedPorts(8080);`
`48`	`48`
`49`	`49`	`@ParameterizedTest(name = "{0}\|{1}{2}\|{3}")`
`50`	`50`	`@MethodSource("casesProvider")`
`51`	`51`	`void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {`
`52`		`- testShellInjectAssertOk(getUrl(tomcat), Server.TOMCAT, shellType, shellTool, Opcodes.V9, packer);`
	`52`	`+ testShellInjectAssertOk(getUrl(container), Server.TOMCAT, shellType, shellTool, Opcodes.V9, packer);`
`53`	`53`	`}`
`54`	`54`	`}`