tests: improve base_prot_sig

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

diff --git a/tests/base_prot_sig.nit b/tests/base_prot_sig.nit
index 22d361e..5c399c6 100644 (file)
--- a/tests/base_prot_sig.nit
+++ b/tests/base_prot_sig.nit
@@ -18,6 +18,10 @@ class A
        protected fun proA(a: A) do end
        private fun priA(a: A) do end
 
+       fun pubA2: A do abort
+       protected fun proA2: A do abort
+       private fun priA2: A do abort
+
        var vpubA: nullable A is writable, noinit
        protected var vproA: nullable A is protected writable, noinit
        private var vpriA: nullable A is noinit
@@ -30,6 +34,10 @@ class A
        #alt2#protected fun proB(a: B) do end
        private fun priB(a: B) do end
 
+       #alt1#fun pubB2: B do abort
+       #alt2#protected fun proB2: B do abort
+       private fun priB2: B do abort
+
        #alt3#var vpubB: nullable B is writable, noinit
        #alt4#protected var vproB: nullable B is protected writable, noinit
        private var vpriB: nullable B is noinit

diff --git a/tests/sav/base_prot_sig_alt1.res b/tests/sav/base_prot_sig_alt1.res
index 6d747f4..30dc40c 100644 (file)
--- a/tests/sav/base_prot_sig_alt1.res
+++ b/tests/sav/base_prot_sig_alt1.res
@@ -1 +1,2 @@
-alt/base_prot_sig_alt1.nit:29,14: Error: the public property `pubB` cannot contain the private type `B`.
+alt/base_prot_sig_alt1.nit:33,14: Error: the public property `pubB` cannot contain the private type `B`.
+alt/base_prot_sig_alt1.nit:37,13: Error: the public property `pubB2` cannot contain the private type `B`.

diff --git a/tests/sav/base_prot_sig_alt2.res b/tests/sav/base_prot_sig_alt2.res
index e28956b..f31d97a 100644 (file)
--- a/tests/sav/base_prot_sig_alt2.res
+++ b/tests/sav/base_prot_sig_alt2.res
@@ -1 +1,2 @@
-alt/base_prot_sig_alt2.nit:30,24: Error: the protected property `proB` cannot contain the private type `B`.
+alt/base_prot_sig_alt2.nit:34,24: Error: the protected property `proB` cannot contain the private type `B`.
+alt/base_prot_sig_alt2.nit:38,23: Error: the protected property `proB2` cannot contain the private type `B`.

diff --git a/tests/sav/base_prot_sig_alt3.res b/tests/sav/base_prot_sig_alt3.res
index 6c32a28..aa019c0 100644 (file)
--- a/tests/sav/base_prot_sig_alt3.res
+++ b/tests/sav/base_prot_sig_alt3.res
@@ -1,2 +1,2 @@
-alt/base_prot_sig_alt3.nit:33,13--22: Error: the public property `vpubB` cannot contain the private type `B`.
-alt/base_prot_sig_alt3.nit:33,13--22: Error: the public property `vpubB=` cannot contain the private type `B`.
+alt/base_prot_sig_alt3.nit:41,13--22: Error: the public property `vpubB` cannot contain the private type `B`.
+alt/base_prot_sig_alt3.nit:41,13--22: Error: the public property `vpubB=` cannot contain the private type `B`.

diff --git a/tests/sav/base_prot_sig_alt4.res b/tests/sav/base_prot_sig_alt4.res
index 7a646cb..bb4255d 100644 (file)
--- a/tests/sav/base_prot_sig_alt4.res
+++ b/tests/sav/base_prot_sig_alt4.res
@@ -1,2 +1,2 @@
-alt/base_prot_sig_alt4.nit:34,23--32: Error: the protected property `vproB` cannot contain the private type `B`.
-alt/base_prot_sig_alt4.nit:34,23--32: Error: the protected property `vproB=` cannot contain the private type `B`.
+alt/base_prot_sig_alt4.nit:42,23--32: Error: the protected property `vproB` cannot contain the private type `B`.
+alt/base_prot_sig_alt4.nit:42,23--32: Error: the protected property `vproB=` cannot contain the private type `B`.

