Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Rossen Stoyanchev
2019-06-21 14:15:26 +01:00
parent 0e5a38591f 594c5806a6
commit 030caea9cf
2 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java
View File

@@ -92,7 +92,7 @@ public class ChannelSendOperatorTests {
@Test
public void writeMultipleItems() throws Exception {
public void writeMultipleItems() {
List<String> items = Arrays.asList("one", "two", "three");
Mono<Void> completion = Flux.fromIterable(items).as(this::sendOperator);
Signal<Void> signal = completion.materialize().block();
@@ -108,7 +108,7 @@ public class ChannelSendOperatorTests {
}
@Test
public void errorAfterMultipleItems() throws Exception {
public void errorAfterMultipleItems() {
IllegalStateException error = new IllegalStateException("boo");
Flux<String> publisher = Flux.generate(() -> 0, (idx , subscriber) -> {
int i = ++idx;
@@ -213,6 +213,25 @@ public class ChannelSendOperatorTests {
bufferFactory.checkForLeaks();
}
@Test // gh-23175
public void errorInWriteFunction() {
StepVerifier
.create(new ChannelSendOperator<>(Mono.just("one"), p -> {
throw new IllegalStateException("boo");
}))
.expectErrorMessage("boo")
.verify(Duration.ofMillis(5000));
StepVerifier
.create(new ChannelSendOperator<>(Mono.empty(), p -> {
throw new IllegalStateException("boo");
}))
.expectErrorMessage("boo")
.verify(Duration.ofMillis(5000));
}
private <T> Mono<Void> sendOperator(Publisher<String> source){
return new ChannelSendOperator<>(source, writer::send);
}