From: Jean Privat Date: Thu, 25 Dec 2008 10:39:40 +0000 (-0500) Subject: Update tests X-Git-Url: http://nitlanguage.org?ds=sidebyside Update tests Fix count in tests.sh Update various .nit and .sav test add rterror_check.sav #### --- diff --git a/tests/base_inline_statement.nit b/tests/base_inline_statement.nit index a7df76d..683b0ed 100644 --- a/tests/base_inline_statement.nit +++ b/tests/base_inline_statement.nit @@ -16,7 +16,7 @@ import kernel -var x: Int +var x = 0 while x == 0 do x = 2 while x == 0 do x = 2 diff --git a/tests/rterror_nilcall_undead.nit b/tests/rterror_nilcall_undead.nit index 41acebd..7b29844 100644 --- a/tests/rterror_nilcall_undead.nit +++ b/tests/rterror_nilcall_undead.nit @@ -27,6 +27,6 @@ class A end end -var a: A +var a: A = null a.bar.output a.foo diff --git a/tests/sav/base_abort.sav b/tests/sav/base_abort.sav index 6680898..c2d8821 100644 --- a/tests/sav/base_abort.sav +++ b/tests/sav/base_abort.sav @@ -1,5 +1,5 @@ -Aborted: ./base_abort.nit:21,2--6 +Aborted in base_abort::Object::foo (./base_abort.nit:21) ,---- Stack trace -- - - - -| base_abort::Object::foo (./base_abort.nit:19,1--21:6) -| base_abort::Sys::main (./base_abort.nit:24,1--3) +| base_abort::Object::foo (./base_abort.nit:19) +| base_abort::Sys::(kernel::Sys::main) (./base_abort.nit:24) `------------------- - - - diff --git a/tests/sav/base_init_linext2_alt4.sav b/tests/sav/base_init_linext2_alt4.sav index ebdd308..5de5823 100644 --- 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:103,3--7: Error: Constructor of B must be invoked before constructor of C -alt/base_init_linext2_alt4.nit:97,2--111:12: Error: Conflicting default constructor to call for B: initb, init_par, init_par2. +alt/base_init_linext2_alt4.nit:97,2--111:12: Error: Conflicting default constructor to call for B: initb, init_par. diff --git a/tests/sav/base_isa_cast_alt6.sav b/tests/sav/base_isa_cast_alt6.sav index e74a435..91ff640 100644 --- a/tests/sav/base_isa_cast_alt6.sav +++ b/tests/sav/base_isa_cast_alt6.sav @@ -1,4 +1,4 @@ -Assert failed: alt/base_isa_cast_alt6.nit:58,1--14 +Assert failed in base_isa_cast_alt6::Sys::(kernel::Sys::main) (alt/base_isa_cast_alt6.nit:58) ,---- Stack trace -- - - - -| base_isa_cast_alt6::Sys::main (alt/base_isa_cast_alt6.nit:35,1--59:5) +| base_isa_cast_alt6::Sys::(kernel::Sys::main) (alt/base_isa_cast_alt6.nit:35) `------------------- - - - diff --git a/tests/sav/error_attr_2def.sav b/tests/sav/error_attr_2def.sav index fb20f9a..37775c2 100644 --- a/tests/sav/error_attr_2def.sav +++ b/tests/sav/error_attr_2def.sav @@ -1 +1 @@ -./error_attr_2def.nit:19,2--19: Error: A property _toto is already defined in class A at line 18. +./error_attr_2def.nit:19,2--19: Error: A property _toto is already defined in class A. diff --git a/tests/sav/error_defs_alt2.sav b/tests/sav/error_defs_alt2.sav index 4ddb00c..4e4d510 100644 --- a/tests/sav/error_defs_alt2.sav +++ b/tests/sav/error_defs_alt2.sav @@ -1 +1 @@ -alt/error_defs_alt2.nit:26,2--40: Error: A property foo is already defined in class A at line 25. +alt/error_defs_alt2.nit:26,2--40: Error: A property foo is already defined in class A. diff --git a/tests/sav/error_meth_2def.sav b/tests/sav/error_meth_2def.sav index 5b390cc..6258904 100644 --- a/tests/sav/error_meth_2def.sav +++ b/tests/sav/error_meth_2def.sav @@ -1 +1 @@ -./error_meth_2def.nit:19,2--18: Error: A property toto is already defined in class A at line 18. +./error_meth_2def.nit:19,2--18: Error: A property toto is already defined in class A. diff --git a/tests/sav/error_meth_2def2.sav b/tests/sav/error_meth_2def2.sav index 7a3dff4..b2c0f94 100644 --- a/tests/sav/error_meth_2def2.sav +++ b/tests/sav/error_meth_2def2.sav @@ -1 +1 @@ -./error_meth_2def2.nit:19,2--35: Error: A property toto is already defined in class A at line 18. +./error_meth_2def2.nit:19,2--35: Error: A property toto is already defined in class A. diff --git a/tests/sav/rterror_check.sav b/tests/sav/rterror_check.sav new file mode 100644 index 0000000..14f4b2a --- /dev/null +++ b/tests/sav/rterror_check.sav @@ -0,0 +1,4 @@ +Assert 'fail' failed in rterror_check::Sys::(kernel::Sys::main) (./rterror_check.nit:20) +,---- Stack trace -- - - - +| rterror_check::Sys::(kernel::Sys::main) (./rterror_check.nit:18) +`------------------- - - - diff --git a/tests/shootout_pidigits.nit b/tests/shootout_pidigits.nit index 05b2e4a..8f27655 100644 --- a/tests/shootout_pidigits.nit +++ b/tests/shootout_pidigits.nit @@ -87,8 +87,12 @@ class Transformation attr _t: Int attr _k: Int - init(q: Int, r: Int, s: Int, t: Int) + do + set(q, r, s, t) + end + + meth set(q: Int, r: Int, s: Int, t: Int) do _q = q _r = r @@ -125,7 +129,7 @@ class Transformation meth qrst(q: Int, r: Int, s: Int, t: Int): Transformation do - init(q, r, s, t) + set(q, r, s, t) return self end end diff --git a/tests/test_equal_nil.nit b/tests/test_equal_nil.nit index f94446a..dd7edd7 100644 --- a/tests/test_equal_nil.nit +++ b/tests/test_equal_nil.nit @@ -20,7 +20,7 @@ class A end var a = new A -var b : A +var b: A = null if a == null then printn(0) else printn(1) if a is null then printn(0) else printn(1) #if b == null then printn(1) else printn(0) diff --git a/tests/test_let.nit b/tests/test_let.nit index 868e548..70dbe4b 100644 --- a/tests/test_let.nit +++ b/tests/test_let.nit @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -var i: Int +var i = 0 var j: Object = i var k: Object diff --git a/tests/test_nil.nit b/tests/test_nil.nit index 81b4ac3..dbac319 100644 --- a/tests/test_nil.nit +++ b/tests/test_nil.nit @@ -15,10 +15,10 @@ # limitations under the License. -var a: Object -var b: Object -var c= a -var d= "coucou" +var a: Object = null +var b: Object = null +var c = a +var d = "coucou" d = null printn(0) printn(null) diff --git a/tests/test_undead.nit b/tests/test_undead.nit index 6d7950a..b6c509a 100644 --- a/tests/test_undead.nit +++ b/tests/test_undead.nit @@ -27,7 +27,7 @@ class A end end -var a: A +var a: A = null if a != null then a.foo a.bar.output diff --git a/tests/tests.sh b/tests/tests.sh index ef4cc4f..68dd164 100755 --- a/tests/tests.sh +++ b/tests/tests.sh @@ -121,15 +121,19 @@ for ii in "$@"; do else echo "[=== no sav ===] $ff.res" echo -n "res" >> $HTM + nos="$nos $ff" fi echo "" >> $HTM done done -echo "ok: " `echo $ok | wc -w` "/ $#" +echo "ok: " `echo $ok | wc -w` "/" `echo $ok $nok $nos | wc -w` echo "" `echo $ok | wc -w` "" `echo $nok | wc -w` "" >> $HTM if [ -n "$nok" ]; then echo "fail: $nok" echo "There were errors !" fi +if [ -n "$nos" ]; then + echo "no sav: $nos" +fi