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

diff --git a/src/testing/testing_doc.nit b/src/testing/testing_doc.nit
index 7bb39ca..d6de328 100644
--- a/src/testing/testing_doc.nit
+++ b/src/testing/testing_doc.nit
@@ -16,7 +16,7 @@
 module testing_doc
 
 import testing_base
-intrude import markdown
+intrude import docdown
 
 # Extractor, Executor and Reporter for the tests in a module
 class NitUnitExecutor
@@ -34,32 +34,31 @@ class NitUnitExecutor
 	# All blocks of code from a same `ADoc`
 	var blocks = new Array[Array[String]]
 
-	redef fun process_code(n: HTMLTag, text: String)
+	# All failures from a same `ADoc`
+	var failures = new Array[String]
+
+	redef fun process_code(n: HTMLTag, text: String, tag: nullable String)
 	do
 		# Skip non-blocks
 		if n.tag != "pre" then return
 
+		# Skip strict non-nit
+		if tag != null and tag != "nit" and tag != "" then
+			return
+		end
+
 		# Try to parse it
 		var ast = toolcontext.parse_something(text)
 
+		# Skip pure comments
+		if ast isa TComment then return
+
 		# We want executable code
 		if not (ast isa AModule or ast isa ABlockExpr or ast isa AExpr) then
-			if ndoc != null and n.tag == "pre" and toolcontext.opt_warn.value > 1 then
-				toolcontext.warning(ndoc.location, "invalid-block", "Warning: There is a block of code that is not valid Nit, thus not considered a nitunit")
-				if ast isa AError then toolcontext.warning(ast.location, "syntax-error", ast.message)
-				ndoc = null # To avoid multiple warning in the same node
-			end
-			return
-		end
-
-		# Search `assert` in the AST
-		var v = new SearchAssertVisitor
-		v.enter_visit(ast)
-		if not v.foundit then
-			if ndoc != null and n.tag == "pre" and toolcontext.opt_warn.value > 1 then
-				toolcontext.warning(ndoc.location, "invalid-block", "Warning: There is a block of Nit code without `assert`, thus not considered a nitunit")
-				ndoc = null # To avoid multiple warning in the same node
-			end
+			var message = ""
+			if ast isa AError then message = " At {ast.location}: {ast.message}."
+			toolcontext.warning(ndoc.location, "invalid-block", "Error: There is a block of code that is not valid Nit, thus not considered a nitunit. To suppress this warning, enclose the block with a fence tagged `nitish` or `raw` (see `man nitdoc`).{message}")
+			failures.add("{ndoc.location}: Invalid block of code.{message}")
 			return
 		end
 
@@ -80,24 +79,149 @@ class NitUnitExecutor
 	var cpt = 0
 
 	# The entry point for a new `ndoc` node
-	# Fill the prepated `tc` (testcase) XTM node
+	# Fill `docunits` with new discovered unit of tests.
+	#
+	# `tc` (testcase) is the pre-filled XML node
 	fun extract(ndoc: ADoc, tc: HTMLTag)
 	do
 		blocks.clear
+		failures.clear
 
 		self.ndoc = ndoc
 
 		work(ndoc.to_mdoc)
+
 		toolcontext.check_errors
 
+		if not failures.is_empty then
+			for msg in failures do
+				var ne = new HTMLTag("failure")
+				ne.attr("message", msg)
+				tc.add ne
+				toolcontext.modelbuilder.failed_entities += 1
+			end
+			if blocks.is_empty then testsuite.add(tc)
+		end
+
 		if blocks.is_empty then return
 
-		for block in blocks do test_block(ndoc, tc, block)
+		for block in blocks do
+			docunits.add new DocUnit(ndoc, tc, block.join(""))
+		end
 	end
 
-	# Execute a block
-	fun test_block(ndoc: ADoc, tc: HTMLTag, block: Array[String])
+	# All extracted docunits
+	var docunits = new Array[DocUnit]
+
+	# Execute all the docunits
+	fun run_tests
 	do
