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

Update tests according to latest reactor-test changes

Browse Source 
- ScriptedSubscriber has been renamed to Verifier
 - The Publisher is passed to create() instead of verify()
 - No more need to specify the generic type explicitly
 - Version is now sync with reactor-core

Issue: SPR-14800
This commit is contained in:
Sebastien Deleuze
2016-11-01 17:54:53 +01:00
parent 9000acd39d
commit b4b7c278df
49 changed files with 387 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-web/src/test/java/org/springframework/http/codec/BodyExtractorsTests.java
View File

@@ -28,7 +28,7 @@ import org.junit.Before;
import org.junit.Test;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.core.codec.ByteBufferDecoder;
import org.springframework.core.codec.StringDecoder;
@@ -80,10 +80,10 @@ public class BodyExtractorsTests {
Mono<String> result = extractor.extract(request, this.context);
ScriptedSubscriber.<String>create()
Verifier.create(result)
.expectNext("foo")
.expectComplete()
.verify(result);
.verify();
}
@Test
@@ -100,10 +100,10 @@ public class BodyExtractorsTests {
Flux<String> result = extractor.extract(request, this.context);
ScriptedSubscriber.<String>create()
Verifier.create(result)
.expectNext("foo")
.expectComplete()
.verify(result);
.verify();
}
@Test
@@ -127,9 +127,9 @@ public class BodyExtractorsTests {
};
Flux<String> result = extractor.extract(request, emptyContext);
ScriptedSubscriber.create()
Verifier.create(result)
.expectError(UnsupportedMediaTypeException.class)
.verify(result);
.verify();
}
}

24
spring-web/src/test/java/org/springframework/http/codec/BodyInsertersTests.java
View File

@@ -28,7 +28,7 @@ import org.junit.Before;
import org.junit.Test;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.core.codec.ByteBufferEncoder;
import org.springframework.core.codec.CharSequenceEncoder;
@@ -85,14 +85,14 @@ public class BodyInsertersTests {
MockServerHttpResponse response = new MockServerHttpResponse();
Mono<Void> result = inserter.insert(response, this.context);
ScriptedSubscriber.create().expectComplete().verify(result);
Verifier.create(result).expectComplete().verify();
ByteBuffer byteBuffer = ByteBuffer.wrap(body.getBytes(UTF_8));
DataBuffer buffer = new DefaultDataBufferFactory().wrap(byteBuffer);
ScriptedSubscriber.<DataBuffer>create()
Verifier.create(response.getBody())
.expectNext(buffer)
.expectComplete()
.verify(response.getBody());
.verify();
}
@Test
@@ -104,14 +104,14 @@ public class BodyInsertersTests {
MockServerHttpResponse response = new MockServerHttpResponse();
Mono<Void> result = inserter.insert(response, this.context);
ScriptedSubscriber.create().expectComplete().verify(result);
Verifier.create(result).expectComplete().verify();
ByteBuffer byteBuffer = ByteBuffer.wrap("foo".getBytes(UTF_8));
DataBuffer buffer = new DefaultDataBufferFactory().wrap(byteBuffer);
ScriptedSubscriber.<DataBuffer>create()
Verifier.create(response.getBody())
.expectNext(buffer)
.expectComplete()
.verify(response.getBody());
.verify();
}
@Test
@@ -123,18 +123,18 @@ public class BodyInsertersTests {
MockServerHttpResponse response = new MockServerHttpResponse();
Mono<Void> result = inserter.insert(response, this.context);
ScriptedSubscriber.create().expectComplete().verify(result);
Verifier.create(result).expectComplete().verify();
byte[] expectedBytes = Files.readAllBytes(body.getFile().toPath());
ScriptedSubscriber.<DataBuffer>create()
Verifier.create(response.getBody())
.consumeNextWith(dataBuffer -> {
byte[] resultBytes = new byte[dataBuffer.readableByteCount()];
dataBuffer.read(resultBytes);
assertArrayEquals(expectedBytes, resultBytes);
})
.expectComplete()
.verify(response.getBody());
.verify();
}
@Test
@@ -148,7 +148,7 @@ public class BodyInsertersTests {
MockServerHttpResponse response = new MockServerHttpResponse();
Mono<Void> result = inserter.insert(response, this.context);
ScriptedSubscriber.create().expectNextCount(0).expectComplete().verify(result);
Verifier.create(result).expectNextCount(0).expectComplete().verify();
}
@Test
@@ -161,7 +161,7 @@ public class BodyInsertersTests {
MockServerHttpResponse response = new MockServerHttpResponse();
Mono<Void> result = inserter.insert(response, this.context);
ScriptedSubscriber.create().expectNextCount(0).expectComplete().verify(result);
Verifier.create(result).expectNextCount(0).expectComplete().verify();
}
}

