Skip to content

Commit b849a66

Browse files
smowtonsmowton
committed
Update test expectations
1 parent 06238dd commit b849a66

File tree

31 files changed

+1040
-1040
lines changed

31 files changed

+1040
-1040
lines changed

‎java/ql/test/kotlin/library-tests/annotation_classes/PrintAst.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ def.kt:
3737
# 46| 0: [TypeAccess] Annot0k
3838
# 46| 5: [BlockStmt] { ... }
3939
# 47| 0: [ExprStmt] <Expr>;
40-
# 47| 0: [MethodAccess] println(...)
40+
# 47| 0: [MethodCall] println(...)
4141
# 47| -1: [TypeAccess] ConsoleKt
42-
# 47| 0: [MethodAccess] a(...)
42+
# 47| 0: [MethodCall] a(...)
4343
# 47| -1: [VarAccess] a
4444
# 50| 1: [LocalVariableDeclStmt] var ...;
4545
# 50| 1: [LocalVariableDeclExpr] x

‎java/ql/test/kotlin/library-tests/classes/PrintAst.expected‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ classes.kt:
111111
# 28| 3: [TypeAccess] Unit
112112
# 28| 5: [BlockStmt] { ... }
113113
# 28| 0: [ReturnStmt] return ...
114-
# 28| 0: [MethodAccess] funIF1(...)
114+
# 28| 0: [MethodCall] funIF1(...)
115115
# 28| -1: [SuperAccess] IF1.super
116116
# 28| 0: [TypeAccess] IF1
117117
# 28| 3: [Method] funIF2
118118
# 28| 3: [TypeAccess] Unit
119119
# 28| 5: [BlockStmt] { ... }
120120
# 28| 0: [ReturnStmt] return ...
121-
# 28| 0: [MethodAccess] funIF2(...)
121+
# 28| 0: [MethodCall] funIF2(...)
122122
# 28| -1: [SuperAccess] IF2.super
123123
# 28| 0: [TypeAccess] IF2
124124
# 29| 4: [Constructor] ClassSix
@@ -136,18 +136,18 @@ classes.kt:
136136
# 35| 0: [SuperConstructorInvocationStmt] super(...)
137137
# 35| 1: [BlockStmt] { ... }
138138
# 39| 0: [ExprStmt] <Expr>;
139-
# 39| 0: [MethodAccess] f(...)
139+
# 39| 0: [MethodCall] f(...)
140140
# 39| -1: [TypeAccess] ClassesKt
141141
# 39| 0: [StringLiteral] "init1"
142142
# 42| 1: [ExprStmt] <Expr>;
143143
# 42| 0: [KtInitializerAssignExpr] ...=...
144144
# 42| 0: [VarAccess] x
145145
# 45| 2: [ExprStmt] <Expr>;
146-
# 45| 0: [MethodAccess] f(...)
146+
# 45| 0: [MethodCall] f(...)
147147
# 45| -1: [TypeAccess] ClassesKt
148148
# 45| 0: [StringLiteral] "init2"
149149
# 36| 2: [ExprStmt] <Expr>;
150-
# 36| 0: [MethodAccess] f(...)
150+
# 36| 0: [MethodCall] f(...)
151151
# 36| -1: [TypeAccess] ClassesKt
152152
# 36| 0: [VarAccess] i
153153
# 42| 2: [Method] getX
@@ -466,7 +466,7 @@ classes.kt:
466466
# 112| 0: [TypeAccess] int
467467
# 112| 5: [BlockStmt] { ... }
468468
# 114| 1: [ExprStmt] <Expr>;
469-
# 114| 0: [MethodAccess] foo(...)
469+
# 114| 0: [MethodCall] foo(...)
470470
# 114| -1: [ClassInstanceExpr] new Local1<Integer>(...)
471471
# 114| -3: [TypeAccess] Local1<Integer>
472472
# 114| 0: [TypeAccess] Integer
@@ -500,7 +500,7 @@ classes.kt:
500500
# 120| 0: [TypeAccess] int
501501
# 120| 5: [BlockStmt] { ... }
502502
# 122| 1: [ExprStmt] <Expr>;
503-
# 122| 0: [MethodAccess] foo(...)
503+
# 122| 0: [MethodCall] foo(...)
504504
# 122| -1: [ClassInstanceExpr] new Local2<Integer>(...)
505505
# 122| -3: [TypeAccess] Local2<Integer>
506506
# 122| 0: [TypeAccess] Integer
@@ -538,7 +538,7 @@ classes.kt:
538538
# 130| 0: [TypeAccess] int
539539
# 130| 5: [BlockStmt] { ... }
540540
# 132| 1: [ExprStmt] <Expr>;
541-
# 132| 0: [MethodAccess] foo(...)
541+
# 132| 0: [MethodCall] foo(...)
542542
# 132| -1: [ClassInstanceExpr] new Local3<Integer>(...)
543543
# 132| -3: [TypeAccess] Local3<Integer>
544544
# 132| 0: [TypeAccess] Integer
@@ -616,7 +616,7 @@ generic_anonymous.kt:
616616
# 11| 0: [TypeAccess] String
617617
# 11| 5: [BlockStmt] { ... }
618618
# 11| 0: [ReturnStmt] return ...
619-
# 11| 0: [MethodAccess] get(...)
619+
# 11| 0: [MethodCall] get(...)
620620
# 11| -1: [ClassInstanceExpr] new Generic<String>(...)
621621
# 11| -3: [TypeAccess] Generic<String>
622622
# 11| 0: [TypeAccess] String
@@ -628,7 +628,7 @@ generic_anonymous.kt:
628628
# 13| 0: [TypeAccess] int
629629
# 13| 5: [BlockStmt] { ... }
630630
# 13| 0: [ReturnStmt] return ...
631-
# 13| 0: [MethodAccess] get(...)
631+
# 13| 0: [MethodCall] get(...)
632632
# 13| -1: [ClassInstanceExpr] new Generic<Integer>(...)
633633
# 13| -3: [TypeAccess] Generic<Integer>
634634
# 13| 0: [TypeAccess] Integer
@@ -674,7 +674,7 @@ generic_anonymous.kt:
674674
# 4| 0: [VarAccess] member
675675
# 4| 2: [FieldDeclaration] T member;
676676
# 4| -1: [TypeAccess] T
677-
# 4| 0: [MethodAccess] getT(...)
677+
# 4| 0: [MethodCall] getT(...)
678678
# 4| -1: [ThisAccess] Generic.this
679679
# 4| 0: [TypeAccess] Generic
680680
# 4| 3: [Method] getMember
@@ -697,8 +697,8 @@ generic_anonymous.kt:
697697
# 7| 3: [TypeAccess] T
698698
# 7| 5: [BlockStmt] { ... }
699699
# 7| 0: [ReturnStmt] return ...
700-
# 7| 0: [MethodAccess] getMember(...)
701-
# 7| -1: [MethodAccess] getX$private(...)
700+
# 7| 0: [MethodCall] getMember(...)
701+
# 7| -1: [MethodCall] getX$private(...)
702702
# 7| -1: [ThisAccess] this
703703
# 15| 4: [Class,GenericType,ParameterizedType] Outer
704704
#-----| -2: (Generic Parameters)
@@ -753,14 +753,14 @@ generic_anonymous.kt:
753753
# 26| 3: [TypeAccess] U2
754754
# 26| 5: [BlockStmt] { ... }
755755
# 26| 0: [ReturnStmt] return ...
756-
# 26| 0: [MethodAccess] fn0(...)
756+
# 26| 0: [MethodCall] fn0(...)
757757
# 26| -1: [SuperAccess] C0.super
758758
# 26| 0: [TypeAccess] C0
759759
# 26| 3: [Method] fn1
760760
# 26| 3: [TypeAccess] U3
761761
# 26| 5: [BlockStmt] { ... }
762762
# 26| 0: [ReturnStmt] return ...
763-
# 26| 0: [MethodAccess] fn1(...)
763+
# 26| 0: [MethodCall] fn1(...)
764764
# 26| -1: [SuperAccess] C1.super
765765
# 26| 0: [TypeAccess] C1
766766
# 26| 1: [ExprStmt] <Expr>;
@@ -781,14 +781,14 @@ generic_anonymous.kt:
781781
# 27| 3: [TypeAccess] U2
782782
# 27| 5: [BlockStmt] { ... }
783783
# 27| 0: [ReturnStmt] return ...
784-
# 27| 0: [MethodAccess] fn0(...)
784+
# 27| 0: [MethodCall] fn0(...)
785785
# 27| -1: [SuperAccess] C0.super
786786
# 27| 0: [TypeAccess] C0
787787
# 27| 3: [Method] fn1
788788
# 27| 3: [TypeAccess] U2
789789
# 27| 5: [BlockStmt] { ... }
790790
# 27| 0: [ReturnStmt] return ...
791-
# 27| 0: [MethodAccess] fn1(...)
791+
# 27| 0: [MethodCall] fn1(...)
792792
# 27| -1: [SuperAccess] C1.super
793793
# 27| 0: [TypeAccess] C1
794794
# 27| 1: [ExprStmt] <Expr>;
@@ -809,14 +809,14 @@ generic_anonymous.kt:
809809
# 28| 3: [TypeAccess] U2
810810
# 28| 5: [BlockStmt] { ... }
811811
# 28| 0: [ReturnStmt] return ...
812-
# 28| 0: [MethodAccess] fn0(...)
812+
# 28| 0: [MethodCall] fn0(...)
813813
# 28| -1: [SuperAccess] C0.super
814814
# 28| 0: [TypeAccess] C0
815815
# 28| 3: [Method] fn1
816816
# 28| 3: [TypeAccess] String
817817
# 28| 5: [BlockStmt] { ... }
818818
# 28| 0: [ReturnStmt] return ...
819-
# 28| 0: [MethodAccess] fn1(...)
819+
# 28| 0: [MethodCall] fn1(...)
820820
# 28| -1: [SuperAccess] C1.super
821821
# 28| 0: [TypeAccess] C1
822822
# 28| 1: [ExprStmt] <Expr>;
@@ -837,7 +837,7 @@ generic_anonymous.kt:
837837
# 29| 3: [TypeAccess] U2
838838
# 29| 5: [BlockStmt] { ... }
839839
# 29| 0: [ReturnStmt] return ...
840-
# 29| 0: [MethodAccess] fn0(...)
840+
# 29| 0: [MethodCall] fn0(...)
841841
# 29| -1: [SuperAccess] C0.super
842842
# 29| 0: [TypeAccess] C0
843843
# 29| 1: [ExprStmt] <Expr>;
@@ -858,7 +858,7 @@ generic_anonymous.kt:
858858
# 30| 3: [TypeAccess] String
859859
# 30| 5: [BlockStmt] { ... }
860860
# 30| 0: [ReturnStmt] return ...
861-
# 30| 0: [MethodAccess] fn0(...)
861+
# 30| 0: [MethodCall] fn0(...)
862862
# 30| -1: [SuperAccess] C0.super
863863
# 30| 0: [TypeAccess] C0
864864
# 30| 1: [ExprStmt] <Expr>;
@@ -962,7 +962,7 @@ local_anonymous.kt:
962962
# 11| 3: [TypeAccess] Unit
963963
# 11| 5: [BlockStmt] { ... }
964964
# 12| 1: [ExprStmt] <Expr>;
965-
# 12| 0: [MethodAccess] fnLocal(...)
965+
# 12| 0: [MethodCall] fnLocal(...)
966966
# 12| -1: [ClassInstanceExpr] new (...)
967967
# 12| -3: [TypeAccess] Object
968968
# 15| 4: [Method] fn3
@@ -1030,7 +1030,7 @@ local_anonymous.kt:
10301030
# 21| 0: [Parameter] a0
10311031
# 21| 5: [BlockStmt] { ... }
10321032
# 21| 0: [ReturnStmt] return ...
1033-
# 21| 0: [MethodAccess] fn3(...)
1033+
# 21| 0: [MethodCall] fn3(...)
10341034
# 21| -1: [VarAccess] a0
10351035
# 21| -3: [TypeAccess] Function1<Class1,Unit>
10361036
# 21| 0: [TypeAccess] Class1
@@ -1092,7 +1092,7 @@ local_anonymous.kt:
10921092
# 33| 0: [WhenExpr] when ...
10931093
# 33| 0: [WhenBranch] ... -> ...
10941094
# 33| 0: [ValueEQExpr] ... (value equals) ...
1095-
# 33| 0: [MethodAccess] getX(...)
1095+
# 33| 0: [MethodCall] getX(...)
10961096
# 33| -1: [ThisAccess] this
10971097
# 33| 1: [IntegerLiteral] 1
10981098
# 33| 1: [ExprStmt] <Expr>;

