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

diff --git a/src/nitunit.nit b/src/nitunit.nit
index 137b207..e86f92f 100644
--- a/src/nitunit.nit
+++ b/src/nitunit.nit
@@ -12,41 +12,97 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Program to extract and execute unit tests from nit source files
+# Testing tool.
+# see `testing/README`
 module nitunit
 
 import testing
 
 var toolcontext = new ToolContext
 
-toolcontext.option_context.add_option(toolcontext.opt_full, toolcontext.opt_output, toolcontext.opt_dir, toolcontext.opt_noact)
+toolcontext.option_context.add_option(toolcontext.opt_full, toolcontext.opt_output, toolcontext.opt_dir, toolcontext.opt_noact, toolcontext.opt_pattern, toolcontext.opt_file, toolcontext.opt_gen_unit, toolcontext.opt_gen_force, toolcontext.opt_gen_private, toolcontext.opt_gen_show)
 toolcontext.tooldescription = "Usage: nitunit [OPTION]... <file.nit>...\nExecutes the unit tests from Nit source files."
 
 toolcontext.process_options(args)
 var args = toolcontext.option_context.rest
 
+if toolcontext.opt_gen_unit.value then
+	if toolcontext.opt_pattern.value != null then
+		print "Option --pattern cannot be used with --gen-suite"
+		exit(0)
+	end
+	if toolcontext.opt_file.value != null then
+		print "Option --target-file cannot be used with --gen-suite"
+		exit(0)
+	end
+else
+	if toolcontext.opt_gen_force.value then
+		print "Option --force must be used with --gen-suite"
+		exit(0)
+	end
+	if toolcontext.opt_gen_private.value then
+		print "Option --private must be used with --gen-suite"
+		exit(0)
+	end
+	if toolcontext.opt_gen_show.value then
+		print "Option --only-show must be used with --gen-suite"
+		exit(0)
+	end
+end
+
 var model = new Model
 var modelbuilder = new ModelBuilder(model, toolcontext)
 
-var mmodules = modelbuilder.parse(args)
+var module_files = modelbuilder.filter_nit_source(args)
+
+var mmodules = modelbuilder.parse_full(module_files)
 modelbuilder.run_phases
 
+if toolcontext.opt_gen_unit.value then
+	modelbuilder.gen_test_unit(mmodules.first)
+	exit(0)
+end
+
 var page = new HTMLTag("testsuites")
 
 if toolcontext.opt_full.value then mmodules = model.mmodules
 
+for a in args do
+	if not a.file_exists then
+		toolcontext.fatal_error(null, "Error: cannot load file or module `{a}`.")
+	end
+	# Try to load the file as a markdown document
+	var mdoc = modelbuilder.load_markdown(a)
+	page.add modelbuilder.test_mdoc(mdoc)
+end
+
+for a in module_files do
+	var g = modelbuilder.get_mgroup(a)
+	if g == null then continue
+	page.add modelbuilder.test_group(g)
+end
+
 for m in mmodules do
 	page.add modelbuilder.test_markdown(m)
+	page.add modelbuilder.test_unit(m)
 end
 
 var file = toolcontext.opt_output.value
 if file == null then file = "nitunit.xml"
 page.write_to_file(file)
-print "Results saved in {file}"
-
+# print docunits results
+print "DocUnits:"
 if modelbuilder.unit_entities == 0 then
-	print "No nitunits found"
+	print "No doc units found"
 else if modelbuilder.failed_entities == 0 and not toolcontext.opt_noact.value then
-	print "Success"
+	print "DocUnits Success"
 end
 print "Entities: {modelbuilder.total_entities}; Documented ones: {modelbuilder.doc_entities}; With nitunits: {modelbuilder.unit_entities}; Failures: {modelbuilder.failed_entities}"
+# print testsuites results
+print "\nTestSuites:"
+if modelbuilder.total_tests == 0 then
+	print "No test cases found"
+else if modelbuilder.failed_tests == 0 and not toolcontext.opt_noact.value then
+	print "TestSuites Success"
+end
+print "Class suites: {modelbuilder.total_classes}; Test Cases: {modelbuilder.total_tests}; Failures: {modelbuilder.failed_tests}"