Sync with TestSubscriber changes in reactor-core

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

@@ -56,9 +56,10 @@ public class ByteBufferDecoderTests extends AbstractDataBufferAllocatingTestCase
 		Flux<ByteBuffer> output = this.decoder.decode(source,
 				ResolvableType.forClassWithGenerics(Publisher.class, ByteBuffer.class),
 				null);
-		TestSubscriber<ByteBuffer> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output).assertNoError().assertComplete()
+				.subscribe(output)
-				.assertValues(ByteBuffer.wrap("foo".getBytes()),
+				.assertNoError()
-						ByteBuffer.wrap("bar".getBytes()));
+				.assertComplete()
+				.assertValues(ByteBuffer.wrap("foo".getBytes()), ByteBuffer.wrap("bar".getBytes()));
 	}
 }

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

@@ -64,8 +64,8 @@ public class ByteBufferEncoderTests extends AbstractDataBufferAllocatingTestCase
 		Flux<DataBuffer> output = this.encoder.encode(source, this.dataBufferFactory,
 				ResolvableType.forClassWithGenerics(Publisher.class, ByteBuffer.class),
 				null);
-		TestSubscriber<DataBuffer> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output)
+				.subscribe(output)
 				.assertValuesWith(b -> {
 					byte[] buf = new byte[3];
 					b.read(buf);

spring-web-reactive/src/test/java/org/springframework/core/codec/support/JacksonJsonDecoderTests.java

@@ -47,8 +47,9 @@ public class JacksonJsonDecoderTests extends AbstractDataBufferAllocatingTestCas
 				Flux.just(stringBuffer("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}"));
 		Flux<Object> output =
 				this.decoder.decode(source, ResolvableType.forClass(Pojo.class), null);
-		TestSubscriber<Object> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output).assertValues(new Pojo("foofoo", "barbar"));
+				.subscribe(output)
+				.assertValues(new Pojo("foofoo", "barbar"));
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/core/codec/support/JacksonJsonEncoderTests.java

@@ -53,11 +53,11 @@ public class JacksonJsonEncoderTests extends AbstractDataBufferAllocatingTestCas
 		Flux<DataBuffer> output =
 				this.encoder.encode(source, this.dataBufferFactory, null, null);
 
-		TestSubscriber<DataBuffer> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output).
+				.subscribe(output)
-				assertComplete().
+				.assertComplete()
-				assertNoError().
+				.assertNoError()
-				assertValuesWith(stringConsumer("["),
+				.assertValuesWith(stringConsumer("["),
 						stringConsumer("{\"foo\":\"foofoo\",\"bar\":\"barbar\"}"),
 						stringConsumer(","),
 						stringConsumer("{\"foo\":\"foofoofoo\",\"bar\":\"barbarbar\"}"),

spring-web-reactive/src/test/java/org/springframework/core/codec/support/Jaxb2DecoderTests.java

@@ -88,11 +88,11 @@ public class Jaxb2DecoderTests extends AbstractDataBufferAllocatingTestCase {
 				.decode(Flux.just(stringBuffer(POJO_ROOT)), null, null);
 		Flux<List<XMLEvent>> result = this.decoder.split(xmlEvents, new QName("pojo"));
 
-		TestSubscriber<List<XMLEvent>> resultSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		resultSubscriber.bindTo(result).
+				.subscribe(result)
-				assertNoError().
+				.assertNoError()
-				assertComplete().
+				.assertComplete()
-				assertValuesWith(events -> {
+				.assertValuesWith(events -> {
 					assertEquals(8, events.size());
 					assertStartElement(events.get(0), "pojo");
 					assertStartElement(events.get(1), "foo");
@@ -113,11 +113,11 @@ public class Jaxb2DecoderTests extends AbstractDataBufferAllocatingTestCase {
 				.decode(Flux.just(stringBuffer(POJO_CHILD)), null, null);
 		Flux<List<XMLEvent>> result = this.decoder.split(xmlEvents, new QName("pojo"));
 
-		TestSubscriber<List<XMLEvent>> resultSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		resultSubscriber.bindTo(result).
+				.subscribe(result)
-				assertNoError().
+				.assertNoError()
-				assertComplete().
+				.assertComplete()
-				assertValuesWith(events -> {
+				.assertValuesWith(events -> {
 					assertEquals(8, events.size());
 					assertStartElement(events.get(0), "pojo");
 					assertStartElement(events.get(1), "foo");
@@ -161,14 +161,11 @@ public class Jaxb2DecoderTests extends AbstractDataBufferAllocatingTestCase {
 		Flux<Object> output =
 				this.decoder.decode(source, ResolvableType.forClass(Pojo.class), null);
 
-		TestSubscriber<Object> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-
+				.subscribe(output)
-		testSubscriber.bindTo(output).
+				.assertNoError()
-				assertNoError().
+				.assertComplete()
-				assertComplete().
+				.assertValues(new Pojo("foofoo", "barbar"));
-				assertValues(new Pojo("foofoo", "barbar")
-
-				);
 	}
 
 	@Test
@@ -177,14 +174,11 @@ public class Jaxb2DecoderTests extends AbstractDataBufferAllocatingTestCase {
 		Flux<Object> output = this.decoder
 				.decode(source, ResolvableType.forClass(TypePojo.class), null);
 
-		TestSubscriber<Object> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-
+				.subscribe(output)
-		testSubscriber.bindTo(output).
+				.assertNoError()
-				assertNoError().
+				.assertComplete()
-				assertComplete().
+				.assertValues(new TypePojo("foofoo", "barbar"));
-				assertValues(new TypePojo("foofoo", "barbar")
-
-				);
 	}
 
 	@Test
@@ -193,14 +187,11 @@ public class Jaxb2DecoderTests extends AbstractDataBufferAllocatingTestCase {
 		Flux<Object> output =
 				this.decoder.decode(source, ResolvableType.forClass(Pojo.class), null);
 
-		TestSubscriber<Object> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-
+				.subscribe(output)
-		testSubscriber.bindTo(output).
+				.assertNoError()
-				assertNoError().
+				.assertComplete()
-				assertComplete().
+				.assertValues(new Pojo("foo", "bar"), new Pojo("foofoo", "barbar"));
-				assertValues(new Pojo("foo", "bar"), new Pojo("foofoo", "barbar")
-
-				);
 	}
 
 	@Test
@@ -209,14 +200,11 @@ public class Jaxb2DecoderTests extends AbstractDataBufferAllocatingTestCase {
 		Flux<Object> output = this.decoder
 				.decode(source, ResolvableType.forClass(TypePojo.class), null);
 
-		TestSubscriber<Object> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-
+				.subscribe(output)
-		testSubscriber.bindTo(output).
+				.assertNoError()
-				assertNoError().
+				.assertComplete()
-				assertComplete().
+				.assertValues(new TypePojo("foo", "bar"), new TypePojo("foofoo", "barbar"));
-				assertValues(new TypePojo("foo", "bar"), new TypePojo("foofoo", "barbar")
-
-				);
 	}
 
 	@Test

spring-web-reactive/src/test/java/org/springframework/core/codec/support/Jaxb2EncoderTests.java

@@ -73,8 +73,9 @@ public class Jaxb2EncoderTests extends AbstractDataBufferAllocatingTestCase {
 		Flux<DataBuffer> output = this.encoder.encode(source, this.dataBufferFactory,
 				ResolvableType.forClass(Pojo.class),
 						MediaType.APPLICATION_XML);
-		TestSubscriber<DataBuffer> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output).assertValuesWith(dataBuffer -> {
+				.subscribe(output)
+				.assertValuesWith(dataBuffer -> {
 			try {
 				String s = DataBufferTestUtils
 						.dumpString(dataBuffer, StandardCharsets.UTF_8);

spring-web-reactive/src/test/java/org/springframework/core/codec/support/JsonObjectDecoderTests.java

@@ -38,8 +38,8 @@ public class JsonObjectDecoderTests extends AbstractDataBufferAllocatingTestCase
 				Flux.just(stringBuffer("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}"));
 		Flux<String> output =
 				decoder.decode(source, null, null).map(JsonObjectDecoderTests::toString);
-		TestSubscriber<String> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output)
+				.subscribe(output)
 				.assertValues("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}");
 	}
 
@@ -50,8 +50,8 @@ public class JsonObjectDecoderTests extends AbstractDataBufferAllocatingTestCase
 				stringBuffer(", \"bar\": \"barbar\"}"));
 		Flux<String> output =
 				decoder.decode(source, null, null).map(JsonObjectDecoderTests::toString);
-		TestSubscriber<String> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output)
+				.subscribe(output)
 				.assertValues("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}");
 	}
 
@@ -62,8 +62,8 @@ public class JsonObjectDecoderTests extends AbstractDataBufferAllocatingTestCase
 				"[{\"foo\": \"foofoo\", \"bar\": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"));
 		Flux<String> output =
 				decoder.decode(source, null, null).map(JsonObjectDecoderTests::toString);
-		TestSubscriber<String> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output)
+				.subscribe(output)
 				.assertValues("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}",
 							  "{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}");
 	}
@@ -76,8 +76,8 @@ public class JsonObjectDecoderTests extends AbstractDataBufferAllocatingTestCase
 						": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"));
 		Flux<String> output =
 				decoder.decode(source, null, null).map(JsonObjectDecoderTests::toString);
-		TestSubscriber<String> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output)
+				.subscribe(output)
 				.assertValues("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}",
 							  "{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}");
 	}

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

@@ -64,11 +64,11 @@ public class ResourceDecoderTests extends AbstractDataBufferAllocatingTestCase {
 		Flux<Resource> result = this.decoder
 				.decode(source, ResolvableType.forClass(Resource.class), null);
 
-		TestSubscriber<Resource> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(result).
+				.subscribe(result)
-				assertNoError().
+				.assertNoError()
-				assertComplete().
+				.assertComplete()
-				assertValuesWith(resource -> {
+				.assertValuesWith(resource -> {
 					try {
 						byte[] bytes =
 								StreamUtils.copyToByteArray(resource.getInputStream());

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

@@ -66,8 +66,10 @@ public class ResourceEncoderTests extends AbstractDataBufferAllocatingTestCase {
 				ResolvableType.forClass(Resource.class),
 						null);
 
-		TestSubscriber<DataBuffer> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output).assertNoError().assertComplete()
+				.subscribe(output)
+				.assertNoError()
+				.assertComplete()
 				.assertValuesWith(stringConsumer(s));
 
 	}

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

@@ -65,11 +65,11 @@ public class StringDecoderTests extends AbstractDataBufferAllocatingTestCase {
 				Flux.just(stringBuffer("foo"), stringBuffer("bar"), stringBuffer("baz"));
 		Flux<String> output =
 				this.decoder.decode(source, ResolvableType.forClass(String.class), null);
-		TestSubscriber<String> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output).
+				.subscribe(output)
-				assertNoError().
+				.assertNoError()
-				assertComplete().
+				.assertComplete()
-				assertValues("foo", "bar", "baz");
+				.assertValues("foo", "bar", "baz");
 	}
 
 	@Test
@@ -79,21 +79,21 @@ public class StringDecoderTests extends AbstractDataBufferAllocatingTestCase {
 		Flux<DataBuffer> source = Flux.just(fooBar, baz);
 		Flux<String> output =
 				decoder.decode(source, ResolvableType.forClass(String.class), null);
-		TestSubscriber<String> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output).
+				.subscribe(output)
-				assertNoError().
+				.assertNoError()
-				assertComplete().
+				.assertComplete()
-				assertValues("foo", "bar", "baz");
+				.assertValues("foo", "bar", "baz");
 	}
 
-
 	@Test
 	public void decodeEmpty() throws InterruptedException {
 		Flux<DataBuffer> source = Flux.just(stringBuffer(""));
 		Flux<String> output =
 				this.decoder.decode(source, ResolvableType.forClass(String.class), null);
-		TestSubscriber<String> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output).assertValues("");
+				.subscribe(output)
+				.assertValues("");
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/core/codec/support/StringEncoderTests.java

@@ -66,8 +66,9 @@ public class StringEncoderTests extends AbstractDataBufferAllocatingTestCase {
 							DataBufferUtils.release(chunk);
 							return new String(b, StandardCharsets.UTF_8);
 		});
-		TestSubscriber<String> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(output).assertValues("foo");
+				.subscribe(output)
+				.assertValues("foo");
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/core/codec/support/XmlEventDecoderTests.java

@@ -46,11 +46,11 @@ public class XmlEventDecoderTests extends AbstractDataBufferAllocatingTestCase {
 		Flux<XMLEvent> events =
 				this.decoder.decode(Flux.just(stringBuffer(XML)), null, null);
 
-		TestSubscriber<XMLEvent> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(events).
+				.subscribe(events)
-				assertNoError().
+				.assertNoError()
-				assertComplete().
+				.assertComplete()
-				assertValuesWith(e -> assertTrue(e.isStartDocument()),
+				.assertValuesWith(e -> assertTrue(e.isStartDocument()),
 						e -> assertStartElement(e, "pojo"),
 						e -> assertStartElement(e, "foo"),
 						e -> assertCharacters(e, "foofoo"),
@@ -68,11 +68,11 @@ public class XmlEventDecoderTests extends AbstractDataBufferAllocatingTestCase {
 		Flux<XMLEvent> events =
 				this.decoder.decode(Flux.just(stringBuffer(XML)), null, null);
 
-		TestSubscriber<XMLEvent> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(events).
+				.subscribe(events)
-				assertNoError().
+				.assertNoError()
-				assertComplete().
+				.assertComplete()
-				assertValuesWith(e -> assertTrue(e.isStartDocument()),
+				.assertValuesWith(e -> assertTrue(e.isStartDocument()),
 						e -> assertStartElement(e, "pojo"),
 						e -> assertStartElement(e, "foo"),
 						e -> assertCharacters(e, "foofoo"),
@@ -98,5 +98,4 @@ public class XmlEventDecoderTests extends AbstractDataBufferAllocatingTestCase {
 		assertEquals(expectedData, event.asCharacters().getData());
 	}
 
-
 }

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

@@ -47,11 +47,12 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
 
 		Flux<DataBuffer> flux = DataBufferUtils.read(channel, this.dataBufferFactory, 4);
 
-		TestSubscriber<DataBuffer> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(flux).
+				.subscribe(flux)
-				assertNoError().
+				.assertNoError()
-				assertComplete().
+				.assertComplete()
-				assertValuesWith(stringConsumer("foo\n"), stringConsumer("bar\n"),
+				.assertValuesWith(
+						stringConsumer("foo\n"), stringConsumer("bar\n"),
 						stringConsumer("baz\n"), stringConsumer("qux\n"));
 
 		assertFalse(channel.isOpen());
@@ -65,11 +66,12 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
 
 		Flux<DataBuffer> flux = DataBufferUtils.read(channel, this.dataBufferFactory, 3);
 
-		TestSubscriber<DataBuffer> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(flux).
+				.subscribe(flux)
-				assertNoError().
+				.assertNoError()
-				assertComplete().
+				.assertComplete()
-				assertValuesWith(stringConsumer("foo"), stringConsumer("\nba"),
+				.assertValuesWith(
+						stringConsumer("foo"), stringConsumer("\nba"),
 						stringConsumer("r\nb"), stringConsumer("az\n"),
 						stringConsumer("qux"), stringConsumer("\n"));
 
@@ -83,11 +85,12 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
 
 		Flux<DataBuffer> flux = DataBufferUtils.read(is, this.dataBufferFactory, 4);
 
-		TestSubscriber<DataBuffer> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(flux).
+				.subscribe(flux)
-				assertNoError().
+				.assertNoError()
-				assertComplete().
+				.assertComplete()
-				assertValuesWith(stringConsumer("foo\n"), stringConsumer("bar\n"),
+				.assertValuesWith(
+						stringConsumer("foo\n"), stringConsumer("bar\n"),
 						stringConsumer("baz\n"), stringConsumer("qux\n"));
 	}
 
@@ -100,11 +103,11 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
 
 		Flux<DataBuffer> result = DataBufferUtils.takeUntilByteCount(flux, 5L);
 
-		TestSubscriber<DataBuffer> testSubscriber = new TestSubscriber<>();
+		TestSubscriber
-		testSubscriber.bindTo(result).
+				.subscribe(result)
-				assertNoError().
+				.assertNoError()
-				assertComplete().
+				.assertComplete()
-				assertValuesWith(stringConsumer("foo"), stringConsumer("ba"));
+				.assertValuesWith(stringConsumer("foo"), stringConsumer("ba"));
 
 		release(baz);
 	}

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

@@ -65,14 +65,14 @@ public class WebClientIntegrationTests {
 				.perform(get(baseUrl.toString()))
 				.extract(headers());
 
-		TestSubscriber<HttpHeaders> ts = new TestSubscriber<>();
+		TestSubscriber
-		result.subscribe(ts);
+				.subscribe(result)
-		ts.awaitAndAssertNextValuesWith(
+				.awaitAndAssertNextValuesWith(
 					httpHeaders -> {
 						assertEquals(MediaType.TEXT_PLAIN, httpHeaders.getContentType());
 						assertEquals(13L, httpHeaders.getContentLength());
-				}
+					})
-		).assertComplete();
+				.assertComplete();
 
 		RecordedRequest request = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
@@ -92,9 +92,10 @@ public class WebClientIntegrationTests {
 				.extract(body(String.class));
 
 
-		TestSubscriber<String> ts = new TestSubscriber<>();
+		TestSubscriber
-		result.subscribe(ts);
+				.subscribe(result)
-		ts.awaitAndAssertNextValues("Hello Spring!").assertComplete();
+				.awaitAndAssertNextValues("Hello Spring!")
+				.assertComplete();
 
 		RecordedRequest request = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
@@ -114,9 +115,9 @@ public class WebClientIntegrationTests {
 						.accept(MediaType.TEXT_PLAIN))
 				.extract(response(String.class));
 
-		TestSubscriber<ResponseEntity<String>> ts = new TestSubscriber<>();
+		TestSubscriber
-		result.subscribe(ts);
+				.subscribe(result)
-		ts.awaitAndAssertNextValuesWith((Consumer<ResponseEntity<String>>) response -> {
+				.awaitAndAssertNextValuesWith((Consumer<ResponseEntity<String>>) response -> {
 					assertEquals(200, response.getStatusCode().value());
 					assertEquals(MediaType.TEXT_PLAIN, response.getHeaders().getContentType());
 					assertEquals("Hello Spring!", response.getBody());
@@ -140,9 +141,10 @@ public class WebClientIntegrationTests {
 						.accept(MediaType.APPLICATION_JSON))
 				.extract(body(String.class));
 
-		TestSubscriber<String> ts = new TestSubscriber<>();
+		TestSubscriber
-		result.subscribe(ts);
+				.subscribe(result)
-		ts.awaitAndAssertNextValues(content).assertComplete();
+				.awaitAndAssertNextValues(content)
+				.assertComplete();
 		RecordedRequest request = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
 		assertEquals("/json", request.getPath());
@@ -161,9 +163,10 @@ public class WebClientIntegrationTests {
 						.accept(MediaType.APPLICATION_JSON))
 				.extract(body(Pojo.class));
 
-		TestSubscriber<Pojo> ts = new TestSubscriber<>();
+		TestSubscriber
-		result.subscribe(ts);
+				.subscribe(result)
-		ts.awaitAndAssertNextValuesWith(p -> assertEquals("barbar", p.getBar())).assertComplete();
+				.awaitAndAssertNextValuesWith(p -> assertEquals("barbar", p.getBar()))
+				.assertComplete();
 		RecordedRequest request = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
 		assertEquals("/pojo", request.getPath());
@@ -182,12 +185,13 @@ public class WebClientIntegrationTests {
 						.accept(MediaType.APPLICATION_JSON))
 				.extract(bodyStream(Pojo.class));
 
-		TestSubscriber<Pojo> ts = new TestSubscriber<>();
+		TestSubscriber
-		result.subscribe(ts);
+				.subscribe(result)
-		ts.awaitAndAssertNextValuesWith(
+				.awaitAndAssertNextValuesWith(
 					p -> assertThat(p.getBar(), Matchers.is("bar1")),
-				p -> assertThat(p.getBar(), Matchers.is("bar2"))
+					p -> assertThat(p.getBar(), Matchers.is("bar2")))
-		).assertValueCount(2).assertComplete();
+				.assertValueCount(2)
+				.assertComplete();
 		RecordedRequest request = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
 		assertEquals("/pojos", request.getPath());
@@ -206,14 +210,14 @@ public class WebClientIntegrationTests {
 						.accept(MediaType.APPLICATION_JSON))
 				.extract(responseStream(Pojo.class));
 
-		TestSubscriber<ResponseEntity<Flux<Pojo>>> ts = new TestSubscriber<>();
+		TestSubscriber
-		result.subscribe(ts);
+				.subscribe(result)
-		ts.awaitAndAssertNextValuesWith(
+				.awaitAndAssertNextValuesWith(
 					response -> {
 						assertEquals(200, response.getStatusCode().value());
 						assertEquals(MediaType.APPLICATION_JSON, response.getHeaders().getContentType());
-				}
+					})
-		).assertComplete();
+				.assertComplete();
 		RecordedRequest request = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
 		assertEquals("/pojos", request.getPath());
@@ -234,9 +238,10 @@ public class WebClientIntegrationTests {
 						.accept(MediaType.APPLICATION_JSON))
 				.extract(body(Pojo.class));
 
-		TestSubscriber<Pojo> ts = new TestSubscriber<>();
+		TestSubscriber
-		result.subscribe(ts);
+				.subscribe(result)
-		ts.awaitAndAssertNextValuesWith(p -> assertEquals("BARBAR", p.getBar())).assertComplete();
+				.awaitAndAssertNextValuesWith(p -> assertEquals("BARBAR", p.getBar()))
+				.assertComplete();
 
 		RecordedRequest request = server.takeRequest();
 		assertEquals(1, server.getRequestCount());
@@ -257,11 +262,11 @@ public class WebClientIntegrationTests {
 				.perform(get(baseUrl.toString()))
 				.extract(body(String.class));
 
-
-		TestSubscriber<String> ts = new TestSubscriber<>();
-		result.subscribe(ts);
 		// TODO: error message should be converted to a ClientException
-		ts.await().assertError();
+		TestSubscriber
+				.subscribe(result)
+				.await()
+				.assertError();
 
 		RecordedRequest request = server.takeRequest();
 		assertEquals(1, server.getRequestCount());

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java

@@ -38,7 +38,6 @@ import org.springframework.util.AntPathMatcher;
 import org.springframework.util.PathMatcher;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.reactive.result.method.AbstractHandlerMethodMapping;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
 import org.springframework.web.server.session.WebSessionManager;
@@ -103,9 +102,9 @@ public class HandlerMethodMappingTests {
 		this.mapping.registerMapping("/fo?", this.handler, this.method2);
 		Mono<Object> result = this.mapping.getHandler(createExchange(HttpMethod.GET, "/foo"));
 
-		TestSubscriber<Object> subscriber = new TestSubscriber<>();
+		TestSubscriber
-		result.subscribeWith(subscriber);
+				.subscribe(result)
-		subscriber.assertError(IllegalStateException.class);
+				.assertError(IllegalStateException.class);
 	}
 
 	@Test

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java

@@ -160,9 +160,9 @@ public class RequestMappingInfoHandlerMappingTests {
 		this.handlerMapping.registerHandler(new UserController());
 		Mono<Object> mono = this.handlerMapping.getHandler(exchange);
 
-		TestSubscriber<Object> subscriber = new TestSubscriber<>();
+		TestSubscriber
-		mono.subscribeWith(subscriber);
+				.subscribe(mono)
-		subscriber.assertError(NotAcceptableStatusException.class);
+				.assertError(NotAcceptableStatusException.class);
 	}
 
 	// SPR-8462
@@ -357,9 +357,9 @@ public class RequestMappingInfoHandlerMappingTests {
 
 	@SuppressWarnings("unchecked")
 	private <T> void assertError(Mono<Object> mono, final Class<T> exceptionClass, final Consumer<T> consumer)  {
-		TestSubscriber<Object> subscriber = new TestSubscriber<>();
+		TestSubscriber
-		mono.subscribeWith(subscriber);
+				.subscribe(mono)
-		subscriber.assertErrorWith(ex -> {
+				.assertErrorWith(ex -> {
 					assertEquals(exceptionClass, ex.getClass());
 					consumer.accept((T) ex);
 				});

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/AbstractRequestAttributesArgumentResolverTests.java

@@ -96,9 +96,9 @@ public abstract class AbstractRequestAttributesArgumentResolverTests {
 	public void resolve() throws Exception {
 		MethodParameter param = initMethodParameter(0);
 		Mono<Object> mono = this.resolver.resolveArgument(param, null, this.exchange);
-		TestSubscriber<Object> subscriber = new TestSubscriber<>();
+		TestSubscriber
-		mono.subscribeWith(subscriber);
+				.subscribe(mono)
-		subscriber.assertError(ServerWebInputException.class);
+				.assertError(ServerWebInputException.class);
 
 		Foo foo = new Foo();
 		this.exchange.getAttributes().put("foo", foo);

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolverTests.java

@@ -116,9 +116,9 @@ public class CookieValueMethodArgumentResolverTests {
 	@Test
 	public void notFound() {
 		Mono<Object> mono = resolver.resolveArgument(this.cookieParameter, null, this.exchange);
-		TestSubscriber<Object> subscriber = new TestSubscriber<>();
+		TestSubscriber
-		mono.subscribeWith(subscriber);
+				.subscribe(mono)
-		subscriber.assertError(ServerWebInputException.class);
+				.assertError(ServerWebInputException.class);
 	}
 
 

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolverTests.java

@@ -98,9 +98,9 @@ public class PathVariableMethodArgumentResolverTests {
 	@Test
 	public void handleMissingValue() throws Exception {
 		Mono<Object> mono = this.resolver.resolveArgument(this.paramNamedString, new ModelMap(), this.exchange);
-		TestSubscriber<Object> subscriber = new TestSubscriber<>();
+		TestSubscriber
-		mono.subscribeWith(subscriber);
+				.subscribe(mono)
-		subscriber.assertError(ServerErrorException.class);
+				.assertError(ServerErrorException.class);
 	}
 
 	@SuppressWarnings("unused")

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java

@@ -90,9 +90,9 @@ public class RequestAttributeMethodArgumentResolverTests {
 	public void resolve() throws Exception {
 		MethodParameter param = initMethodParameter(0);
 		Mono<Object> mono = this.resolver.resolveArgument(param, null, this.exchange);
-		TestSubscriber<Object> subscriber = new TestSubscriber<>();
+		TestSubscriber
-		mono.subscribeWith(subscriber);
+				.subscribe(mono)
-		subscriber.assertError(ServerWebInputException.class);
+				.assertError(ServerWebInputException.class);
 
 		Foo foo = new Foo();
 		this.exchange.getAttributes().put("foo", foo);

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolverTests.java

@@ -184,9 +184,9 @@ public class RequestHeaderMethodArgumentResolverTests {
 	@Test
 	public void notFound() throws Exception {
 		Mono<Object> mono = resolver.resolveArgument(paramNamedValueStringArray, null, this.exchange);
-		TestSubscriber<Object> subscriber = new TestSubscriber<>();
+		TestSubscriber
-		mono.subscribeWith(subscriber);
+				.subscribe(mono)
-		subscriber.assertError(ServerWebInputException.class);
+				.assertError(ServerWebInputException.class);
 	}
 
 	@Test

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverTests.java

@@ -149,9 +149,9 @@ public class RequestParamMethodArgumentResolverTests {
 	@Test
 	public void missingRequestParam() throws Exception {
 		Mono<Object> mono = this.resolver.resolveArgument(paramNamedStringArray, null, this.exchange);
-		TestSubscriber<Object> subscriber = new TestSubscriber<>();
+		TestSubscriber
-		mono.subscribeWith(subscriber);
+				.subscribe(mono)
-		subscriber.assertError(ServerWebInputException.class);
+				.assertError(ServerWebInputException.class);
 	}
 
 	@Test

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java

@@ -97,9 +97,9 @@ public class SessionAttributeMethodArgumentResolverTests {
 	public void resolve() throws Exception {
 		MethodParameter param = initMethodParameter(0);
 		Mono<Object> mono = this.resolver.resolveArgument(param, null, this.exchange);
-		TestSubscriber<Object> subscriber = new TestSubscriber<>();
+		TestSubscriber
-		mono.subscribeWith(subscriber);
+				.subscribe(mono)
-		subscriber.assertError(ServerWebInputException.class);
+				.assertError(ServerWebInputException.class);
 
 		Foo foo = new Foo();
 		when(this.session.getAttribute("foo")).thenReturn(Optional.of(foo));

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/HttpMessageConverterViewTests.java

@@ -172,7 +172,8 @@ public class HttpMessageConverterViewTests {
 
 		this.view.render(result, MediaType.APPLICATION_JSON, exchange);
 
-		new TestSubscriber<DataBuffer>().bindTo(response.getBody())
+		TestSubscriber
+				.subscribe(response.getBody())
 				.assertValuesWith(buf -> assertEquals("{\"foo\":\"foo\",\"bar\":\"bar\"}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 	}

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java

@@ -120,7 +120,7 @@ public class ViewResolutionResultHandlerTests {
 		Object value = new TestView("account");
 		handle("/path", value, "handleView");
 
-		new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
+		TestSubscriber.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("account: {id=123}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 	}
@@ -130,7 +130,7 @@ public class ViewResolutionResultHandlerTests {
 		Object value = Mono.just(new TestView("account"));
 		handle("/path", value, "handleMonoView");
 
-		new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
+		TestSubscriber.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("account: {id=123}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 	}
@@ -140,8 +140,8 @@ public class ViewResolutionResultHandlerTests {
 		Object value = "account";
 		handle("/path", value, "handleString", new TestViewResolver("account"));
 
-		TestSubscriber<DataBuffer> subscriber = new TestSubscriber<>();
+		TestSubscriber
-		subscriber.bindTo(this.response.getBody())
+				.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("account: {id=123}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 	}
@@ -151,7 +151,7 @@ public class ViewResolutionResultHandlerTests {
 		Object value = Mono.just("account");
 		handle("/path", value, "handleMonoString", new TestViewResolver("account"));
 
-		new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
+		TestSubscriber.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("account: {id=123}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 	}
@@ -162,7 +162,7 @@ public class ViewResolutionResultHandlerTests {
 		handle("/path", value, "handleString",
 				new TestViewResolver("account"), new TestViewResolver("profile"));
 
-		new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
+		TestSubscriber.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("profile: {id=123}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 	}
@@ -178,17 +178,17 @@ public class ViewResolutionResultHandlerTests {
 		ViewResolver resolver = new TestViewResolver("account");
 
 		handle("/account", null, "handleString", resolver);
-		new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
+		TestSubscriber.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("account: {id=123}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 
 		handle("/account/", null, "handleString", resolver);
-		new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
+		TestSubscriber.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("account: {id=123}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 
 		handle("/account.123", null, "handleString", resolver);
-		new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
+		TestSubscriber.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("account: {id=123}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 	}
@@ -198,7 +198,7 @@ public class ViewResolutionResultHandlerTests {
 		Object value = Mono.empty();
 		handle("/account", value, "handleMonoString", new TestViewResolver("account"));
 
-		new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
+		TestSubscriber.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("account: {id=123}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 	}
@@ -208,7 +208,7 @@ public class ViewResolutionResultHandlerTests {
 		Model value = new ExtendedModelMap().addAttribute("name", "Joe");
 		handle("/account", value, "handleModel", new TestViewResolver("account"));
 
-		new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
+		TestSubscriber.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("account: {id=123, name=Joe}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 	}
@@ -218,7 +218,7 @@ public class ViewResolutionResultHandlerTests {
 		Map<String, String> value = Collections.singletonMap("name", "Joe");
 		handle("/account", value, "handleMap", new TestViewResolver("account"));
 
-		new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
+		TestSubscriber.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("account: {id=123, name=Joe}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 	}
@@ -228,7 +228,7 @@ public class ViewResolutionResultHandlerTests {
 		String value = "Joe";
 		handle("/account", value, "handleModelAttributeAnnotation", new TestViewResolver("account"));
 
-		new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
+		TestSubscriber.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("account: {id=123, name=Joe}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 	}
@@ -238,7 +238,7 @@ public class ViewResolutionResultHandlerTests {
 		Object value = new TestBean("Joe");
 		handle("/account", value, "handleTestBean", new TestViewResolver("account"));
 
-		new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
+		TestSubscriber.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("account: {id=123, testBean=TestBean[name=Joe]}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 	}
@@ -258,7 +258,7 @@ public class ViewResolutionResultHandlerTests {
 				Collections.singletonList(jsonView));
 
 		assertEquals(MediaType.APPLICATION_JSON, this.response.getHeaders().getContentType());
-		new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
+		TestSubscriber.subscribe(this.response.getBody())
 				.assertValuesWith(buf -> assertEquals("defaultView: {id=123}",
 						DataBufferTestUtils.dumpString(buf, Charset.forName("UTF-8"))));
 	}
@@ -315,8 +315,7 @@ public class ViewResolutionResultHandlerTests {
 
 		Mono<Void> mono = handler.handleResult(exchange, handlerResult);
 
-		TestSubscriber<Void> subscriber = new TestSubscriber<>();
+		return TestSubscriber.subscribe(mono).await(Duration.ofSeconds(1));
-		return subscriber.bindTo(mono).await(Duration.ofSeconds(1));
 	}
 
 

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewTests.java

@@ -128,13 +128,13 @@ public class FreeMarkerViewTests {
 		HandlerResult result = new HandlerResult(new Object(), "", ResolvableType.NONE, model);
 		view.render(result, null, this.exchange);
 
-		TestSubscriber<DataBuffer> subscriber = new TestSubscriber<>();
+		TestSubscriber
-		subscriber.bindTo(this.response.getBody()).assertValuesWith(dataBuffer ->
+				.subscribe(this.response.getBody())
+				.assertValuesWith(dataBuffer ->
 					assertEquals("<html><body>hi FreeMarker</body></html>", asString(dataBuffer)));
 	}
 
 
-
 	private static String asString(DataBuffer dataBuffer) {
 		ByteBuffer byteBuffer = dataBuffer.asByteBuffer();
 		final byte[] bytes = new byte[byteBuffer.remaining()];