X-Git-Url: http://nitlanguage.org

diff --git a/src/testing/testing_base.nit b/src/testing/testing_base.nit
index 7db143e..36ce1f9 100644
--- a/src/testing/testing_base.nit
+++ b/src/testing/testing_base.nit
@@ -18,6 +18,7 @@ module testing_base
 import modelize
 private import parser_util
 import html
+import console
 
 redef class ToolContext
 	# opt --full
@@ -34,7 +35,7 @@ redef class ToolContext
 	# Working directory for testing.
 	fun test_dir: String do
 		var dir = opt_dir.value
-		if dir == null then return ".nitunit"
+		if dir == null then return "nitunit.out"
 		return dir
 	end
 
@@ -93,6 +94,77 @@ ulimit -t {{{ulimit_usertime}}} 2> /dev/null
 	#
 	# Default: 10 CPU minute
 	var ulimit_usertime = 600 is writable
+
+	# Show a single-line status to use as a progression.
+	#
+	# If `has_progress_bar` is true, then the output is a progress bar.
+	# The printed the line starts with `'\r'` and is not ended by a `'\n'`.
+	# So it is expected that:
+	# * no other output is printed between two calls
+	# * the last `show_unit_status` is followed by a new-line
+	#
+	# If `has_progress_bar` is false, then only the first and last state is shown
+	fun show_unit_status(name: String, tests: SequenceRead[UnitTest])
+	do
+		var esc = 27.code_point.to_s
+		var line = "\r\x1B[K==== {name} ["
+		var done = tests.length
+		var fails = 0
+		for t in tests do
+			if not t.is_done then
+				line += " "
+				done -= 1
+			else if t.error == null then
+				line += ".".green.bold
+			else
+				line += "X".red.bold
+				fails += 1
+			end
+		end
+
+		if not has_progress_bar then
+			if done == 0 then
+				print "==== {name} | tests: {tests.length}"
+			end
+			return
+		end
+
+		if done < tests.length then
+			line += "] {done}/{tests.length}"
+		else
+			line += "] tests: {tests.length} "
+			if fails == 0 then
+				line += "OK".green.bold
+			else
+				line += "KO: {fails}".red.bold
+			end
+		end
+		printn "{line}"
+	end
+
+	# Is a progress bar printed?
+	#
+	# true if color (because and non-verbose mode
+	# (because verbose mode messes up with the progress bar).
+	fun has_progress_bar: Bool
+	do
+		return not opt_no_color.value and opt_verbose.value <= 0
+	end
+
+	# Clear the line if `has_progress_bar` (no-op else)
+	fun clear_progress_bar
+	do
+		if has_progress_bar then printn "\r\x1B[K"
+	end
+
+	# Show the full description of the test-case.
+	#
+	# The output honors `--no-color`.
+	#
+	# `more message`, if any, is added after the error message.
+	fun show_unit(test: UnitTest, more_message: nullable String) do
+		print test.to_screen(more_message, not opt_no_color.value)
+	end
 end
 
 # A unit test is an elementary test discovered, run and reported by nitunit.
@@ -109,6 +181,8 @@ abstract class UnitTest
 	var is_done: Bool = false is writable
 
 	# Error message occurred during test-case execution (or compilation).
+	#
+	# e.g.: `Runtime Error`
 	var error: nullable String = null is writable
 
 	# Was the test case executed at least once?
@@ -124,6 +198,55 @@ abstract class UnitTest
 	# The location where the error occurred, if it makes sense.
 	var error_location: nullable Location = null is writable
 
+	# Additional noteworthy information when a test success.
+	var info: nullable String = null
+
+	# A colorful `[OK]` or `[KO]`.
+	fun status_tag(color: nullable Bool): String do
+		color = color or else true
+		if not is_done then
+			return "[  ]"
+		else if error != null then
+			var res = "[KO]"
+			if color then res = res.red.bold
+			return res
+		else
+			var res = "[OK]"
+			if color then res = res.green.bold
+			return res
+		end
+	end
+
+	# The full (color) description of the test-case.
+	#
+	# `more message`, if any, is added after the error message.
+	fun to_screen(more_message: nullable String, color: nullable Bool): String do
+		color = color or else true
+		var res
+		var error = self.error
+		if error != null then
+			if more_message != null then error += " " + more_message
+			var loc = error_location or else location
+			if color then
+				res = "{status_tag(color)} {full_name}\n     {loc.to_s.yellow}: {error}\n{loc.colored_line("1;31")}"
+			else
+				res = "{status_tag(color)} {full_name}\n     {loc}: {error}"
+			end
+			var output = self.raw_output
+			if output != null then
+				res += "\n     Output\n\t{output.chomp.replace("\n", "\n\t")}\n"
+			end
+		else
+			res = "{status_tag(color)} {full_name}"
+			if more_message != null then res += more_message
+			var info = self.info
+			if info != null then
+				res += "\n     {info}"
+			end
+		end
+		return res
+	end
+
 	# Return a `<testcase>` XML node in format compatible with Jenkins unit tests.
 	fun to_xml: HTMLTag do
 		var tc = new HTMLTag("testcase")
@@ -132,11 +255,14 @@ abstract class UnitTest
 		var error = self.error
 		if error != null then
 			if was_exec then
-				tc.open("error").append("Runtime Error")
+				tc.open("error").append(error)
 			else
-				tc.open("failure").append("Compilation Error")
+				tc.open("failure").append(error)
 			end
-			tc.open("system-err").append(error.trunc(8192).filter_nonprintable)
+		end
+		var output = self.raw_output
+		if output != null then
+			tc.open("system-err").append(output.trunc(8192).filter_nonprintable)
 		end
 		return tc
 	end