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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2017-05-02 21:38:09 +02:00
parent b709c77329
commit 7f19e57d9d
4 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java
View File

@@ -21,13 +21,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import static org.springframework.core.ResolvableType.forClassWithGenerics;
import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
import reactor.core.publisher.Mono;
import org.springframework.core.ResolvableType;
@@ -45,29 +39,34 @@ import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import static org.junit.Assert.*;
/**
* @author Sebastien Deleuze
*/
public class MultipartHttpMessageWriterTests {
private final MultipartHttpMessageWriter writer = new MultipartHttpMessageWriter(
Arrays.asList(
new EncoderHttpMessageWriter<>(CharSequenceEncoder.textPlainOnly()),
new ResourceHttpMessageWriter(),
new EncoderHttpMessageWriter<>(new Jackson2JsonEncoder())
private final MultipartHttpMessageWriter writer = new MultipartHttpMessageWriter(Arrays.asList(
new EncoderHttpMessageWriter<>(CharSequenceEncoder.textPlainOnly()),
new ResourceHttpMessageWriter(),
new EncoderHttpMessageWriter<>(new Jackson2JsonEncoder())
));
@Test
public void canWrite() {
assertTrue(this.writer.canWrite(forClassWithGenerics(MultiValueMap.class, String.class, Object.class),
assertTrue(this.writer.canWrite(
ResolvableType.forClassWithGenerics(MultiValueMap.class, String.class, Object.class),
MediaType.MULTIPART_FORM_DATA));
assertTrue(this.writer.canWrite(forClassWithGenerics(MultiValueMap.class, String.class, String.class),
assertTrue(this.writer.canWrite(
ResolvableType.forClassWithGenerics(MultiValueMap.class, String.class, String.class),
MediaType.MULTIPART_FORM_DATA));
assertFalse(this.writer.canWrite(forClassWithGenerics(Map.class, String.class, Object.class),
assertFalse(this.writer.canWrite(
ResolvableType.forClassWithGenerics(Map.class, String.class, Object.class),
MediaType.MULTIPART_FORM_DATA));
assertFalse(this.writer.canWrite(forClassWithGenerics(MultiValueMap.class, String.class, Object.class),
assertFalse(this.writer.canWrite(
ResolvableType.forClassWithGenerics(MultiValueMap.class, String.class, Object.class),
MediaType.APPLICATION_FORM_URLENCODED));
}
@@ -105,14 +104,13 @@ public class MultipartHttpMessageWriterTests {
// see if Synchronoss NIO Multipart can read what we wrote
SynchronossMultipartHttpMessageReader reader = new SynchronossMultipartHttpMessageReader();
MockServerHttpRequest request = MockServerHttpRequest.post("/foo")
.header(CONTENT_TYPE, contentType.toString())
.header(HttpHeaders.CONTENT_TYPE, contentType.toString())
.body(response.getBody());
ResolvableType elementType = forClassWithGenerics(MultiValueMap.class, String.class, Part.class);
ResolvableType elementType = ResolvableType.forClassWithGenerics(MultiValueMap.class, String.class, Part.class);
MultiValueMap<String, Part> requestParts = reader.readMono(elementType, request, hints).block();
assertEquals(5, requestParts.size());
Part part = requestParts.getFirst("name 1");
assertEquals("name 1", part.getName());
assertEquals("value 1", part.getContentAsString().block());
@@ -147,6 +145,7 @@ public class MultipartHttpMessageWriterTests {
assertEquals("{\"bar\":\"bar\"}", part.getContentAsString().block());
}
private class Foo {
private String bar;