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

diff --git a/tests/test_deserialization.nit b/tests/test_deserialization.nit
index deb8997..c0f1045 100644
--- a/tests/test_deserialization.nit
+++ b/tests/test_deserialization.nit
@@ -20,23 +20,14 @@ import serialization
 class A
 	auto_serializable
 
-	var b = false
+	var b: Bool
 	var c: Char
 	var f: Float
-	var i = 123
-	var s = "asdf"
+	var i: Int
+	var s: String is serialize_as "serialization_specific_name"
 	var n: nullable Int
 	var password = "p4ssw0rd" is lazy, noserialize
 
-	init(b: Bool, c: Char, f: Float, i: Int, s: String, n: nullable Int)
-	do
-		self.b = b
-		self.c = c
-		self.f = f
-		self.i = i
-		self.s = s
-	end
-
 	redef fun to_s do return "<A: {b} {c} {f} {i} {s} {n != null} {password}>"
 end
 
@@ -48,14 +39,6 @@ class B
 	var ii: Int
 	var ss: String
 
-	init(b: Bool, c: Char, f: Float, i: Int, s: String, n: nullable Int, ii: Int, ss: String)
-	do
-		super(b, c, f, i, s, n)
-
-		self.ii = ii
-		self.ss = ss
-	end
-
 	redef fun to_s do return "<B: {super} {ii} {ss}>"
 end
 
@@ -64,16 +47,9 @@ class C
 	auto_serializable
 
 	var a: A
-	var b = new B(false, 'b', 123.123, 2345, "hjkl", 12, 1111, "qwer")
+	var b: B
 	var aa: A
 
-	init(a: A, b: B)
-	do
-		self.a = a
-		self.b = b
-		self.aa = a
-	end
-
 	redef fun to_s do return "<C: {a} {b}>"
 end
 
@@ -103,7 +79,7 @@ class F[N: Numeric]
 
 	var n: N
 
-	redef fun to_s do return "<E: {n}>"
+	redef fun to_s do return "<F: {n}>"
 end
 
 # Other collections
@@ -134,7 +110,7 @@ end
 class TestEntities
 	var a = new A(true, 'a', 0.1234, 1234, "asdf", null)
 	var b = new B(false, 'b', 123.123, 2345, "hjkl", 12, 1111, "qwer")
-	var c = new C(a, b)
+	var c = new C(a, b, a)
 	var d = new D(false, 'b', 123.123, 2345, "new line ->\n<-", null, 1111, "\t\f\"\r\\/")
 	init do d.d = d
 	var e = new E
@@ -149,5 +125,5 @@ class TestEntities
 	var with_generics: Array[Serializable] = [a, b, c, d, e, fi, ff, g: Serializable]
 end
 
-# We instanciate it here so that `nitserial` detects generic types as being alive
+# We instantiate it here so that `nitserial` detects generic types as being alive
 var entities = new TestEntities