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

diff --git a/src/testing/testing_doc.nit b/src/testing/testing_doc.nit
index 1ca4deb..0121162 100644
--- a/src/testing/testing_doc.nit
+++ b/src/testing/testing_doc.nit
@@ -19,6 +19,7 @@ private import parser_util
 import testing_base
 import markdown
 import html
+import realtime
 
 # Extractor, Executor and Reporter for the tests in a module
 class NitUnitExecutor
@@ -43,7 +44,7 @@ class NitUnitExecutor
 	var mdproc = new MarkdownProcessor
 
 	init do
-		mdproc.emitter.decorator = new NitunitDecorator(self)
+		mdproc.decorator = new NitunitDecorator(self)
 	end
 
 	# The associated documentation object
@@ -86,6 +87,8 @@ class NitUnitExecutor
 	fun mark_done(du: DocUnit)
 	do
 		du.is_done = true
+		toolcontext.clear_progress_bar
+		toolcontext.show_unit(du)
 		show_status
 	end
 
@@ -96,33 +99,41 @@ class NitUnitExecutor
 			return
 		end
 
+		# Try to group each nitunit into a single source file to fasten the compilation
 		var simple_du = new Array[DocUnit]
 		show_status
 		for du in docunits do
 			# Skip existing errors
 			if du.error != null then
-				mark_done(du)
 				continue
 			end
 
 			var ast = toolcontext.parse_something(du.block)
 			if ast isa AExpr then
 				simple_du.add du
+			end
+		end
+		test_simple_docunits(simple_du)
+
+		# Now test them in order
+		for du in docunits do
+			if du.error != null then
+				# Nothing to execute. Conclude
+			else if du.test_file != null then
+				# Already compiled. Execute it.
+				execute_simple_docunit(du)
 			else
+				# Need to try to compile it, then execute it
 				test_single_docunit(du)
 			end
+			mark_done(du)
 		end
 
-		test_simple_docunits(simple_du)
-
+		# Final status
 		show_status
 		print ""
 
 		for du in docunits do
-			toolcontext.show_unit(du)
-		end
-
-		for du in docunits do
 			testsuite.add du.to_xml
 		end
 	end
@@ -164,28 +175,37 @@ class NitUnitExecutor
 
 		if res != 0 then
 			# Compilation error.
-			# Fall-back to individual modes:
-			for du in dus do
-				test_single_docunit(du)
-			end
+			# They will be executed independently
 			return
 		end
 
+		# Compilation was a success.
+		# Store what need to be executed for each one.
 		i = 0
 		for du in dus do
 			i += 1
-			toolcontext.info("Execute doc-unit {du.full_name} in {file} {i}", 1)
-			var res2 = toolcontext.safe_exec("{file.to_program_name}.bin {i} >'{file}.out1' 2>&1 </dev/null")
-			du.was_exec = true
+			du.test_file = file
+			du.test_arg = i
+		end
+	end
 
-			var content = "{file}.out1".to_path.read_all
-			du.raw_output = content
+	# Execute a docunit compiled by `test_single_docunit`
+	fun execute_simple_docunit(du: DocUnit)
+	do
+		var file = du.test_file.as(not null)
+		var i = du.test_arg.as(not null)
+		toolcontext.info("Execute doc-unit {du.full_name} in {file} {i}", 1)
+		var clock = new Clock
+		var res2 = toolcontext.safe_exec("{file.to_program_name}.bin {i} >'{file}.out1' 2>&1 </dev/null")
+		if not toolcontext.opt_no_time.value then du.real_time = clock.total
+		du.was_exec = true
 
-			if res2 != 0 then
-				du.error = "Runtime error in {file} with argument {i}"
-				toolcontext.modelbuilder.failed_entities += 1
-			end
-			mark_done(du)
+		var content = "{file}.out1".to_path.read_all
+		du.raw_output = content
+
+		if res2 != 0 then
+			du.error = "Runtime error in {file} with argument {i}"
+			toolcontext.modelbuilder.failed_entities += 1
 		end
 	end
 
@@ -208,7 +228,9 @@ class NitUnitExecutor
 		var res = compile_unitfile(file)
 		var res2 = 0
 		if res == 0 then
+			var clock = new Clock
 			res2 = toolcontext.safe_exec("{file.to_program_name}.bin >'{file}.out1' 2>&1 </dev/null")
+			if not toolcontext.opt_no_time.value then du.real_time = clock.total
 			du.was_exec = true
 		end
 
