From e7973daf744fea018bfc4aef44490783fd417ca1 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Fri, 21 Feb 2014 09:07:29 -0500 Subject: [PATCH] tests: update sav and remove some fixme. It means that #271 was already known but nobody cared :( Signed-off-by: Jean Privat --- tests/sav/error_ref_param.res | 2 +- tests/sav/error_ref_ret.res | 2 +- tests/sav/error_spe_param.res | 2 +- tests/sav/error_spe_param2.res | 2 +- tests/sav/error_spe_ret.res | 2 +- tests/sav/fixme/test_multiconstraint_inh.res | 1 - tests/sav/test_multiconstraint_inh.res | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 tests/sav/fixme/error_ref_param.res delete mode 100644 tests/sav/fixme/error_spe_param.res delete mode 100644 tests/sav/fixme/test_multiconstraint_inh.res diff --git a/tests/sav/error_ref_param.res b/tests/sav/error_ref_param.res index b005476..44d3647 100644 --- a/tests/sav/error_ref_param.res +++ b/tests/sav/error_ref_param.res @@ -1 +1 @@ -error_ref_param.nit:20,14--17: Redef error: Expected B, as in C::r. +error_ref_param.nit:20,14--17: Redef Error: Wrong type for parameter `x'. found C, expected B as in module_simple#C#r. diff --git a/tests/sav/error_ref_ret.res b/tests/sav/error_ref_ret.res index b5bc984..afb9bdb 100644 --- a/tests/sav/error_ref_ret.res +++ b/tests/sav/error_ref_ret.res @@ -1 +1 @@ -error_ref_ret.nit:20,15--17: Redef Error: Wrong return type. found Int, expected B. +error_ref_ret.nit:20,15--17: Redef Error: Wrong return type. found Int, expected B as in module_simple#C#s. diff --git a/tests/sav/error_spe_param.res b/tests/sav/error_spe_param.res index 5a89161..c440f90 100644 --- a/tests/sav/error_spe_param.res +++ b/tests/sav/error_spe_param.res @@ -1 +1 @@ -error_spe_param.nit:24,16--24: Redef error: Expected Int, as in A::toto. +error_spe_param.nit:24,16--24: Redef Error: Wrong type for parameter `c'. found Object, expected Int as in error_spe_param#A#toto. diff --git a/tests/sav/error_spe_param2.res b/tests/sav/error_spe_param2.res index 9b57ac5..733cf4f 100644 --- a/tests/sav/error_spe_param2.res +++ b/tests/sav/error_spe_param2.res @@ -1 +1 @@ -error_spe_param2.nit:24,16--22: Redef Error: Wrong type for parameter `c'. found Char, expected Int. +error_spe_param2.nit:24,16--22: Redef Error: Wrong type for parameter `c'. found Char, expected Int as in error_spe_param2#A#toto. diff --git a/tests/sav/error_spe_ret.res b/tests/sav/error_spe_ret.res index 4e85242..7c1a5f8 100644 --- a/tests/sav/error_spe_ret.res +++ b/tests/sav/error_spe_ret.res @@ -1 +1 @@ -error_spe_ret.nit:23,17--20: Redef Error: Wrong return type. found Char, expected Int. +error_spe_ret.nit:23,17--20: Redef Error: Wrong return type. found Char, expected Int as in error_spe_ret#A#toto. diff --git a/tests/sav/fixme/error_ref_param.res b/tests/sav/fixme/error_ref_param.res deleted file mode 100644 index e69de29..0000000 diff --git a/tests/sav/fixme/error_spe_param.res b/tests/sav/fixme/error_spe_param.res deleted file mode 100644 index e69de29..0000000 diff --git a/tests/sav/fixme/test_multiconstraint_inh.res b/tests/sav/fixme/test_multiconstraint_inh.res deleted file mode 100644 index 0cfbf08..0000000 --- a/tests/sav/fixme/test_multiconstraint_inh.res +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tests/sav/test_multiconstraint_inh.res b/tests/sav/test_multiconstraint_inh.res index cd69487..ec31f82 100644 --- a/tests/sav/test_multiconstraint_inh.res +++ b/tests/sav/test_multiconstraint_inh.res @@ -1 +1 @@ -test_multiconstraint_inh.nit:39,18--21: Redef error: Expected I[A], as in G::baz. +test_multiconstraint_inh.nit:39,18--21: Redef Error: Wrong type for parameter `e'. found J, expected I[G#0] as in test_multiconstraint_inh#G#baz. -- 1.7.9.5