Migrate spring-webflux test suite from JUnit 4 to JUnit Jupiter

See spring-projectsgh-23451

Author: sbrannen

spring-test/src/test/java/org/springframework/test/context/jdbc/PopulatedSchemaDatabaseConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ public PlatformTransactionManager transactionManager() {
 	@Bean
 	public DataSource dataSource() {
 		return new EmbeddedDatabaseBuilder()//
-		.setName("populated-sql-scripts-test-db")//
+		.generateUniqueName(true)
 		.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql") //
 		.build();
 	}

spring-web/src/test/java/org/springframework/http/server/reactive/AbstractHttpHandlerIntegrationTests.java

@@ -27,6 +27,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestExecutionExceptionHandler;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import reactor.core.publisher.Flux;
@@ -36,9 +38,40 @@
 import org.springframework.http.server.reactive.bootstrap.ReactorHttpServer;
 import org.springframework.http.server.reactive.bootstrap.TomcatHttpServer;
 import org.springframework.http.server.reactive.bootstrap.UndertowHttpServer;
+import org.springframework.util.StringUtils;
+import org.springframework.web.client.HttpServerErrorException;
 
 public abstract class AbstractHttpHandlerIntegrationTests {
 
+	/**
+	 * Custom JUnit Jupiter extension that handles exceptions thrown by test methods.
+	 *
+	 * <p>If the test method throws an {@link HttpServerErrorException}, this
+	 * extension will throw an {@link AssertionError} that wraps the
+	 * {@code HttpServerErrorException} using the
+	 * {@link HttpServerErrorException#getResponseBodyAsString() response body}
+	 * as the failure message.
+	 *
+	 * <p>This mechanism provides an actually meaningful failure message if the
+	 * test fails due to an {@code AssertionError} on the server.
+	 */
+	@RegisterExtension
+	TestExecutionExceptionHandler serverErrorToAssertionErrorConverter = (context, throwable) -> {
+		if (throwable instanceof HttpServerErrorException) {
+			HttpServerErrorException ex = (HttpServerErrorException) throwable;
+			String responseBody = ex.getResponseBodyAsString();
+			if (StringUtils.hasText(responseBody)) {
+				String prefix = AssertionError.class.getName() + ": ";
+				if (responseBody.startsWith(prefix)) {
+					responseBody = responseBody.substring(prefix.length());
+				}
+				throw new AssertionError(responseBody, ex);
+			}
+		}
+		// Else throw as-is in order to comply with the contract of TestExecutionExceptionHandler.
+		throw throwable;
+	};
+
 	protected final Log logger = LogFactory.getLog(getClass());
 
 	protected HttpServer server;
@@ -85,9 +118,10 @@ public static Flux<Long> testInterval(Duration period, int count) {
 
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target(ElementType.METHOD)
-	@ParameterizedTest
+	@ParameterizedTest(name = "{0}")
 	@MethodSource("org.springframework.http.server.reactive.AbstractHttpHandlerIntegrationTests#httpServers()")
-	protected @interface ParameterizedHttpServerTest {
+	// public for Kotlin
+	public @interface ParameterizedHttpServerTest {
 	}
 
 	static Stream<HttpServer> httpServers() {

spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java

@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -67,7 +67,7 @@ public class DispatcherHandlerErrorTests {
 	private DispatcherHandler dispatcherHandler;
 
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(TestConfig.class);

spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerTests.java

@@ -20,7 +20,7 @@
 import java.time.Duration;
 import java.util.function.Supplier;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 
 import org.springframework.context.support.StaticApplicationContext;

spring-webflux/src/test/java/org/springframework/web/reactive/FlushingIntegrationTests.java

@@ -19,8 +19,6 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -30,6 +28,7 @@
 import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.http.server.reactive.bootstrap.HttpServer;
 import org.springframework.web.reactive.function.client.WebClient;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -39,22 +38,25 @@
  *
  * @author Sebastien Deleuze
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 5.0
  */
-public class FlushingIntegrationTests extends AbstractHttpHandlerIntegrationTests {
+class FlushingIntegrationTests extends AbstractHttpHandlerIntegrationTests {
 
 	private WebClient webClient;
 
 
-	@Before
-	public void setup() throws Exception {
-		super.setup();
+	@Override
+	protected void startServer(HttpServer httpServer) throws Exception {
+		super.startServer(httpServer);
 		this.webClient = WebClient.create("http://localhost:" + this.port);
 	}
 
 
-	@Test
-	public void writeAndFlushWith() {
+	@ParameterizedHttpServerTest
+	void writeAndFlushWith(HttpServer httpServer) throws Exception {
+		startServer(httpServer);
+
 		Mono<String> result = this.webClient.get()
 				.uri("/write-and-flush")
 				.retrieve()
@@ -68,8 +70,10 @@ public void writeAndFlushWith() {
 				.verify(Duration.ofSeconds(10L));
 	}
 
-	@Test  // SPR-14991
-	public void writeAndAutoFlushOnComplete() {
+	@ParameterizedHttpServerTest  // SPR-14991
+	void writeAndAutoFlushOnComplete(HttpServer httpServer) throws Exception {
+		startServer(httpServer);
+
 		Mono<String> result = this.webClient.get()
 				.uri("/write-and-complete")
 				.retrieve()
@@ -93,8 +97,10 @@ public void writeAndAutoFlushOnComplete() {
 		}
 	}
 
-	@Test  // SPR-14992
-	public void writeAndAutoFlushBeforeComplete() {
+	@ParameterizedHttpServerTest  // SPR-14992
+	void writeAndAutoFlushBeforeComplete(HttpServer httpServer) throws Exception {
+		startServer(httpServer);
+
 		Mono<String> result = this.webClient.get()
 				.uri("/write-and-never-complete")
 				.retrieve()

spring-webflux/src/test/java/org/springframework/web/reactive/accept/HeaderContentTypeResolverTests.java

@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;

spring-webflux/src/test/java/org/springframework/web/reactive/accept/ParameterContentTypeResolverTests.java

@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;

spring-webflux/src/test/java/org/springframework/web/reactive/accept/RequestedContentTypeResolverBuilderTests.java

@@ -18,7 +18,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;

spring-webflux/src/test/java/org/springframework/web/reactive/config/CorsRegistryTests.java

@@ -19,7 +19,7 @@
 import java.util.Arrays;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.web.cors.CorsConfiguration;
 

spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java

@@ -19,13 +19,13 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.ReactiveAdapterRegistry;
@@ -49,7 +49,7 @@
  *
  * @author Brian Clozel
  */
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class DelegatingWebFluxConfigurationTests {
 
 	@Mock
@@ -67,7 +67,7 @@ public class DelegatingWebFluxConfigurationTests {
 	private DelegatingWebFluxConfiguration delegatingConfig;
 
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		delegatingConfig = new DelegatingWebFluxConfiguration();
 		delegatingConfig.setApplicationContext(new StaticApplicationContext());