From: Alexandre Terrasa <alexandre@moz-code.org>
Date: Tue, 6 Jun 2017 05:17:30 +0000 (-0400)
Subject: loader: use `test` annotations for modules
X-Git-Url: http://nitlanguage.org

loader: use `test` annotations for modules

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>
---

diff --git a/src/catalog.nit b/src/catalog.nit
index 92510bc..51cdd53 100644
--- a/src/catalog.nit
+++ b/src/catalog.nit
@@ -384,7 +384,7 @@ class Catalog
 					end
 				end
 				var ms = gs
-				if m.is_test_suite then ms /= 100.0
+				if m.is_test then ms /= 100.0
 				entity_score += ms
 				if m.mdoc != null then doc_score += ms else ms /= 10.0
 				for cd in m.mclassdefs do
diff --git a/src/loader.nit b/src/loader.nit
index 1502c40..6d012e6 100644
--- a/src/loader.nit
+++ b/src/loader.nit
@@ -810,8 +810,6 @@ redef class ModelBuilder
 				mmodule.mdoc = mdoc
 				mdoc.original_mentity = mmodule
 			end
-			# Is the module a test suite?
-			mmodule.is_test_suite = not decl.get_annotations("test_suite").is_empty
 			# Is the module generated?
 			mmodule.is_generated = not decl.get_annotations("generated").is_empty
 		end
diff --git a/src/model/mmodule.nit b/src/model/mmodule.nit
index 9d1fb9c..a410236 100644
--- a/src/model/mmodule.nit
+++ b/src/model/mmodule.nit
@@ -248,9 +248,6 @@ class MModule
 		end
 	end
 
-	# Is `self` a unit test module used by `nitunit`?
-	var is_test_suite: Bool = false is writable
-
 	# Is `self` a module generated by a tool?
 	#
 	# This flag has no effect on the semantic.
diff --git a/src/model/model_views.nit b/src/model/model_views.nit
index 2f0eed5..8b0f122 100644
--- a/src/model/model_views.nit
+++ b/src/model/model_views.nit
@@ -122,7 +122,7 @@ class ModelView
 		v.include_fictive = self.include_fictive
 		v.include_empty_doc = self.include_empty_doc
 		v.include_attribute = self.include_attribute
-		v.include_test_suite = self.include_test_suite
+		v.include_test = self.include_test
 	end
 
 	# Searches the MEntity that matches `full_name`.
diff --git a/src/model/model_visitor.nit b/src/model/model_visitor.nit
index 59d3e61..a2807de 100644
--- a/src/model/model_visitor.nit
+++ b/src/model/model_visitor.nit
@@ -104,13 +104,13 @@ abstract class ModelVisitor
 	# Should we accept nitunit test suites?
 	#
 	# Default is `false`.
-	var include_test_suite = false is writable
+	var include_test = false is writable
 
 	# Can we accept this `mentity` regarding its test suite status?
-	fun accept_test_suite(mentity: MEntity): Bool do
-		if include_test_suite then return true
+	fun accept_test(mentity: MEntity): Bool do
+		if include_test then return true
 		if not mentity isa MModule then return true
-		return not mentity.is_test_suite
+		return not mentity.is_test
 	end
 
 	# Should we accept `MAttribute` instances?
@@ -131,7 +131,7 @@ abstract class ModelVisitor
 		if not accept_visibility(mentity) then return false
 		if not accept_fictive(mentity) then return false
 		if not accept_empty_doc(mentity) then return false
-		if not accept_test_suite(mentity) then return false
+		if not accept_test(mentity) then return false
 		if not accept_attribute(mentity) then return false
 		return true
 	end
diff --git a/src/web/web_base.nit b/src/web/web_base.nit
index 1daebdd..e9f1b61 100644
--- a/src/web/web_base.nit
+++ b/src/web/web_base.nit
@@ -47,7 +47,7 @@ class NitwebConfig
 		view.include_fictive = true
 		view.include_empty_doc = true
 		view.include_attribute = true
-		view.include_test_suite = true
+		view.include_test = true
 		return view
 	end
 end