Single line tracing reworked: SingleLineProgressConsole removed, added startTrace(), trace() and endTrace() to IProgress

Author: host6

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

@@ -7,5 +7,9 @@ public interface IProgress extends AutoCloseable {
 
 	void error(String message);
 
-	IProgress startTrace(String startMessage, String endMessage);
+	void startTrace(String message);
+	
+	void endTrace(String message);
+	
+	void trace(String message);
 }

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

@@ -42,22 +42,22 @@ public ProgressConsole(String name) {
 		this(System.out, 0, name, "", "");
 	}
 
-	public ProgressConsole() {
-		this(System.out, 0, "", "", "");
-	}
-
 	public ProgressConsole(PrintStream out, int level, String name, String indent, String outdent) {
 		this.out = out;
 		this.name = name;
 		this.level = level;
 		this.indent = indent;
 		this.outdent = outdent;
-		indent(level);
 		if (!(indent + name).isEmpty()) {
+			indent(level);
 			out.println(indent + name);
 		}
 	}
 
+	public ProgressConsole() {
+		this("");
+	}
+
 	protected void indent(int level) {
 		out.print(Strings.repeat("\t", level));
 	}
@@ -81,17 +81,25 @@ public void close() {
 		}
 	}
 
+	@Override
 	public void trace(String message) {
-		
+		out.print(message);
+		out.flush();
 	}
 
 	@Override
 	public void error(String message) {
 		reportStatus(ansi().fg(RED).a(message).reset().toString());
 	}
-
+	
+	@Override
+	public void startTrace(String message) {
+		indent(level + 1);
+		trace(message);
+	}
+	
 	@Override
-	public IProgress startTrace(String startMessage, String endMessage) {
-		return new SingleLineProgressConsole(level + 1, out, startMessage, endMessage);
+	public void endTrace(String message) {
+		out.println(message);
 	}
 }

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

@@ -78,32 +78,23 @@ public void testConstructor() {
 	}
 
 	public void testTrace() {
-		ProgressConsole pc = new ProgressConsole("Progress 1", ">>> ", "<<< ");
-		pc.trace(TRACE);
-		pc.close();
-	}
-	
-	public void testStartTrace() throws Exception {
 		PrintStream mockedOut = Mockito.mock(PrintStream.class);
 		ProgressConsole pc = new ProgressConsole(mockedOut, 0, "Progress 1", ">>> ", "<<< ");
-		try (IProgress pcTrace = pc.startTrace(START_MESSAGE, END_MESSAGE)) {
-			pcTrace.reportStatus(TRACE);
-			
-			Mockito.verify(mockedOut).print("");
-			Mockito.verify(mockedOut).print("\t");
-			Mockito.verify(mockedOut).print(START_MESSAGE);
-			Mockito.verify(mockedOut).print(TRACE);
-			assertTrue(pcTrace instanceof SingleLineProgressConsole);
-		}
+		pc.startTrace(START_MESSAGE);
+		pc.trace(TRACE);
+		pc.endTrace(END_MESSAGE);
+		Mockito.verify(mockedOut).print("");
+		Mockito.verify(mockedOut).println(">>> Progress 1");
+		Mockito.verify(mockedOut).print("\t");
+		Mockito.verify(mockedOut).print(START_MESSAGE);
+		Mockito.verify(mockedOut).print(TRACE);
 		Mockito.verify(mockedOut).println(END_MESSAGE);
 		pc.close();
 	}
 
 	public void testEmpty() throws Exception {
 		PrintStream mockedOut = Mockito.mock(PrintStream.class);
 		try (IProgress pc = new ProgressConsole(mockedOut, 0, "", "", "")) {
-			Mockito.verify(mockedOut).print("");
-			
 		}
 		Mockito.verifyNoMoreInteractions(mockedOut);