Fix StdOut in StdIo handling of Unicode. (#822 / #823)

J08nY · web-flow · commit a114c8990017 · 2024-08-12T16:56:51.000+02:00
For a better support of Unicode the StringWriter was replaced by a ByteArrayOutputStream. fixes #822 PR: #823
diff --git a/src/main/java/org/junitpioneer/jupiter/StdOutputStream.java b/src/main/java/org/junitpioneer/jupiter/StdOutputStream.java
@@ -10,34 +10,33 @@
 
 package org.junitpioneer.jupiter;
 
+import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
-import java.io.StringWriter;
-import java.nio.charset.Charset;
 import java.util.Arrays;
 
 abstract class StdOutputStream extends OutputStream {
 
-	private final StringWriter writer = new StringWriter();
+	private final ByteArrayOutputStream out = new ByteArrayOutputStream();
 
 	public StdOutputStream() {
 		// recreate default constructor to prevent compiler warning
 	}
 
 	@Override
 	public void write(int i) {
-		writer.write(i);
+		out.write(i);
 	}
 
 	@Override
 	public final void write(byte[] b, int off, int len) {
-		writer.write(new String(b, Charset.defaultCharset()), off, len);
+		out.write(b, off, len);
 	}
 
 	/**
 	 * @return the string that was written to {@code System.out} or {@code System.err}
 	 */
 	public String capturedString() {
-		return writer.toString();
+		return out.toString();
 	}
 
 	/**
@@ -55,7 +54,7 @@ public String capturedString() {
 	 * @return the lines that were written to {@code System.out} or {@code System.err}
 	 */
 	public String[] capturedLines() {
-		var lines = writer.toString().split(StdIoExtension.SEPARATOR, -1);
+		var lines = out.toString().split(StdIoExtension.SEPARATOR, -1);
 		return lines[lines.length - 1].isEmpty() ? Arrays.copyOf(lines, lines.length - 1) : lines;
 	}
 
diff --git a/src/test/java/org/junitpioneer/jupiter/StdIoExtensionTests.java b/src/test/java/org/junitpioneer/jupiter/StdIoExtensionTests.java
@@ -240,6 +240,14 @@ void catchesNothing(StdIn in, TestReporter reporter) {
 			// ParameterResolutionException: Discovered multiple competing ParameterResolvers
 		}
 
+		@Test
+		@StdIo()
+		@DisplayName("handles Unicode properly")
+		void handlesUnicode(StdOut out) {
+			String s = "■━━━".repeat(100);
+			assertThatCode(() -> System.out.println(s)).doesNotThrowAnyException();
+		}
+
 	}
 
 	@Nested

Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,14 @@ void catchesNothing(StdIn in, TestReporter reporter) {`
`240`	`240`	`// ParameterResolutionException: Discovered multiple competing ParameterResolvers`
`241`	`241`	`}`
`242`	`242`
	`243`	`+ @Test`
	`244`	`+ @StdIo()`
	`245`	`+ @DisplayName("handles Unicode properly")`
	`246`	`+ void handlesUnicode(StdOut out) {`
	`247`	`+ String s = "■━━━".repeat(100);`
	`248`	`+ assertThatCode(() -> System.out.println(s)).doesNotThrowAnyException();`
	`249`	`+ }`
	`250`	`+`
`243`	`251`	`}`
`244`	`252`
`245`	`253`	`@Nested`