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

8
spring-core/src/test/java/org/springframework/core/codec/ByteArrayDecoderTests.java
View File

@@ -21,7 +21,7 @@ import java.util.Collections;
import org.junit.Test;
import org.reactivestreams.Publisher;
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;
@@ -57,12 +57,12 @@ public class ByteArrayDecoderTests extends AbstractDataBufferAllocatingTestCase
Flux<byte[]> output = this.decoder.decode(source,
ResolvableType.forClassWithGenerics(Publisher.class, byte[].class),
null, Collections.emptyMap());
ScriptedSubscriber
.<byte[]>create()
Verifier.create(output)
.consumeNextWith(bytes -> assertArrayEquals("foo".getBytes(), bytes))
.consumeNextWith(bytes -> assertArrayEquals("bar".getBytes(), bytes))
.expectComplete()
.verify(output);
.verify();
}
}

8
spring-core/src/test/java/org/springframework/core/codec/ByteArrayEncoderTests.java
View File

@@ -24,7 +24,7 @@ import org.junit.Before;
import org.junit.Test;
import org.reactivestreams.Publisher;
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;
@@ -66,8 +66,8 @@ public class ByteArrayEncoderTests extends AbstractDataBufferAllocatingTestCase
Flux<DataBuffer> output = this.encoder.encode(source, this.bufferFactory,
ResolvableType.forClassWithGenerics(Publisher.class, ByteBuffer.class),
null, Collections.emptyMap());
ScriptedSubscriber
.<DataBuffer>create()
Verifier.create(output)
.consumeNextWith(b -> {
byte[] buf = new byte[3];
b.read(buf);
@@ -79,7 +79,7 @@ public class ByteArrayEncoderTests extends AbstractDataBufferAllocatingTestCase
assertArrayEquals(barBytes, buf);
})
.expectComplete()
.verify(output);
.verify();
}
}

6
spring-core/src/test/java/org/springframework/core/codec/ByteBufferDecoderTests.java
View File

@@ -22,7 +22,7 @@ import java.util.Collections;
import org.junit.Test;
import org.reactivestreams.Publisher;
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;
@@ -58,9 +58,9 @@ public class ByteBufferDecoderTests extends AbstractDataBufferAllocatingTestCase
ResolvableType.forClassWithGenerics(Publisher.class, ByteBuffer.class),
null, Collections.emptyMap());
ScriptedSubscriber.<ByteBuffer>create()
Verifier.create(output)
.expectNext(ByteBuffer.wrap("foo".getBytes()), ByteBuffer.wrap("bar".getBytes()))
.expectComplete()
.verify(output);
.verify();
}
}

6
spring-core/src/test/java/org/springframework/core/codec/ByteBufferEncoderTests.java
View File

@@ -24,7 +24,7 @@ import org.junit.Before;
import org.junit.Test;
import org.reactivestreams.Publisher;
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;
@@ -67,7 +67,7 @@ public class ByteBufferEncoderTests extends AbstractDataBufferAllocatingTestCase
Flux<DataBuffer> output = this.encoder.encode(source, this.bufferFactory,
ResolvableType.forClassWithGenerics(Publisher.class, ByteBuffer.class),
null, Collections.emptyMap());
ScriptedSubscriber.<DataBuffer>create()
Verifier.create(output)
.consumeNextWith(b -> {
byte[] buf = new byte[3];
b.read(buf);
@@ -79,7 +79,7 @@ public class ByteBufferEncoderTests extends AbstractDataBufferAllocatingTestCase
assertArrayEquals(barBytes, buf);
})
.expectComplete()
.verify(output);
.verify();
}
}

10
spring-core/src/test/java/org/springframework/core/codec/CharSequenceEncoderTests.java
View File

@@ -23,7 +23,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
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;
@@ -65,10 +65,10 @@ public class CharSequenceEncoderTests extends AbstractDataBufferAllocatingTestCa
Flux<String> stringFlux = Flux.just("foo");
Flux<DataBuffer> output = Flux.from(
this.encoder.encode(stringFlux, this.bufferFactory, null, null, Collections.emptyMap()));
ScriptedSubscriber.<DataBuffer>create()
Verifier.create(output)
.consumeNextWith(stringConsumer("foo"))
.expectComplete()
.verify(output);
.verify();
}
@Test
@@ -76,10 +76,10 @@ public class CharSequenceEncoderTests extends AbstractDataBufferAllocatingTestCa
Flux<StringBuilder> stringBuilderFlux = Flux.just(new StringBuilder("foo"));
Flux<DataBuffer> output = Flux.from(
this.encoder.encode(stringBuilderFlux, this.bufferFactory, null, null, Collections.emptyMap()));
ScriptedSubscriber.<DataBuffer>create()
Verifier.create(output)
.consumeNextWith(stringConsumer("foo"))
.expectComplete()
.verify(output);
.verify();
}
}

