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

diff --git a/src/model/test_model_json.nit b/src/model/test_model_json.nit
index 105c493..cc10f48 100644
--- a/src/model/test_model_json.nit
+++ b/src/model/test_model_json.nit
@@ -12,18 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-module test_model_json is test_suite
+module test_model_json is test
 
-import test_suite
 import model_json
 import frontend
 
 class TestModelSerialization
-	super TestSuite
+	test
 
 	var suite_path: String = "NIT_TESTING_PATH".environ
 	var lib_path: String = "{suite_path.dirname}/../../tests/test_prog"
 
+	var mainmodule: MModule is noinit
+
 	private var model: Model do
 		var toolcontext = new ToolContext
 		var model = new Model
@@ -32,69 +33,70 @@ class TestModelSerialization
 		if mmodules.is_empty then return model
 		mbuilder.run_phases
 		toolcontext.run_global_phases(mmodules)
+		mainmodule = mmodules.first
 		return model
 	end
 
-	fun test_refs_to_full_json do
+	fun test_refs_to_full_json is test do
 		var mentities = new Array[MEntity]
 		mentities.add model.mpackages.first
 		mentities.add model.mmodules.first
 		mentities.add model.mclasses.first
 		for mentity in mentities do
-			print ((new MEntityRef(mentity)).to_pretty_full_json)
+			print ((new MEntityRef(mentity)).to_pretty_full_json(mainmodule))
 		end
 	end
 
-	fun test_packages_to_full_json do
+	fun test_packages_to_full_json is test do
 		for mentity in model.mpackages do
-			print mentity.to_pretty_full_json
+			print mentity.to_pretty_full_json(mainmodule)
 		end
 	end
 
-	fun test_groups_to_full_json do
+	fun test_groups_to_full_json is test do
 		for mpackage in model.mpackages do
 			for mentity in mpackage.mgroups do
-				print mentity.to_pretty_full_json
+				print mentity.to_pretty_full_json(mainmodule)
 			end
 		end
 	end
 
-	fun test_modules_to_full_json do
+	fun test_modules_to_full_json is test do
 		for mentity in model.mmodules do
-			print mentity.to_pretty_full_json
+			print mentity.to_pretty_full_json(mainmodule)
 		end
 	end
 
-	fun test_classes_to_full_json do
+	fun test_classes_to_full_json is test do
 		for mentity in model.mclasses do
-			print mentity.to_pretty_full_json
+			print mentity.to_pretty_full_json(mainmodule)
 		end
 	end
 
-	fun test_classdefs_to_full_json do
+	fun test_classdefs_to_full_json is test do
 		for mclass in model.mclasses do
 			for mentity in mclass.mclassdefs do
-				print mentity.to_pretty_full_json
+				print mentity.to_pretty_full_json(mainmodule)
 			end
 		end
 	end
 
-	fun test_props_to_full_json do
+	fun test_props_to_full_json is test do
 		for mentity in model.mproperties do
-			print mentity.to_pretty_full_json
+			print mentity.to_pretty_full_json(mainmodule)
 		end
 	end
 
-	fun test_propdefs_to_full_json do
+	fun test_propdefs_to_full_json is test do
 		for mprop in model.mproperties do
 			for mentity in mprop.mpropdefs do
-				print mentity.to_pretty_full_json
+				print mentity.to_pretty_full_json(mainmodule)
 			end
 		end
 	end
 end
 
-redef class Location
+redef class nitc::Location
 	serialize
 
 	# Avoid diff on location absolute path