6
spring-web/src/test/java/org/springframework/http/codec/EncoderHttpMessageWriterTest.java
View File

@@ -21,7 +21,7 @@ import java.util.Collections;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import reactor.core.publisher.Mono;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.core.ResolvableType;
import org.springframework.core.codec.ByteBufferEncoder;
@@ -68,10 +68,10 @@ public class EncoderHttpMessageWriterTest {
MediaType.APPLICATION_OCTET_STREAM, this.response, Collections.emptyMap());
assertThat(this.response.getHeaders().getContentType(), is(MediaType.APPLICATION_OCTET_STREAM));
ScriptedSubscriber.<String>create()
Verifier.create(this.response.getBodyAsString())
.expectNext(payload)
.expectComplete()
.verify(this.response.getBodyAsString());
.verify();
}
@NotNull

27
spring-web/src/test/java/org/springframework/http/codec/ResourceHttpMessageWriterTests.java
View File

@@ -22,7 +22,7 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
import reactor.core.publisher.Mono;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.ByteArrayResource;
@@ -73,22 +73,20 @@ public class ResourceHttpMessageWriterTests {
Mono<Void> mono = this.writer.write(Mono.just(resource), null,
ResolvableType.forClass(Resource.class),
MediaType.TEXT_PLAIN, this.request, this.response, Collections.emptyMap());
ScriptedSubscriber
.<Void>create()
Verifier.create(mono)
.expectNextCount(0)
.expectComplete()
.verify(mono);
.verify();
assertThat(this.response.getHeaders().getContentType(), is(MediaType.TEXT_PLAIN));
assertThat(this.response.getHeaders().getContentLength(), is(39L));
assertThat(this.response.getHeaders().getFirst(HttpHeaders.ACCEPT_RANGES), is("bytes"));
Mono<String> result = this.response.getBodyAsString();
ScriptedSubscriber
.<String>create()
Verifier.create(result)
.expectNext("Spring Framework test resource content.")
.expectComplete()
.verify(result);
.verify();
}
@Test
@@ -96,11 +94,10 @@ public class ResourceHttpMessageWriterTests {
this.request.getHeaders().setRange(Collections.singletonList(HttpRange.createByteRange(0, 5)));
Mono<Void> mono = this.writer.write(Mono.just(resource), null, ResolvableType.forClass(Resource.class),
MediaType.TEXT_PLAIN, this.request, this.response, Collections.emptyMap());
ScriptedSubscriber
.<Void>create()
Verifier.create(mono)
.expectNextCount(0)
.expectComplete()
.verify(mono);
.verify();
assertThat(this.response.getHeaders().getContentType(), is(MediaType.TEXT_PLAIN));
assertThat(this.response.getHeaders().getFirst(HttpHeaders.CONTENT_RANGE), is("bytes 0-5/39"));
@@ -108,11 +105,10 @@ public class ResourceHttpMessageWriterTests {
assertThat(this.response.getHeaders().getContentLength(), is(6L));
Mono<String> result = this.response.getBodyAsString();
ScriptedSubscriber
.<String>create()
Verifier.create(result)
.expectNext("Spring")
.expectComplete()
.verify(result);
.verify();
}
@Test
@@ -121,11 +117,10 @@ public class ResourceHttpMessageWriterTests {
Mono<Void> mono = this.writer.write(Mono.just(resource), null, ResolvableType.forClass(Resource.class),
MediaType.TEXT_PLAIN, this.request, this.response, Collections.emptyMap());
ScriptedSubscriber
.<Void>create()
Verifier.create(mono)
.expectNextCount(0)
.expectComplete()
.verify(mono);
.verify();
assertThat(this.response.getHeaders().getFirst(HttpHeaders.ACCEPT_RANGES), is("bytes"));
assertThat(this.response.getStatusCode(), is(HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE));

13
spring-web/src/test/java/org/springframework/http/codec/ResourceRegionHttpMessageWriterTests.java
View File

@@ -28,7 +28,7 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.ByteArrayResource;
@@ -85,14 +85,14 @@ public class ResourceRegionHttpMessageWriterTests {
Mono<Void> mono = this.writer.write(Mono.just(region), ResolvableType.forClass(ResourceRegion.class),
MediaType.TEXT_PLAIN, this.response, Collections.emptyMap());
ScriptedSubscriber.<Void>create().expectComplete().verify(mono);
Verifier.create(mono).expectComplete().verify();
assertThat(this.response.getHeaders().getContentType(), is(MediaType.TEXT_PLAIN));
assertThat(this.response.getHeaders().getFirst(HttpHeaders.CONTENT_RANGE), is("bytes 0-5/39"));
assertThat(this.response.getHeaders().getContentLength(), is(6L));
Mono<String> result = response.getBodyAsString();
ScriptedSubscriber.<String>create().expectNext("Spring").expectComplete().verify(result);
Verifier.create(result).expectNext("Spring").expectComplete().verify();
}
@Test
@@ -109,15 +109,14 @@ public class ResourceRegionHttpMessageWriterTests {
Mono<Void> mono = this.writer.write(regions, ResolvableType.forClass(ResourceRegion.class),
MediaType.TEXT_PLAIN, this.response, hints);
ScriptedSubscriber.<Void>create().expectComplete().verify(mono);
Verifier.create(mono).expectComplete().verify();
HttpHeaders headers = this.response.getHeaders();
assertThat(headers.getContentType().toString(), startsWith("multipart/byteranges;boundary=" + boundary));
Mono<String> result = response.getBodyAsString();
ScriptedSubscriber
.<String>create()
Verifier.create(result)
.consumeNextWith(content -> {
String[] ranges = StringUtils
.tokenizeToStringArray(content, "\r\n", false, true);
@@ -143,7 +142,7 @@ public class ResourceRegionHttpMessageWriterTests {
assertArrayEquals(expected, ranges);
})
.expectComplete()
.verify(result);
.verify();
}
}

26
spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageWriterTests.java
View File

@@ -24,7 +24,7 @@ import org.junit.Test;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
@@ -73,12 +73,11 @@ public class ServerSentEventHttpMessageWriterTests extends AbstractDataBufferAll
new MediaType("text", "event-stream"), outputMessage, Collections.emptyMap());
Publisher<Publisher<DataBuffer>> result = Flux.from(outputMessage.getBodyWithFlush());
ScriptedSubscriber
.<Publisher<DataBuffer>>create()
Verifier.create(result)
.consumeNextWith(sseConsumer("id:c42\n" + "event:foo\n" + "retry:123\n" +
":bla\n:bla bla\n:bla bla bla\n" + "data:bar\n"))
.expectComplete()
.verify(result);
.verify();
}
@Test
@@ -89,12 +88,11 @@ public class ServerSentEventHttpMessageWriterTests extends AbstractDataBufferAll
new MediaType("text", "event-stream"), outputMessage, Collections.emptyMap());
Publisher<Publisher<DataBuffer>> result = outputMessage.getBodyWithFlush();
ScriptedSubscriber
.<Publisher<DataBuffer>>create()
Verifier.create(result)
.consumeNextWith(sseConsumer("data:foo\n"))
.consumeNextWith(sseConsumer("data:bar\n"))
.expectComplete()
.verify(result);
.verify();
}
@Test
@@ -105,12 +103,11 @@ public class ServerSentEventHttpMessageWriterTests extends AbstractDataBufferAll
new MediaType("text", "event-stream"), outputMessage, Collections.emptyMap());
Publisher<Publisher<DataBuffer>> result = outputMessage.getBodyWithFlush();
ScriptedSubscriber
.<Publisher<DataBuffer>>create()
Verifier.create(result)
.consumeNextWith(sseConsumer("data:foo\ndata:bar\n"))
.consumeNextWith(sseConsumer("data:foo\ndata:baz\n"))
.expectComplete()
.verify(result);
.verify();
}
@Test
@@ -122,21 +119,20 @@ public class ServerSentEventHttpMessageWriterTests extends AbstractDataBufferAll
new MediaType("text", "event-stream"), outputMessage, Collections.emptyMap());
Publisher<Publisher<DataBuffer>> result = outputMessage.getBodyWithFlush();
ScriptedSubscriber
.<Publisher<DataBuffer>>create()
Verifier.create(result)
.consumeNextWith(sseConsumer("data:", "{\"foo\":\"foofoo\",\"bar\":\"barbar\"}", "\n"))
.consumeNextWith(sseConsumer("data:", "{\"foo\":\"foofoofoo\",\"bar\":\"barbarbar\"}", "\n"))
.expectComplete()
.verify(result);
.verify();
}
private Consumer<Publisher<DataBuffer>> sseConsumer(String... expected) {
return publisher -> {
ScriptedSubscriber.StepBuilder<DataBuffer> builder = ScriptedSubscriber.create();
Verifier.Step builder = Verifier.create(publisher);
for (String value : expected) {
builder = builder.consumeNextWith(stringConsumer(value));
}
builder.consumeNextWith(stringConsumer("\n")).expectComplete().verify(publisher);
builder.consumeNextWith(stringConsumer("\n")).expectComplete().verify();
};
}

