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

diff --git a/src/testing/testing_suite.nit b/src/testing/testing_suite.nit
index 7ab177c..bbe9372 100644
--- a/src/testing/testing_suite.nit
+++ b/src/testing/testing_suite.nit
@@ -21,9 +21,9 @@ private import annotation
 
 redef class ToolContext
 	# -- target-file
-	var opt_file = new OptionString("Specify test suite location.", "-t", "--target-file")
+	var opt_file = new OptionString("Specify test suite location", "-t", "--target-file")
 	# --pattern
-	var opt_pattern = new OptionString("Only run test case with name that match pattern. Examples: 'TestFoo', 'TestFoo*', 'TestFoo::test_foo', 'TestFoo::test_foo*', 'test_foo', 'test_foo*'", "-p", "--pattern")
+	var opt_pattern = new OptionString("Only run test case with name that match pattern", "-p", "--pattern")
 end
 
 # Used to test nitunit test files.
@@ -58,15 +58,11 @@ class NitUnitTester
 			if not mclassdef.is_test then continue
 			if not suite_match_pattern(mclassdef) then continue
 			toolcontext.modelbuilder.total_classes += 1
-			var before_test = mclassdef.before_test
-			var after_test = mclassdef.after_test
 			for mpropdef in mclassdef.mpropdefs do
 				if not mpropdef isa MMethodDef or not mpropdef.is_test then continue
 				if not case_match_pattern(mpropdef) then continue
 				toolcontext.modelbuilder.total_tests += 1
 				var test = new TestCase(suite, mpropdef, toolcontext)
-				test.before_test = before_test
-				test.after_test = after_test
 				suite.add_test test
 			end
 		end
@@ -136,8 +132,14 @@ class TestSuite
 	# Test to be executed after the whole test suite.
 	var after_module: nullable TestCase = null
 
+	fun show_status(more_message: nullable String)
+	do
+		toolcontext.show_unit_status("Test-suite of module " + mmodule.full_name, test_cases, more_message)
+	end
+
 	# Execute the test suite
 	fun run do
+		show_status
 		if not toolcontext.test_dir.file_exists then
 			toolcontext.test_dir.mkdir
 		end
@@ -146,9 +148,19 @@ class TestSuite
 		toolcontext.info("Execute test-suite {mmodule.name}", 1)
 		var before_module = self.before_module
 		if not before_module == null then before_module.run
-		for case in test_cases do case.run
+		for case in test_cases do
+			case.run
+			show_status(case.full_name + " " + case.status_tag)
+		end
+
+		show_status
+		print ""
+
 		var after_module = self.after_module
 		if not after_module == null then after_module.run
+		for case in test_cases do
+			print case.to_screen
+		end
 	end
 
 	# Write the test unit for `self` in a nit compilable file.
@@ -168,6 +180,7 @@ class TestSuite
 	fun to_xml: HTMLTag do
 		var n = new HTMLTag("testsuite")
 		n.attr("package", mmodule.name)
+		var failure = self.failure
 		if failure != null then
 			var f = new HTMLTag("failure")
 			f.attr("message", failure.to_s)
@@ -186,17 +199,18 @@ class TestSuite
 	# Compile all `test_cases` cases in one file.
 	fun compile do
 		# find nitc
-		var nit_dir = toolcontext.nit_dir
-		var nitc = nit_dir/"bin/nitc"
-		if not nitc.file_exists then
-			toolcontext.error(null, "Error: cannot find nitc. Set envvar NIT_DIR.")
-			toolcontext.check_errors
-		end
+		var nitc = toolcontext.find_nitc
 		# compile test suite
 		var file = test_file
-		var include_dir = mmodule.location.file.filename.dirname
+		var module_file = mmodule.location.file
+		if module_file == null then
+			toolcontext.error(null, "Error: cannot find module file for {mmodule.name}.")
+			toolcontext.check_errors
+			return
+		end
+		var include_dir = module_file.filename.dirname
 		var cmd = "{nitc} --no-color '{file}.nit' -I {include_dir} -o '{file}.bin' > '{file}.out' 2>&1 </dev/null"
-		var res = sys.system(cmd)
+		var res = toolcontext.safe_exec(cmd)
 		var f = new FileReader.open("{file}.out")
 		var msg = f.read_all
 		f.close
@@ -216,6 +230,7 @@ end
 
 # A test case is a unit test considering only a `MMethodDef`.
 class TestCase
+	super UnitTest
 
 	# Test suite wich `self` belongs to.
 	var test_suite: TestSuite
@@ -223,14 +238,12 @@ class TestCase
 	# Test method to be compiled and tested.
 	var test_method: MMethodDef
 
-	# `ToolContext` to use to display messages and find `nitc` bin.
-	var toolcontext: ToolContext
+	redef fun full_name do return test_method.full_name
 
-	# `MMethodDef` to call before the test case.
-	var before_test: nullable MMethodDef = null
+	redef fun location do return test_method.location
 
-	# `MMethodDef` to call after the test case.
-	var after_test: nullable MMethodDef = null
+	# `ToolContext` to use to display messages and find `nitc` bin.
+	var toolcontext: ToolContext
 
 	# Generate the test unit for `self` in `file`.
 	fun write_to_nit(file: Template) do
@@ -240,9 +253,9 @@ class TestCase
 			file.addn "\t{name}"
 		else
 			file.addn "\tvar subject = new {test_method.mclassdef.name}.nitunit"
