Skip to content

Refactored log capture and formatting code in org.openqa.selenium.tes… #13322

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.

Sign up for GitHub

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
merged 3 commits into from
Dec 18, 2023
Merged

Refactored log capture and formatting code in org.openqa.selenium.tes… #13322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba7e2d6
Refactored log capture and formatting code in org.openqa.selenium.tes…
manuelsblanco Dec 17, 2023
7129fa9
Merge branch 'trunk' into lineSeparator
diemol Dec 18, 2023
2e6ff6a
Format files
diemol Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions java/src/org/openqa/selenium/grid/log/TerseFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class TerseFormatter extends Formatter {
* Line separator string. This is the value of the line.separator property at the moment that the
* TerseFormatter was created.
*/
private final String lineSeparator = System.getProperty("line.separator");
private final String lineSeparator = System.lineSeparator();

/*
* DGF - These have to be compile time constants to be used with switch
Expand Down Expand Up @@ -78,7 +78,12 @@ public synchronized String format(final LogRecord record) {
buffer.append(' ');
buffer.append(levelNumberToCommonsLevelName(record.getLevel()));
String[] parts = record.getSourceClassName().split("\\.");
buffer.append(" [" + parts[parts.length - 1] + "." + record.getSourceMethodName() + "]");
buffer
.append(" [")
.append(parts[parts.length - 1])
.append(".")
.append(record.getSourceMethodName())
.append("]");
buffer.append(SUFFIX);
buffer.append(formatMessage(record)).append(lineSeparator);
if (record.getThrown() != null) {
Expand Down
2 changes: 1 addition & 1 deletion java/test/org/openqa/selenium/testing/CaptureLoggingRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public String format(LogRecord record) {
.append("]");
}
buffer.append(" - ");
buffer.append(formatMessage(record)).append(System.getProperty("line.separator"));
buffer.append(formatMessage(record)).append(System.lineSeparator());
if (record.getThrown() != null) {
final StringWriter trace = new StringWriter();
record.getThrown().printStackTrace(new PrintWriter(trace));
Expand Down