+		var simple_du = new Array[DocUnit]
+		for du in docunits do
+			var ast = toolcontext.parse_something(du.block)
+			if ast isa AExpr then
+				simple_du.add du
+			else
+				test_single_docunit(du)
+			end
+		end
+
+		test_simple_docunits(simple_du)
+	end
+
+	# Executes multiples doc-units in a shared program.
+	# Used for docunits simple block of code (without modules, classes, functions etc.)
+	#
+	# In case of compilation error, the method fallbacks to `test_single_docunit` to
+	# * locate exactly the compilation problem in the problematic docunit.
+	# * permit the execution of the other docunits that may be correct.
+	fun test_simple_docunits(dus: Array[DocUnit])
+	do
+		if dus.is_empty then return
+
+		var file = "{prefix}-0.nit"
+
+		var dir = file.dirname
+		if dir != "" then dir.mkdir
+		var f
+		f = new FileWriter.open(file)
+		f.write("# GENERATED FILE\n")
+		f.write("# Docunits extracted from comments\n")
+		f.write("import {mmodule.name}\n")
+		f.write("\n")
+		var i = 0
+		for du in dus do
+
+			i += 1
+			f.write("fun run_{i} do\n")
+			f.write("# {du.testcase.attrs["name"]}\n")
+			f.write(du.block)
+			f.write("end\n")
+		end
+		f.write("var a = args.first.to_i\n")
+		for j in [1..i] do
+			f.write("if a == {j} then run_{j}\n")
+		end
+		f.close
+
+		if toolcontext.opt_noact.value then return
+
+		var nit_dir = toolcontext.nit_dir
+		var nitg = nit_dir/"bin/nitg"
+		if not nitg.file_exists then
+			toolcontext.error(null, "Cannot find nitg. Set envvar NIT_DIR.")
+			toolcontext.check_errors
+		end
+		var cmd = "{nitg} --ignore-visibility --no-color '{file}' -I {mmodule.location.file.filename.dirname} >'{file}.out1' 2>&1 </dev/null -o '{file}.bin'"
+		var res = sys.system(cmd)
+
+		if res != 0 then
+			# Compilation error.
+			# Fall-back to individual modes:
+			for du in dus do
+				test_single_docunit(du)
+			end
+			return
+		end
+
+		i = 0
+		for du in dus do
+			var tc = du.testcase
+			toolcontext.modelbuilder.unit_entities += 1
+			i += 1
+			toolcontext.info("Execute doc-unit {du.testcase.attrs["name"]} in {file} {i}", 1)
+			var res2 = sys.system("{file.to_program_name}.bin {i} >>'{file}.out1' 2>&1 </dev/null")
+
+			var msg
+			f = new FileReader.open("{file}.out1")
+			var n2
+			n2 = new HTMLTag("system-err")
+			tc.add n2
+			msg = f.read_all
+			f.close
+
+			n2 = new HTMLTag("system-out")
+			tc.add n2
+			n2.append(du.block)
+
+			if res2 != 0 then
+				var ne = new HTMLTag("error")
+				ne.attr("message", msg)
+				tc.add ne
+				toolcontext.warning(du.ndoc.location, "error", "ERROR: {tc.attrs["classname"]}.{tc.attrs["name"]} (in {file}): {msg}")
+				toolcontext.modelbuilder.failed_entities += 1
+			end
+			toolcontext.check_errors
+
+			testsuite.add(tc)
+		end
+	end
+
+	# Executes a single doc-unit in its own program.
+	# Used for docunits larger than a single block of code (with modules, classes, functions etc.)
+	fun test_single_docunit(du: DocUnit)
+	do
+		var tc = du.testcase
 		toolcontext.modelbuilder.unit_entities += 1
 
 		cpt += 1
