From 12d3b15244e7fb5d5a49d431b641024c6e56ca77 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 26 Feb 2021 15:42:13 +0000 Subject: [PATCH] Ensure that Jersey's filter has a servlet at the end of its chain See gh-25449 --- .../smoketest/jersey/AbstractJerseyManagementPortTests.java | 3 +-- .../java/smoketest/jersey/JerseyFilterApplicationTests.java | 2 +- .../java/smoketest/jersey/JerseyFilterManagementPortTests.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/AbstractJerseyManagementPortTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/AbstractJerseyManagementPortTests.java index 22f3ac5ea65..f5abaeda11c 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/AbstractJerseyManagementPortTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/AbstractJerseyManagementPortTests.java @@ -43,8 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Madhura Bhave */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - properties = { "management.server.port=0", "debug=true" }) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = "management.server.port=0") @Import(ResourceConfigConfiguration.class) class AbstractJerseyManagementPortTests { diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyFilterApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyFilterApplicationTests.java index 957bfbf0620..5fd452d717b 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyFilterApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyFilterApplicationTests.java @@ -23,7 +23,7 @@ import org.springframework.test.context.TestPropertySource; * * @author Andy Wilkinson */ -@TestPropertySource(properties = "spring.jersey.type=filter") +@TestPropertySource(properties = { "spring.jersey.type=filter", "server.servlet.register-default-servlet=true" }) class JerseyFilterApplicationTests extends AbstractJerseyApplicationTests { } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyFilterManagementPortTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyFilterManagementPortTests.java index a8785637d2d..db7a9c5960a 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyFilterManagementPortTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyFilterManagementPortTests.java @@ -24,7 +24,7 @@ import org.springframework.test.context.TestPropertySource; * * @author Andy Wilkinson */ -@TestPropertySource(properties = "spring.jersey.type=filter") +@TestPropertySource(properties = { "spring.jersey.type=filter", "server.servlet.register-default-servlet=true" }) public class JerseyFilterManagementPortTests extends AbstractJerseyManagementPortTests { }