From c4374787cdacaac99b2b78139d1489bcccd10383 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Sat, 25 Jun 2016 14:42:32 -0400 Subject: [PATCH] tests: update `isa` tests Signed-off-by: Jean Privat --- tests/sav/base_classid.res | 1 + tests/sav/base_isa3.res | 14 +++++++++++--- tests/sav/base_isa_gen1.res | 3 +++ tests/sav/base_isa_gen2.res | 5 +++++ tests/sav/base_isa_gen4.res | 1 + tests/sav/base_isa_gen5.res | 1 + tests/sav/base_isa_nullable1.res | 3 ++- tests/sav/base_isa_nullable2.res | 2 +- tests/sav/nitce/base_isa_gen1.res | 3 +++ tests/sav/nitce/base_isa_gen4.res | 1 + tests/sav/nitce/base_isa_gen5.res | 1 + tests/sav/nitce/base_isa_nullable1.res | 3 ++- tests/sav/nitce/base_isa_nullable2.res | 2 +- 13 files changed, 33 insertions(+), 7 deletions(-) diff --git a/tests/sav/base_classid.res b/tests/sav/base_classid.res index 2952126..fbe83ce 100644 --- a/tests/sav/base_classid.res +++ b/tests/sav/base_classid.res @@ -1,6 +1,7 @@ base_classid.nit:47,2--8: Warning: expression is already a `A`. base_classid.nit:48,2--9: Warning: expression is already a `A`. base_classid.nit:49,2--8: Warning: expression is already a `A` since it is a `B`. +base_classid.nit:52,2--8: Warning: expression is already a `B`. true true true diff --git a/tests/sav/base_isa3.res b/tests/sav/base_isa3.res index 0c4b877..0a31c73 100644 --- a/tests/sav/base_isa3.res +++ b/tests/sav/base_isa3.res @@ -1,12 +1,20 @@ base_isa3.nit:59,8--14: Warning: expression is already a `A` since it is a `B`. +base_isa3.nit:60,8--14: Warning: expression is already a `B`. base_isa3.nit:64,8--14: Warning: expression is already a `A` since it is a `C`. +base_isa3.nit:66,8--14: Warning: expression is already a `C`. base_isa3.nit:69,8--14: Warning: expression is already a `A` since it is a `D`. +base_isa3.nit:71,8--14: Warning: expression is already a `C` since it is a `D`. +base_isa3.nit:72,8--14: Warning: expression is already a `D`. base_isa3.nit:73,8--14: Warning: expression is already a `E` since it is a `D`. -base_isa3.nit:74,8--14: Warning: expression is already a `E`. -base_isa3.nit:75,8--14: Warning: expression is already a `E`. -base_isa3.nit:76,8--14: Warning: expression is already a `E`. +base_isa3.nit:74,8--14: Warning: expression is already a `E` since it is a `D`. +base_isa3.nit:75,8--14: Warning: expression is already a `E` since it is a `D`. +base_isa3.nit:76,8--14: Warning: expression is already a `E` since it is a `D`. base_isa3.nit:79,8--14: Warning: expression is already a `A` since it is a `E`. +base_isa3.nit:81,8--14: Warning: expression is already a `E`. base_isa3.nit:84,8--14: Warning: expression is already a `A` since it is a `F`. +base_isa3.nit:85,8--14: Warning: expression is already a `E` since it is a `F`. +base_isa3.nit:86,8--14: Warning: expression is already a `F`. base_isa3.nit:87,8--14: Warning: expression is already a `G` since it is a `F`. base_isa3.nit:91,8--14: Warning: expression is already a `A` since it is a `G`. +base_isa3.nit:93,8--14: Warning: expression is already a `G`. true diff --git a/tests/sav/base_isa_gen1.res b/tests/sav/base_isa_gen1.res index 989bc61..31017d3 100644 --- a/tests/sav/base_isa_gen1.res +++ b/tests/sav/base_isa_gen1.res @@ -1,4 +1,7 @@ base_isa_gen1.nit:62,8--14: Warning: expression is already a `A` since it is a `F`. +base_isa_gen1.nit:63,8--14: Warning: expression is already a `C` since it is a `F`. base_isa_gen1.nit:65,8--30: Warning: expression is already a `D[Object, Object]` since it is a `G[Object]`. base_isa_gen1.nit:66,8--30: Warning: expression is already a `D[Object, Object]` since it is a `E[F]`. +base_isa_gen1.nit:67,8--25: Warning: expression is already a `D[A, Object]` since it is a `E[F]`. +base_isa_gen1.nit:69,8--25: Warning: expression is already a `D[F, Object]` since it is a `E[F]`. true diff --git a/tests/sav/base_isa_gen2.res b/tests/sav/base_isa_gen2.res index 6dde482..1442eb3 100644 --- a/tests/sav/base_isa_gen2.res +++ b/tests/sav/base_isa_gen2.res @@ -1,5 +1,10 @@ base_isa_gen2.nit:39,8--22: Warning: expression is already a `A[Object]`. base_isa_gen2.nit:41,8--22: Warning: expression is already a `A[Object]` since it is a `B[Object]`. +base_isa_gen2.nit:42,8--22: Warning: expression is already a `B[Object]`. base_isa_gen2.nit:44,8--22: Warning: expression is already a `A[Object]` since it is a `C[Object]`. +base_isa_gen2.nit:46,8--22: Warning: expression is already a `C[Object]`. base_isa_gen2.nit:48,8--22: Warning: expression is already a `A[Object]` since it is a `D[Object, Object]`. +base_isa_gen2.nit:49,8--22: Warning: expression is already a `B[Object]` since it is a `D[Object, Object]`. +base_isa_gen2.nit:50,8--22: Warning: expression is already a `C[Object]` since it is a `D[Object, Object]`. +base_isa_gen2.nit:51,8--30: Warning: expression is already a `D[Object, Object]`. true diff --git a/tests/sav/base_isa_gen4.res b/tests/sav/base_isa_gen4.res index 8725a4a..04c6196 100644 --- a/tests/sav/base_isa_gen4.res +++ b/tests/sav/base_isa_gen4.res @@ -1,4 +1,5 @@ base_isa_gen4.nit:34,8--15: Warning: expression is already a `A` since it is a `B[Canard]`. +base_isa_gen4.nit:35,8--23: Warning: expression is already a `B[Canard]`. base_isa_gen4.nit:36,8--23: Warning: expression is already a `B[Animal]` since it is a `B[Canard]`. base_isa_gen4.nit:40,8--26: Warning: expression is already a `B[B[Canard]]`. base_isa_gen4.nit:42,8--26: Warning: expression is already a `B[B[Animal]]` since it is a `B[B[Canard]]`. diff --git a/tests/sav/base_isa_gen5.res b/tests/sav/base_isa_gen5.res index c391776..92d4cb2 100644 --- a/tests/sav/base_isa_gen5.res +++ b/tests/sav/base_isa_gen5.res @@ -1,4 +1,5 @@ base_isa_gen5.nit:39,8--15: Warning: expression is already a `A` since it is a `B[Canard]`. +base_isa_gen5.nit:40,8--23: Warning: expression is already a `B[Canard]`. base_isa_gen5.nit:41,8--23: Warning: expression is already a `B[Animal]` since it is a `B[Canard]`. base_isa_gen5.nit:46,8--26: Warning: expression is already a `B[B[Canard]]`. base_isa_gen5.nit:48,8--26: Warning: expression is already a `B[B[Animal]]` since it is a `B[B[Canard]]`. diff --git a/tests/sav/base_isa_nullable1.res b/tests/sav/base_isa_nullable1.res index 2b455c4..9553da4 100644 --- a/tests/sav/base_isa_nullable1.res +++ b/tests/sav/base_isa_nullable1.res @@ -1,6 +1,7 @@ base_isa_nullable1.nit:39,8--15: Warning: expression is already a `A` since it is a `B[Integer]`. +base_isa_nullable1.nit:40,8--24: Warning: expression is already a `B[Integer]`. base_isa_nullable1.nit:41,8--25: Warning: expression is already a `B[Discrete]` since it is a `B[Integer]`. base_isa_nullable1.nit:46,8--27: Warning: expression is already a `B[B[Integer]]`. base_isa_nullable1.nit:48,8--28: Warning: expression is already a `B[B[Discrete]]` since it is a `B[B[Integer]]`. -base_isa_nullable1.nit:50,8--34: Warning: expression is already a `B[nullable Discrete]` since it is a `B[Discrete]`. +base_isa_nullable1.nit:50,8--34: Warning: expression is already a `B[nullable Discrete]` since it is a `B[Integer]`. true diff --git a/tests/sav/base_isa_nullable2.res b/tests/sav/base_isa_nullable2.res index 947e8c1..2440af9 100644 --- a/tests/sav/base_isa_nullable2.res +++ b/tests/sav/base_isa_nullable2.res @@ -1,5 +1,5 @@ base_isa_nullable2.nit:27,8--23: Warning: expression is already a `nullable A` since it is a `A`. base_isa_nullable2.nit:29,8--31: Warning: expression is already a `nullable B[Object]` since it is a `B[Object]`. -base_isa_nullable2.nit:30,8--40: Warning: expression is already a `nullable B[nullable Object]` since it is a `nullable B[Object]`. +base_isa_nullable2.nit:30,8--40: Warning: expression is already a `nullable B[nullable Object]` since it is a `B[Object]`. base_isa_nullable2.nit:33,8--31: Warning: expression is already a `C[nullable Object]`. true diff --git a/tests/sav/nitce/base_isa_gen1.res b/tests/sav/nitce/base_isa_gen1.res index 4000211..33a285a 100644 --- a/tests/sav/nitce/base_isa_gen1.res +++ b/tests/sav/nitce/base_isa_gen1.res @@ -1,4 +1,7 @@ base_isa_gen1.nit:62,8--14: Warning: expression is already a `A` since it is a `F`. +base_isa_gen1.nit:63,8--14: Warning: expression is already a `C` since it is a `F`. base_isa_gen1.nit:65,8--30: Warning: expression is already a `D[Object, Object]` since it is a `G[Object]`. base_isa_gen1.nit:66,8--30: Warning: expression is already a `D[Object, Object]` since it is a `E[F]`. +base_isa_gen1.nit:67,8--25: Warning: expression is already a `D[A, Object]` since it is a `E[F]`. +base_isa_gen1.nit:69,8--25: Warning: expression is already a `D[F, Object]` since it is a `E[F]`. Runtime error: Assert failed (base_isa_gen1.nit:68) diff --git a/tests/sav/nitce/base_isa_gen4.res b/tests/sav/nitce/base_isa_gen4.res index 203c263..0e06154 100644 --- a/tests/sav/nitce/base_isa_gen4.res +++ b/tests/sav/nitce/base_isa_gen4.res @@ -1,4 +1,5 @@ base_isa_gen4.nit:34,8--15: Warning: expression is already a `A` since it is a `B[Canard]`. +base_isa_gen4.nit:35,8--23: Warning: expression is already a `B[Canard]`. base_isa_gen4.nit:36,8--23: Warning: expression is already a `B[Animal]` since it is a `B[Canard]`. base_isa_gen4.nit:40,8--26: Warning: expression is already a `B[B[Canard]]`. base_isa_gen4.nit:42,8--26: Warning: expression is already a `B[B[Animal]]` since it is a `B[B[Canard]]`. diff --git a/tests/sav/nitce/base_isa_gen5.res b/tests/sav/nitce/base_isa_gen5.res index 26754cf..6b34919 100644 --- a/tests/sav/nitce/base_isa_gen5.res +++ b/tests/sav/nitce/base_isa_gen5.res @@ -1,4 +1,5 @@ base_isa_gen5.nit:39,8--15: Warning: expression is already a `A` since it is a `B[Canard]`. +base_isa_gen5.nit:40,8--23: Warning: expression is already a `B[Canard]`. base_isa_gen5.nit:41,8--23: Warning: expression is already a `B[Animal]` since it is a `B[Canard]`. base_isa_gen5.nit:46,8--26: Warning: expression is already a `B[B[Canard]]`. base_isa_gen5.nit:48,8--26: Warning: expression is already a `B[B[Animal]]` since it is a `B[B[Canard]]`. diff --git a/tests/sav/nitce/base_isa_nullable1.res b/tests/sav/nitce/base_isa_nullable1.res index ff43ba5..89a56f6 100644 --- a/tests/sav/nitce/base_isa_nullable1.res +++ b/tests/sav/nitce/base_isa_nullable1.res @@ -1,6 +1,7 @@ base_isa_nullable1.nit:39,8--15: Warning: expression is already a `A` since it is a `B[Integer]`. +base_isa_nullable1.nit:40,8--24: Warning: expression is already a `B[Integer]`. base_isa_nullable1.nit:41,8--25: Warning: expression is already a `B[Discrete]` since it is a `B[Integer]`. base_isa_nullable1.nit:46,8--27: Warning: expression is already a `B[B[Integer]]`. base_isa_nullable1.nit:48,8--28: Warning: expression is already a `B[B[Discrete]]` since it is a `B[B[Integer]]`. -base_isa_nullable1.nit:50,8--34: Warning: expression is already a `B[nullable Discrete]` since it is a `B[Discrete]`. +base_isa_nullable1.nit:50,8--34: Warning: expression is already a `B[nullable Discrete]` since it is a `B[Integer]`. Runtime error: Assert failed (base_isa_nullable1.nit:42) diff --git a/tests/sav/nitce/base_isa_nullable2.res b/tests/sav/nitce/base_isa_nullable2.res index 84216d5..d8ca02f 100644 --- a/tests/sav/nitce/base_isa_nullable2.res +++ b/tests/sav/nitce/base_isa_nullable2.res @@ -1,5 +1,5 @@ base_isa_nullable2.nit:27,8--23: Warning: expression is already a `nullable A` since it is a `A`. base_isa_nullable2.nit:29,8--31: Warning: expression is already a `nullable B[Object]` since it is a `B[Object]`. -base_isa_nullable2.nit:30,8--40: Warning: expression is already a `nullable B[nullable Object]` since it is a `nullable B[Object]`. +base_isa_nullable2.nit:30,8--40: Warning: expression is already a `nullable B[nullable Object]` since it is a `B[Object]`. base_isa_nullable2.nit:33,8--31: Warning: expression is already a `C[nullable Object]`. Runtime error: Assert failed (base_isa_nullable2.nit:32) -- 1.7.9.5