Polish "switch junit 4 tests to junit 5"

See gh-2365

spring-cloud-gateway-mvc/src/test/java/org/springframework/cloud/gateway/mvc/GetWithBodyRequestTests.java

@@ -23,7 +23,6 @@ import java.util.Collections;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -45,7 +44,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -56,7 +54,6 @@ import org.springframework.web.client.RestTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ContextConfiguration(classes = GetWithBodyRequestTests.TestApplication.class)
 public class GetWithBodyRequestTests {

spring-cloud-gateway-mvc/src/test/java/org/springframework/cloud/gateway/mvc/ProductionConfigurationTests.java

@@ -25,7 +25,6 @@ import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -45,7 +44,6 @@ import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -58,7 +56,6 @@ import org.springframework.web.util.UriComponentsBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(properties = { "spring.cloud.gateway.proxy.auto-forward=Baz" },
 		webEnvironment = WebEnvironment.RANDOM_PORT)
 @ContextConfiguration(classes = TestApplication.class)

spring-cloud-gateway-mvc/src/test/java/org/springframework/cloud/gateway/mvc/config/ProxyExchangeArgumentResolverTest.java

@@ -22,7 +22,6 @@ import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -38,14 +37,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.DefaultResponseErrorHandler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @ContextConfiguration(classes = ProxyExchangeArgumentResolverTest.ProxyExchangeArgumentResolverTestApplication.class)
 public class ProxyExchangeArgumentResolverTest {

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java

@@ -26,7 +26,6 @@ import java.util.function.Predicate;
 import org.assertj.core.util.Maps;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
@@ -49,7 +48,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.server.ServerWebExchange;
@@ -57,7 +55,6 @@ import org.springframework.web.server.ServerWebExchange;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(properties = { "management.endpoint.gateway.enabled=true",
 		"management.endpoints.web.exposure.include=*", "spring.cloud.gateway.actuator.verbose.enabled=true" },
 		webEnvironment = RANDOM_PORT)

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayMetricsAutoConfigurationTests.java

@@ -51,7 +51,7 @@ public class GatewayMetricsAutoConfigurationTests {
 
 	@Nested
 	@SpringBootTest(classes = Config.class)
-	public static class EnabledByDefault {
+	public class EnabledByDefault {
 
 		@Autowired(required = false)
 		private GatewayMetricsFilter filter;
@@ -90,7 +90,7 @@ public class GatewayMetricsAutoConfigurationTests {
 
 	@Nested
 	@SpringBootTest(classes = Config.class, properties = "spring.cloud.gateway.metrics.enabled=false")
-	public static class DisabledByProperty {
+	public class DisabledByProperty {
 
 		@Autowired(required = false)
 		private GatewayMetricsFilter filter;
@@ -112,7 +112,7 @@ public class GatewayMetricsAutoConfigurationTests {
 
 	@Nested
 	@SpringBootTest(classes = Config.class, properties = "spring.cloud.gateway.observability.enabled=false")
-	public static class ObservabilityDisabledByProperty {
+	public class ObservabilityDisabledByProperty {
 
 		@Autowired
 		private BeanFactory beanFactory;
@@ -135,7 +135,7 @@ public class GatewayMetricsAutoConfigurationTests {
 	@Nested
 	@SpringBootTest(classes = CustomTagsProviderConfig.class,
 			properties = "spring.cloud.gateway.metrics.prefix=myprefix.")
-	public static class AddCustomTagsProvider {
+	public class AddCustomTagsProvider {
 
 		@Autowired(required = false)
 		private GatewayMetricsFilter filter;

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/conditional/DisableBuiltInFiltersTests.java

@@ -42,7 +42,7 @@ public class DisableBuiltInFiltersTests {
 
 	@Nested
 	@SpringBootTest(classes = Config.class)
-	public static class FilterDefault {
+	public class FilterDefault {
 
 		@Autowired
 		private List<GatewayFilterFactory<?>> gatewayFilters;
@@ -59,7 +59,7 @@ public class DisableBuiltInFiltersTests {
 			properties = { "spring.cloud.gateway.filter.add-request-header.enabled=false",
 					"spring.cloud.gateway.filter.map-request-header.enabled=false" })
 	@ActiveProfiles("disable-components")
-	public static class DisableSpecificsFiltersByProperty {
+	public class DisableSpecificsFiltersByProperty {
 
 		@Autowired
 		private List<GatewayFilterFactory<?>> gatewayFilters;
@@ -114,7 +114,7 @@ public class DisableBuiltInFiltersTests {
 					"spring.cloud.gateway.filter.cache-request-body.enabled=false",
 					"spring.cloud.gateway.filter.fallback-headers.enabled=false" })
 	@ActiveProfiles("disable-components")
-	public static class DisableAllFiltersByProperty {
+	public class DisableAllFiltersByProperty {
 
 		@Autowired(required = false)
 		private List<GatewayFilterFactory<?>> gatewayFilters;

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/conditional/DisableBuiltInGlobalFiltersTests.java

@@ -42,7 +42,7 @@ public class DisableBuiltInGlobalFiltersTests {
 
 	@Nested
 	@SpringBootTest(classes = Config.class)
-	public static class GlobalFilterDefault {
+	public class GlobalFilterDefault {
 
 		@Autowired
 		private List<GlobalFilter> globalFilters;
@@ -59,7 +59,7 @@ public class DisableBuiltInGlobalFiltersTests {
 			properties = { "spring.cloud.gateway.global-filter.remove-cached-body.enabled=false",
 					"spring.cloud.gateway.global-filter.route-to-request-url.enabled=false" })
 	@ActiveProfiles("disable-components")
-	public static class DisableSpecificsFiltersByProperty {
+	public class DisableSpecificsFiltersByProperty {
 
 		@Autowired
 		private List<GlobalFilter> globalFilters;
@@ -88,7 +88,7 @@ public class DisableBuiltInGlobalFiltersTests {
 					"spring.cloud.gateway.global-filter.load-balancer-service-instance-cookie.enabled=false",
 					"spring.cloud.gateway.metrics.enabled=false" })
 	@ActiveProfiles("disable-components")
-	public static class DisableAllGlobalFiltersByProperty {
+	public class DisableAllGlobalFiltersByProperty {
 
 		@Autowired(required = false)
 		private List<GlobalFilter> globalFilters;

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/conditional/DisableBuiltInPredicatesTests.java

@@ -42,7 +42,7 @@ public class DisableBuiltInPredicatesTests {
 
 	@Nested
 	@SpringBootTest(classes = Config.class)
-	public static class RoutePredicateDefault {
+	public class RoutePredicateDefault {
 
 		@Autowired
 		private List<RoutePredicateFactory<?>> predicates;
@@ -59,7 +59,7 @@ public class DisableBuiltInPredicatesTests {
 			properties = { "spring.cloud.gateway.predicate.after.enabled=false",
 					"spring.cloud.gateway.predicate.before.enabled=false" })
 	@ActiveProfiles("disable-components")
-	public static class DisableSpecificsPredicatesByProperty {
+	public class DisableSpecificsPredicatesByProperty {
 
 		@Autowired
 		private List<RoutePredicateFactory<?>> predicates;
@@ -87,7 +87,7 @@ public class DisableBuiltInPredicatesTests {
 			"spring.cloud.gateway.predicate.weight.enabled=false",
 			"spring.cloud.gateway.predicate.cloud-foundry-route-service.enabled=false" })
 	@ActiveProfiles("disable-components")
-	public static class DisableAllPredicatesByProperty {
+	public class DisableAllPredicatesByProperty {
 
 		@Autowired(required = false)
 		private List<RoutePredicateFactory<?>> predicates;

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteDefinitionLocatorIntegrationTests.java

@@ -20,7 +20,6 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import reactor.core.publisher.Flux;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,11 +34,9 @@ import org.springframework.cloud.gateway.route.Route;
 import org.springframework.cloud.gateway.route.RouteLocator;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = DiscoveryClientRouteDefinitionLocatorIntegrationTests.Config.class,
 		properties = { "spring.cloud.gateway.discovery.locator.enabled=true",
 				"spring.cloud.gateway.discovery.locator.route-id-prefix=test__" })

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteDefinitionLocatorTests.java

@@ -21,7 +21,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import reactor.core.publisher.Flux;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +33,6 @@ import org.springframework.cloud.gateway.filter.FilterDefinition;
 import org.springframework.cloud.gateway.handler.predicate.PredicateDefinition;
 import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -43,7 +41,6 @@ import static org.springframework.cloud.gateway.filter.factory.RewritePathGatewa
 import static org.springframework.cloud.gateway.filter.factory.RewritePathGatewayFilterFactory.REPLACEMENT_KEY;
 import static org.springframework.cloud.gateway.handler.predicate.RoutePredicateFactory.PATTERN_KEY;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = DiscoveryClientRouteDefinitionLocatorTests.Config.class,
 		properties = { "spring.cloud.gateway.discovery.locator.enabled=true",
 				"spring.cloud.gateway.discovery.locator.route-id-prefix=testedge_",

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/discovery/ReactiveGatewayDiscoveryClientAutoConfigurationTests.java

@@ -20,7 +20,6 @@ import java.util.List;
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
@@ -28,11 +27,10 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.gateway.config.GatewayLoadBalancerProperties;
 import org.springframework.cloud.gateway.route.RouteDefinition;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ExtendWith(SpringExtension.class)
+//@ExtendWith(SpringExtension.class)
 public class ReactiveGatewayDiscoveryClientAutoConfigurationTests {
 
 	@Nested
@@ -40,7 +38,7 @@ public class ReactiveGatewayDiscoveryClientAutoConfigurationTests {
 			properties = { "spring.cloud.gateway.discovery.locator.enabled=true",
 					"spring.cloud.gateway.loadbalancer.use404=true",
 					"spring.cloud.discovery.client.simple.instances.service[0].uri=https://service1:443" })
-	public static class EnabledByProperty {
+	public class EnabledByProperty {
 
 		@Autowired(required = false)
 		private DiscoveryClientRouteDefinitionLocator locator;
@@ -64,7 +62,7 @@ public class ReactiveGatewayDiscoveryClientAutoConfigurationTests {
 
 	@Nested
 	@SpringBootTest(classes = Config.class)
-	public static class DisabledByDefault {
+	public class DisabledByDefault {
 
 		@Autowired(required = false)
 		private DiscoveryClientRouteDefinitionLocator locator;

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/WeightCalculatorWebFilterConcurrentTests.java

@@ -26,7 +26,6 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import reactor.core.publisher.Mono;
 
@@ -42,7 +41,6 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilterChain;
 
@@ -53,7 +51,6 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
  *
  * @author Alexey Nakidkin
  */
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = RANDOM_PORT)
 @ActiveProfiles("weights-concurrent")
 @DirtiesContext

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ratelimit/PrincipalNameKeyResolverIntegrationTests.java

@@ -25,7 +25,6 @@ import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import reactor.core.publisher.Mono;
 
 import org.springframework.beans.factory.annotation.Value;
@@ -43,7 +42,6 @@ import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.web.server.SecurityWebFilterChain;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.util.TestSocketUtils;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -54,7 +52,6 @@ import org.springframework.web.bind.annotation.RestController;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT;
 import static org.springframework.web.reactive.function.client.ExchangeFilterFunctions.basicAuthentication;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = DEFINED_PORT)
 @ActiveProfiles("principalname")
 public class PrincipalNameKeyResolverIntegrationTests {

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiterConfigTests.java

@@ -18,7 +18,6 @@ package org.springframework.cloud.gateway.filter.ratelimit;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
@@ -30,14 +29,12 @@ import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Spencer Gibb
  */
-@ExtendWith(SpringExtension.class)
 @SpringBootTest
 @DirtiesContext
 @ActiveProfiles("redis-rate-limiter-config")

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiterDefaultFilterConfigTests.java

@@ -18,7 +18,6 @@ package org.springframework.cloud.gateway.filter.ratelimit;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
@@ -28,7 +27,6 @@ import org.springframework.cloud.gateway.route.Route;
 import org.springframework.cloud.gateway.route.RouteLocator;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -36,7 +34,6 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Spencer Gibb
  * @author Denis Cutic
  */
-@ExtendWith(SpringExtension.class)
 @SpringBootTest
 @DirtiesContext
 @ActiveProfiles("redis-rate-limiter-default-config")

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingTests.java

@@ -32,7 +32,6 @@ import org.springframework.cloud.gateway.route.RouteLocator;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.web.server.ServerWebExchange;
 
-
 /**
  * @author Simon Baslé
  */
@@ -41,20 +40,20 @@ public class RoutePredicateHandlerMappingTests {
 
 	@Test
 	public void lookupRouteFromSyncPredicates(CapturedOutput capturedOutput) {
-			Route routeFalse = Route.async().id("routeFalse").uri("http://localhost").predicate(swe -> false).build();
-			Route routeFail = Route.async().id("routeFail").uri("http://localhost").predicate(swe -> {
-				throw new IllegalStateException("boom");
-			}).build();
-			Route routeTrue = Route.async().id("routeTrue").uri("http://localhost").predicate(swe -> true).build();
-			RouteLocator routeLocator = () -> Flux.just(routeFalse, routeFail, routeTrue).hide();
-			RoutePredicateHandlerMapping mapping = new RoutePredicateHandlerMapping(null, routeLocator,
-					new GlobalCorsProperties(), new MockEnvironment());
+		Route routeFalse = Route.async().id("routeFalse").uri("http://localhost").predicate(swe -> false).build();
+		Route routeFail = Route.async().id("routeFail").uri("http://localhost").predicate(swe -> {
+			throw new IllegalStateException("boom");
+		}).build();
+		Route routeTrue = Route.async().id("routeTrue").uri("http://localhost").predicate(swe -> true).build();
+		RouteLocator routeLocator = () -> Flux.just(routeFalse, routeFail, routeTrue).hide();
+		RoutePredicateHandlerMapping mapping = new RoutePredicateHandlerMapping(null, routeLocator,
+				new GlobalCorsProperties(), new MockEnvironment());
 
-			final Mono<Route> routeMono = mapping.lookupRoute(Mockito.mock(ServerWebExchange.class));
+		final Mono<Route> routeMono = mapping.lookupRoute(Mockito.mock(ServerWebExchange.class));
 
-			StepVerifier.create(routeMono.map(Route::getId)).expectNext("routeTrue").verifyComplete();
-			Assertions.assertTrue(capturedOutput.getOut().contains("Error applying predicate for route: routeFail"));
-			Assertions.assertTrue(capturedOutput.getOut().contains("java.lang.IllegalStateException: boom"));
+		StepVerifier.create(routeMono.map(Route::getId)).expectNext("routeTrue").verifyComplete();
+		Assertions.assertTrue(capturedOutput.getOut().contains("Error applying predicate for route: routeFail"));
+		Assertions.assertTrue(capturedOutput.getOut().contains("java.lang.IllegalStateException: boom"));
 	}
 
 	@Test

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/predicate/ReadBodyRoutePredicateFactoryTests.java

@@ -19,7 +19,6 @@ package org.springframework.cloud.gateway.handler.predicate;
 import java.util.function.Predicate;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
@@ -38,7 +37,6 @@ import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -52,7 +50,6 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 /**
  * @author Ryan Baxter
  */
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = RANDOM_PORT)
 @DirtiesContext
 public class ReadBodyRoutePredicateFactoryTests {

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/route/RouteDefinitionDefaultIdTests.java

@@ -17,7 +17,6 @@
 package org.springframework.cloud.gateway.route;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
@@ -28,13 +27,11 @@ import org.springframework.cloud.gateway.test.BaseWebClientTests;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.web.bind.annotation.RestController;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = RANDOM_PORT)
 @DirtiesContext
 @ActiveProfiles("defaultid")

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/route/builder/RouteBuilderTests.java

@@ -21,7 +21,6 @@ import java.util.Map;
 
 import org.assertj.core.util.Maps;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import reactor.test.StepVerifier;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +28,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.gateway.route.RouteLocator;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.springframework.cloud.gateway.support.RouteMetadataUtils.CONNECT_TIMEOUT_ATTR;
 import static org.springframework.cloud.gateway.support.RouteMetadataUtils.RESPONSE_TIMEOUT_ATTR;
@@ -38,7 +36,6 @@ import static org.springframework.cloud.gateway.support.RouteMetadataUtils.RESPO
  * @author Biju Kunjummen
  */
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest
 public class RouteBuilderTests {
 

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/support/ShortcutConfigurableNonRestrictiveTests.java

@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,11 +31,9 @@ import org.springframework.cloud.gateway.support.ShortcutConfigurable.ShortcutTy
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(properties = "spring.cloud.gateway.restrictive-property-accessor.enabled=false")
 public class ShortcutConfigurableNonRestrictiveTests {
 

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/support/ShortcutConfigurableTests.java

@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,12 +32,10 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.expression.spel.SpelEvaluationException;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest
 public class ShortcutConfigurableTests {
 

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/test/ForwardTests.java

@@ -21,7 +21,6 @@ import java.util.Map;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -30,14 +29,12 @@ import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = RANDOM_PORT)
 @DirtiesContext
 @SuppressWarnings("unchecked")

spring-cloud-gateway-server/src/test/kotlin/org/springframework/cloud/gateway/route/builder/RouteDslTests.kt

@@ -17,7 +17,6 @@
 package org.springframework.cloud.gateway.route.builder
 
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.test.context.SpringBootTest
@@ -31,7 +30,6 @@ import reactor.core.publisher.toMono
 import reactor.test.StepVerifier
 import java.net.URI
 
-@ExtendWith(SpringExtension::class)
 @SpringBootTest(classes = arrayOf(Config::class))
 class RouteDslTests {
 

spring-cloud-gateway-webflux/src/test/java/org/springframework/cloud/gateway/webflux/ProductionConfigurationTests.java

@@ -25,7 +25,6 @@ import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -48,7 +47,6 @@ import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -60,7 +58,6 @@ import org.springframework.web.util.UriComponentsBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(properties = { "spring.cloud.gateway.proxy.auto-forward=baz" },
 		webEnvironment = WebEnvironment.RANDOM_PORT)
 @ContextConfiguration(classes = TestApplication.class)

spring-cloud-gateway-webflux/src/test/java/org/springframework/cloud/gateway/webflux/ReactiveTests.java

@@ -22,7 +22,6 @@ import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -42,7 +41,6 @@ import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.lang.Nullable;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -54,7 +52,6 @@ import org.springframework.web.server.ServerWebExchange;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @ContextConfiguration(classes = TestApplication.class)
 public class ReactiveTests {