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

diff --git a/src/test_model_visitor.nit b/src/test_model_visitor.nit
index b46af5c..9596132 100644
--- a/src/test_model_visitor.nit
+++ b/src/test_model_visitor.nit
@@ -55,42 +55,39 @@ do
 	var model = modelbuilder.model
 
 	print "All entities, including fictive ones:"
-	var v = new TestModelVisitor
-	v.min_visibility = private_visibility
-	v.include_fictive = true
+	var filters = new ModelFilter(private_visibility, accept_fictive = true)
+	var v = new TestModelVisitor(filters)
 	v.enter_visit(model)
 	v.cpt.print_elements(10)
 	var names = v.names
 
 	print "All entities:"
-	v = new TestModelVisitor
-	v.min_visibility = private_visibility
+	filters = new ModelFilter(private_visibility)
+	v = new TestModelVisitor(filters)
 	v.enter_visit(model)
 	v.cpt.print_elements(10)
 
 	print "\nAll non-private entities:"
-	v = new TestModelVisitor
-	v.min_visibility = protected_visibility
+	filters = new ModelFilter(protected_visibility)
+	v = new TestModelVisitor(filters)
 	v.enter_visit(model)
 	v.cpt.print_elements(10)
 
 	print "\nAll documented non-private entities:"
-	v = new TestModelVisitor
-	v.min_visibility = protected_visibility
-	v.include_empty_doc = false
+	filters = new ModelFilter(protected_visibility, accept_empty_doc = false)
+	v = new TestModelVisitor(filters)
 	v.enter_visit(model)
 	v.cpt.print_elements(10)
 
 	print "\nAll public entities:"
-	v = new TestModelVisitor
-	v.min_visibility = public_visibility
+	filters = new ModelFilter(public_visibility)
+	v = new TestModelVisitor(filters)
 	v.enter_visit(model)
 	v.cpt.print_elements(10)
 
 	print "\nAll documented public entities:"
-	v = new TestModelVisitor
-	v.min_visibility = public_visibility
-	v.include_empty_doc = false
+	filters = new ModelFilter(public_visibility, accept_empty_doc = false)
+	v = new TestModelVisitor(filters)
 	v.enter_visit(model)
 	v.cpt.print_elements(10)
 
@@ -117,6 +114,6 @@ do
 		var c = ""
 		var d = e.mdoc_or_fallback
 		if d != null and d.content.not_empty then c = d.content.first
-		print "{n}\t{e.class_name}\t{c}"
+		print "{n}\t{e.class_name}\t{e.location}\t{c}"
 	end
 end