6
spring-core/src/test/java/org/springframework/core/codec/ResourceDecoderTests.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.ByteArrayResource;
@@ -64,7 +64,7 @@ public class ResourceDecoderTests extends AbstractDataBufferAllocatingTestCase {
Flux<Resource> result = this.decoder
.decode(source, ResolvableType.forClass(Resource.class), null, Collections.emptyMap());
ScriptedSubscriber.<Resource>create()
Verifier.create(result)
.consumeNextWith(resource -> {
try {
byte[] bytes = StreamUtils.copyToByteArray(resource.getInputStream());
@@ -75,7 +75,7 @@ public class ResourceDecoderTests extends AbstractDataBufferAllocatingTestCase {
}
})
.expectComplete()
.verify(result);
.verify();
}
}

7
spring-core/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java
View File

@@ -22,7 +22,7 @@ import java.util.Collections;
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.ByteArrayResource;
@@ -64,11 +64,10 @@ public class ResourceEncoderTests extends AbstractDataBufferAllocatingTestCase {
ResolvableType.forClass(Resource.class),
null, Collections.emptyMap());
ScriptedSubscriber
.<DataBuffer>create()
Verifier.create(output)
.consumeNextWith(stringConsumer(s))
.expectComplete()
.verify(output);
.verify();
}
}

10
spring-core/src/test/java/org/springframework/core/codec/ResourceRegionEncoderTests.java
View File

@@ -23,7 +23,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.ResolvableType;
import org.springframework.core.io.ByteArrayResource;
@@ -81,10 +81,10 @@ public class ResourceRegionEncoderTests extends AbstractDataBufferAllocatingTest
ResolvableType.forClass(ResourceRegion.class), MimeTypeUtils.APPLICATION_OCTET_STREAM
, Collections.emptyMap());
ScriptedSubscriber.<DataBuffer>create()
Verifier.create(result)
.consumeNextWith(stringConsumer("Spring"))
.expectComplete()
.verify(result);
.verify();
}
@Test
@@ -111,7 +111,7 @@ public class ResourceRegionEncoderTests extends AbstractDataBufferAllocatingTest
return previous;
});
ScriptedSubscriber.<DataBuffer>create()
Verifier.create(reduced)
.consumeNextWith(buf -> {
String content = DataBufferTestUtils.dumpString(buf, StandardCharsets.UTF_8);
String[] ranges = StringUtils.tokenizeToStringArray(content, "\r\n",
@@ -138,7 +138,7 @@ public class ResourceRegionEncoderTests extends AbstractDataBufferAllocatingTest
assertArrayEquals(expected, ranges);
})
.expectComplete()
.verify(reduced);
.verify();
}
}

37
spring-core/src/test/java/org/springframework/core/codec/StringDecoderTests.java
View File

@@ -21,7 +21,7 @@ import java.util.Collections;
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,11 @@ public class StringDecoderTests extends AbstractDataBufferAllocatingTestCase {
Flux<DataBuffer> source = Flux.just(stringBuffer("foo"), stringBuffer("bar"), stringBuffer("baz"));
Flux<String> output = this.decoder.decode(source, ResolvableType.forClass(String.class),
null, Collections.emptyMap());
ScriptedSubscriber
.<String>create()
Verifier.create(output)
.expectNext("foo", "bar", "baz")
.expectComplete().verify(output);
.expectComplete()
.verify();
}
@@ -75,10 +76,11 @@ public class StringDecoderTests extends AbstractDataBufferAllocatingTestCase {
Flux<DataBuffer> source = Flux.just(fooBar, baz);
Flux<String> output = decoder.decode(source, ResolvableType.forClass(String.class),
null, Collections.emptyMap());
ScriptedSubscriber
.<String>create()
Verifier.create(output)
.expectNext("\n", "foo\r", "\n", "bar\r", "\n", "baz")
.expectComplete().verify(output);
.expectComplete()
.verify();
}
@@ -88,10 +90,10 @@ public class StringDecoderTests extends AbstractDataBufferAllocatingTestCase {
Flux<String> output = this.decoder.decode(source, ResolvableType.forClass(String.class),
null, Collections.emptyMap());
ScriptedSubscriber
.<String>create()
Verifier.create(output)
.expectNextCount(0)
.expectComplete().verify(output);
.expectComplete()
.verify();
}
@@ -101,10 +103,9 @@ public class StringDecoderTests extends AbstractDataBufferAllocatingTestCase {
Flux<String> output = this.decoder.decode(source,
ResolvableType.forClass(String.class), null, Collections.emptyMap());
ScriptedSubscriber
.<String>create()
Verifier.create(output)
.expectNext("")
.expectComplete().verify(output);
.expectComplete().verify();
}
@@ -115,11 +116,10 @@ public class StringDecoderTests extends AbstractDataBufferAllocatingTestCase {
Mono<String> output = this.decoder.decodeToMono(source,
ResolvableType.forClass(String.class), null, Collections.emptyMap());
ScriptedSubscriber
.<String>create()
Verifier.create(output)
.expectNext("foobarbaz")
.expectComplete()
.verify(output);
.verify();
}
@Test
@@ -128,11 +128,10 @@ public class StringDecoderTests extends AbstractDataBufferAllocatingTestCase {
Mono<String> output = this.decoder.decodeToMono(source,
ResolvableType.forClass(String.class), null, Collections.emptyMap());
ScriptedSubscriber
.<String>create()
Verifier.create(output)
.expectNextCount(0)
.expectComplete()
.verify(output);
.verify();
}
}

