Polish "Check that WebClient is available"

See gh-24152

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerFactoryWithWebfluxTest.java

@@ -1,55 +0,0 @@
-/*
- * Copyright 2012-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.boot.test.web.reactive.server;
-
-import java.util.Collections;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ContextCustomizer;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for {@link WebTestClientContextCustomizerFactory} when spring webflux is on the
- * classpath.
- *
- * @author Tobias Gesellchen
- */
-class WebTestClientContextCustomizerFactoryWithWebfluxTest {
-
-	WebTestClientContextCustomizerFactory contextCustomizerFactory;
-
-	@BeforeEach
-	void setup() {
-		this.contextCustomizerFactory = new WebTestClientContextCustomizerFactory();
-	}
-
-	@Test
-	void createContextCustomizer() {
-		ContextCustomizer contextCustomizer = this.contextCustomizerFactory.createContextCustomizer(TestClass.class,
-				Collections.emptyList());
-		assertThat(contextCustomizer).isNotNull();
-	}
-
-	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-	static class TestClass {
-
-	}
-
-}

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithoutWebfluxIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -17,7 +17,6 @@ package org.springframework.boot.test.web.reactive.server;
 
 import java.util.Collections;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.test.context.SpringBootTest;
@@ -31,26 +30,21 @@ import static org.assertj.core.api.Assertions.assertThat;
  * the classpath.
  *
  * @author Tobias Gesellchen
+ * @author Stephane Nicoll
  */
 @ClassPathExclusions("spring-webflux*.jar")
-public class WebTestClientContextCustomizerFactoryWithoutWebfluxTest {
+public class WebTestClientContextCustomizerWithoutWebfluxIntegrationTests {
-
-	WebTestClientContextCustomizerFactory contextCustomizerFactory;
-
-	@BeforeEach
-	void setup() {
-		this.contextCustomizerFactory = new WebTestClientContextCustomizerFactory();
-	}
 
 	@Test
-	void doNotCreateContextCustomizer() {
+	void customizerIsNotCreatedWithoutWebClient() {
-		ContextCustomizer contextCustomizer = this.contextCustomizerFactory.createContextCustomizer(TestClass.class,
+		WebTestClientContextCustomizerFactory contextCustomizerFactory = new WebTestClientContextCustomizerFactory();
+		ContextCustomizer contextCustomizer = contextCustomizerFactory.createContextCustomizer(TestClass.class,
 				Collections.emptyList());
 		assertThat(contextCustomizer).isNull();
 	}
 
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-	static class TestClass {
+	private static class TestClass {
 
 	}