Fix base_init_linext tests.

diff --git a/tests/base_init_linext.nit b/tests/base_init_linext.nit
index 0503278..010e1ab 100644 (file)
--- a/tests/base_init_linext.nit
+++ b/tests/base_init_linext.nit
@@ -17,16 +17,17 @@
 import kernel
 
 class A
-       init inita do
+       init do
                'A'.output
                ' '.output
        end
+       init inita do init
        meth work do '\n'.output
 end
 
 class B
 special A
-       init initb do
+       init do
                'B'.output
                '1'.output
                ' '.output
@@ -35,11 +36,12 @@ special A
                '2'.output
                ' '.output
        end
+       init initb do init
 end
 
 class C
 special A
-       init initc do
+       init do
                'C'.output
                '1'.output
                ' '.output
@@ -48,12 +50,13 @@ special A
                '2'.output
                ' '.output
        end
+       init initc do init
 end
 
 class D
 special B
 special C
-       init initd do
+       init do
                'D'.output
                '0'.output
                ' '.output
@@ -122,8 +125,8 @@ special C
        end
 end
 
-#alt0#(new A.inita).work
-#alt0#(new B.initb).work
-#alt0#(new C.initc).work
-(new D.initd).work
+#alt0#(new A).work
+#alt0#(new B).work
+#alt0#(new C).work
+(new D).work
 #alt0#(new D.inite).work

diff --git a/tests/base_init_linext_raf.nit b/tests/base_init_linext_raf.nit
index 9d9dfea..dfd7b7d 100644 (file)
--- a/tests/base_init_linext_raf.nit
+++ b/tests/base_init_linext_raf.nit
@@ -17,7 +17,7 @@
 import base_init_linext
 
 redef class B
-       redef init initb do
+       redef init do
                'b'.output
                '1'.output
                ' '.output
@@ -29,7 +29,7 @@ redef class B
 end
 
 redef class C
-       redef init initc do
+       redef init do
                'c'.output
                '1'.output
                ' '.output
@@ -41,7 +41,7 @@ redef class C
 end
 
 redef class D
-       redef init initd do
+       redef init do
                'd'.output
                '1'.output
                ' '.output
@@ -52,7 +52,7 @@ redef class D
        end
 end
 
-(new A.inita).work
-(new B.initb).work
-(new C.initc).work
-(new D.initd).work
+(new A).work
+(new B).work
+(new C).work
+(new D).work

diff --git a/tests/sav/base_init_linext2_alt2.sav b/tests/sav/base_init_linext2_alt2.sav
index 53abc6b..d76e844 100644 (file)
--- a/tests/sav/base_init_linext2_alt2.sav
+++ b/tests/sav/base_init_linext2_alt2.sav
@@ -1 +1 @@
-alt/base_init_linext2_alt2.nit:81,2--94:12: Error: Conflicting default constructor to call for B: initb, init_par, init_par2.
+alt/base_init_linext2_alt2.nit:99,2--112:12: Error: there is no available compatible constrctor in B. Discarded candidates are base_init_linext2_alt2::B::initb, base_init_linext2_alt2::B::init_par, base_init_linext2_alt2::B::init_par2(Char).

diff --git a/tests/sav/base_init_linext2_alt4.sav b/tests/sav/base_init_linext2_alt4.sav
index 74c35e0..0897605 100644 (file)
--- a/tests/sav/base_init_linext2_alt4.sav
+++ b/tests/sav/base_init_linext2_alt4.sav
@@ -1,2 +1,2 @@
 alt/base_init_linext2_alt4.nit:105,3--7: Error: Constructor of B must be invoked before constructor of C
-alt/base_init_linext2_alt4.nit:99,2--113:12: Error: Conflicting default constructor to call for B: initb, init_par.
+alt/base_init_linext2_alt4.nit:99,2--113:12: Error: there is no available compatible constrctor in B. Discarded candidates are base_init_linext2_alt4::B::initb, base_init_linext2_alt4::B::init_par, base_init_linext2_alt4::B::init_par2(Char).