Skip to content

Commit fff9a75

Browse files
smowtonsmowton
committed
Accept test changes
1 parent 4201031 commit fff9a75

File tree

6 files changed

+1148
-1
lines changed

6 files changed

+1148
-1
lines changed

‎java/ql/integration-tests/posix-only/kotlin/gradle_kotlinx_serialization/PrintAst.expected

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,15 @@ app/src/main/kotlin/testProject/App.kt:
425425
# 7| -1: [ThisAccess] $serializer.this
426426
# 7| 0: [TypeAccess] $serializer
427427
# 7| 1: [VarAccess] tmp0_serialDesc
428+
# 7| 7: [Method] typeParametersSerializers
429+
# 7| 3: [TypeAccess] KSerializer<?>[]
430+
# 7| 0: [TypeAccess] KSerializer<?>
431+
# 7| 0: [WildcardTypeAccess] ? ...
432+
# 7| 5: [BlockStmt] { ... }
433+
# 7| 0: [ReturnStmt] return ...
434+
# 7| 0: [MethodAccess] typeParametersSerializers(...)
435+
# 7| -1: [SuperAccess] GeneratedSerializer.super
436+
# 7| 0: [TypeAccess] GeneratedSerializer
428437
# 7| 11: [Class] Companion
429438
# 0| 1: [Method] serializer
430439
# 0| 3: [TypeAccess] KSerializer<Project>

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

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,21 @@ classes.kt:
107107
# 28| 5: [BlockStmt] { ... }
108108
# 28| 0: [SuperConstructorInvocationStmt] super(...)
109109
# 28| 1: [BlockStmt] { ... }
110-
# 29| 2: [Constructor] ClassSix
110+
# 28| 2: [Method] funIF1
111+
# 28| 3: [TypeAccess] Unit
112+
# 28| 5: [BlockStmt] { ... }
113+
# 28| 0: [ReturnStmt] return ...
114+
# 28| 0: [MethodAccess] funIF1(...)
115+
# 28| -1: [SuperAccess] IF1.super
116+
# 28| 0: [TypeAccess] IF1
117+
# 28| 3: [Method] funIF2
118+
# 28| 3: [TypeAccess] Unit
119+
# 28| 5: [BlockStmt] { ... }
120+
# 28| 0: [ReturnStmt] return ...
121+
# 28| 0: [MethodAccess] funIF2(...)
122+
# 28| -1: [SuperAccess] IF2.super
123+
# 28| 0: [TypeAccess] IF2
124+
# 29| 4: [Constructor] ClassSix
111125
#-----| 4: (Parameters)
112126
# 29| 0: [Parameter] i
113127
# 29| 0: [TypeAccess] int
@@ -725,6 +739,20 @@ generic_anonymous.kt:
725739
# 26| 5: [BlockStmt] { ... }
726740
# 26| 0: [SuperConstructorInvocationStmt] super(...)
727741
# 26| 1: [BlockStmt] { ... }
742+
# 26| 2: [Method] fn0
743+
# 26| 3: [TypeAccess] U2
744+
# 26| 5: [BlockStmt] { ... }
745+
# 26| 0: [ReturnStmt] return ...
746+
# 26| 0: [MethodAccess] fn0(...)
747+
# 26| -1: [SuperAccess] C0.super
748+
# 26| 0: [TypeAccess] C0
749+
# 26| 3: [Method] fn1
750+
# 26| 3: [TypeAccess] U3
751+
# 26| 5: [BlockStmt] { ... }
752+
# 26| 0: [ReturnStmt] return ...
753+
# 26| 0: [MethodAccess] fn1(...)
754+
# 26| -1: [SuperAccess] C1.super
755+
# 26| 0: [TypeAccess] C1
728756
# 26| 1: [ExprStmt] <Expr>;
729757
# 26| 0: [ClassInstanceExpr] new (...)
730758
# 26| -3: [TypeAccess] Object
@@ -739,6 +767,20 @@ generic_anonymous.kt:
739767
# 27| 5: [BlockStmt] { ... }
740768
# 27| 0: [SuperConstructorInvocationStmt] super(...)
741769
# 27| 1: [BlockStmt] { ... }
770+
# 27| 2: [Method] fn0
771+
# 27| 3: [TypeAccess] U2
772+
# 27| 5: [BlockStmt] { ... }
773+
# 27| 0: [ReturnStmt] return ...
774+
# 27| 0: [MethodAccess] fn0(...)
775+
# 27| -1: [SuperAccess] C0.super
776+
# 27| 0: [TypeAccess] C0
777+
# 27| 3: [Method] fn1
778+
# 27| 3: [TypeAccess] U2
779+
# 27| 5: [BlockStmt] { ... }
780+
# 27| 0: [ReturnStmt] return ...
781+
# 27| 0: [MethodAccess] fn1(...)
782+
# 27| -1: [SuperAccess] C1.super
783+
# 27| 0: [TypeAccess] C1
742784
# 27| 1: [ExprStmt] <Expr>;
743785
# 27| 0: [ClassInstanceExpr] new (...)
744786
# 27| -3: [TypeAccess] Object
@@ -753,6 +795,20 @@ generic_anonymous.kt:
753795
# 28| 5: [BlockStmt] { ... }
754796
# 28| 0: [SuperConstructorInvocationStmt] super(...)
755797
# 28| 1: [BlockStmt] { ... }
798+
# 28| 2: [Method] fn0
799+
# 28| 3: [TypeAccess] U2
800+
# 28| 5: [BlockStmt] { ... }
801+
# 28| 0: [ReturnStmt] return ...
802+
# 28| 0: [MethodAccess] fn0(...)
803+
# 28| -1: [SuperAccess] C0.super
804+
# 28| 0: [TypeAccess] C0
805+
# 28| 3: [Method] fn1
806+
# 28| 3: [TypeAccess] String
807+
# 28| 5: [BlockStmt] { ... }
808+
# 28| 0: [ReturnStmt] return ...
809+
# 28| 0: [MethodAccess] fn1(...)
810+
# 28| -1: [SuperAccess] C1.super
811+
# 28| 0: [TypeAccess] C1
756812
# 28| 1: [ExprStmt] <Expr>;
757813
# 28| 0: [ClassInstanceExpr] new (...)
758814
# 28| -3: [TypeAccess] Object
@@ -767,6 +823,13 @@ generic_anonymous.kt:
767823
# 29| 5: [BlockStmt] { ... }
768824
# 29| 0: [SuperConstructorInvocationStmt] super(...)
769825
# 29| 1: [BlockStmt] { ... }
826+
# 29| 2: [Method] fn0
827+
# 29| 3: [TypeAccess] U2
828+
# 29| 5: [BlockStmt] { ... }
829+
# 29| 0: [ReturnStmt] return ...
830+
# 29| 0: [MethodAccess] fn0(...)
831+
# 29| -1: [SuperAccess] C0.super
832+
# 29| 0: [TypeAccess] C0
770833
# 29| 1: [ExprStmt] <Expr>;
771834
# 29| 0: [ClassInstanceExpr] new (...)
772835
# 29| -3: [TypeAccess] C0<U2>
@@ -781,6 +844,13 @@ generic_anonymous.kt:
781844
# 30| 5: [BlockStmt] { ... }
782845
# 30| 0: [SuperConstructorInvocationStmt] super(...)
783846
# 30| 1: [BlockStmt] { ... }
847+
# 30| 2: [Method] fn0
848+
# 30| 3: [TypeAccess] String
849+
# 30| 5: [BlockStmt] { ... }
850+
# 30| 0: [ReturnStmt] return ...
851+
# 30| 0: [MethodAccess] fn0(...)
852+
# 30| -1: [SuperAccess] C0.super
853+
# 30| 0: [TypeAccess] C0
784854
# 30| 1: [ExprStmt] <Expr>;
785855
# 30| 0: [ClassInstanceExpr] new (...)
786856
# 30| -3: [TypeAccess] C0<String>

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,26 +52,58 @@
5252
| generic_anonymous.kt:25:9:31:9 | Unit | Unit |
5353
| generic_anonymous.kt:26:13:26:37 | <Stmt> | new Object(...) { ... } |
5454
| generic_anonymous.kt:26:13:26:37 | <implicit coercion to unit> | Unit |
55+
| generic_anonymous.kt:26:13:26:37 | C0 | C0 |
56+
| generic_anonymous.kt:26:13:26:37 | C0.super | C0 |
57+
| generic_anonymous.kt:26:13:26:37 | C1 | C1 |
58+
| generic_anonymous.kt:26:13:26:37 | C1.super | C1 |
5559
| generic_anonymous.kt:26:13:26:37 | Object | Object |
60+
| generic_anonymous.kt:26:13:26:37 | U2 | U2 |
61+
| generic_anonymous.kt:26:13:26:37 | U3 | U3 |
5662
| generic_anonymous.kt:26:13:26:37 | Unit | Unit |
63+
| generic_anonymous.kt:26:13:26:37 | fn0(...) | U2 |
64+
| generic_anonymous.kt:26:13:26:37 | fn1(...) | U3 |
5765
| generic_anonymous.kt:26:13:26:37 | new (...) | new Object(...) { ... } |
5866
| generic_anonymous.kt:27:13:27:37 | <Stmt> | new Object(...) { ... } |
5967
| generic_anonymous.kt:27:13:27:37 | <implicit coercion to unit> | Unit |
68+
| generic_anonymous.kt:27:13:27:37 | C0 | C0 |
69+
| generic_anonymous.kt:27:13:27:37 | C0.super | C0 |
70+
| generic_anonymous.kt:27:13:27:37 | C1 | C1 |
71+
| generic_anonymous.kt:27:13:27:37 | C1.super | C1 |
6072
| generic_anonymous.kt:27:13:27:37 | Object | Object |
73+
| generic_anonymous.kt:27:13:27:37 | U2 | U2 |
74+
| generic_anonymous.kt:27:13:27:37 | U2 | U2 |
6175
| generic_anonymous.kt:27:13:27:37 | Unit | Unit |
76+
| generic_anonymous.kt:27:13:27:37 | fn0(...) | U2 |
77+
| generic_anonymous.kt:27:13:27:37 | fn1(...) | U2 |
6278
| generic_anonymous.kt:27:13:27:37 | new (...) | new Object(...) { ... } |
6379
| generic_anonymous.kt:28:13:28:41 | <Stmt> | new Object(...) { ... } |
6480
| generic_anonymous.kt:28:13:28:41 | <implicit coercion to unit> | Unit |
81+
| generic_anonymous.kt:28:13:28:41 | C0 | C0 |
82+
| generic_anonymous.kt:28:13:28:41 | C0.super | C0 |
83+
| generic_anonymous.kt:28:13:28:41 | C1 | C1 |
84+
| generic_anonymous.kt:28:13:28:41 | C1.super | C1 |
6585
| generic_anonymous.kt:28:13:28:41 | Object | Object |
86+
| generic_anonymous.kt:28:13:28:41 | String | String |
87+
| generic_anonymous.kt:28:13:28:41 | U2 | U2 |
6688
| generic_anonymous.kt:28:13:28:41 | Unit | Unit |
89+
| generic_anonymous.kt:28:13:28:41 | fn0(...) | U2 |
90+
| generic_anonymous.kt:28:13:28:41 | fn1(...) | String |
6791
| generic_anonymous.kt:28:13:28:41 | new (...) | new Object(...) { ... } |
6892
| generic_anonymous.kt:29:13:29:29 | <Stmt> | new C0<U2>(...) { ... } |
6993
| generic_anonymous.kt:29:13:29:29 | <implicit coercion to unit> | Unit |
94+
| generic_anonymous.kt:29:13:29:29 | C0 | C0 |
95+
| generic_anonymous.kt:29:13:29:29 | C0.super | C0 |
7096
| generic_anonymous.kt:29:13:29:29 | C0<U2> | C0<U2> |
97+
| generic_anonymous.kt:29:13:29:29 | U2 | U2 |
7198
| generic_anonymous.kt:29:13:29:29 | Unit | Unit |
99+
| generic_anonymous.kt:29:13:29:29 | fn0(...) | U2 |
72100
| generic_anonymous.kt:29:13:29:29 | new (...) | new C0<U2>(...) { ... } |
73101
| generic_anonymous.kt:30:13:30:33 | <Stmt> | new C0<String>(...) { ... } |
74102
| generic_anonymous.kt:30:13:30:33 | <implicit coercion to unit> | Unit |
103+
| generic_anonymous.kt:30:13:30:33 | C0 | C0 |
104+
| generic_anonymous.kt:30:13:30:33 | C0.super | C0 |
75105
| generic_anonymous.kt:30:13:30:33 | C0<String> | C0<String> |
106+
| generic_anonymous.kt:30:13:30:33 | String | String |
76107
| generic_anonymous.kt:30:13:30:33 | Unit | Unit |
108+
| generic_anonymous.kt:30:13:30:33 | fn0(...) | String |
77109
| generic_anonymous.kt:30:13:30:33 | new (...) | new C0<String>(...) { ... } |

