nitunit: extract `generate_single_docunit` from `test_single_docunit`

[nit.git] / src / testing / testing_suite.nit

diff --git a/src/testing/testing_suite.nit b/src/testing/testing_suite.nit
index 69478cd..295598b 100644 (file)
--- a/src/testing/testing_suite.nit
+++ b/src/testing/testing_suite.nit
@@ -122,13 +122,17 @@ class TestSuite
        # Test to be executed after the whole test suite.
        var after_module: nullable TestCase = null
 
-       fun show_status
-       do
+       # Display test suite status in std-out.
+       fun show_status do
+               var test_cases = self.test_cases.to_a
+               if before_module != null then test_cases.add before_module.as(not null)
+               if after_module != null then test_cases.add after_module.as(not null)
                toolcontext.show_unit_status("Test-suite of module " + mmodule.full_name, test_cases)
        end
 
        # Execute the test suite
        fun run do
+               set_env
                show_status
                if not toolcontext.test_dir.file_exists then
                        toolcontext.test_dir.mkdir
@@ -137,10 +141,8 @@ class TestSuite
                compile
                if failure != null then
                        for case in test_cases do
-                               case.is_done = true
-                               case.error = "Compilation Error"
+                               case.fail "Compilation Error"
                                case.raw_output = failure
-                               toolcontext.modelbuilder.failed_tests += 1
                                toolcontext.clear_progress_bar
                                toolcontext.show_unit(case)
                        end
@@ -149,8 +151,31 @@ class TestSuite
                        return
                end
                toolcontext.info("Execute test-suite {mmodule.name}", 1)
+
                var before_module = self.before_module
-               if not before_module == null then before_module.run
+               var after_module = self.after_module
+
+               if before_module != null then
+                       before_module.run
+                       toolcontext.clear_progress_bar
+                       toolcontext.show_unit(before_module)
+                       if before_module.error != null then
+                               for case in test_cases do
+                                       case.fail "Nitunit Error: before_module test failed"
+                                       toolcontext.clear_progress_bar
+                                       toolcontext.show_unit(case)
+                               end
+                               if after_module != null then
+                                       after_module.fail "Nitunit Error: before_module test failed"
+                                       toolcontext.clear_progress_bar
+                                       toolcontext.show_unit(after_module)
+                               end
+                               show_status
+                               print ""
+                               return
+                       end
+               end
+
                for case in test_cases do
                        case.run
                        toolcontext.clear_progress_bar
@@ -158,8 +183,12 @@ class TestSuite
                        show_status
                end
 
-               var after_module = self.after_module
-               if not after_module == null then after_module.run
+               if not after_module == null then
+                       after_module.run
+                       toolcontext.clear_progress_bar
+                       toolcontext.show_unit(after_module)
+                       show_status
+               end
 
                show_status
                print ""
@@ -171,9 +200,17 @@ class TestSuite
                file.addn "intrude import test_suite"
                file.addn "import {mmodule.name}\n"
                file.addn "var name = args.first"
+               var before_module = self.before_module
+               if before_module != null then
+                       before_module.write_to_nit(file)
+               end
                for case in test_cases do
                        case.write_to_nit(file)
                end
+               var after_module = self.after_module
+               if after_module != null then
+                       after_module.write_to_nit(file)
+               end
                file.write_to_file("{test_file}.nit")
        end
 
@@ -214,6 +251,13 @@ class TestSuite
                end
        end
 
+       # Set environment variables for test suite execution
+       fun set_env do
+               var loc = mmodule.location.file
+               if loc == null then return
+               toolcontext.set_testing_path(loc.filename)
+       end
+
        # Error occured during test-suite compilation.
        var failure: nullable String = null
 end
@@ -261,7 +305,7 @@ class TestCase
                var res_name = "{test_file}_{method_name.escape_to_c}"
                var clock = new Clock
                var res = toolcontext.safe_exec("{test_file}.bin {method_name} > '{res_name}.out1' 2>&1 </dev/null")
-               real_time = clock.total
+               if not toolcontext.opt_no_time.value then real_time = clock.total
 
                var raw_output = "{res_name}.out1".to_path.read_all
                self.raw_output = raw_output
@@ -310,6 +354,15 @@ class TestCase
                is_done = true
        end
 
+       # Make the test case fail without testing it
+       #
+       # Useful when the compilation or the before_test failed.
+       fun fail(message: String) do
+               is_done = true
+               error = message
+               toolcontext.modelbuilder.failed_tests += 1
+       end
+
        redef fun xml_classname do
                var a = test_method.full_name.split("$")
                return "nitunit.{a[0]}.{a[1]}"
@@ -329,10 +382,10 @@ redef class MMethodDef
        private fun is_test: Bool do return name.has_prefix("test_")
 
        # Is the method a "before_module"?
-       private fun is_before_module: Bool do return mproperty.is_toplevel and name == "before_module"
+       private fun is_before_module: Bool do return name == "before_module"
 
        # Is the method a "after_module"?
-       private fun is_after_module: Bool do return mproperty.is_toplevel and name == "after_module"
+       private fun is_after_module: Bool do return name == "after_module"
 end
 
 redef class MClassDef
@@ -352,7 +405,7 @@ redef class MModule
        # "before_module" method for this module.
        private fun before_test: nullable MMethodDef do
                for mclassdef in mclassdefs do
-                       if not mclassdef.name == "Object" then continue
+                       if not mclassdef.name == "Sys" then continue
                        for mpropdef in mclassdef.mpropdefs do
                                if mpropdef isa MMethodDef and mpropdef.is_before_module then return mpropdef
                        end
@@ -363,7 +416,7 @@ redef class MModule
        # "after_module" method for this module.
        private fun after_test: nullable MMethodDef do
                for mclassdef in mclassdefs do
-                       if not mclassdef.name == "Object" then continue
+                       if not mclassdef.name == "Sys" then continue
                        for mpropdef in mclassdef.mpropdefs do
                                if mpropdef isa MMethodDef and mpropdef.is_after_module then return mpropdef
                        end