Skip to content

Commit 5531e80

Browse files
committed
Anticipate reactor.test.TestSubscriber removal
reactor.test.TestSubscriber will not be part of Reactor Core 3.0.0 since it needs to be refactored to fit all the needs expressed by the users. It is likely to be back later in one of the Reactor Core 3.0.x releases. This commit anticipate this removal by temporarily copying TestSubscriber in spring-core test classes. As soon as the new TestSubscriber will be available in Reactor Core, Spring Framework reactive tests will use it again.
1 parent e4ccbc9 commit 5531e80

File tree

39 files changed

+1202
-38
lines changed

39 files changed

+1202
-38
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import org.junit.Test;
2222
import org.reactivestreams.Publisher;
2323
import reactor.core.publisher.Flux;
24-
import reactor.test.TestSubscriber;
2524

2625
import org.springframework.core.ResolvableType;
2726
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
2827
import org.springframework.core.io.buffer.DataBuffer;
28+
import org.springframework.tests.TestSubscriber;
2929
import org.springframework.util.MimeTypeUtils;
3030

3131
import static org.junit.Assert.assertFalse;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import org.junit.Test;
2424
import org.reactivestreams.Publisher;
2525
import reactor.core.publisher.Flux;
26-
import reactor.test.TestSubscriber;
2726

2827
import org.springframework.core.ResolvableType;
2928
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
3029
import org.springframework.core.io.buffer.DataBuffer;
30+
import org.springframework.tests.TestSubscriber;
3131
import org.springframework.util.MimeTypeUtils;
3232

3333
import static org.junit.Assert.assertArrayEquals;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import org.junit.runner.RunWith;
2222
import org.junit.runners.Parameterized;
2323
import reactor.core.publisher.Flux;
24-
import reactor.test.TestSubscriber;
2524

2625
import org.springframework.core.ResolvableType;
2726
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
2827
import org.springframework.core.io.buffer.DataBuffer;
28+
import org.springframework.tests.TestSubscriber;
2929
import org.springframework.util.MimeTypeUtils;
3030

3131
import static org.junit.Assert.assertFalse;

spring-core/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020

2121
import org.junit.Test;
2222
import reactor.core.publisher.Flux;
23-
import reactor.test.TestSubscriber;
2423

2524
import org.springframework.core.ResolvableType;
2625
import org.springframework.core.io.ByteArrayResource;
2726
import org.springframework.core.io.InputStreamResource;
2827
import org.springframework.core.io.Resource;
2928
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
3029
import org.springframework.core.io.buffer.DataBuffer;
30+
import org.springframework.tests.TestSubscriber;
3131
import org.springframework.util.MimeTypeUtils;
3232
import org.springframework.util.StreamUtils;
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import org.junit.Test;
2222
import reactor.core.publisher.Flux;
2323
import reactor.core.publisher.Mono;
24-
import reactor.test.TestSubscriber;
2524

2625
import org.springframework.core.ResolvableType;
2726
import org.springframework.core.io.ByteArrayResource;
2827
import org.springframework.core.io.InputStreamResource;
2928
import org.springframework.core.io.Resource;
3029
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
3130
import org.springframework.core.io.buffer.DataBuffer;
31+
import org.springframework.tests.TestSubscriber;
3232
import org.springframework.util.MimeTypeUtils;
3333

3434
import static org.junit.Assert.assertTrue;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import org.junit.Test;
2020
import reactor.core.publisher.Flux;
2121
import reactor.core.publisher.Mono;
22-
import reactor.test.TestSubscriber;
2322

2423
import org.springframework.core.ResolvableType;
2524
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
2625
import org.springframework.core.io.buffer.DataBuffer;
26+
import org.springframework.tests.TestSubscriber;
2727
import org.springframework.util.MimeTypeUtils;
2828

2929
import static org.junit.Assert.assertFalse;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import org.junit.Test;
2626
import reactor.core.publisher.Flux;
27-
import reactor.test.TestSubscriber;
27+
import org.springframework.tests.TestSubscriber;
2828

2929
import static org.junit.Assert.*;
3030

0 commit comments

Comments
 (0)