tests: update sav for VT related tests

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/tests/sav/error_virtual_type2_alt1.res b/tests/sav/error_virtual_type2_alt1.res
index 102039e..17280d8 100644 (file)
--- a/tests/sav/error_virtual_type2_alt1.res
+++ b/tests/sav/error_virtual_type2_alt1.res
@@ -1,5 +1,2 @@
 alt/error_virtual_type2_alt1.nit:22,2--24,14: Error: circularity of virtual type definition: GT -> T <-> T.
 alt/error_virtual_type2_alt1.nit:25,2--10: Error: circularity of virtual type definition: T <-> T.
-alt/error_virtual_type2_alt1.nit:38,23: Redef Error: expected `Comparable` for return type; got `T`.
-alt/error_virtual_type2_alt1.nit:40,17--27: Redef Error: expected `null` bound type; got `G[Discrete]`.
-alt/error_virtual_type2_alt1.nit:42,23: Redef Error: expected `Comparable` for return type; got `T`.

diff --git a/tests/sav/error_virtual_type2_alt2.res b/tests/sav/error_virtual_type2_alt2.res
index a591422..31774e9 100644 (file)
--- a/tests/sav/error_virtual_type2_alt2.res
+++ b/tests/sav/error_virtual_type2_alt2.res
@@ -1,5 +1,2 @@
 alt/error_virtual_type2_alt2.nit:22,2--24,14: Error: circularity of virtual type definition: GT -> T <-> nullable T.
 alt/error_virtual_type2_alt2.nit:25,2--26,19: Error: circularity of virtual type definition: T <-> nullable T.
-alt/error_virtual_type2_alt2.nit:38,23: Redef Error: expected `Comparable` for return type; got `T`.
-alt/error_virtual_type2_alt2.nit:40,17--27: Redef Error: expected `null` bound type; got `G[Discrete]`.
-alt/error_virtual_type2_alt2.nit:42,23: Redef Error: expected `Comparable` for return type; got `T`.

diff --git a/tests/sav/error_virtual_type2_alt3.res b/tests/sav/error_virtual_type2_alt3.res
index 0a01c3d..9f5edb2 100644 (file)
--- a/tests/sav/error_virtual_type2_alt3.res
+++ b/tests/sav/error_virtual_type2_alt3.res
@@ -1,5 +1,2 @@
 alt/error_virtual_type2_alt3.nit:22,2--24,14: Error: circularity of virtual type definition: GT -> G[T] <-> T.
 alt/error_virtual_type2_alt3.nit:25,2--27,13: Error: circularity of virtual type definition: T <-> G[T].
-alt/error_virtual_type2_alt3.nit:38,23: Redef Error: expected `Comparable` for return type; got `T`.
-alt/error_virtual_type2_alt3.nit:40,17--27: Redef Error: expected `null` bound type; got `G[Discrete]`.
-alt/error_virtual_type2_alt3.nit:42,23: Redef Error: expected `Comparable` for return type; got `T`.

diff --git a/tests/sav/error_virtual_type2_alt4.res b/tests/sav/error_virtual_type2_alt4.res
index 4d60ab3..03a96d6 100644 (file)
--- a/tests/sav/error_virtual_type2_alt4.res
+++ b/tests/sav/error_virtual_type2_alt4.res
@@ -1,4 +1 @@
 alt/error_virtual_type2_alt4.nit:29,10--13: Error: class `FAIL` not found in module `error_virtual_type2_alt4`.
-alt/error_virtual_type2_alt4.nit:38,23: Redef Error: expected `Comparable` for return type; got `T`.
-alt/error_virtual_type2_alt4.nit:40,17--27: Redef Error: expected `null` bound type; got `G[Discrete]`.
-alt/error_virtual_type2_alt4.nit:42,23: Redef Error: expected `Comparable` for return type; got `T`.

diff --git a/tests/sav/error_virtual_type2_alt5.res b/tests/sav/error_virtual_type2_alt5.res
index 62974d7..07e038b 100644 (file)
--- a/tests/sav/error_virtual_type2_alt5.res
+++ b/tests/sav/error_virtual_type2_alt5.res
@@ -1,5 +1,2 @@
 alt/error_virtual_type2_alt5.nit:22,2--24,14: Error: circularity of virtual type definition: GT -> T <-> U.
 alt/error_virtual_type2_alt5.nit:25,2--30,10: Error: circularity of virtual type definition: T <-> U.
-alt/error_virtual_type2_alt5.nit:38,23: Redef Error: expected `Comparable` for return type; got `T`.
-alt/error_virtual_type2_alt5.nit:40,17--27: Redef Error: expected `null` bound type; got `G[Discrete]`.
-alt/error_virtual_type2_alt5.nit:42,23: Redef Error: expected `Comparable` for return type; got `T`.

diff --git a/tests/sav/error_virtual_type2_alt6.res b/tests/sav/error_virtual_type2_alt6.res
index 48dc700..ce3c98c 100644 (file)
--- a/tests/sav/error_virtual_type2_alt6.res
+++ b/tests/sav/error_virtual_type2_alt6.res
@@ -1,2 +1,3 @@
 alt/error_virtual_type2_alt6.nit:40,17--27: Redef Error: expected `G[T]` bound type; got `G[Discrete]`.
+alt/error_virtual_type2_alt6.nit:41,17--23: Redef Error: expected `G[T]` bound type; got `G[Bool]`.
 alt/error_virtual_type2_alt6.nit:41,2--23: Error: a property `GT` is already defined in class `B` at line 39.

diff --git a/tests/sav/error_virtual_type_alt3.res b/tests/sav/error_virtual_type_alt3.res
index 7514f5f..74c01ee 100644 (file)
--- a/tests/sav/error_virtual_type_alt3.res
+++ b/tests/sav/error_virtual_type_alt3.res
@@ -1,2 +1 @@
-alt/error_virtual_type_alt3.nit:25,12: Type Error: expected `Object`, got `T`.
 alt/error_virtual_type_alt3.nit:22,2--25,13: Error: circularity of virtual type definition: T <-> G[T].