Skip to content

Commit fe86bc0

Browse files
committed
test: remove some packer test to speedup
1 parent 5c27b80 commit fe86bc0

File tree

52 files changed

+248
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+248
-83
lines changed

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish3ContainerTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,13 @@ static void setup() {
5858
static Stream<Arguments> casesProvider() {
5959
String server = Server.GlassFish;
6060
List<String> supportedShellTypes = List.of(
61-
ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
61+
ShellType.FILTER,
62+
ShellType.LISTENER,
63+
ShellType.VALVE,
6264
ShellType.AGENT_FILTER_CHAIN,
6365
ShellType.CATALINA_AGENT_CONTEXT_VALVE
6466
);
65-
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
67+
List<Packers> testPackers = List.of(Packers.JSP);
6668
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
6769
}
6870

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish4ContainerTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,13 @@ static void setup() {
5858
static Stream<Arguments> casesProvider() {
5959
String server = Server.GlassFish;
6060
List<String> supportedShellTypes = List.of(
61-
ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
61+
ShellType.FILTER,
62+
ShellType.LISTENER,
63+
ShellType.VALVE,
6264
ShellType.AGENT_FILTER_CHAIN,
6365
ShellType.CATALINA_AGENT_CONTEXT_VALVE
6466
);
65-
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
67+
List<Packers> testPackers = List.of(Packers.JSP);
6668
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
6769
}
6870

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish501ContainerTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,20 @@ public class GlassFish501ContainerTest {
5151
static Stream<Arguments> casesProvider() {
5252
String server = Server.GlassFish;
5353
List<String> supportedShellTypes = List.of(
54-
ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
54+
ShellType.FILTER,
55+
ShellType.LISTENER,
56+
ShellType.VALVE,
5557
ShellType.AGENT_FILTER_CHAIN,
5658
ShellType.CATALINA_AGENT_CONTEXT_VALVE
5759
);
58-
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
60+
List<Packers> testPackers = List.of(Packers.JSP);
5961
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
6062
}
6163

6264
@AfterAll
6365
static void tearDown() {
6466
String logs = container.getLogs();
67+
log.info(logs);
6568
assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
6669
}
6770

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish510ContainerTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,13 @@ public class GlassFish510ContainerTest {
5151
static Stream<Arguments> casesProvider() {
5252
String server = Server.GlassFish;
5353
List<String> supportedShellTypes = List.of(
54-
ShellType.FILTER, ShellType.LISTENER, ShellType.VALVE,
54+
ShellType.FILTER,
55+
ShellType.LISTENER,
56+
ShellType.VALVE,
5557
ShellType.AGENT_FILTER_CHAIN,
5658
ShellType.CATALINA_AGENT_CONTEXT_VALVE
5759
);
58-
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
60+
List<Packers> testPackers = List.of(Packers.JSP);
5961
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
6062
}
6163

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish6ContainerTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,13 @@ public class GlassFish6ContainerTest {
5252
static Stream<Arguments> casesProvider() {
5353
String server = Server.GlassFish;
5454
List<String> supportedShellTypes = List.of(
55-
ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE,
55+
ShellType.JAKARTA_FILTER,
56+
ShellType.JAKARTA_LISTENER,
57+
ShellType.JAKARTA_VALVE,
5658
ShellType.AGENT_FILTER_CHAIN,
5759
ShellType.CATALINA_AGENT_CONTEXT_VALVE
5860
);
59-
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
61+
List<Packers> testPackers = List.of(Packers.JSP);
6062
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
6163
}
6264

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish7ContainerTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,20 @@ public class GlassFish7ContainerTest {
5252
static Stream<Arguments> casesProvider() {
5353
String server = Server.GlassFish;
5454
List<String> supportedShellTypes = List.of(
55-
ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE,
55+
ShellType.JAKARTA_FILTER,
56+
ShellType.JAKARTA_LISTENER,
57+
ShellType.JAKARTA_VALVE,
5658
ShellType.AGENT_FILTER_CHAIN,
5759
ShellType.CATALINA_AGENT_CONTEXT_VALVE
5860
);
59-
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX);
61+
List<Packers> testPackers = List.of(Packers.JSP);
6062
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
6163
}
6264

6365
@AfterAll
6466
static void tearDown() {
6567
String logs = container.getLogs();
68+
log.info(logs);
6669
assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
6770
}
6871

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss423ContainerTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,14 @@ public class Jboss423ContainerTest {
5252
static Stream<Arguments> casesProvider() {
5353
String server = Server.JBoss;
5454
List<String> supportedShellTypes = List.of(
55-
ShellType.PROXY_VALVE
55+
ShellType.FILTER,
56+
ShellType.LISTENER,
57+
ShellType.VALVE,
58+
ShellType.PROXY_VALVE,
59+
ShellType.AGENT_FILTER_CHAIN,
60+
ShellType.CATALINA_AGENT_CONTEXT_VALVE
5661
);
57-
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
62+
List<Packers> testPackers = List.of(Packers.JSP);
5863
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
5964
}
6065

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss510ContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static Stream<Arguments> casesProvider() {
5858
ShellType.AGENT_FILTER_CHAIN,
5959
ShellType.CATALINA_AGENT_CONTEXT_VALVE
6060
);
61-
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
61+
List<Packers> testPackers = List.of(Packers.JSP);
6262
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers,
6363
null, List.of(ShellTool.Behinder) // Behinder SocketTimeOuts
6464
);

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss610ContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static Stream<Arguments> casesProvider() {
5757
ShellType.AGENT_FILTER_CHAIN,
5858
ShellType.CATALINA_AGENT_CONTEXT_VALVE
5959
);
60-
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
60+
List<Packers> testPackers = List.of(Packers.JSP);
6161
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
6262
}
6363

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss711ContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static Stream<Arguments> casesProvider() {
6060
ShellType.AGENT_FILTER_CHAIN,
6161
ShellType.CATALINA_AGENT_CONTEXT_VALVE
6262
);
63-
List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.ScriptEngine);
63+
List<Packers> testPackers = List.of(Packers.JSP);
6464
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
6565
}
6666

0 commit comments

Comments
 (0)