tests: rewrite base_covar_int to not runtime-error in kernel.nit

thus having moving line numbers

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

diff --git a/tests/base_covar_int.nit b/tests/base_covar_int.nit
index db5d705..583b4fd 100644 (file)
--- a/tests/base_covar_int.nit
+++ b/tests/base_covar_int.nit
@@ -14,16 +14,28 @@
 
 import kernel
 
+redef class Discrete
+       fun foo(o: OTHER): Bool is abstract
+end
+
+redef class Int
+       redef fun foo(o) do return self < o
+end
+
+redef class Char
+       redef fun foo(o) do return self < o
+end
+
 var d1: Discrete = 1
 var d2: Discrete = 2
 var c1: Discrete = 'a'
 var c2: Discrete = 'b'
-(1<2).output
-(d1<2).output
-#alt1#(c1<2).output
-#alt2#(1<d2).output
-(d1<d2).output
-#alt3#(c1<d2).output
-#alt4#(1<c2).output
-#alt5#(d1<c2).output
-(c1<c2).output
+1.foo(2).output
+d1.foo(2).output
+#alt1#c1.foo(2).output
+#alt2#1.foo(d2).output
+d1.foo(d2).output
+#alt3#c1.foo(d2).output
+#alt4#1.foo(c2).output
+#alt5#d1.foo(c2).output
+c1.foo(c2).output

diff --git a/tests/sav/base_covar_int_alt1.res b/tests/sav/base_covar_int_alt1.res
index 19eee4c..b5052b2 100644 (file)
--- a/tests/sav/base_covar_int_alt1.res
+++ b/tests/sav/base_covar_int_alt1.res
@@ -1,3 +1,3 @@
-Runtime error: Cast failed. Expected `OTHER`, got `Int` (../lib/standard/kernel.nit:433)
+Runtime error: Cast failed. Expected `OTHER`, got `Int` (alt/base_covar_int_alt1.nit:26)
 true
 true

diff --git a/tests/sav/base_covar_int_alt2.res b/tests/sav/base_covar_int_alt2.res
index 9aa073e..45d7c9b 100644 (file)
--- a/tests/sav/base_covar_int_alt2.res
+++ b/tests/sav/base_covar_int_alt2.res
@@ -1 +1 @@
-alt/base_covar_int_alt2.nit:24,4--5: Type error: expected Int, got Discrete
+alt/base_covar_int_alt2.nit:36,7--8: Type error: expected Int, got Discrete

diff --git a/tests/sav/base_covar_int_alt3.res b/tests/sav/base_covar_int_alt3.res
index cf10fad..699e95e 100644 (file)
--- a/tests/sav/base_covar_int_alt3.res
+++ b/tests/sav/base_covar_int_alt3.res
@@ -1,4 +1,4 @@
-Runtime error: Cast failed. Expected `OTHER`, got `Int` (../lib/standard/kernel.nit:433)
+Runtime error: Cast failed. Expected `OTHER`, got `Int` (alt/base_covar_int_alt3.nit:26)
 true
 true
 true

diff --git a/tests/sav/base_covar_int_alt4.res b/tests/sav/base_covar_int_alt4.res
index e13ee62..b127ae1 100644 (file)
--- a/tests/sav/base_covar_int_alt4.res
+++ b/tests/sav/base_covar_int_alt4.res
@@ -1 +1 @@
-alt/base_covar_int_alt4.nit:27,4--5: Type error: expected Int, got Discrete
+alt/base_covar_int_alt4.nit:39,7--8: Type error: expected Int, got Discrete

diff --git a/tests/sav/base_covar_int_alt5.res b/tests/sav/base_covar_int_alt5.res
index 02e4d88..5006252 100644 (file)
--- a/tests/sav/base_covar_int_alt5.res
+++ b/tests/sav/base_covar_int_alt5.res
@@ -1,4 +1,4 @@
-Runtime error: Cast failed. Expected `OTHER`, got `Char` (../lib/standard/kernel.nit:257)
+Runtime error: Cast failed. Expected `OTHER`, got `Char` (alt/base_covar_int_alt5.nit:22)
 true
 true
 true

