refactor: rename

1. 将枚举 Server 改为字符串常量,使得 memshell 和 probeshell 都能共用
2. 移除 memshell 模块直接内置在 generator 中
3. 通用类从 memshell 移动至 javaweb 下,命名修改,增加辨识度
This commit is contained in:
ReaJason
2025-08-13 23:53:40 +08:00
parent a513e44c96
commit b2c614eea4
354 changed files with 1094 additions and 1387 deletions
@@ -1,6 +1,6 @@
package com.reajason.javaweb.integration;
import com.reajason.javaweb.memshell.Server;
import com.reajason.javaweb.memshell.ServerFactory;
import com.reajason.javaweb.memshell.ShellTool;
import com.reajason.javaweb.memshell.ShellType;
import com.reajason.javaweb.packer.Packers;
@@ -20,7 +20,7 @@ import static org.junit.jupiter.params.provider.Arguments.arguments;
public class TestCasesProvider {
public static Stream<Arguments> getTestCases(String imageName,
Server server,
String server,
List<String> testShellTypes,
List<Packers> testPackers,
List<Triple<String, ShellTool, Packers>> unSupportedCases) {
@@ -28,12 +28,12 @@ public class TestCasesProvider {
}
public static Stream<Arguments> getTestCases(String imageName,
Server server,
String server,
List<String> testShellTypes,
List<Packers> testPackers,
List<Triple<String, ShellTool, Packers>> unSupportedCases,
List<ShellTool> unSupportedShellTools) {
Set<ShellTool> supportedShellTools = new TreeSet<>(server.getShell().getSupportedShellTools());
Set<ShellTool> supportedShellTools = new TreeSet<>(ServerFactory.getServer(server).getSupportedShellTools());
if (unSupportedShellTools != null) {
unSupportedShellTools.forEach(supportedShellTools::remove);
}
@@ -46,7 +46,7 @@ public class TestCasesProvider {
return supportedShellTools.stream()
.flatMap(supportedShellTool -> {
List<String> toolSupportedShellTypes = new ArrayList<>();
Set<String> supportedShellTypes = server.getShell().getSupportedShellTypes(supportedShellTool);
Set<String> supportedShellTypes = ServerFactory.getServer(server).getSupportedShellTypes(supportedShellTool);
for (String testShellType : testShellTypes) {
if (supportedShellTypes.contains(testShellType)) {
toolSupportedShellTypes.add(testShellType);
@@ -81,7 +81,7 @@ public class TestCasesProvider {
}
public static Stream<Arguments> getTestCases(String imageName,
Server server,
String server,
List<String> testShellTypes,
List<Packers> testPackers) {
return getTestCases(imageName, server, testShellTypes, testPackers, null);