24
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java
View File

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonView;
import org.junit.Test;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
@@ -61,10 +61,10 @@ public class Jackson2JsonDecoderTests extends AbstractDataBufferAllocatingTestCa
Flux<Object> flux = new Jackson2JsonDecoder().decode(source, elementType, null,
Collections.emptyMap());
ScriptedSubscriber.<Object>create()
Verifier.create(flux)
.expectNext(new Pojo("foofoo", "barbar"))
.expectComplete()
.verify(flux);
.verify();
}
@Test
@@ -76,10 +76,10 @@ public class Jackson2JsonDecoderTests extends AbstractDataBufferAllocatingTestCa
Mono<Object> mono = new Jackson2JsonDecoder().decodeToMono(source, elementType,
null, Collections.emptyMap());
ScriptedSubscriber.<Object>create()
Verifier.create(mono)
.expectNext(Arrays.asList(new Pojo("f1", "b1"), new Pojo("f2", "b2")))
.expectComplete()
.verify(mono);
.verify();
}
@Test
@@ -91,11 +91,11 @@ public class Jackson2JsonDecoderTests extends AbstractDataBufferAllocatingTestCa
Flux<Object> flux = new Jackson2JsonDecoder().decode(source, elementType, null,
Collections.emptyMap());
ScriptedSubscriber.<Object>create()
Verifier.create(flux)
.expectNext(new Pojo("f1", "b1"))
.expectNext(new Pojo("f2", "b2"))
.expectComplete()
.verify(flux);
.verify();
}
@Test
@@ -107,14 +107,14 @@ public class Jackson2JsonDecoderTests extends AbstractDataBufferAllocatingTestCa
Flux<JacksonViewBean> flux = new Jackson2JsonDecoder()
.decode(source, elementType, null, hints).cast(JacksonViewBean.class);
ScriptedSubscriber.<JacksonViewBean>create()
Verifier.create(flux)
.consumeNextWith(b -> {
assertTrue(b.getWithView1().equals("with"));
assertNull(b.getWithView2());
assertNull(b.getWithoutView());
})
.expectComplete()
.verify(flux);
.verify();
}
@Test
@@ -124,10 +124,10 @@ public class Jackson2JsonDecoderTests extends AbstractDataBufferAllocatingTestCa
Mono<Object> mono = new Jackson2JsonDecoder().decodeToMono(source, elementType,
null, Collections.emptyMap());
ScriptedSubscriber.
<Object>create().expectNextCount(0)
Verifier.create(mono)
.expectNextCount(0)
.expectComplete()
.verify(mono);
.verify();
}