‎java/ql/test/kotlin/library-tests/inherited-callee/test.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
| Test.java:25:5:25:16 | hashCode(...) | hashCode | Object |
44
| Test.java:26:5:26:17 | inheritMe(...) | inheritMe | Test |
55
| Test.java:28:5:28:34 | inheritedInterfaceMethodJ(...) | inheritedInterfaceMethodJ | ParentIf |
6+
| Test.kt:13:1:16:1 | inheritedInterfaceMethodK(...) | inheritedInterfaceMethodK | ParentIf |
67
| Test.kt:23:7:23:16 | toString(...) | toString | Object |
78
| Test.kt:24:7:24:15 | equals(...) | equals | Object |
89
| Test.kt:25:7:25:16 | hashCode(...) | hashCode | Object |

‎java/ql/test/kotlin/library-tests/java-kotlin-collection-type-generic-methods/test.expected

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,38 @@ methodWithDuplicate
44
| AbstractCollection | addAll | Collection<? extends E> |
55
| AbstractCollection | contains | Object |
66
| AbstractCollection | containsAll | Collection<?> |
7+
| AbstractCollection | forEach | Consumer<? super E> |
78
| AbstractCollection | remove | Object |
89
| AbstractCollection | removeAll | Collection<?> |
910
| AbstractCollection | retainAll | Collection<?> |
11+
| AbstractCollection | toArray | IntFunction<T[]> |
1012
| AbstractCollection | toArray | T[] |
1113
| AbstractCollection<E> | add | E |
1214
| AbstractCollection<E> | addAll | Collection<? extends E> |
1315
| AbstractCollection<E> | contains | Object |
1416
| AbstractCollection<E> | containsAll | Collection<?> |
17+
| AbstractCollection<E> | forEach | Consumer<? super E> |
1518
| AbstractCollection<E> | remove | Object |
1619
| AbstractCollection<E> | removeAll | Collection<?> |
1720
| AbstractCollection<E> | retainAll | Collection<?> |
21+
| AbstractCollection<E> | toArray | IntFunction<T[]> |
1822
| AbstractCollection<E> | toArray | T[] |
1923
| AbstractCollection<String> | add | String |
2024
| AbstractCollection<String> | addAll | Collection<? extends String> |
2125
| AbstractCollection<String> | contains | Object |
2226
| AbstractCollection<String> | containsAll | Collection<?> |
27+
| AbstractCollection<String> | forEach | Consumer<? super String> |
2328
| AbstractCollection<String> | remove | Object |
2429
| AbstractCollection<String> | removeAll | Collection<?> |
2530
| AbstractCollection<String> | retainAll | Collection<?> |
31+
| AbstractCollection<String> | toArray | IntFunction<T[]> |
2632
| AbstractCollection<String> | toArray | T[] |
2733
| AbstractList | add | E |
2834
| AbstractList | add | int |
2935
| AbstractList | addAll | Collection<? extends E> |
3036
| AbstractList | addAll | int |
3137
| AbstractList | equals | Object |
38+
| AbstractList | forEach | Consumer<? super E> |
3239
| AbstractList | get | int |
3340
| AbstractList | indexOf | Object |
3441
| AbstractList | lastIndexOf | Object |
@@ -39,6 +46,7 @@ methodWithDuplicate
3946
| AbstractList | set | int |
4047
| AbstractList | subList | int |
4148
| AbstractList | subListRangeCheck | int |
49+
| AbstractList | toArray | IntFunction<T[]> |
4250
| AbstractList<E> | add | E |
4351
| AbstractList<E> | add | int |
4452
| AbstractList<E> | addAll | Collection<? extends E> |
@@ -58,7 +66,10 @@ methodWithDuplicate
5866
| AbstractMap | containsKey | Object |
5967
| AbstractMap | containsValue | Object |
6068
| AbstractMap | equals | Object |
69+
| AbstractMap | forEach | BiConsumer<? super K,? super V> |
6170
| AbstractMap | get | Object |
71+
| AbstractMap | getOrDefault | Object |
72+
| AbstractMap | getOrDefault | V |
6273
| AbstractMap | put | K |
6374
| AbstractMap | put | V |
6475
| AbstractMap | putAll | Map<? extends K,? extends V> |
@@ -83,23 +94,53 @@ methodWithDuplicate
8394
| AbstractMap<String,String> | containsKey | Object |
8495
| AbstractMap<String,String> | containsValue | Object |
8596
| AbstractMap<String,String> | equals | Object |
97+
| AbstractMap<String,String> | forEach | BiConsumer<? super String,? super String> |
8698
| AbstractMap<String,String> | get | Object |
99+
| AbstractMap<String,String> | getOrDefault | Object |
100+
| AbstractMap<String,String> | getOrDefault | String |
87101
| AbstractMap<String,String> | put | String |
88102
| AbstractMap<String,String> | putAll | Map<? extends String,? extends String> |
89103
| AbstractMap<String,String> | remove | Object |
90104
| AbstractMutableCollection | add | E |
105+
| AbstractMutableCollection | forEach | Consumer<? super E> |
106+
| AbstractMutableCollection | removeIf | Predicate<? super E> |
107+
| AbstractMutableCollection | toArray | IntFunction<T[]> |
91108
| AbstractMutableList | add | E |
92109
| AbstractMutableList | add | int |
110+
| AbstractMutableList | forEach | Consumer<? super E> |
93111
| AbstractMutableList | remove | int |
112+
| AbstractMutableList | removeIf | Predicate<? super E> |
113+
| AbstractMutableList | replaceAll | UnaryOperator<E> |
94114
| AbstractMutableList | set | E |
95115
| AbstractMutableList | set | int |
116+
| AbstractMutableList | sort | Comparator<? super E> |
117+
| AbstractMutableList | toArray | IntFunction<T[]> |
118+
| AbstractMutableMap | compute | BiFunction<? super K,? super V,? extends V> |
119+
| AbstractMutableMap | compute | K |
120+
| AbstractMutableMap | computeIfAbsent | Function<? super K,? extends V> |
121+
| AbstractMutableMap | computeIfAbsent | K |
122+
| AbstractMutableMap | computeIfPresent | BiFunction<? super K,? super V,? extends V> |
123+
| AbstractMutableMap | computeIfPresent | K |
124+
| AbstractMutableMap | forEach | BiConsumer<? super K,? super V> |
125+
| AbstractMutableMap | getOrDefault | Object |
126+
| AbstractMutableMap | getOrDefault | V |
127+
| AbstractMutableMap | merge | BiFunction<? super V,? super V,? extends V> |
128+
| AbstractMutableMap | merge | K |
129+
| AbstractMutableMap | merge | V |
96130
| AbstractMutableMap | put | K |
97131
| AbstractMutableMap | put | V |
132+
| AbstractMutableMap | putIfAbsent | K |
133+
| AbstractMutableMap | putIfAbsent | V |
134+
| AbstractMutableMap | remove | Object |
135+
| AbstractMutableMap | replace | K |
136+
| AbstractMutableMap | replace | V |
137+
| AbstractMutableMap | replaceAll | BiFunction<? super K,? super V,? extends V> |
98138
| Collection | add | E |
99139
| Collection | addAll | Collection<? extends E> |
100140
| Collection | contains | Object |
101141
| Collection | containsAll | Collection<?> |
102142
| Collection | equals | Object |
143+
| Collection | forEach | Consumer<? super E> |
103144
| Collection | remove | Object |
104145
| Collection | removeAll | Collection<?> |
105146
| Collection | removeIf | Predicate<? super E> |
@@ -165,6 +206,7 @@ methodWithDuplicate
165206
| List | containsAll | Collection<?> |
166207
| List | copyOf | Collection<? extends E> |
167208
| List | equals | Object |
209+
| List | forEach | Consumer<? super E> |
168210
| List | get | int |
169211
| List | indexOf | Object |
170212
| List | lastIndexOf | Object |
@@ -180,6 +222,7 @@ methodWithDuplicate
180222
| List | set | int |
181223
| List | sort | Comparator<? super E> |
182224
| List | subList | int |
225+
| List | toArray | IntFunction<T[]> |
183226
| List | toArray | T[] |
184227
| List<E> | add | E |
185228
| List<E> | add | int |
@@ -373,30 +416,48 @@ methodWithDuplicate
373416
| Map<String,String> | replaceAll | BiFunction<? super String,? super String,? extends String> |
374417
| MutableCollection | add | E |
375418
| MutableCollection | addAll | Collection<? extends E> |
419+
| MutableCollection | contains | Object |
420+
| MutableCollection | containsAll | Collection<?> |
421+
| MutableCollection | forEach | Consumer<? super E> |
376422
| MutableCollection | remove | Object |
377423
| MutableCollection | removeAll | Collection<?> |
378424
| MutableCollection | removeIf | Predicate<? super E> |
379425
| MutableCollection | retainAll | Collection<?> |
426+
| MutableCollection | toArray | IntFunction<T[]> |
380427
| MutableList | add | E |
381428
| MutableList | add | int |
382429
| MutableList | addAll | Collection<? extends E> |
383430
| MutableList | addAll | int |
431+
| MutableList | contains | Object |
432+
| MutableList | containsAll | Collection<?> |
433+
| MutableList | forEach | Consumer<? super E> |
434+
| MutableList | get | int |
435+
| MutableList | indexOf | Object |
436+
| MutableList | lastIndexOf | Object |
384437
| MutableList | listIterator | int |
385438
| MutableList | remove | Object |
386439
| MutableList | remove | int |
387440
| MutableList | removeAll | Collection<?> |
441+
| MutableList | removeIf | Predicate<? super E> |
388442
| MutableList | replaceAll | UnaryOperator<E> |
389443
| MutableList | retainAll | Collection<?> |
390444
| MutableList | set | E |
391445
| MutableList | set | int |
392446
| MutableList | sort | Comparator<? super E> |
393447
| MutableList | subList | int |
448+
| MutableList | toArray | IntFunction<T[]> |
394449
| MutableMap | compute | BiFunction<? super K,? super V,? extends V> |
395450
| MutableMap | compute | K |
396451
| MutableMap | computeIfAbsent | Function<? super K,? extends V> |
397452
| MutableMap | computeIfAbsent | K |
398453
| MutableMap | computeIfPresent | BiFunction<? super K,? super V,? extends V> |
399454
| MutableMap | computeIfPresent | K |
455+
| MutableMap | containsKey | Object |
456+
| MutableMap | containsValue | Object |
457+
| MutableMap | forEach | BiConsumer<? super K,? super V> |
458+
| MutableMap | get | Object |
459+
| MutableMap | getOrDefault | Object |
460+
| MutableMap | getOrDefault | V |
400461
| MutableMap | merge | BiFunction<? super V,? super V,? extends V> |
401462
| MutableMap | merge | K |
402463
| MutableMap | merge | V |

0 commit comments

Comments
 (0)