diff --git a/tests/sav/base_prot_sig_alt5.res b/tests/sav/base_prot_sig_alt5.res
index 01696e4..071db82 100644 (file)
--- a/tests/sav/base_prot_sig_alt5.res
+++ b/tests/sav/base_prot_sig_alt5.res
@@ -1,2 +1,2 @@
-alt/base_prot_sig_alt5.nit:37,6--11: Error: the public property `vpubB2` cannot contain the private type `B`.
-alt/base_prot_sig_alt5.nit:37,6--11: Error: the public property `vpubB2=` cannot contain the private type `B`.
+alt/base_prot_sig_alt5.nit:45,6--11: Error: the public property `vpubB2` cannot contain the private type `B`.
+alt/base_prot_sig_alt5.nit:45,6--11: Error: the public property `vpubB2=` cannot contain the private type `B`.

diff --git a/tests/sav/base_prot_sig_alt6.res b/tests/sav/base_prot_sig_alt6.res
index f129fb5..154d877 100644 (file)
--- a/tests/sav/base_prot_sig_alt6.res
+++ b/tests/sav/base_prot_sig_alt6.res
@@ -1,2 +1,2 @@
-alt/base_prot_sig_alt6.nit:38,16--21: Error: the protected property `vproB2` cannot contain the private type `B`.
-alt/base_prot_sig_alt6.nit:38,16--21: Error: the protected property `vproB2=` cannot contain the private type `B`.
+alt/base_prot_sig_alt6.nit:46,16--21: Error: the protected property `vproB2` cannot contain the private type `B`.
+alt/base_prot_sig_alt6.nit:46,16--21: Error: the protected property `vproB2=` cannot contain the private type `B`.

diff --git a/tests/sav/base_prot_sig_alt7.res b/tests/sav/base_prot_sig_alt7.res
index 1451e5f..786426c 100644 (file)
--- a/tests/sav/base_prot_sig_alt7.res
+++ b/tests/sav/base_prot_sig_alt7.res
@@ -1,10 +1,10 @@
-alt/base_prot_sig_alt7.nit:46,2--10: Error: `private` is the only legal visibility for properties in a private class.
-alt/base_prot_sig_alt7.nit:50,2--10: Error: `private` is the only legal visibility for properties in a private class.
-alt/base_prot_sig_alt7.nit:50,37--45: Error: `private` is the only legal visibility for properties in a private class.
 alt/base_prot_sig_alt7.nit:54,2--10: Error: `private` is the only legal visibility for properties in a private class.
-alt/base_prot_sig_alt7.nit:54,34--42: Error: `private` is the only legal visibility for properties in a private class.
 alt/base_prot_sig_alt7.nit:58,2--10: Error: `private` is the only legal visibility for properties in a private class.
+alt/base_prot_sig_alt7.nit:58,37--45: Error: `private` is the only legal visibility for properties in a private class.
 alt/base_prot_sig_alt7.nit:62,2--10: Error: `private` is the only legal visibility for properties in a private class.
-alt/base_prot_sig_alt7.nit:62,37--45: Error: `private` is the only legal visibility for properties in a private class.
+alt/base_prot_sig_alt7.nit:62,34--42: Error: `private` is the only legal visibility for properties in a private class.
 alt/base_prot_sig_alt7.nit:66,2--10: Error: `private` is the only legal visibility for properties in a private class.
-alt/base_prot_sig_alt7.nit:66,34--42: Error: `private` is the only legal visibility for properties in a private class.
+alt/base_prot_sig_alt7.nit:70,2--10: Error: `private` is the only legal visibility for properties in a private class.
+alt/base_prot_sig_alt7.nit:70,37--45: Error: `private` is the only legal visibility for properties in a private class.
+alt/base_prot_sig_alt7.nit:74,2--10: Error: `private` is the only legal visibility for properties in a private class.
+alt/base_prot_sig_alt7.nit:74,34--42: Error: `private` is the only legal visibility for properties in a private class.