‎java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@
109109
| Test.kt:40:4:40:6 | <Stmt> | StmtExpr | Test.kt:40:4:40:6 | { ... } | BlockStmt |
110110
| Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr | Test.kt:38:9:38:9 | x | VarAccess |
111111
| Test.kt:40:4:40:6 | Unit | TypeAccess | file://:0:0:0:0 | <none> | <none> |
112-
| Test.kt:40:4:40:6 | dec(...) | MethodAccess | Test.kt:40:4:40:6 | ...=... | AssignExpr |
112+
| Test.kt:40:4:40:6 | dec(...) | MethodCall | Test.kt:40:4:40:6 | ...=... | AssignExpr |
113113
| Test.kt:40:4:40:6 | int tmp0 | LocalVariableDecl | file://:0:0:0:0 | <none> | <none> |
114114
| Test.kt:40:4:40:6 | tmp0 | LocalVariableDeclExpr | Test.kt:40:4:40:4 | <Expr>; | ExprStmt |
115115
| Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
116-
| Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | dec(...) | MethodAccess |
116+
| Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | dec(...) | MethodCall |
117117
| Test.kt:40:4:40:6 | var ...; | LocalVariableDeclStmt | Test.kt:40:4:40:4 | x | VarAccess |
118118
| Test.kt:40:4:40:6 | { ... } | BlockStmt | Test.kt:40:4:40:6 | var ...; | LocalVariableDeclStmt |
119119
| Test.kt:43:3:43:3 | <Expr>; | ExprStmt | Test.kt:43:7:43:8 | 30 | IntegerLiteral |
@@ -208,8 +208,8 @@
208208
| Test.kt:105:20:107:5 | { ... } | BlockStmt | Test.kt:106:9:106:29 | <Expr>; | ExprStmt |
209209
| Test.kt:106:9:106:29 | <Expr>; | ExprStmt | Test.kt:106:18:106:27 | "x not null" | StringLiteral |
210210
| Test.kt:106:9:106:29 | ConsoleKt | TypeAccess | file://:0:0:0:0 | <none> | <none> |
211-
| Test.kt:106:9:106:29 | println(...) | MethodAccess | Test.kt:100:1:110:1 | fn | Method |
212-
| Test.kt:106:18:106:27 | "x not null" | StringLiteral | Test.kt:106:9:106:29 | println(...) | MethodAccess |
211+
| Test.kt:106:9:106:29 | println(...) | MethodCall | Test.kt:100:1:110:1 | fn | Method |
212+
| Test.kt:106:18:106:27 | "x not null" | StringLiteral | Test.kt:106:9:106:29 | println(...) | MethodCall |
213213
| Test.kt:107:16:107:16 | y | VarAccess | Test.kt:107:21:107:24 | null | NullLiteral |
214214
| Test.kt:107:16:107:24 | ... (value not-equals) ... | ValueNEExpr | Test.kt:100:1:110:1 | fn | Method |
215215
| Test.kt:107:16:107:24 | ... (value not-equals) ... | ValueNEExpr | Test.kt:107:27:109:5 | { ... } | BlockStmt |
@@ -218,8 +218,8 @@
218218
| Test.kt:107:27:109:5 | { ... } | BlockStmt | Test.kt:108:9:108:29 | <Expr>; | ExprStmt |
219219
| Test.kt:108:9:108:29 | <Expr>; | ExprStmt | Test.kt:108:18:108:27 | "y not null" | StringLiteral |
220220
| Test.kt:108:9:108:29 | ConsoleKt | TypeAccess | file://:0:0:0:0 | <none> | <none> |
221-
| Test.kt:108:9:108:29 | println(...) | MethodAccess | Test.kt:100:1:110:1 | fn | Method |
222-
| Test.kt:108:18:108:27 | "y not null" | StringLiteral | Test.kt:108:9:108:29 | println(...) | MethodAccess |
221+
| Test.kt:108:9:108:29 | println(...) | MethodCall | Test.kt:100:1:110:1 | fn | Method |
222+
| Test.kt:108:18:108:27 | "y not null" | StringLiteral | Test.kt:108:9:108:29 | println(...) | MethodCall |
223223
| Test.kt:112:1:116:1 | Unit | TypeAccess | file://:0:0:0:0 | <none> | <none> |
224224
| Test.kt:112:1:116:1 | fn | Method | file://:0:0:0:0 | <none> | <none> |
225225
| Test.kt:112:8:112:17 | boolean | TypeAccess | file://:0:0:0:0 | <none> | <none> |