17
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java
View File

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonView;
import org.junit.Test;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
@@ -65,8 +65,7 @@ public class Jackson2JsonEncoderTests extends AbstractDataBufferAllocatingTestCa
ResolvableType type = ResolvableType.forClass(Pojo.class);
Flux<DataBuffer> output = this.encoder.encode(source, this.bufferFactory, type, null, Collections.emptyMap());
ScriptedSubscriber
.<DataBuffer>create()
Verifier.create(output)
.consumeNextWith(stringConsumer("["))
.consumeNextWith(stringConsumer("{\"foo\":\"foo\",\"bar\":\"bar\"}"))
.consumeNextWith(stringConsumer(","))
@@ -75,7 +74,7 @@ public class Jackson2JsonEncoderTests extends AbstractDataBufferAllocatingTestCa
.consumeNextWith(stringConsumer("{\"foo\":\"foofoofoo\",\"bar\":\"barbarbar\"}"))
.consumeNextWith(stringConsumer("]"))
.expectComplete()
.verify(output);
.verify();
}
@Test
@@ -84,15 +83,14 @@ public class Jackson2JsonEncoderTests extends AbstractDataBufferAllocatingTestCa
ResolvableType type = ResolvableType.forClass(ParentClass.class);
Flux<DataBuffer> output = this.encoder.encode(source, this.bufferFactory, type, null, Collections.emptyMap());
ScriptedSubscriber
.<DataBuffer>create()
Verifier.create(output)
.consumeNextWith(stringConsumer("["))
.consumeNextWith(stringConsumer("{\"type\":\"foo\"}"))
.consumeNextWith(stringConsumer(","))
.consumeNextWith(stringConsumer("{\"type\":\"bar\"}"))
.consumeNextWith(stringConsumer("]"))
.expectComplete()
.verify(output);
.verify();
}
@Test
@@ -106,11 +104,10 @@ public class Jackson2JsonEncoderTests extends AbstractDataBufferAllocatingTestCa
Map<String, Object> hints = Collections.singletonMap(Jackson2JsonEncoder.JSON_VIEW_HINT, MyJacksonView1.class);
Flux<DataBuffer> output = this.encoder.encode(Mono.just(bean), this.bufferFactory, type, null, hints);
ScriptedSubscriber
.<DataBuffer>create()
Verifier.create(output)
.consumeNextWith(stringConsumer("{\"withView1\":\"with\"}"))
.expectComplete()
.verify(output);
.verify();
}

