Skip to content

Commit

Permalink
Fixed CRLF issues on windows os
Browse files Browse the repository at this point in the history 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
  • Loading branch information
@dmatej
dmatej committed Oct 2, 2023
1 parent 5133414 commit b102d59
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 19 deletions.
2 changes: 1 addition & 1 deletion ...assfish-jul-extension/src/main/java/org/glassfish/main/jul/formatter/ODLLogFormatter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ private String formatGlassFishLogRecord(final GlassFishLogRecord record) {
if (message == null) {
return "";
}
final boolean forceMultiline = multiline || message.contains(lineSeparator());
final boolean forceMultiline = multiline || message.indexOf('\n') >= 0;
final Level logLevel = record.getLevel();
final String msgId = record.getMessageKey();
final String loggerName = record.getLoggerName();
Expand Down
2 changes: 1 addition & 1 deletion ...-jul-extension/src/test/java/org/glassfish/main/jul/GlassFishLogManagerLifeCycleTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public void finishReconfigurationAndStartFlushing() throws Exception {
@Timeout(10)
public void finishFlushing() throws Exception {
ACTION_FLUSH.unblock();
doLog(Level.INFO, "Log after flushing finished", 5);
doLog(Level.INFO, "Log after flushing finished", 10);
final List<GlassFishLogRecord> logRecords = COLLECTOR.getAll();
assertAll(
() -> assertEquals(GlassFishLoggingStatus.FULL_SERVICE, MANAGER.getLoggingStatus(),
Expand Down
10 changes: 5 additions & 5 deletions ...ish-jul-extension/src/test/java/org/glassfish/main/jul/formatter/ODLLogFormatterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void simpleLogRecordMultiLineEnabled() {
final ODLLogFormatter formatter = new ODLLogFormatter();
final String log = formatter.format(record);
assertNotNull(log, "log");
final String[] lines = log.split("\n");
final String[] lines = log.split("\r?\n");
assertAll(
() -> assertThat(lines, arrayWithSize(2)),
() -> assertThat(lines[0], matchesPattern(PATTERN_MULTILINE)),
Expand All @@ -124,7 +124,7 @@ public void simpleLogRecordMultiLineMessage() {
formatter.setMultiline(false);
final String log = formatter.format(record);
assertNotNull(log, "log");
final String[] lines = log.split("\n");
final String[] lines = log.split("\r?\n");
assertAll(
() -> assertThat(lines, arrayWithSize(3)),
() -> assertThat(lines[0], matchesPattern(PATTERN_MULTILINE)),
Expand All @@ -151,7 +151,7 @@ public void fullLogRecordSingleLine() {

final String log = formatter.format(record);
assertNotNull(log, "log");
final String[] lines = log.split("\n");
final String[] lines = log.split("\r?\n");
assertAll(
() -> assertThat(lines, arrayWithSize(1)),
() -> assertThat(lines[0], matchesPattern(PATTERN_SINGLELINE)),
Expand All @@ -169,7 +169,7 @@ public void exception() {
final ODLLogFormatter formatter = new ODLLogFormatter();
final String log = formatter.format(record);
assertNotNull(log, "log");
final String[] lines = log.split("\n");
final String[] lines = log.split("\r?\n");
assertAll(
() -> assertThat(lines, arrayWithSize(greaterThan(20))),
() -> assertThat(lines[0],
Expand Down Expand Up @@ -197,7 +197,7 @@ public void exclusionsAndCustomTimestampFormat() {
+ " \\[INFO\\]"
+ " \\[\\]"
+ " \\[\\]"
+ " This is a message\\.+\\n\\n"
+ " This is a message\\.+\\r?\\n\\r?\\n"
);
assertThat(log, matchesPattern(pattern));
}
Expand Down
6 changes: 3 additions & 3 deletions ...sh-jul-extension/src/test/java/org/glassfish/main/jul/formatter/OneLineFormatterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public void anonymousLoggerAndNullSource() {
final OneLineFormatter formatter = new OneLineFormatter();
final String log = formatter.format(record);
assertNotNull(log, "log");
final String[] lines = log.split("\n");
final String[] lines = log.split("\r?\n");
assertAll(
() -> assertThat(lines, arrayWithSize(1)),
() -> assertThat(lines[0], matchesPattern(PATTERN_SINGLELINE)),
Expand All @@ -92,7 +92,7 @@ public void fullLogRecordSingleLine() {
final OneLineFormatter formatter = new OneLineFormatter();
final String log = formatter.format(record);
assertNotNull(log, "log");
final String[] lines = log.split("\n");
final String[] lines = log.split("\r?\n");
assertAll(
() -> assertThat(lines, arrayWithSize(1)),
() -> assertThat(lines[0], matchesPattern(PATTERN_SINGLELINE)),
Expand All @@ -109,7 +109,7 @@ public void exception() {
final OneLineFormatter formatter = new OneLineFormatter();
final String log = formatter.format(record);
assertNotNull(log, "log");
final String[] lines = log.split("\n");
final String[] lines = log.split("\r?\n");
assertAll(
() -> assertThat(lines, arrayWithSize(greaterThan(20))),
() -> assertThat(lines[0], endsWith(leftPad("SEVERE", 8) + leftPad("main", 21) + leftPad("", 61) + ". Failure!")),
Expand Down
11 changes: 6 additions & 5 deletions ...jul-extension/src/test/java/org/glassfish/main/jul/formatter/UniformLogFormatterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public void simpleLogRecordMultiLineEnabled() {
formatter.setMultiline(true);
final String log = formatter.format(record);
assertNotNull(log, "log");
final String[] lines = log.split("\n");
final String[] lines = log.split("\r?\n");
assertAll(
() -> assertThat(lines, arrayWithSize(2)),
() -> assertThat(lines[0], matchesPattern(PATTERN_MULTILINE)),
Expand All @@ -121,7 +121,7 @@ public void simpleLogRecordMultiLineMessage() {
formatter.setMultiline(false);
final String log = formatter.format(record);
assertNotNull(log, "log");
final String[] lines = log.split("\n");
final String[] lines = log.split("\r?\n");
assertAll(
() -> assertThat(lines, arrayWithSize(2)),
() -> assertThat(lines[0], matchesPattern(PATTERN_MULTILINE)),
Expand All @@ -146,7 +146,7 @@ public void fullLogRecordSingleLine() {

final String log = formatter.format(record);
assertNotNull(log, "log");
final String[] lines = log.split("\n");
final String[] lines = log.split("\r?\n");
assertAll(
() -> assertThat(lines, arrayWithSize(1)),
() -> assertThat(lines[0], matchesPattern(PATTERN_SINGLELINE)),
Expand All @@ -167,7 +167,7 @@ public void exception() {
formatter.setMultiline(false);
final String log = formatter.format(record);
assertNotNull(log, "log");
final String[] lines = log.split("\n");
final String[] lines = log.split("\r?\n");
assertAll(
() -> assertThat(lines, arrayWithSize(greaterThan(20))),
() -> assertThat(lines[0], stringContainsInOrder(
Expand All @@ -187,6 +187,7 @@ public void exclusionsAndCustomTimestampFormat() {
.collect(Collectors.joining(",")));
final String log = formatter.format(record);
assertNotNull(log, "log");
assertThat(log, matchesPattern("\\[#\\|" + P_TIME + "\\|INFO\\|\\|\\|\\|This is a message\\.\\|#\\]\n\n"));
assertThat(log,
matchesPattern("\\[#\\|" + P_TIME + "\\|INFO\\|\\|\\|\\|This is a message\\.\\|#\\]\r?\n\r?\n"));
}
}
6 changes: 4 additions & 2 deletions ...xtension/src/test/java/org/glassfish/main/jul/handler/HandlerConfigurationHelperTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ void customFormatter() {
final Formatter formatter = helper.getFormatter(ODLLogFormatter.class);
assertThat("formatter", formatter, IsInstanceOf.instanceOf(OneLineFormatter.class));
final String line = formatter.format(new LogRecord(Level.INFO, "something"));
assertThat("line length", line, hasLength(58));
// trim to remove LF or CRLF
assertThat("line length", line.trim(), hasLength(57));
}


Expand All @@ -61,7 +62,8 @@ void defaultFormatter() {
final Formatter formatter = helper.getFormatter(OneLineFormatter.class);
assertThat("formatter", formatter, IsInstanceOf.instanceOf(OneLineFormatter.class));
final String line = formatter.format(new LogRecord(Level.INFO, "something"));
assertThat("line length", line, hasLength(117));
// trim to remove LF or CRLF
assertThat("line length", line.trim(), hasLength(116));
}


Expand Down
4 changes: 2 additions & 2 deletions ...fish-jul-extension/src/test/java/org/glassfish/main/jul/handler/SimpleLogHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void standardMessage() throws Exception {
handler.publish(record);
final String log = os.toString(StandardCharsets.UTF_8.name());
assertNotNull(log, "log");
final String[] lines = log.split("\n");
final String[] lines = log.split("\r?\n");
assertAll(
() -> assertThat(lines, arrayWithSize(1)),
() -> assertThat(lines[0],
Expand All @@ -90,7 +90,7 @@ void exception() throws Exception {
handler.publish(record);
final String log = os.toString(StandardCharsets.UTF_8.name());
assertNotNull(log, "log");
final String[] lines = log.split("\n");
final String[] lines = log.split("\r?\n");
assertAll(
() -> assertThat(lines, arrayWithSize(greaterThan(20))),
() -> assertThat(lines[0],
Expand Down

0 comments on commit b102d59

Please sign in to comment.