@@ -108,14 +232,12 @@ class NitUnitExecutor
 		var dir = file.dirname
 		if dir != "" then dir.mkdir
 		var f
-		f = new OFStream.open(file)
+		f = new FileWriter.open(file)
 		f.write("# GENERATED FILE\n")
 		f.write("# Example extracted from a documentation\n")
 		f.write("import {mmodule.name}\n")
 		f.write("\n")
-		for text in block do
-			f.write(text)
-		end
+		f.write(du.block)
 		f.close
 
 		if toolcontext.opt_noact.value then return
@@ -134,7 +256,7 @@ class NitUnitExecutor
 		end
 
 		var msg
-		f = new IFStream.open("{file}.out1")
+		f = new FileReader.open("{file}.out1")
 		var n2
 		n2 = new HTMLTag("system-err")
 		tc.add n2
@@ -143,20 +265,20 @@ class NitUnitExecutor
 
 		n2 = new HTMLTag("system-out")
 		tc.add n2
-		for text in block do n2.append(text)
+		n2.append(du.block)
 
 
 		if res != 0 then
 			var ne = new HTMLTag("failure")
 			ne.attr("message", msg)
 			tc.add ne
-			toolcontext.warning(ndoc.location, "failure", "FAILURE: {tc.attrs["classname"]}.{tc.attrs["name"]} (in {file}): {msg}")
+			toolcontext.warning(du.ndoc.location, "failure", "FAILURE: {tc.attrs["classname"]}.{tc.attrs["name"]} (in {file}): {msg}")
 			toolcontext.modelbuilder.failed_entities += 1
 		else if res2 != 0 then
 			var ne = new HTMLTag("error")
 			ne.attr("message", msg)
 			tc.add ne
-			toolcontext.warning(ndoc.location, "error", "ERROR: {tc.attrs["classname"]}.{tc.attrs["name"]} (in {file}): {msg}")
+			toolcontext.warning(du.ndoc.location, "error", "ERROR: {tc.attrs["classname"]}.{tc.attrs["name"]} (in {file}): {msg}")
 			toolcontext.modelbuilder.failed_entities += 1
 		end
 		toolcontext.check_errors
@@ -165,35 +287,40 @@ class NitUnitExecutor
 	end
 end
 
-class SearchAssertVisitor
-	super Visitor
-	var foundit = false
-	redef fun visit(node)
-	do
-		if foundit then
-			return
-		else if node isa AAssertExpr then
-			foundit = true
-			return
-		else
-			node.visit_all(self)
-		end
-	end
+# A unit-test to run
+class DocUnit
+	# The original comment node
+	var ndoc: ADoc
+
+	# The XML node that contains the information about the execution
+	var testcase: HTMLTag
+
+	# The text of the code to execute
+	var block: String
 end
 
 redef class ModelBuilder
+	# Total number analyzed `MEntity`
 	var total_entities = 0
+
+	# The number of `MEntity` that have some documentation
 	var doc_entities = 0
+
+	# The total number of executed docunits
 	var unit_entities = 0
+
+	# The number failed docunits
 	var failed_entities = 0
 
+	# Extracts and executes all the docunits in the `mmodule`
+	# Returns a JUnit-compatible `<testsuite>` XML element that contains the results of the executions.
 	fun test_markdown(mmodule: MModule): HTMLTag
 	do
 		var ts = new HTMLTag("testsuite")
 		toolcontext.info("nitunit: doc-unit {mmodule}", 2)
-		if not mmodule2nmodule.has_key(mmodule) then return ts
 
-		var nmodule = mmodule2nmodule[mmodule]
+		var nmodule = mmodule2node(mmodule)
+		if nmodule == null then return ts
 
 		# usualy, only the original module must be imported in the unit test.
 		var o = mmodule
@@ -254,6 +381,8 @@ redef class ModelBuilder
 			end
 		end
 
+		d2m.run_tests
+
 		return ts
 	end
 end