26
spring-web/src/test/java/org/springframework/http/codec/json/JsonObjectDecoderTests.java
View File

@@ -21,7 +21,7 @@ import java.util.Collections;
import org.junit.Test;
import reactor.core.publisher.Flux;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
import org.springframework.core.io.buffer.DataBuffer;
@@ -38,10 +38,10 @@ public class JsonObjectDecoderTests extends AbstractDataBufferAllocatingTestCase
Flux.just(stringBuffer("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}"));
Flux<String> output =
decoder.decode(source, null, null, Collections.emptyMap()).map(JsonObjectDecoderTests::toString);
ScriptedSubscriber.<String>create()
Verifier.create(output)
.expectNext("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}")
.expectComplete()
.verify(output);
.verify();
}
@Test
@@ -51,10 +51,10 @@ public class JsonObjectDecoderTests extends AbstractDataBufferAllocatingTestCase
stringBuffer(", \"bar\": \"barbar\"}"));
Flux<String> output =
decoder.decode(source, null, null, Collections.emptyMap()).map(JsonObjectDecoderTests::toString);
ScriptedSubscriber.<String>create()
Verifier.create(output)
.expectNext("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}")
.expectComplete()
.verify(output);
.verify();
}
@Test
@@ -65,19 +65,19 @@ public class JsonObjectDecoderTests extends AbstractDataBufferAllocatingTestCase
"[{\"foo\": \"foofoo\", \"bar\": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"));
Flux<String> output =
decoder.decode(source, null, null, Collections.emptyMap()).map(JsonObjectDecoderTests::toString);
ScriptedSubscriber.<String>create()
Verifier.create(output)
.expectNext("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}")
.expectNext("{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}")
.expectComplete()
.verify(output);
.verify();
source = Flux.just(stringBuffer("[{\"foo\": \"bar\"},{\"foo\": \"baz\"}]"));
output = decoder.decode(source, null, null, Collections.emptyMap()).map(JsonObjectDecoderTests::toString);
ScriptedSubscriber.<String>create()
Verifier.create(output)
.expectNext("{\"foo\": \"bar\"}")
.expectNext("{\"foo\": \"baz\"}")
.expectComplete()
.verify(output);
.verify();
}
@Test
@@ -89,11 +89,11 @@ public class JsonObjectDecoderTests extends AbstractDataBufferAllocatingTestCase
": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"));
Flux<String> output =
decoder.decode(source, null, null, Collections.emptyMap()).map(JsonObjectDecoderTests::toString);
ScriptedSubscriber.<String>create()
Verifier.create(output)
.expectNext("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}")
.expectNext("{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}")
.expectComplete()
.verify(output);
.verify();
source = Flux.just(
stringBuffer("[{\"foo\": \""),
@@ -101,11 +101,11 @@ public class JsonObjectDecoderTests extends AbstractDataBufferAllocatingTestCase
stringBuffer("o\": \"baz\"}"),
stringBuffer("]"));
output = decoder.decode(source, null, null, Collections.emptyMap()).map(JsonObjectDecoderTests::toString);
ScriptedSubscriber.<String>create()
Verifier.create(output)
.expectNext("{\"foo\": \"bar\"}")
.expectNext("{\"foo\": \"baz\"}")
.expectComplete()
.verify(output);
.verify();
}

26
spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java
View File

