From 2d6f52307541ddc9a35e6370d0cc5393cc48c6eb Mon Sep 17 00:00:00 2001 From: ReaJason Date: Fri, 29 Nov 2024 18:05:28 +0800 Subject: [PATCH] test: add tomcat6-jdk6 integration-test --- .../java/com/reajason/javaweb/config/ShellConfig.java | 2 +- integration-test/src/test/java/tomcat/GodzillaTest.java | 8 -------- .../src/test/java/tomcat/TomcatGodzillaTest.java | 5 +++-- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/generator/src/main/java/com/reajason/javaweb/config/ShellConfig.java b/generator/src/main/java/com/reajason/javaweb/config/ShellConfig.java index aef4c6a9..8f5cbfb4 100644 --- a/generator/src/main/java/com/reajason/javaweb/config/ShellConfig.java +++ b/generator/src/main/java/com/reajason/javaweb/config/ShellConfig.java @@ -24,5 +24,5 @@ public class ShellConfig { @Builder.Default private String urlPattern = "/*"; @Builder.Default - private int targetJdkVersion = Opcodes.V1_5; + private int targetJdkVersion = Constants.DEFAULT_VERSION; } \ No newline at end of file diff --git a/integration-test/src/test/java/tomcat/GodzillaTest.java b/integration-test/src/test/java/tomcat/GodzillaTest.java index 2f251e7b..42e7a4c0 100644 --- a/integration-test/src/test/java/tomcat/GodzillaTest.java +++ b/integration-test/src/test/java/tomcat/GodzillaTest.java @@ -14,14 +14,6 @@ import godzilla.BaseGodzillaTest; */ public interface GodzillaTest extends BaseGodzillaTest { - default String generateGodzillaJsp(GodzillaShellConfig config, String shellType) { - Server server = Server.TOMCAT; - ShellTool shellTool = ShellTool.Godzilla; - GenerateResult generateResult = GeneratorMain.generate(server, shellTool, shellType, config); - JspPacker jspPacker = new JspPacker(); - return new String(jspPacker.pack(generateResult)); - } - default String generateGodzillaJsp(GodzillaShellConfig config, String shellType, int targetJdkVersion) { Server server = Server.TOMCAT; ShellTool shellTool = ShellTool.Godzilla; diff --git a/integration-test/src/test/java/tomcat/TomcatGodzillaTest.java b/integration-test/src/test/java/tomcat/TomcatGodzillaTest.java index 9afea897..33b7fa2d 100644 --- a/integration-test/src/test/java/tomcat/TomcatGodzillaTest.java +++ b/integration-test/src/test/java/tomcat/TomcatGodzillaTest.java @@ -26,10 +26,11 @@ public class TomcatGodzillaTest implements GodzillaTest { public static final MountableFile warFile = MountableFile.forHostPath(Paths.get("../vul-webapp/build/libs/vul-webapp.war").toAbsolutePath()); public static final MountableFile warJakartaFile = MountableFile.forHostPath(Paths.get("../vul-webapp-jakarta/build/libs/vul-webapp-jakarta.war").toAbsolutePath()); - public static final String tomcat6ImageName = "tomcat:6.0.53-jre7"; + // https://hub.docker.com/_/tomcat/tags + public static final String tomcat6ImageName = "reajason/tomcat:6-jdk6"; public static final String tomcat7ImageName = "tomcat:7.0.85-jre7"; public static final String tomcat8ImageName = "tomcat:8-jre8"; - public static final String tomcat9ImageName = "tomcat:9-jre8"; + public static final String tomcat9ImageName = "tomcat:9-jre9"; public static final String tomcat10ImageName = "tomcat:10.1-jre11"; public static final String tomcat11ImageName = "tomcat:11.0-jre17";