‎java/ql/test/kotlin/library-tests/data-classes/PrintAst.expected‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ dc.kt:
6565
# 0| 1: [VarAccess] p0.strs
6666
# 0| -1: [VarAccess] p0
6767
# 0| 2: [ReturnStmt] return ...
68-
# 0| 0: [MethodAccess] copy(...)
68+
# 0| 0: [MethodCall] copy(...)
6969
# 0| -1: [VarAccess] p0
7070
# 0| 0: [VarAccess] p1
7171
# 0| 1: [VarAccess] p2
@@ -123,7 +123,7 @@ dc.kt:
123123
# 0| 5: [BlockStmt] { ... }
124124
# 0| 0: [LocalVariableDeclStmt] var ...;
125125
# 0| 1: [LocalVariableDeclExpr] result
126-
# 0| 0: [MethodAccess] hashCode(...)
126+
# 0| 0: [MethodCall] hashCode(...)
127127
# 0| -1: [TypeAccess] Arrays
128128
# 0| 0: [VarAccess] this.bytes
129129
# 0| -1: [ThisAccess] this
@@ -134,7 +134,7 @@ dc.kt:
134134
# 0| 0: [MulExpr] ... * ...
135135
# 0| 0: [VarAccess] result
136136
# 0| 1: [IntegerLiteral] 31
137-
# 0| 1: [MethodAccess] hashCode(...)
137+
# 0| 1: [MethodCall] hashCode(...)
138138
# 0| -1: [TypeAccess] Arrays
139139
# 0| 0: [VarAccess] this.strs
140140
# 0| -1: [ThisAccess] this
@@ -147,13 +147,13 @@ dc.kt:
147147
# 0| 0: [StringTemplateExpr] "..."
148148
# 0| 0: [StringLiteral] "ProtoMapValue("
149149
# 0| 1: [StringLiteral] "bytes="
150-
# 0| 2: [MethodAccess] toString(...)
150+
# 0| 2: [MethodCall] toString(...)
151151
# 0| -1: [TypeAccess] Arrays
152152
# 0| 0: [VarAccess] this.bytes
153153
# 0| -1: [ThisAccess] this
154154
# 0| 3: [StringLiteral] ", "
155155
# 0| 4: [StringLiteral] "strs="
156-
# 0| 5: [MethodAccess] toString(...)
156+
# 0| 5: [MethodCall] toString(...)
157157
# 0| -1: [TypeAccess] Arrays
158158
# 0| 0: [VarAccess] this.strs
159159
# 0| -1: [ThisAccess] this

0 commit comments

Comments
 (0)