Skip to content

Commit

Permalink
Check that WebClient is available
Browse files Browse the repository at this point in the history
This commit reinstanties the isWeBClientPresent() check so that
WebTestClientContextCustomizer is only added if a web client is
available.

See gh-24152
  • Loading branch information
gesellix authored and snicoll committed Nov 25, 2020
1 parent b1678ee commit f6255cc
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 1 deletion.
Expand Up @@ -39,7 +39,7 @@ public ContextCustomizer createContextCustomizer(Class<?> testClass,
List<ContextConfigurationAttributes> configAttributes) {
SpringBootTest springBootTest = TestContextAnnotationUtils.findMergedAnnotation(testClass,
SpringBootTest.class);
return (springBootTest != null) ? new WebTestClientContextCustomizer() : null;
return (springBootTest != null && isWebClientPresent()) ? new WebTestClientContextCustomizer() : null;
}

private boolean isWebClientPresent() {
Expand Down
@@ -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 {

}

}
@@ -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 {

}

}

0 comments on commit f6255cc

Please sign in to comment.