diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerFactory.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerFactory.java index b8d4216640..8582af1bb3 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerFactory.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerFactory.java @@ -39,7 +39,7 @@ class WebTestClientContextCustomizerFactory implements ContextCustomizerFactory List configAttributes) { SpringBootTest springBootTest = TestContextAnnotationUtils.findMergedAnnotation(testClass, SpringBootTest.class); - return (springBootTest != null) ? new WebTestClientContextCustomizer() : null; + return (springBootTest != null && isWebClientPresent()) ? new WebTestClientContextCustomizer() : null; } private boolean isWebClientPresent() { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerFactoryWithWebfluxTest.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerFactoryWithWebfluxTest.java new file mode 100644 index 0000000000..2eb87d3fdd --- /dev/null +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerFactoryWithWebfluxTest.java @@ -0,0 +1,55 @@ +/* + * 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 { + + } + +} diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerFactoryWithoutWebfluxTest.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerFactoryWithoutWebfluxTest.java new file mode 100644 index 0000000000..4b16335280 --- /dev/null +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerFactoryWithoutWebfluxTest.java @@ -0,0 +1,57 @@ +/* + * 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.boot.testsupport.classpath.ClassPathExclusions; +import org.springframework.test.context.ContextCustomizer; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link WebTestClientContextCustomizerFactory} when spring webflux is not on + * the classpath. + * + * @author Tobias Gesellchen + */ +@ClassPathExclusions("spring-webflux*.jar") +public class WebTestClientContextCustomizerFactoryWithoutWebfluxTest { + + WebTestClientContextCustomizerFactory contextCustomizerFactory; + + @BeforeEach + void setup() { + this.contextCustomizerFactory = new WebTestClientContextCustomizerFactory(); + } + + @Test + void doNotCreateContextCustomizer() { + ContextCustomizer contextCustomizer = this.contextCustomizerFactory.createContextCustomizer(TestClass.class, + Collections.emptyList()); + assertThat(contextCustomizer).isNull(); + } + + @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) + static class TestClass { + + } + +}