Polishing in SubscriberInputStreamTests

Author: rstoyanchev

spring-web/src/test/java/org/springframework/http/client/SubscriberInputStreamTests.java

@@ -26,8 +26,6 @@
 import java.util.concurrent.Flow;
 
 import org.junit.jupiter.api.Test;
-import org.reactivestreams.FlowAdapters;
-import reactor.test.StepVerifier;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -68,22 +66,7 @@ public byte[] map(byte[] b, int off, int len) {
 
 
 	@Test
-	void basic() {
-		Flow.Publisher<byte[]> publisher = new OutputStreamPublisher<>(
-				out -> {
-					out.write(FOO);
-					out.write(BAR);
-					out.write(BAZ);
-				},
-				this.byteMapper, this.executor, null);
-
-		StepVerifier.create(FlowAdapters.toPublisher(publisher))
-				.assertNext(s -> assertThat(s).containsExactly("foobarbaz".getBytes(UTF_8)))
-				.verifyComplete();
-	}
-
-	@Test
-	void flush() throws IOException {
+	void basic() throws IOException {
 		Flow.Publisher<byte[]> publisher = new OutputStreamPublisher<>(
 				out -> {
 					out.write(FOO);
@@ -115,7 +98,7 @@ void flush() throws IOException {
 	}
 
 	@Test
-	void chunkSize() {
+	void chunkSize() throws Exception {
 		Flow.Publisher<byte[]> publisher = new OutputStreamPublisher<>(
 				out -> {
 					out.write(FOO);
@@ -127,24 +110,25 @@ void chunkSize() {
 		try (SubscriberInputStream<byte[]> is = new SubscriberInputStream<>(s -> s, s -> {}, 1)) {
 			publisher.subscribe(is);
 
-			StringBuilder stringBuilder = new StringBuilder();
+			StringBuilder sb = new StringBuilder();
 			byte[] chunk = new byte[3];
 
-			stringBuilder.append(new String(new byte[]{(byte)is.read()}, UTF_8));
+			sb.append((char) is.read());
+			assertThat(sb).matches("f");
+
 			assertThat(is.read(chunk)).isEqualTo(3);
+			sb.append(new String(chunk, UTF_8));
+			assertThat(sb).matches("foob");
 
-			stringBuilder.append(new String(chunk, UTF_8));
 			assertThat(is.read(chunk)).isEqualTo(3);
+			sb.append(new String(chunk, UTF_8));
+			assertThat(sb).matches("foobarb");
 
-			stringBuilder.append(new String(chunk, UTF_8));
 			assertThat(is.read(chunk)).isEqualTo(2);
+			sb.append(new String(chunk,0, 2, UTF_8));
+			assertThat(sb).matches("foobarbaz");
 
-			stringBuilder.append(new String(chunk,0, 2, UTF_8));
 			assertThat(is.read()).isEqualTo(-1);
-			assertThat(stringBuilder.toString()).isEqualTo("foobarbaz");
-		}
-		catch (IOException e) {
-			throw new RuntimeException(e);
 		}
 	}
 
@@ -155,13 +139,13 @@ void cancel() throws InterruptedException, IOException {
 		Flow.Publisher<byte[]> publisher = new OutputStreamPublisher<>(
 				out -> {
 					assertThatIOException().isThrownBy(() -> {
-								out.write(FOO);
-								out.flush();
-								out.write(BAR);
-								out.flush();
-								out.write(BAZ);
-								out.flush();
-							}).withMessage("Subscription has been terminated");
+						out.write(FOO);
+						out.flush();
+						out.write(BAR);
+						out.flush();
+						out.write(BAZ);
+						out.flush();
+					}).withMessage("Subscription has been terminated");
 					latch.countDown();
 
 				}, this.byteMapper, this.executor, null);
@@ -201,6 +185,7 @@ void closed() throws InterruptedException, IOException {
 
 			assertThat(is.read(chunk)).isEqualTo(3);
 			assertThat(chunk).containsExactly(FOO);
+
 			assertThat(is.read(chunk)).isEqualTo(-1);
 		}
 
@@ -215,7 +200,8 @@ void mapperThrowsException() throws InterruptedException {
 				out -> {
 					out.write(FOO);
 					out.flush();
-					assertThatIOException().isThrownBy(() -> {
+					assertThatIOException()
+							.isThrownBy(() -> {
 								out.write(BAR);
 								out.flush();
 							})