From 98620e2b2e2c8e99a9758541e64690c4ac6d96f5 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Sat, 4 Apr 2015 22:04:55 +0700 Subject: [PATCH] Update tests error message on null adaptation and tests Signed-off-by: Jean Privat --- tests/sav/base_as_notnull.res | 8 ++++---- tests/sav/base_as_notnull2.res | 4 ++-- tests/sav/base_as_notnull2_alt1.res | 4 ++-- tests/sav/base_as_notnull2_alt2.res | 4 ++-- tests/sav/base_as_notnull2_alt3.res | 4 ++-- tests/sav/base_as_notnull_alt1.res | 10 +++++----- tests/sav/base_as_notnull_alt2.res | 10 +++++----- tests/sav/base_as_notnull_alt3.res | 8 ++++---- tests/sav/base_as_notnull_alt4.res | 8 ++++---- tests/sav/base_as_notnull_alt5.res | 8 ++++---- tests/sav/base_as_notnull_alt6.res | 8 ++++---- tests/sav/base_as_notnull_alt7.res | 8 ++++---- tests/sav/base_as_notnull_int.res | 4 ++-- tests/sav/base_eq_null_notnull.res | 4 ++-- tests/sav/base_null.res | 2 -- tests/sav/base_var_type_evolution_null3.res | 2 +- tests/sav/base_var_type_evolution_null3_alt1.res | 2 +- tests/sav/error_expr_not_ok_alt4.res | 2 +- tests/sav/error_expr_not_ok_alt5.res | 2 +- tests/sav/error_expr_not_ok_alt6.res | 2 +- 20 files changed, 51 insertions(+), 53 deletions(-) diff --git a/tests/sav/base_as_notnull.res b/tests/sav/base_as_notnull.res index 2380a43..2324342 100644 --- a/tests/sav/base_as_notnull.res +++ b/tests/sav/base_as_notnull.res @@ -1,7 +1,7 @@ -base_as_notnull.nit:41,6--19: Warning: expression is already not null, since it is a `A`. -base_as_notnull.nit:42,6--20: Warning: expression is already not null, since it is a `A`. -base_as_notnull.nit:43,6--19: Warning: expression is already not null, since it is a `B`. -base_as_notnull.nit:52,6--19: Warning: expression is already not null, since it is a `B`. +base_as_notnull.nit:41,6: Warning: expression is not null, since it is a `A`. +base_as_notnull.nit:42,6--7: Warning: expression is not null, since it is a `A`. +base_as_notnull.nit:43,6: Warning: expression is not null, since it is a `B`. +base_as_notnull.nit:52,6: Warning: expression is not null, since it is a `B`. 1 2 3 diff --git a/tests/sav/base_as_notnull2.res b/tests/sav/base_as_notnull2.res index b0818df..1962743 100644 --- a/tests/sav/base_as_notnull2.res +++ b/tests/sav/base_as_notnull2.res @@ -1,5 +1,5 @@ -base_as_notnull2.nit:30,12--25: Warning: expression is already not null, since it is a `Object`. -base_as_notnull2.nit:50,12--25: Warning: expression is already not null, since it is a `F: Object`. +base_as_notnull2.nit:30,12: Warning: expression is not null, since it is a `Object`. +base_as_notnull2.nit:50,12: Warning: expression is not null, since it is a `F: Object`. 1 1 2 diff --git a/tests/sav/base_as_notnull2_alt1.res b/tests/sav/base_as_notnull2_alt1.res index 01ee624..b61957e 100644 --- a/tests/sav/base_as_notnull2_alt1.res +++ b/tests/sav/base_as_notnull2_alt1.res @@ -1,3 +1,3 @@ -alt/base_as_notnull2_alt1.nit:30,12--25: Warning: expression is already not null, since it is a `Object`. -alt/base_as_notnull2_alt1.nit:50,12--25: Warning: expression is already not null, since it is a `F: Object`. +alt/base_as_notnull2_alt1.nit:30,12: Warning: expression is not null, since it is a `Object`. +alt/base_as_notnull2_alt1.nit:50,12: Warning: expression is not null, since it is a `F: Object`. alt/base_as_notnull2_alt1.nit:58,7--10: Type error: expected Object, got null diff --git a/tests/sav/base_as_notnull2_alt2.res b/tests/sav/base_as_notnull2_alt2.res index e6335c5..4ac9e4e 100644 --- a/tests/sav/base_as_notnull2_alt2.res +++ b/tests/sav/base_as_notnull2_alt2.res @@ -1,5 +1,5 @@ -alt/base_as_notnull2_alt2.nit:30,12--25: Warning: expression is already not null, since it is a `Object`. -alt/base_as_notnull2_alt2.nit:50,12--25: Warning: expression is already not null, since it is a `F: Object`. +alt/base_as_notnull2_alt2.nit:30,12: Warning: expression is not null, since it is a `Object`. +alt/base_as_notnull2_alt2.nit:50,12: Warning: expression is not null, since it is a `F: Object`. Runtime error: Cast failed (alt/base_as_notnull2_alt2.nit:40) 1 1 diff --git a/tests/sav/base_as_notnull2_alt3.res b/tests/sav/base_as_notnull2_alt3.res index 4fb6e73..4a57748 100644 --- a/tests/sav/base_as_notnull2_alt3.res +++ b/tests/sav/base_as_notnull2_alt3.res @@ -1,3 +1,3 @@ -alt/base_as_notnull2_alt3.nit:30,12--25: Warning: expression is already not null, since it is a `Object`. -alt/base_as_notnull2_alt3.nit:50,12--25: Warning: expression is already not null, since it is a `F: Object`. +alt/base_as_notnull2_alt3.nit:30,12: Warning: expression is not null, since it is a `Object`. +alt/base_as_notnull2_alt3.nit:50,12: Warning: expression is not null, since it is a `F: Object`. alt/base_as_notnull2_alt3.nit:64,7--10: Type error: expected Int, got null diff --git a/tests/sav/base_as_notnull_alt1.res b/tests/sav/base_as_notnull_alt1.res index ad6b798..cbb18f8 100644 --- a/tests/sav/base_as_notnull_alt1.res +++ b/tests/sav/base_as_notnull_alt1.res @@ -1,6 +1,6 @@ -alt/base_as_notnull_alt1.nit:41,6--19: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt1.nit:42,6--20: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt1.nit:43,6--19: Warning: expression is already not null, since it is a `B`. -alt/base_as_notnull_alt1.nit:50,6--19: Warning: expression is already not null, since it is a `A`. +alt/base_as_notnull_alt1.nit:41,6: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt1.nit:42,6--7: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt1.nit:43,6: Warning: expression is not null, since it is a `B`. +alt/base_as_notnull_alt1.nit:50,6: Warning: expression is not null, since it is a `A`. alt/base_as_notnull_alt1.nit:50,6--19: Type error: expected B, got A -alt/base_as_notnull_alt1.nit:52,6--19: Warning: expression is already not null, since it is a `B`. +alt/base_as_notnull_alt1.nit:52,6: Warning: expression is not null, since it is a `B`. diff --git a/tests/sav/base_as_notnull_alt2.res b/tests/sav/base_as_notnull_alt2.res index 0e0e68c..c9dfed9 100644 --- a/tests/sav/base_as_notnull_alt2.res +++ b/tests/sav/base_as_notnull_alt2.res @@ -1,6 +1,6 @@ -alt/base_as_notnull_alt2.nit:41,6--19: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt2.nit:42,6--20: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt2.nit:43,6--19: Warning: expression is already not null, since it is a `B`. -alt/base_as_notnull_alt2.nit:51,6--20: Warning: expression is already not null, since it is a `A`. +alt/base_as_notnull_alt2.nit:41,6: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt2.nit:42,6--7: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt2.nit:43,6: Warning: expression is not null, since it is a `B`. +alt/base_as_notnull_alt2.nit:51,6--7: Warning: expression is not null, since it is a `A`. alt/base_as_notnull_alt2.nit:51,6--20: Type error: expected B, got A -alt/base_as_notnull_alt2.nit:52,6--19: Warning: expression is already not null, since it is a `B`. +alt/base_as_notnull_alt2.nit:52,6: Warning: expression is not null, since it is a `B`. diff --git a/tests/sav/base_as_notnull_alt3.res b/tests/sav/base_as_notnull_alt3.res index bd83530..d66632f 100644 --- a/tests/sav/base_as_notnull_alt3.res +++ b/tests/sav/base_as_notnull_alt3.res @@ -1,5 +1,5 @@ -alt/base_as_notnull_alt3.nit:41,6--19: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt3.nit:42,6--20: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt3.nit:43,6--19: Warning: expression is already not null, since it is a `B`. -alt/base_as_notnull_alt3.nit:52,6--19: Warning: expression is already not null, since it is a `B`. +alt/base_as_notnull_alt3.nit:41,6: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt3.nit:42,6--7: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt3.nit:43,6: Warning: expression is not null, since it is a `B`. +alt/base_as_notnull_alt3.nit:52,6: Warning: expression is not null, since it is a `B`. alt/base_as_notnull_alt3.nit:53,6--20: Type error: expected B, got A diff --git a/tests/sav/base_as_notnull_alt4.res b/tests/sav/base_as_notnull_alt4.res index 0050108..b25242f 100644 --- a/tests/sav/base_as_notnull_alt4.res +++ b/tests/sav/base_as_notnull_alt4.res @@ -1,5 +1,5 @@ -alt/base_as_notnull_alt4.nit:41,6--19: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt4.nit:42,6--20: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt4.nit:43,6--19: Warning: expression is already not null, since it is a `B`. -alt/base_as_notnull_alt4.nit:52,6--19: Warning: expression is already not null, since it is a `B`. +alt/base_as_notnull_alt4.nit:41,6: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt4.nit:42,6--7: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt4.nit:43,6: Warning: expression is not null, since it is a `B`. +alt/base_as_notnull_alt4.nit:52,6: Warning: expression is not null, since it is a `B`. alt/base_as_notnull_alt4.nit:54,6--21: Type error: expected B, got A diff --git a/tests/sav/base_as_notnull_alt5.res b/tests/sav/base_as_notnull_alt5.res index d8136e9..b52a40b 100644 --- a/tests/sav/base_as_notnull_alt5.res +++ b/tests/sav/base_as_notnull_alt5.res @@ -1,7 +1,7 @@ -alt/base_as_notnull_alt5.nit:41,6--19: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt5.nit:42,6--20: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt5.nit:43,6--19: Warning: expression is already not null, since it is a `B`. -alt/base_as_notnull_alt5.nit:52,6--19: Warning: expression is already not null, since it is a `B`. +alt/base_as_notnull_alt5.nit:41,6: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt5.nit:42,6--7: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt5.nit:43,6: Warning: expression is not null, since it is a `B`. +alt/base_as_notnull_alt5.nit:52,6: Warning: expression is not null, since it is a `B`. Runtime error: Cast failed (alt/base_as_notnull_alt5.nit:59) 1 2 diff --git a/tests/sav/base_as_notnull_alt6.res b/tests/sav/base_as_notnull_alt6.res index 7083fa3..518f166 100644 --- a/tests/sav/base_as_notnull_alt6.res +++ b/tests/sav/base_as_notnull_alt6.res @@ -1,7 +1,7 @@ -alt/base_as_notnull_alt6.nit:41,6--19: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt6.nit:42,6--20: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt6.nit:43,6--19: Warning: expression is already not null, since it is a `B`. -alt/base_as_notnull_alt6.nit:52,6--19: Warning: expression is already not null, since it is a `B`. +alt/base_as_notnull_alt6.nit:41,6: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt6.nit:42,6--7: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt6.nit:43,6: Warning: expression is not null, since it is a `B`. +alt/base_as_notnull_alt6.nit:52,6: Warning: expression is not null, since it is a `B`. Runtime error: Cast failed (alt/base_as_notnull_alt6.nit:60) 1 2 diff --git a/tests/sav/base_as_notnull_alt7.res b/tests/sav/base_as_notnull_alt7.res index 38f0903..6ad88ec 100644 --- a/tests/sav/base_as_notnull_alt7.res +++ b/tests/sav/base_as_notnull_alt7.res @@ -1,5 +1,5 @@ -alt/base_as_notnull_alt7.nit:41,6--19: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt7.nit:42,6--20: Warning: expression is already not null, since it is a `A`. -alt/base_as_notnull_alt7.nit:43,6--19: Warning: expression is already not null, since it is a `B`. -alt/base_as_notnull_alt7.nit:52,6--19: Warning: expression is already not null, since it is a `B`. +alt/base_as_notnull_alt7.nit:41,6: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt7.nit:42,6--7: Warning: expression is not null, since it is a `A`. +alt/base_as_notnull_alt7.nit:43,6: Warning: expression is not null, since it is a `B`. +alt/base_as_notnull_alt7.nit:52,6: Warning: expression is not null, since it is a `B`. alt/base_as_notnull_alt7.nit:61,1--17: Type error: as(not null) on null diff --git a/tests/sav/base_as_notnull_int.res b/tests/sav/base_as_notnull_int.res index 4635340..8b381a4 100644 --- a/tests/sav/base_as_notnull_int.res +++ b/tests/sav/base_as_notnull_int.res @@ -1,5 +1,5 @@ -base_as_notnull_int.nit:18,1--14: Warning: expression is already not null, since it is a `Int`. -base_as_notnull_int.nit:20,1--15: Warning: expression is already not null, since it is a `Object`. +base_as_notnull_int.nit:18,1: Warning: expression is not null, since it is a `Int`. +base_as_notnull_int.nit:20,1--2: Warning: expression is not null, since it is a `Object`. 1 1 1 diff --git a/tests/sav/base_eq_null_notnull.res b/tests/sav/base_eq_null_notnull.res index b4226bc..faf4840 100644 --- a/tests/sav/base_eq_null_notnull.res +++ b/tests/sav/base_eq_null_notnull.res @@ -1,5 +1,5 @@ -base_eq_null_notnull.nit:36,6--14: Warning: expression is not null, since it is a `A`. -base_eq_null_notnull.nit:43,2--10: Warning: expression is not null, since it is a `A`. +base_eq_null_notnull.nit:36,6: Warning: expression is not null, since it is a `A`. +base_eq_null_notnull.nit:43,2: Warning: expression is not null, since it is a `A`. true true true diff --git a/tests/sav/base_null.res b/tests/sav/base_null.res index 80acf2a..814a7ef 100644 --- a/tests/sav/base_null.res +++ b/tests/sav/base_null.res @@ -1,5 +1,3 @@ -base_null.nit:28,2--13: Warning: expression is not null, since it is a `null`. -base_null.nit:42,2--13: Warning: expression is not null, since it is a `null`. false false true diff --git a/tests/sav/base_var_type_evolution_null3.res b/tests/sav/base_var_type_evolution_null3.res index 46069e8..0025f05 100644 --- a/tests/sav/base_var_type_evolution_null3.res +++ b/tests/sav/base_var_type_evolution_null3.res @@ -1,4 +1,4 @@ -base_var_type_evolution_null3.nit:52,5--13: Warning: expression is not null, since it is a `Object`. +base_var_type_evolution_null3.nit:52,5: Warning: expression is not null, since it is a `Object`. 1 1 5 diff --git a/tests/sav/base_var_type_evolution_null3_alt1.res b/tests/sav/base_var_type_evolution_null3_alt1.res index a10a5e3..5bc9b2d 100644 --- a/tests/sav/base_var_type_evolution_null3_alt1.res +++ b/tests/sav/base_var_type_evolution_null3_alt1.res @@ -1,4 +1,4 @@ -alt/base_var_type_evolution_null3_alt1.nit:52,5--13: Warning: expression is not null, since it is a `Object`. +alt/base_var_type_evolution_null3_alt1.nit:52,5: Warning: expression is not null, since it is a `Object`. 1 1 5 diff --git a/tests/sav/error_expr_not_ok_alt4.res b/tests/sav/error_expr_not_ok_alt4.res index 01f96ed..d22055c 100644 --- a/tests/sav/error_expr_not_ok_alt4.res +++ b/tests/sav/error_expr_not_ok_alt4.res @@ -106,7 +106,7 @@ alt/error_expr_not_ok_alt4.nit:147,7--18: Type error: expected A, got Array[Int] alt/error_expr_not_ok_alt4.nit:149,7--24: Type error: expected A, got String alt/error_expr_not_ok_alt4.nit:150,7--18: Warning: Expression is already a Int. alt/error_expr_not_ok_alt4.nit:150,7--18: Type error: expected A, got Int -alt/error_expr_not_ok_alt4.nit:151,7--23: Warning: expression is already not null, since it is a `Int`. +alt/error_expr_not_ok_alt4.nit:151,7--10: Warning: expression is not null, since it is a `Int`. alt/error_expr_not_ok_alt4.nit:151,7--23: Type error: expected A, got Int alt/error_expr_not_ok_alt4.nit:152,7--18: Warning: Expression is already a Int. alt/error_expr_not_ok_alt4.nit:152,7--18: Type error: expected A, got Bool diff --git a/tests/sav/error_expr_not_ok_alt5.res b/tests/sav/error_expr_not_ok_alt5.res index 98e1d46..a6caca4 100644 --- a/tests/sav/error_expr_not_ok_alt5.res +++ b/tests/sav/error_expr_not_ok_alt5.res @@ -101,7 +101,7 @@ alt/error_expr_not_ok_alt5.nit:147,7--18: Type error: expected A, got Array[Int] alt/error_expr_not_ok_alt5.nit:149,7--24: Type error: expected A, got String alt/error_expr_not_ok_alt5.nit:150,7--18: Warning: Expression is already a Int. alt/error_expr_not_ok_alt5.nit:150,7--18: Type error: expected A, got Int -alt/error_expr_not_ok_alt5.nit:151,7--23: Warning: expression is already not null, since it is a `Int`. +alt/error_expr_not_ok_alt5.nit:151,7--10: Warning: expression is not null, since it is a `Int`. alt/error_expr_not_ok_alt5.nit:151,7--23: Type error: expected A, got Int alt/error_expr_not_ok_alt5.nit:152,7--18: Warning: Expression is already a Int. alt/error_expr_not_ok_alt5.nit:152,7--18: Type error: expected A, got Bool diff --git a/tests/sav/error_expr_not_ok_alt6.res b/tests/sav/error_expr_not_ok_alt6.res index efeddc2..c56e7b6 100644 --- a/tests/sav/error_expr_not_ok_alt6.res +++ b/tests/sav/error_expr_not_ok_alt6.res @@ -105,7 +105,7 @@ alt/error_expr_not_ok_alt6.nit:147,7--18: Type error: expected A, got Array[Int] alt/error_expr_not_ok_alt6.nit:149,7--24: Type error: expected A, got String alt/error_expr_not_ok_alt6.nit:150,7--18: Warning: Expression is already a Int. alt/error_expr_not_ok_alt6.nit:150,7--18: Type error: expected A, got Int -alt/error_expr_not_ok_alt6.nit:151,7--23: Warning: expression is already not null, since it is a `Int`. +alt/error_expr_not_ok_alt6.nit:151,7--10: Warning: expression is not null, since it is a `Int`. alt/error_expr_not_ok_alt6.nit:151,7--23: Type error: expected A, got Int alt/error_expr_not_ok_alt6.nit:152,7--18: Warning: Expression is already a Int. alt/error_expr_not_ok_alt6.nit:152,7--18: Type error: expected A, got Bool -- 1.7.9.5