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

Equal MockServerHttpResponse in spring-test and -web

Browse Source
This commit is contained in:
Rossen Stoyanchev
2016-12-14 04:53:13 -05:00
parent 4519c236d6
commit c66dd01724
3 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-web/src/test/java/org/springframework/mock/http/server/reactive/test/MockServerHttpRequest.java
View File

@@ -35,6 +35,7 @@ import org.springframework.util.MultiValueMap;
/**
* Mock implementation of {@link ServerHttpRequest}.
* @author Rossen Stoyanchev
* @since 5.0
*/
public class MockServerHttpRequest implements ServerHttpRequest {

15
spring-web/src/test/java/org/springframework/mock/http/server/reactive/test/MockServerHttpResponse.java
View File

@@ -41,6 +41,7 @@ import org.springframework.util.MultiValueMap;
/**
* Mock implementation of {@link ServerHttpResponse}.
* @author Rossen Stoyanchev
* @since 5.0
*/
public class MockServerHttpResponse implements ServerHttpResponse {
@@ -106,7 +107,7 @@ public class MockServerHttpResponse implements ServerHttpResponse {
@Override
public Mono<Void> writeAndFlushWith(Publisher<? extends Publisher<? extends DataBuffer>> body) {
this.bodyWithFlushes = Flux.from(body).map(p -> Flux.from(p));
this.bodyWithFlushes = Flux.from(body).map(Flux::from);
return this.bodyWithFlushes.then();
}
@@ -131,22 +132,22 @@ public class MockServerHttpResponse implements ServerHttpResponse {
*/
public Mono<String> getBodyAsString() {
Charset charset = getCharset();
Charset charsetToUse = (charset != null ? charset : StandardCharsets.UTF_8);
return Flux.from(this.body)
.reduce(this.bufferFactory.allocateBuffer(), (previous, current) -> {
return Flux.from(getBody())
.reduce(bufferFactory().allocateBuffer(), (previous, current) -> {
previous.write(current);
DataBufferUtils.release(current);
return previous;
})
.map(buffer -> DataBufferTestUtils.dumpString(buffer, charsetToUse));
.map(buffer -> DataBufferTestUtils.dumpString(buffer, charset));
}
private Charset getCharset() {
Charset charset = null;
MediaType contentType = getHeaders().getContentType();
if (contentType != null) {
return contentType.getCharset();
charset = contentType.getCharset();
}
return null;
return (charset != null ? charset : StandardCharsets.UTF_8);
}
}