@@ -222,7 +244,6 @@ class NitUnitExecutor
 			du.error = "Runtime error in {file}"
 			toolcontext.modelbuilder.failed_entities += 1
 		end
-		mark_done(du)
 	end
 
 	# Create and fill the header of a unit file `file`.
@@ -242,7 +263,7 @@ class NitUnitExecutor
 		f.write("# GENERATED FILE\n")
 		f.write("# Docunits extracted from comments\n")
 		if mmodule != null then
-			f.write("import {mmodule.name}\n")
+			f.write("intrude import {mmodule.name}\n")
 		end
 		f.write("\n")
 		return f
@@ -258,7 +279,7 @@ class NitUnitExecutor
 		if mmodule != null then
 			opts.add "-I {mmodule.filepath.dirname}"
 		end
-		var cmd = "{nitc} --ignore-visibility --no-color '{file}' {opts.join(" ")} >'{file}.out1' 2>&1 </dev/null -o '{file}.bin'"
+		var cmd = "{nitc} --ignore-visibility --no-color -q '{file}' {opts.join(" ")} >'{file}.out1' 2>&1 </dev/null -o '{file}.bin'"
 		var res = toolcontext.safe_exec(cmd)
 		return res
 	end
@@ -349,11 +370,11 @@ private class NitunitDecorator
 		var mdoc = executor.mdoc
 		assert mdoc != null
 
-		var next_number = 0
+		var next_number = 1
 		var name = executor.xml_name
 		if executor.docunits.not_empty and executor.docunits.last.mdoc == mdoc then
 			next_number = executor.docunits.last.number + 1
-			name += "+" + next_number.to_s
+			name += "#" + next_number.to_s
 		end
 
 		var res = new DocUnit(mdoc, next_number, "", executor.xml_classname, name)
@@ -376,10 +397,23 @@ class DocUnit
 	# The numbering of self in mdoc (starting with 0)
 	var number: Int
 
+	# The generated Nit source file that contains the unit-test
+	#
+	# Note that a same generated file can be used for multiple tests.
+	# See `test_arg` that is used to distinguish them
+	var test_file: nullable String = null
+
+	# The command-line argument to use when executing the test, if any.
+	var test_arg: nullable Int = null
+
 	redef fun full_name do
 		var mentity = mdoc.original_mentity
 		if mentity != null then
-			return mentity.full_name
+			var res = mentity.full_name
+			if number > 1 then
+				res += "#{number}"
+			end
+			return res
 		else
 			return xml_classname + "." + xml_name
 		end
@@ -490,7 +524,7 @@ redef class ModelBuilder
 				var ndoc = nclassdef.n_doc
 				if ndoc != null then
 					doc_entities += 1
-					d2m.extract(ndoc.to_mdoc, "nitunit." + mmodule.full_name + "." + mclassdef.mclass.full_name, "<class>")
+					d2m.extract(ndoc.to_mdoc, "nitunit." + mclassdef.full_name.replace("$", "."), "<class>")
 				end
 			end
 			for npropdef in nclassdef.n_propdefs do
@@ -500,7 +534,8 @@ redef class ModelBuilder
 				var ndoc = npropdef.n_doc
 				if ndoc != null then
 					doc_entities += 1
-					d2m.extract(ndoc.to_mdoc, "nitunit." + mmodule.full_name + "." + mclassdef.mclass.full_name, mpropdef.mproperty.full_name)
+					var a = mpropdef.full_name.split("$")
+					d2m.extract(ndoc.to_mdoc, "nitunit." + a[0] + "." + a[1], a[2])
 				end
 			end
 		end
@@ -532,7 +567,7 @@ redef class ModelBuilder
 
 		doc_entities += 1
 		# NOTE: jenkins expects a '.' in the classname attr
-		d2m.extract(mdoc, "nitunit." + mgroup.full_name, "<group>")
+		d2m.extract(mdoc, "nitunit." + mgroup.mpackage.name + "." + mgroup.name + ".<group>", "<group>")
 
 		d2m.run_tests
 
@@ -543,7 +578,7 @@ redef class ModelBuilder
 	fun test_mdoc(mdoc: MDoc): HTMLTag
 	do
 		var ts = new HTMLTag("testsuite")
-		var file = mdoc.location.to_s
+		var file = mdoc.location.file.filename
 
 		toolcontext.info("nitunit: doc-unit file {file}", 2)