diff --git a/tests/sav/nitg-e/fixme/base_covar_int_alt1.res b/tests/sav/nitg-e/fixme/base_covar_int_alt1.res
new file mode 100644 (file)
index 0000000..f98f9e1
--- /dev/null
+++ b/tests/sav/nitg-e/fixme/base_covar_int_alt1.res
@@ -0,0 +1,5 @@
+true
+true
+false
+true
+true

diff --git a/tests/sav/nitg-e/fixme/base_covar_int_alt3.res b/tests/sav/nitg-e/fixme/base_covar_int_alt3.res
new file mode 100644 (file)
index 0000000..d3413ee
--- /dev/null
+++ b/tests/sav/nitg-e/fixme/base_covar_int_alt3.res
@@ -0,0 +1,5 @@
+true
+true
+true
+false
+true

diff --git a/tests/sav/nitg-e/fixme/base_covar_int_alt5.res b/tests/sav/nitg-e/fixme/base_covar_int_alt5.res
new file mode 100644 (file)
index 0000000..36c7afa
--- /dev/null
+++ b/tests/sav/nitg-e/fixme/base_covar_int_alt5.res
@@ -0,0 +1,5 @@
+true
+true
+true
+true
+true

diff --git a/tests/sav/nitg-g/fixme/base_covar_int_alt1.res b/tests/sav/nitg-g/fixme/base_covar_int_alt1.res
new file mode 100644 (file)
index 0000000..1ce8a72
--- /dev/null
+++ b/tests/sav/nitg-g/fixme/base_covar_int_alt1.res
@@ -0,0 +1,3 @@
+true
+true
+Cast error: Cannot cast Int to Char.

diff --git a/tests/sav/nitg-g/fixme/base_covar_int_alt3.res b/tests/sav/nitg-g/fixme/base_covar_int_alt3.res
new file mode 100644 (file)
index 0000000..d3413ee
--- /dev/null
+++ b/tests/sav/nitg-g/fixme/base_covar_int_alt3.res
@@ -0,0 +1,5 @@
+true
+true
+true
+false
+true

diff --git a/tests/sav/nitg-g/fixme/base_covar_int_alt5.res b/tests/sav/nitg-g/fixme/base_covar_int_alt5.res
new file mode 100644 (file)
index 0000000..d3413ee
--- /dev/null
+++ b/tests/sav/nitg-g/fixme/base_covar_int_alt5.res
@@ -0,0 +1,5 @@
+true
+true
+true
+false
+true

diff --git a/tests/sav/nitg-s/fixme/base_covar_int_alt1.res b/tests/sav/nitg-s/fixme/base_covar_int_alt1.res
new file mode 100644 (file)
index 0000000..f98f9e1
--- /dev/null
+++ b/tests/sav/nitg-s/fixme/base_covar_int_alt1.res
@@ -0,0 +1,5 @@
+true
+true
+false
+true
+true

diff --git a/tests/sav/nitg-s/fixme/base_covar_int_alt3.res b/tests/sav/nitg-s/fixme/base_covar_int_alt3.res
new file mode 100644 (file)
index 0000000..d3413ee
--- /dev/null
+++ b/tests/sav/nitg-s/fixme/base_covar_int_alt3.res
@@ -0,0 +1,5 @@
+true
+true
+true
+false
+true

diff --git a/tests/sav/nitg-s/fixme/base_covar_int_alt5.res b/tests/sav/nitg-s/fixme/base_covar_int_alt5.res
new file mode 100644 (file)
index 0000000..36c7afa
--- /dev/null
+++ b/tests/sav/nitg-s/fixme/base_covar_int_alt5.res
@@ -0,0 +1,5 @@
+true
+true
+true
+true
+true