37
spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
View File

@@ -24,7 +24,7 @@ import java.nio.file.StandardOpenOption;
import org.junit.Test;
import reactor.core.publisher.Flux;
import reactor.test.subscriber.ScriptedSubscriber;
import reactor.test.subscriber.Verifier;
import static org.junit.Assert.assertFalse;
@@ -39,13 +39,13 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
FileChannel channel = FileChannel.open(Paths.get(uri), StandardOpenOption.READ);
Flux<DataBuffer> flux = DataBufferUtils.read(channel, this.bufferFactory, 3);
ScriptedSubscriber
.<DataBuffer>create()
Verifier.create(flux)
.consumeNextWith(stringConsumer("foo"))
.consumeNextWith(stringConsumer("bar"))
.consumeNextWith(stringConsumer("baz"))
.consumeNextWith(stringConsumer("qux"))
.expectComplete().verify(flux);
.expectComplete()
.verify();
assertFalse(channel.isOpen());
}
@@ -56,12 +56,12 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
FileChannel channel = FileChannel.open(Paths.get(uri), StandardOpenOption.READ);
Flux<DataBuffer> flux = DataBufferUtils.read(channel, this.bufferFactory, 5);
ScriptedSubscriber
.<DataBuffer>create()
Verifier.create(flux)
.consumeNextWith(stringConsumer("fooba"))
.consumeNextWith(stringConsumer("rbazq"))
.consumeNextWith(stringConsumer("ux"))
.expectComplete().verify(flux);
.expectComplete()
.verify();
assertFalse(channel.isOpen());
}
@@ -71,13 +71,13 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
InputStream is = DataBufferUtilsTests.class.getResourceAsStream("DataBufferUtilsTests.txt");
Flux<DataBuffer> flux = DataBufferUtils.read(is, this.bufferFactory, 3);
ScriptedSubscriber
.<DataBuffer>create()
Verifier.create(flux)
.consumeNextWith(stringConsumer("foo"))
.consumeNextWith(stringConsumer("bar"))
.consumeNextWith(stringConsumer("baz"))
.consumeNextWith(stringConsumer("qux"))
.expectComplete().verify(flux);
.expectComplete()
.verify();
}
@Test
@@ -88,11 +88,10 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
Flux<DataBuffer> flux = Flux.just(foo, bar, baz);
Flux<DataBuffer> result = DataBufferUtils.takeUntilByteCount(flux, 5L);
ScriptedSubscriber
.<DataBuffer>create()
Verifier.create(result)
.consumeNextWith(stringConsumer("foo"))
.consumeNextWith(stringConsumer("ba"))
.expectComplete().verify(result);
.expectComplete().verify();
release(baz);
}
@@ -105,11 +104,11 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
Flux<DataBuffer> flux = Flux.just(foo, bar, baz);
Flux<DataBuffer> result = DataBufferUtils.skipUntilByteCount(flux, 5L);
ScriptedSubscriber
.<DataBuffer>create()
Verifier.create(result)
.consumeNextWith(stringConsumer("r"))
.consumeNextWith(stringConsumer("baz"))
.expectComplete().verify(result);
.expectComplete()
.verify();
}
@Test
@@ -120,10 +119,10 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
Flux<DataBuffer> flux = Flux.just(foo, bar, baz);
Flux<DataBuffer> result = DataBufferUtils.skipUntilByteCount(flux, 9L);
ScriptedSubscriber
.<DataBuffer>create()
Verifier.create(result)
.expectNextCount(0)
.expectComplete().verify(result);
.expectComplete()
.verify();
}
}