diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/process/WatchedOutput.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/process/WatchedOutput.java index a86e411d101a..67019b147688 100644 --- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/process/WatchedOutput.java +++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/process/WatchedOutput.java @@ -13,23 +13,11 @@ import java.io.ByteArrayOutputStream; import java.nio.charset.Charset; -public class WatchedOutput { +record WatchedOutput(Thread thread, ByteArrayOutputStream stream) { private static final Charset CHARSET = Charset.forName(System.getProperty("native.encoding")); - private final Thread thread; - private final ByteArrayOutputStream stream; - - WatchedOutput(Thread thread, ByteArrayOutputStream stream) { - this.thread = thread; - this.stream = stream; - } - - void join() throws InterruptedException { - thread.join(); - } - - public String getStreamAsString() { + String streamAsString() { return stream.toString(CHARSET); } } diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/process/WatchedProcess.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/process/WatchedProcess.java index 3e048e5b0caf..4b41d100e404 100644 --- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/process/WatchedProcess.java +++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/process/WatchedProcess.java @@ -36,13 +36,13 @@ ProcessResult waitFor() throws InterruptedException { } finally { try { - out.join(); + out.thread().join(); } finally { - err.join(); + err.thread().join(); } } - return new ProcessResult(exitCode, out.getStreamAsString(), err.getStreamAsString()); + return new ProcessResult(exitCode, out.streamAsString(), err.streamAsString()); } finally { process.destroyForcibly();