Skip to content

Commit 00b5993

Browse files
committed
ProgressConsole - fixed CRLF indenting on reportStatus()
1 parent 9b85580 commit 00b5993

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

src/main/java/org/scm4j/commons/progress/ProgressConsole.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public IProgress createNestedProgress(String name) {
7070
@Override
7171
public void reportStatus(String status) {
7272
indent(level + 1);
73-
out.println(status);
73+
out.println(status.replace("\r\n", "\r\n" + Strings.repeat("\t", level + 2)));
7474
}
7575

7676
@Override

src/test/java/org/scm4j/commons/progress/ProgressConsoleTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,15 @@ public void testNestedTraceFromEmpty() throws Exception {
121121
Mockito.verify(mockedOut).println(END_MESSAGE);
122122
pc.close();
123123
}
124+
125+
public void testCRLFEndent() throws Exception {
126+
PrintStream mockedOut = Mockito.mock(PrintStream.class);
127+
try (IProgress pc = new ProgressConsole(mockedOut, 0, "", "", "")) {
128+
try (IProgress pcNested = pc.createNestedProgress("")) {
129+
pcNested.reportStatus("\r\ntest");
130+
Mockito.verify(mockedOut).print("\t\t");
131+
Mockito.verify(mockedOut).println("\r\n\t\t\ttest");
132+
}
133+
}
134+
}
124135
}

0 commit comments

Comments
 (0)