tests: cleanup some old fixme

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

diff --git a/tests/error_prop_loc.nit b/tests/error_prop_loc.nit
index b74fc3c..4872f08 100644 (file)
--- a/tests/error_prop_loc.nit
+++ b/tests/error_prop_loc.nit
@@ -14,22 +14,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import end
-class Object
-end
+import kernel
 
 class A
-       fun toto do end
+       fun toto do 1.output
 end
 class B
        super A
-       redef fun toto do end
+       redef fun toto do 2.output
 end
 class C
        super A
-       redef fun toto do end
+       redef fun toto do 3.output
 end
 class D
        super B
        super C
 end
+
+(new A).toto
+(new B).toto
+(new C).toto
+#alt1#(new D).toto

diff --git a/tests/sav/error_prop_loc.res b/tests/sav/error_prop_loc.res
index 6a6e994..01e79c3 100644 (file)
--- a/tests/sav/error_prop_loc.res
+++ b/tests/sav/error_prop_loc.res
@@ -1 +1,3 @@
-Property inheritance conflict in class D for `toto': conflicting properties are defined in B, C
+1
+2
+3

diff --git a/tests/sav/error_prop_loc_alt1.res b/tests/sav/error_prop_loc_alt1.res
new file mode 100644 (file)
index 0000000..ca9822e
--- /dev/null
+++ b/tests/sav/error_prop_loc_alt1.res
@@ -0,0 +1,5 @@
+alt/error_prop_loc_alt1.nit:38,1--12: Warning: conflicting property definitions for property toto in D: error_prop_loc_alt1#B#toto error_prop_loc_alt1#C#toto
+1
+2
+3
+3

diff --git a/tests/sav/error_redef_1alt4_alt5.res b/tests/sav/error_redef_1alt4_alt5.res
index 18f8f3d..e69de29 100644 (file)
--- a/tests/sav/error_redef_1alt4_alt5.res
+++ b/tests/sav/error_redef_1alt4_alt5.res
@@ -1 +0,0 @@
-alt/error_redef_1alt4_alt5.nit:30,12--13: Redef error: The procedure B::f1 redefines the function A::f1.

diff --git a/tests/sav/error_redef_1alt4_alt9.res b/tests/sav/error_redef_1alt4_alt9.res
index da892e9..e69de29 100644 (file)
--- a/tests/sav/error_redef_1alt4_alt9.res
+++ b/tests/sav/error_redef_1alt4_alt9.res
@@ -1 +0,0 @@
-alt/error_redef_1alt4_alt9.nit:34,15: Syntax error: untyped parameter.

diff --git a/tests/sav/fixme/error_prop_loc.res b/tests/sav/fixme/error_prop_loc.res
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/tests/sav/fixme/error_redef_1alt4_alt5.res b/tests/sav/fixme/error_redef_1alt4_alt5.res
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/tests/sav/fixme/error_redef_1alt4_alt9.res b/tests/sav/fixme/error_redef_1alt4_alt9.res
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/tests/sav/fixme/test_inheritance_raf.res b/tests/sav/fixme/test_inheritance_raf.res
deleted file mode 100644 (file)
index dd8e78f..0000000
--- a/tests/sav/fixme/test_inheritance_raf.res
+++ /dev/null
@@ -1,16 +0,0 @@
-1
-1
-5
-5
-1
-2
-5
-2
-1
-1
-3
-7
-1
-2
-3
-4

diff --git a/tests/sav/test_inheritance_raf.res b/tests/sav/test_inheritance_raf.res
index a007f82..dd8e78f 100644 (file)
--- a/tests/sav/test_inheritance_raf.res
+++ b/tests/sav/test_inheritance_raf.res
@@ -1 +1,16 @@
-Property inheritance conflict in class B for `i': conflicting properties are defined in B, A
+1
+1
+5
+5
+1
+2
+5
+2
+1
+1
+3
+7
+1
+2
+3
+4