New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ensure the WebClient to be present before enabling the WebTestClientContextCustomizer #24152
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
...k/boot/test/web/reactive/server/WebTestClientContextCustomizerFactoryWithWebfluxTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 { | ||
|
||
} | ||
|
||
} |
57 changes: 57 additions & 0 deletions
57
...oot/test/web/reactive/server/WebTestClientContextCustomizerFactoryWithoutWebfluxTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 { | ||
|
||
} | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure, if there's a policy about changing the copyright notice to
...-2020
, but I guess that could be adjusted for the whole code base :)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We change the date whenever the file is updated. This should be 2020 but don't worry we'll take care of that when merging.