-			if before_test != null then file.addn "\tsubject.{before_test.name}"
+			file.addn "\tsubject.before_test"
 			file.addn "\tsubject.{name}"
-			if after_test != null then file.addn "\tsubject.{after_test.name}"
+			file.addn "\tsubject.after_test"
 		end
 		file.addn "end"
 	end
@@ -256,46 +269,41 @@ class TestCase
 		var method_name = test_method.name
 		var test_file = test_suite.test_file
 		var res_name = "{test_file}_{method_name.escape_to_c}"
-		var res = sys.system("{test_file}.bin {method_name} > '{res_name}.out1' 2>&1 </dev/null")
-		var f = new FileReader.open("{res_name}.out1")
-		var msg = f.read_all
-		f.close
+		var res = toolcontext.safe_exec("{test_file}.bin {method_name} > '{res_name}.out1' 2>&1 </dev/null")
+		self.raw_output = "{res_name}.out1".to_path.read_all
 		# set test case result
-		var loc = test_method.location
 		if res != 0 then
-			error = msg
-			toolcontext.warning(loc, "failure",
-			   "ERROR: {method_name} (in file {test_file}.nit): {msg}")
+			error = "Runtime Error in file {test_file}.nit"
 			toolcontext.modelbuilder.failed_tests += 1
+		else
+			# no error, check with res file, if any.
+			var mmodule = test_method.mclassdef.mmodule
+			var file = mmodule.filepath
+			if file != null then
+				var sav = file.dirname / mmodule.name + ".sav" / test_method.name + ".res"
+				if sav.file_exists then
+					toolcontext.info("Diff output with {sav}", 1)
+					res = toolcontext.safe_exec("diff -u --label 'expected:{sav}' --label 'got:{res_name}.out1' '{sav}' '{res_name}.out1' > '{res_name}.diff' 2>&1 </dev/null")
+					if res != 0 then
+						self.raw_output = "Diff\n" + "{res_name}.diff".to_path.read_all
+						error = "Difference with expected output: diff -u {sav} {res_name}.out1"
+						toolcontext.modelbuilder.failed_tests += 1
+					end
+				else
+					toolcontext.info("No diff: {sav} not found", 2)
+				end
+			end
 		end
-		toolcontext.check_errors
+		is_done = true
 	end
 
-	# Error occured during test-case execution.
-	var error: nullable String = null
-
-	# Was the test case executed at least one?
-	var was_exec = false
-
-	# Return the `TestCase` in XML format compatible with Jenkins.
-	fun to_xml: HTMLTag do
+	redef fun xml_classname do
 		var mclassdef = test_method.mclassdef
-		var tc = new HTMLTag("testcase")
-		# NOTE: jenkins expects a '.' in the classname attr
-		tc.attr("classname", "nitunit." + mclassdef.mmodule.full_name + "." + mclassdef.mclass.full_name)
-		tc.attr("name", test_method.mproperty.full_name)
-		if was_exec then
-			tc.add  new HTMLTag("system-err")
-			var n = new HTMLTag("system-out")
-			n.append "out"
-			tc.add n
-			if error != null then
-				n = new HTMLTag("error")
-				n.attr("message", error.to_s)
-				tc.add n
-			end
-		end
-		return tc
+		return "nitunit." + mclassdef.mmodule.full_name + "." + mclassdef.mclass.full_name
+	end
+
+	redef fun xml_name do
+		return test_method.mproperty.full_name
 	end
 end
 
@@ -306,12 +314,6 @@ redef class MMethodDef
 	# i.e. begins with "test_"
 	private fun is_test: Bool do return name.has_prefix("test_")
 
-	# Is the method a "before_test"?
-	private fun is_before: Bool do return name == "before_test"
-
-	# Is the method a "after_test"?
-	private fun is_after: Bool do return name == "after_test"
-
 	# Is the method a "before_module"?
 	private fun is_before_module: Bool do return mproperty.is_toplevel and name == "before_module"
 
@@ -323,27 +325,13 @@ redef class MClassDef
 	# Is the class a TestClass?
 	# i.e. begins with "Test"
 	private fun is_test: Bool do
+		var in_hierarchy = self.in_hierarchy
+		if in_hierarchy == null then return false
 		for sup in in_hierarchy.greaters do
 			if sup.name == "TestSuite" then return true
 		end
 		return false
 	end
-
-	# "before_test" method for this classdef.
-	private fun before_test: nullable MMethodDef do
-		for mpropdef in mpropdefs do
-			if mpropdef isa MMethodDef and mpropdef.is_before then return mpropdef
-		end
-		return null
-	end
-
-	# "after_test" method for this classdef.
-	private fun after_test: nullable MMethodDef do
-		for mpropdef in mpropdefs do
-			if mpropdef isa MMethodDef and mpropdef.is_after then return mpropdef
-		end
-		return null
-	end
 end
 
 redef class MModule
@@ -389,7 +377,12 @@ redef class ModelBuilder
 		if f != null then
 			test_file = f
 		else if not test_file.file_exists then
-			var include_dir = mmodule.location.file.filename.dirname
+			var module_file = mmodule.location.file
+			if module_file == null then
+				toolcontext.info("Skip test for {mmodule}, no file found", 2)
+				return ts
+			end
+			var include_dir = module_file.filename.dirname
 			test_file = "{include_dir}/{test_file}"
 		end
 		if not test_file.file_exists then