@@ -23,7 +23,7 @@ import javax.xml.stream.events.XMLEvent;
import org.junit.Test;
import reactor.core.publisher.Flux;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
@@ -91,7 +91,7 @@ public class Jaxb2XmlDecoderTests extends AbstractDataBufferAllocatingTestCase {
.decode(Flux.just(stringBuffer(POJO_ROOT)), null, null, Collections.emptyMap());
Flux<List<XMLEvent>> result = this.decoder.split(xmlEvents, new QName("pojo"));
ScriptedSubscriber.<List<XMLEvent>>create()
Verifier.create(result)
.consumeNextWith(events -> {
assertEquals(8, events.size());
assertStartElement(events.get(0), "pojo");
@@ -104,7 +104,7 @@ public class Jaxb2XmlDecoderTests extends AbstractDataBufferAllocatingTestCase {
assertEndElement(events.get(7), "pojo");
})
.expectComplete()
.verify(result);
.verify();
}
@Test
@@ -114,7 +114,7 @@ public class Jaxb2XmlDecoderTests extends AbstractDataBufferAllocatingTestCase {
Flux<List<XMLEvent>> result = this.decoder.split(xmlEvents, new QName("pojo"));
ScriptedSubscriber.<List<XMLEvent>>create()
Verifier.create(result)
.consumeNextWith(events -> {
assertEquals(8, events.size());
assertStartElement(events.get(0), "pojo");
@@ -138,7 +138,7 @@ public class Jaxb2XmlDecoderTests extends AbstractDataBufferAllocatingTestCase {
assertEndElement(events.get(7), "pojo");
})
.expectComplete()
.verify(result);
.verify();
}
private static void assertStartElement(XMLEvent event, String expectedLocalName) {
@@ -162,10 +162,10 @@ public class Jaxb2XmlDecoderTests extends AbstractDataBufferAllocatingTestCase {
Flux<Object> output = this.decoder.decode(source, ResolvableType.forClass(Pojo.class),
null, Collections.emptyMap());
ScriptedSubscriber.<Object>create()
Verifier.create(output)
.expectNext(new Pojo("foofoo", "barbar"))
.expectComplete()
.verify(output);
.verify();
}
@Test
@@ -174,10 +174,10 @@ public class Jaxb2XmlDecoderTests extends AbstractDataBufferAllocatingTestCase {
Flux<Object> output = this.decoder.decode(source, ResolvableType.forClass(TypePojo.class),
null, Collections.emptyMap());
ScriptedSubscriber.<Object>create()
Verifier.create(output)
.expectNext(new TypePojo("foofoo", "barbar"))
.expectComplete()
.verify(output);
.verify();
}
@Test
@@ -186,11 +186,11 @@ public class Jaxb2XmlDecoderTests extends AbstractDataBufferAllocatingTestCase {
Flux<Object> output = this.decoder.decode(source, ResolvableType.forClass(Pojo.class),
null, Collections.emptyMap());
ScriptedSubscriber.<Object>create()
Verifier.create(output)
.expectNext(new Pojo("foo", "bar"))
.expectNext(new Pojo("foofoo", "barbar"))
.expectComplete()
.verify(output);
.verify();
}
@Test
@@ -199,11 +199,11 @@ public class Jaxb2XmlDecoderTests extends AbstractDataBufferAllocatingTestCase {
Flux<Object> output = this.decoder.decode(source, ResolvableType.forClass(TypePojo.class),
null, Collections.emptyMap());
ScriptedSubscriber.<Object>create()
Verifier.create(output)
.expectNext(new TypePojo("foo", "bar"))
.expectNext(new TypePojo("foofoo", "barbar"))
.expectComplete()
.verify(output);
.verify();
}
@Test

7
spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlEncoderTests.java
View File

@@ -21,7 +21,7 @@ import java.util.Collections;
import org.junit.Test;
import reactor.core.publisher.Flux;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
@@ -69,8 +69,7 @@ public class Jaxb2XmlEncoderTests extends AbstractDataBufferAllocatingTestCase {
ResolvableType.forClass(Pojo.class),
MediaType.APPLICATION_XML, Collections.emptyMap());
ScriptedSubscriber
.<DataBuffer>create()
Verifier.create(output)
.consumeNextWith(dataBuffer -> {
try {
String s = DataBufferTestUtils
@@ -83,7 +82,7 @@ public class Jaxb2XmlEncoderTests extends AbstractDataBufferAllocatingTestCase {
}
})
.expectComplete()
.verify(output);
.verify();
}
}

12
spring-web/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java
View File

@@ -21,7 +21,7 @@ import javax.xml.stream.events.XMLEvent;
import org.junit.Test;
import reactor.core.publisher.Flux;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
@@ -47,8 +47,7 @@ public class XmlEventDecoderTests extends AbstractDataBufferAllocatingTestCase {
Flux<XMLEvent> events =
this.decoder.decode(Flux.just(stringBuffer(XML)), null, null, Collections.emptyMap());
ScriptedSubscriber
.<XMLEvent>create()
Verifier.create(events)
.consumeNextWith(e -> assertTrue(e.isStartDocument()))
.consumeNextWith(e -> assertStartElement(e, "pojo"))
.consumeNextWith(e -> assertStartElement(e, "foo"))
@@ -59,7 +58,7 @@ public class XmlEventDecoderTests extends AbstractDataBufferAllocatingTestCase {
.consumeNextWith(e -> assertEndElement(e, "bar"))
.consumeNextWith(e -> assertEndElement(e, "pojo"))
.expectComplete()
.verify(events);
.verify();
}
@Test
@@ -69,8 +68,7 @@ public class XmlEventDecoderTests extends AbstractDataBufferAllocatingTestCase {
Flux<XMLEvent> events =
this.decoder.decode(Flux.just(stringBuffer(XML)), null, null, Collections.emptyMap());
ScriptedSubscriber
.<XMLEvent>create()
Verifier.create(events)
.consumeNextWith(e -> assertTrue(e.isStartDocument()))
.consumeNextWith(e -> assertStartElement(e, "pojo"))
.consumeNextWith(e -> assertStartElement(e, "foo"))
@@ -82,7 +80,7 @@ public class XmlEventDecoderTests extends AbstractDataBufferAllocatingTestCase {
.consumeNextWith(e -> assertEndElement(e, "pojo"))
.consumeNextWith(e -> assertTrue(e.isEndDocument()))
.expectComplete()
.verify(events);
.verify();
}
private static void assertStartElement(XMLEvent event, String expectedLocalName) {

6
spring-web/src/test/java/org/springframework/http/server/reactive/FlushingIntegrationTests.java
View File

@@ -23,7 +23,7 @@ import org.junit.Test;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
@@ -56,10 +56,10 @@ public class FlushingIntegrationTests extends AbstractHttpHandlerIntegrationTest
.takeUntil(s -> s.endsWith("data1"))
.reduce((s1, s2) -> s1 + s2);
ScriptedSubscriber.<String>create()
Verifier.create(result)
.expectNext("data0data1")
.expectComplete()
.verify(result, Duration.ofSeconds(5L));
.verify(Duration.ofSeconds(5L));
}
@Override

18
spring-web/src/test/java/org/springframework/web/client/reactive/ExchangeFilterFunctionsTests.java
View File

@@ -20,7 +20,7 @@ import java.util.Optional;
import org.junit.Test;
import reactor.core.publisher.Mono;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -97,10 +97,10 @@ public class ExchangeFilterFunctionsTests {
Mono<ClientResponse> result = standardErrors.filter(request, exchange);
ScriptedSubscriber.<ClientResponse>create()
Verifier.create(result)
.expectNext(response)
.expectComplete()
.verify(result);
.verify();
}
@Test
@@ -114,9 +114,9 @@ public class ExchangeFilterFunctionsTests {
Mono<ClientResponse> result = standardErrors.filter(request, exchange);
ScriptedSubscriber.<ClientResponse>create()
Verifier.create(result)
.expectError(WebClientException.class)
.verify(result);
.verify();
}
@Test
@@ -131,9 +131,9 @@ public class ExchangeFilterFunctionsTests {
Mono<ClientResponse> result = errorPredicate.filter(request, exchange);
ScriptedSubscriber.<ClientResponse>create()
Verifier.create(result)
.expectError(WebClientException.class)
.verify(result);
.verify();
}
@@ -148,9 +148,9 @@ public class ExchangeFilterFunctionsTests {
Mono<ClientResponse> result = errorMapper.filter(request, exchange);
ScriptedSubscriber.<ClientResponse>create()
Verifier.create(result)
.expectError(IllegalStateException.class)
.verify(result);
.verify();
}

66
spring-web/src/test/java/org/springframework/web/client/reactive/WebClientIntegrationTests.java
View File

@@ -28,7 +28,7 @@ import org.junit.Before;
import org.junit.Test;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -70,14 +70,14 @@ public class WebClientIntegrationTests {
.exchange(request)
.map(response -> response.headers().asHttpHeaders());
ScriptedSubscriber.<HttpHeaders>create()
Verifier.create(result)
.consumeNextWith(
httpHeaders -> {
assertEquals(MediaType.TEXT_PLAIN, httpHeaders.getContentType());
assertEquals(13L, httpHeaders.getContentLength());
})
.expectComplete()
.verify(result);
.verify();
RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount());
@@ -98,11 +98,10 @@ public class WebClientIntegrationTests {
.exchange(request)
.then(response -> response.body(toMono(String.class)));
ScriptedSubscriber
.<String>create()
Verifier.create(result)
.expectNext("Hello Spring!")
.expectComplete()
.verify(result);
.verify();
RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount());
@@ -121,11 +120,10 @@ public class WebClientIntegrationTests {
Mono<String> result = this.webClient
.retrieveMono(request, String.class);
ScriptedSubscriber
.<String>create()
Verifier.create(result)
.expectNext("Hello Spring!")
.expectComplete()
.verify(result);
.verify();
RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount());
@@ -143,11 +141,10 @@ public class WebClientIntegrationTests {
Flux<String> result = this.webClient
.retrieveFlux(request, String.class);
ScriptedSubscriber
.<String>create()
Verifier.create(result)
.expectNext("Hello Spring!")
.expectComplete()
.verify(result);
.verify();
RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount());
@@ -170,11 +167,10 @@ public class WebClientIntegrationTests {
.exchange(request)
.then(response -> response.body(toMono(String.class)));
ScriptedSubscriber
.<String>create()
Verifier.create(result)
.expectNext(content)
.expectComplete()
.verify(result);
.verify();
RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount());
@@ -196,11 +192,10 @@ public class WebClientIntegrationTests {
.exchange(request)
.then(response -> response.body(toMono(Pojo.class)));
ScriptedSubscriber
.<Pojo>create()
Verifier.create(result)
.consumeNextWith(p -> assertEquals("barbar", p.getBar()))
.expectComplete()
.verify(result);
.verify();
RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount());
@@ -222,12 +217,11 @@ public class WebClientIntegrationTests {
.exchange(request)
.flatMap(response -> response.body(toFlux(Pojo.class)));
ScriptedSubscriber
.<Pojo>create()
Verifier.create(result)
.consumeNextWith(p -> assertThat(p.getBar(), Matchers.is("bar1")))
.consumeNextWith(p -> assertThat(p.getBar(), Matchers.is("bar2")))
.expectComplete()
.verify(result);
.verify();
RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount());
@@ -252,11 +246,10 @@ public class WebClientIntegrationTests {
.exchange(request)
.then(response -> response.body(BodyExtractors.toMono(Pojo.class)));
ScriptedSubscriber
.<Pojo>create()
Verifier.create(result)
.consumeNextWith(p -> assertEquals("BARBAR", p.getBar()))
.expectComplete()
.verify(result);
.verify();
RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount());
@@ -281,11 +274,10 @@ public class WebClientIntegrationTests {
.exchange(request)
.then(response -> response.body(toMono(String.class)));
ScriptedSubscriber
.<String>create()
Verifier.create(result)
.expectNext("test")
.expectComplete()
.verify(result);
.verify();
RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount());
@@ -304,13 +296,12 @@ public class WebClientIntegrationTests {
Mono<ClientResponse> result = this.webClient
.exchange(request);
ScriptedSubscriber
.<ClientResponse>create()
Verifier.create(result)
.consumeNextWith(response -> {
assertEquals(HttpStatus.NOT_FOUND, response.statusCode());
})
.expectComplete()
.verify(result, Duration.ofSeconds(3));
.verify(Duration.ofSeconds(3));
RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount());
@@ -329,10 +320,9 @@ public class WebClientIntegrationTests {
Mono<String> result = this.webClient
.retrieveMono(request, String.class);
ScriptedSubscriber
.<String>create()
Verifier.create(result)
.expectError(WebClientException.class)
.verify(result, Duration.ofSeconds(3));
.verify(Duration.ofSeconds(3));
RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount());
@@ -351,10 +341,9 @@ public class WebClientIntegrationTests {
Mono<String> result = this.webClient
.retrieveMono(request, String.class);
ScriptedSubscriber
.<String>create()
Verifier.create(result)
.expectError(WebClientException.class)
.verify(result, Duration.ofSeconds(3));
.verify(Duration.ofSeconds(3));
RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount());
@@ -380,11 +369,10 @@ public class WebClientIntegrationTests {
Mono<String> result = filteredClient.exchange(request)
.then(response -> response.body(toMono(String.class)));
ScriptedSubscriber
.<String>create()
Verifier.create(result)
.expectNext("Hello Spring!")
.expectComplete()
.verify(result);
.verify();
RecordedRequest recordedRequest = server.takeRequest();
assertEquals(1, server.getRequestCount());

7
spring-web/src/test/java/org/springframework/web/server/handler/ResponseStatusExceptionHandlerTests.java
View File

@@ -21,7 +21,7 @@ import java.time.Duration;
import org.junit.Before;
import org.junit.Test;
import reactor.core.publisher.Mono;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -72,10 +72,9 @@ public class ResponseStatusExceptionHandlerTests {
Throwable expected = new IllegalStateException();
Mono<Void> mono = this.handler.handle(this.exchange, expected);
ScriptedSubscriber
.<Void>create()
Verifier.create(mono)
.consumeErrorWith(actual -> assertSame(expected, actual))
.verify(mono);
.verify();
}
}