-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Issue: #3166: Introduce --redirect-stdout and --redirect-stderr CLI options to redirect STDOUT and STDERR #4311
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
marcphilipp
merged 4 commits into
junit-team:main
from
Oyster-zx:feat-redirect_stderr_and_stdout
Mar 10, 2025
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
9c2b4a3
Issue: #3166: Introduce --redirect-stdout and --redirect-stderr CLI o…
Oyster-zx 703bc00
Issue #3166: STDOUT and STDERR are reset after console test execution
Oyster-zx b64113f
Issue #3166: STDOUT and STDERR are auto closed after test execution
Oyster-zx 59c6e36
Issue #3166: detailed docmentation provided for redirecting standard …
Oyster-zx File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
junit-platform-console/src/main/java/org/junit/platform/console/tasks/StdStreamHandler.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Copyright 2015-2025 the original author or authors. | ||
| * | ||
| * All rights reserved. This program and the accompanying materials are | ||
| * made available under the terms of the Eclipse Public License v2.0 which | ||
| * accompanies this distribution and is available at | ||
| * | ||
| * https://www.eclipse.org/legal/epl-v20.html | ||
| */ | ||
|
|
||
| package org.junit.platform.console.tasks; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.PrintStream; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
|
|
||
| import org.junit.platform.commons.JUnitException; | ||
|
|
||
| class StdStreamHandler implements AutoCloseable { | ||
| private PrintStream stdout; | ||
| private PrintStream stderr; | ||
|
|
||
| public StdStreamHandler() { | ||
| } | ||
|
|
||
| private boolean isSameFile(Path path1, Path path2) { | ||
| if (path1 == null || path2 == null) | ||
| return false; | ||
| return (path1.normalize().toAbsolutePath().equals(path2.normalize().toAbsolutePath())); | ||
| } | ||
|
|
||
| /** | ||
| * Redirects standard output (stdout) and standard error (stderr) to the specified file paths. | ||
| * If the paths are the same, both streams are redirected to the same file. | ||
| * The default charset is used for writing to the files. | ||
| * | ||
| * @param stdoutPath The file path for standard output. {@code null} means no redirection. | ||
| * @param stderrPath The file path for standard error. {@code null} means no redirection. | ||
| */ | ||
| public void redirectStdStreams(Path stdoutPath, Path stderrPath) { | ||
| if (isSameFile(stdoutPath, stderrPath)) { | ||
| try { | ||
| PrintStream commonStream = new PrintStream(Files.newOutputStream(stdoutPath), true); | ||
Oyster-zx marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| this.stdout = commonStream; | ||
| this.stderr = commonStream; | ||
| } | ||
| catch (IOException e) { | ||
| throw new JUnitException("Error setting up stream for Stdout and Stderr at path: " + stdoutPath, e); | ||
| } | ||
| } | ||
| else { | ||
| if (stdoutPath != null) { | ||
| try { | ||
| this.stdout = new PrintStream(Files.newOutputStream(stdoutPath), true); | ||
| } | ||
| catch (IOException e) { | ||
| throw new JUnitException("Error setting up stream for Stdout at path: " + stdoutPath, e); | ||
| } | ||
| } | ||
|
|
||
| if (stderrPath != null) { | ||
| try { | ||
| this.stderr = new PrintStream(Files.newOutputStream(stderrPath), true); | ||
| } | ||
| catch (IOException e) { | ||
| throw new JUnitException("Error setting up stream for Stderr at path: " + stderrPath, e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (stdout != null) { | ||
| System.setOut(stdout); | ||
| } | ||
| if (stderr != null) { | ||
| System.setErr(stderr); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
| try { | ||
| if (stdout != null) { | ||
| stdout.close(); | ||
| } | ||
| } | ||
| finally { | ||
| if (stderr != null) { | ||
| stderr.close(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
platform-tests/src/test/java/org/junit/platform/console/options/StdStreamTestCase.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * Copyright 2015-2025 the original author or authors. | ||
| * | ||
| * All rights reserved. This program and the accompanying materials are | ||
| * made available under the terms of the Eclipse Public License v2.0 which | ||
| * accompanies this distribution and is available at | ||
| * | ||
| * https://www.eclipse.org/legal/epl-v20.html | ||
| */ | ||
|
|
||
| package org.junit.platform.console.options; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| public class StdStreamTestCase { | ||
|
|
||
| private static final String STDOUT_DATA = "Writing to STDOUT..."; | ||
| private static final String STDERR_DATA = "Writing to STDERR..."; | ||
|
|
||
| public static int getStdoutOutputFileSize() { | ||
| return STDOUT_DATA.length(); | ||
| } | ||
|
|
||
| public static int getStderrOutputFileSize() { | ||
| return STDERR_DATA.length(); | ||
| } | ||
|
|
||
| @Test | ||
| void printTest() { | ||
| System.out.print(STDOUT_DATA); | ||
| System.err.print(STDERR_DATA); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.