Skip to content

Commit c5e5b8a

Browse files
IdrissRioIdrissRio
authored
Merge pull request #20247 from github/idrissrio/java-upgrade-fix
Java: accept new test results after extractor update
2 parents af82da5 + 5d2268f commit c5e5b8a

File tree

4 files changed

+77
-162
lines changed

4 files changed

+77
-162
lines changed

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

Lines changed: 38 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,6 @@ methodWithDuplicate
1616
| AbstractCollection<E> | removeAll | Collection<?> |
1717
| AbstractCollection<E> | retainAll | Collection<?> |
1818
| AbstractCollection<E> | toArray | T[] |
19-
| AbstractCollection<Entry<K,V>> | add | Entry<K,V> |
20-
| AbstractCollection<Entry<K,V>> | addAll | Collection<? extends Entry<K,V>> |
21-
| AbstractCollection<Entry<K,V>> | contains | Object |
22-
| AbstractCollection<Entry<K,V>> | containsAll | Collection<?> |
23-
| AbstractCollection<Entry<K,V>> | remove | Object |
24-
| AbstractCollection<Entry<K,V>> | removeAll | Collection<?> |
25-
| AbstractCollection<Entry<K,V>> | retainAll | Collection<?> |
26-
| AbstractCollection<Entry<K,V>> | toArray | T[] |
27-
| AbstractCollection<K> | add | K |
28-
| AbstractCollection<K> | addAll | Collection<? extends K> |
29-
| AbstractCollection<K> | contains | Object |
30-
| AbstractCollection<K> | containsAll | Collection<?> |
31-
| AbstractCollection<K> | remove | Object |
32-
| AbstractCollection<K> | removeAll | Collection<?> |
33-
| AbstractCollection<K> | retainAll | Collection<?> |
34-
| AbstractCollection<K> | toArray | T[] |
35-
| AbstractCollection<Runnable> | add | Runnable |
36-
| AbstractCollection<Runnable> | addAll | Collection<? extends Runnable> |
37-
| AbstractCollection<Runnable> | contains | Object |
38-
| AbstractCollection<Runnable> | containsAll | Collection<?> |
39-
| AbstractCollection<Runnable> | remove | Object |
40-
| AbstractCollection<Runnable> | removeAll | Collection<?> |
41-
| AbstractCollection<Runnable> | retainAll | Collection<?> |
42-
| AbstractCollection<Runnable> | toArray | T[] |
4319
| AbstractCollection<String> | add | String |
4420
| AbstractCollection<String> | addAll | Collection<? extends String> |
4521
| AbstractCollection<String> | contains | Object |
@@ -56,14 +32,6 @@ methodWithDuplicate
5632
| AbstractCollection<T> | removeAll | Collection<?> |
5733
| AbstractCollection<T> | retainAll | Collection<?> |
5834
| AbstractCollection<T> | toArray | T[] |
59-
| AbstractCollection<V> | add | V |
60-
| AbstractCollection<V> | addAll | Collection<? extends V> |
61-
| AbstractCollection<V> | contains | Object |
62-
| AbstractCollection<V> | containsAll | Collection<?> |
63-
| AbstractCollection<V> | remove | Object |
64-
| AbstractCollection<V> | removeAll | Collection<?> |
65-
| AbstractCollection<V> | retainAll | Collection<?> |
66-
| AbstractCollection<V> | toArray | T[] |
6735
| AbstractList | add | E |
6836
| AbstractList | add | int |
6937
| AbstractList | addAll | Collection<? extends E> |
@@ -103,14 +71,14 @@ methodWithDuplicate
10371
| AbstractMap | put | V |
10472
| AbstractMap | putAll | Map<? extends K,? extends V> |
10573
| AbstractMap | remove | Object |
106-
| AbstractMap<Identity,Entry<?>> | containsKey | Object |
107-
| AbstractMap<Identity,Entry<?>> | containsValue | Object |
108-
| AbstractMap<Identity,Entry<?>> | equals | Object |
109-
| AbstractMap<Identity,Entry<?>> | get | Object |
110-
| AbstractMap<Identity,Entry<?>> | put | Entry<?> |
111-
| AbstractMap<Identity,Entry<?>> | put | Identity |
112-
| AbstractMap<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
113-
| AbstractMap<Identity,Entry<?>> | remove | Object |
74+
| AbstractMap<Identity,Object> | containsKey | Object |
75+
| AbstractMap<Identity,Object> | containsValue | Object |
76+
| AbstractMap<Identity,Object> | equals | Object |
77+
| AbstractMap<Identity,Object> | get | Object |
78+
| AbstractMap<Identity,Object> | put | Identity |
79+
| AbstractMap<Identity,Object> | put | Object |
80+
| AbstractMap<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
81+
| AbstractMap<Identity,Object> | remove | Object |
11482
| AbstractMap<K,V> | containsKey | Object |
11583
| AbstractMap<K,V> | containsValue | Object |
11684
| AbstractMap<K,V> | equals | Object |
@@ -179,17 +147,6 @@ methodWithDuplicate
179147
| Collection<K> | retainAll | Collection<?> |
180148
| Collection<K> | toArray | IntFunction<T[]> |
181149
| Collection<K> | toArray | T[] |
182-
| Collection<Runnable> | add | Runnable |
183-
| Collection<Runnable> | addAll | Collection<? extends Runnable> |
184-
| Collection<Runnable> | contains | Object |
185-
| Collection<Runnable> | containsAll | Collection<?> |
186-
| Collection<Runnable> | equals | Object |
187-
| Collection<Runnable> | remove | Object |
188-
| Collection<Runnable> | removeAll | Collection<?> |
189-
| Collection<Runnable> | removeIf | Predicate<? super Runnable> |
190-
| Collection<Runnable> | retainAll | Collection<?> |
191-
| Collection<Runnable> | toArray | IntFunction<T[]> |
192-
| Collection<Runnable> | toArray | T[] |
193150
| Collection<String> | add | String |
194151
| Collection<String> | addAll | Collection<? extends String> |
195152
| Collection<String> | contains | Object |
@@ -332,37 +289,36 @@ methodWithDuplicate
332289
| Map | replace | K |
333290
| Map | replace | V |
334291
| Map | replaceAll | BiFunction<? super K,? super V,? extends V> |
335-
| Map<Identity,Entry<?>> | compute | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
336-
| Map<Identity,Entry<?>> | compute | Identity |
337-
| Map<Identity,Entry<?>> | computeIfAbsent | Function<? super Identity,? extends Entry<?>> |
338-
| Map<Identity,Entry<?>> | computeIfAbsent | Identity |
339-
| Map<Identity,Entry<?>> | computeIfPresent | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
340-
| Map<Identity,Entry<?>> | computeIfPresent | Identity |
341-
| Map<Identity,Entry<?>> | containsKey | Object |
342-
| Map<Identity,Entry<?>> | containsValue | Object |
343-
| Map<Identity,Entry<?>> | copyOf | Map<? extends K,? extends V> |
344-
| Map<Identity,Entry<?>> | entry | K |
345-
| Map<Identity,Entry<?>> | entry | V |
346-
| Map<Identity,Entry<?>> | equals | Object |
347-
| Map<Identity,Entry<?>> | forEach | BiConsumer<? super Identity,? super Entry<?>> |
348-
| Map<Identity,Entry<?>> | get | Object |
349-
| Map<Identity,Entry<?>> | getOrDefault | Entry<?> |
350-
| Map<Identity,Entry<?>> | getOrDefault | Object |
351-
| Map<Identity,Entry<?>> | merge | BiFunction<? super Entry<?>,? super Entry<?>,? extends Entry<?>> |
352-
| Map<Identity,Entry<?>> | merge | Entry<?> |
353-
| Map<Identity,Entry<?>> | merge | Identity |
354-
| Map<Identity,Entry<?>> | of | K |
355-
| Map<Identity,Entry<?>> | of | V |
356-
| Map<Identity,Entry<?>> | ofEntries | Entry<? extends K,? extends V>[] |
357-
| Map<Identity,Entry<?>> | put | Entry<?> |
358-
| Map<Identity,Entry<?>> | put | Identity |
359-
| Map<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
360-
| Map<Identity,Entry<?>> | putIfAbsent | Entry<?> |
361-
| Map<Identity,Entry<?>> | putIfAbsent | Identity |
362-
| Map<Identity,Entry<?>> | remove | Object |
363-
| Map<Identity,Entry<?>> | replace | Entry<?> |
364-
| Map<Identity,Entry<?>> | replace | Identity |
365-
| Map<Identity,Entry<?>> | replaceAll | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
292+
| Map<Identity,Object> | compute | BiFunction<? super Identity,? super Object,? extends Object> |
293+
| Map<Identity,Object> | compute | Identity |
294+
| Map<Identity,Object> | computeIfAbsent | Function<? super Identity,? extends Object> |
295+
| Map<Identity,Object> | computeIfAbsent | Identity |
296+
| Map<Identity,Object> | computeIfPresent | BiFunction<? super Identity,? super Object,? extends Object> |
297+
| Map<Identity,Object> | computeIfPresent | Identity |
298+
| Map<Identity,Object> | containsKey | Object |
299+
| Map<Identity,Object> | containsValue | Object |
300+
| Map<Identity,Object> | copyOf | Map<? extends K,? extends V> |
301+
| Map<Identity,Object> | entry | K |
302+
| Map<Identity,Object> | entry | V |
303+
| Map<Identity,Object> | equals | Object |
304+
| Map<Identity,Object> | forEach | BiConsumer<? super Identity,? super Object> |
305+
| Map<Identity,Object> | get | Object |
306+
| Map<Identity,Object> | getOrDefault | Object |
307+
| Map<Identity,Object> | merge | BiFunction<? super Object,? super Object,? extends Object> |
308+
| Map<Identity,Object> | merge | Identity |
309+
| Map<Identity,Object> | merge | Object |
310+
| Map<Identity,Object> | of | K |
311+
| Map<Identity,Object> | of | V |
312+
| Map<Identity,Object> | ofEntries | Entry<? extends K,? extends V>[] |
313+
| Map<Identity,Object> | put | Identity |
314+
| Map<Identity,Object> | put | Object |
315+
| Map<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
316+
| Map<Identity,Object> | putIfAbsent | Identity |
317+
| Map<Identity,Object> | putIfAbsent | Object |
318+
| Map<Identity,Object> | remove | Object |
319+
| Map<Identity,Object> | replace | Identity |
320+
| Map<Identity,Object> | replace | Object |
321+
| Map<Identity,Object> | replaceAll | BiFunction<? super Identity,? super Object,? extends Object> |
366322
| Map<K,V> | compute | BiFunction<? super K,? super V,? extends V> |
367323
| Map<K,V> | compute | K |
368324
| Map<K,V> | computeIfAbsent | Function<? super K,? extends V> |

‎java/ql/test-kotlin1/library-tests/reflection/reflection.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ compGenerated
289289
| file://<external>/LongProgression.class:0:0:0:0 | spliterator | Forwarder for a Kotlin class inheriting an interface default method |
290290
| file://<external>/LongRange.class:0:0:0:0 | forEach | Forwarder for a Kotlin class inheriting an interface default method |
291291
| file://<external>/LongRange.class:0:0:0:0 | spliterator | Forwarder for a Kotlin class inheriting an interface default method |
292+
| file://<external>/String.class:0:0:0:0 | getChars | Forwarder for a Kotlin class inheriting an interface default method |
292293
| file://<external>/String.class:0:0:0:0 | isEmpty | Forwarder for a Kotlin class inheriting an interface default method |
293294
| reflection.kt:7:49:7:54 | new Function2<Ccc,Integer,Double>(...) { ... } | The class around a local function, a lambda, or a function reference |
294295
| reflection.kt:10:38:10:42 | new KProperty1<C,Integer>(...) { ... } | The class around a local function, a lambda, or a function reference |

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

Lines changed: 37 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,6 @@ methodWithDuplicate
1616
| AbstractCollection<E> | removeAll | Collection<?> |
1717
| AbstractCollection<E> | retainAll | Collection<?> |
1818
| AbstractCollection<E> | toArray | T[] |
19-
| AbstractCollection<Entry<K,V>> | add | Entry<K,V> |
20-
| AbstractCollection<Entry<K,V>> | addAll | Collection<? extends Entry<K,V>> |
21-
| AbstractCollection<Entry<K,V>> | contains | Object |
22-
| AbstractCollection<Entry<K,V>> | containsAll | Collection<?> |
23-
| AbstractCollection<Entry<K,V>> | remove | Object |
24-
| AbstractCollection<Entry<K,V>> | removeAll | Collection<?> |
25-
| AbstractCollection<Entry<K,V>> | retainAll | Collection<?> |
26-
| AbstractCollection<Entry<K,V>> | toArray | T[] |
27-
| AbstractCollection<K> | add | K |
28-
| AbstractCollection<K> | addAll | Collection<? extends K> |
29-
| AbstractCollection<K> | contains | Object |
30-
| AbstractCollection<K> | containsAll | Collection<?> |
31-
| AbstractCollection<K> | remove | Object |
32-
| AbstractCollection<K> | removeAll | Collection<?> |
33-
| AbstractCollection<K> | retainAll | Collection<?> |
34-
| AbstractCollection<K> | toArray | T[] |
35-
| AbstractCollection<Runnable> | add | Runnable |
36-
| AbstractCollection<Runnable> | addAll | Collection<? extends Runnable> |
37-
| AbstractCollection<Runnable> | contains | Object |
38-
| AbstractCollection<Runnable> | containsAll | Collection<?> |
39-
| AbstractCollection<Runnable> | remove | Object |
40-
| AbstractCollection<Runnable> | removeAll | Collection<?> |
41-
| AbstractCollection<Runnable> | retainAll | Collection<?> |
42-
| AbstractCollection<Runnable> | toArray | T[] |
4319
| AbstractCollection<String> | add | String |
4420
| AbstractCollection<String> | addAll | Collection<? extends String> |
4521
| AbstractCollection<String> | contains | Object |
@@ -56,14 +32,6 @@ methodWithDuplicate
5632
| AbstractCollection<T> | removeAll | Collection<?> |
5733
| AbstractCollection<T> | retainAll | Collection<?> |
5834
| AbstractCollection<T> | toArray | T[] |
59-
| AbstractCollection<V> | add | V |
60-
| AbstractCollection<V> | addAll | Collection<? extends V> |
61-
| AbstractCollection<V> | contains | Object |
62-
| AbstractCollection<V> | containsAll | Collection<?> |
63-
| AbstractCollection<V> | remove | Object |
64-
| AbstractCollection<V> | removeAll | Collection<?> |
65-
| AbstractCollection<V> | retainAll | Collection<?> |
66-
| AbstractCollection<V> | toArray | T[] |
6735
| AbstractList | add | E |
6836
| AbstractList | add | int |
6937
| AbstractList | addAll | Collection<? extends E> |
@@ -103,14 +71,14 @@ methodWithDuplicate
10371
| AbstractMap | put | V |
10472
| AbstractMap | putAll | Map<? extends K,? extends V> |
10573
| AbstractMap | remove | Object |
106-
| AbstractMap<Identity,Entry<?>> | containsKey | Object |
107-
| AbstractMap<Identity,Entry<?>> | containsValue | Object |
108-
| AbstractMap<Identity,Entry<?>> | equals | Object |
109-
| AbstractMap<Identity,Entry<?>> | get | Object |
110-
| AbstractMap<Identity,Entry<?>> | put | Entry<?> |
111-
| AbstractMap<Identity,Entry<?>> | put | Identity |
112-
| AbstractMap<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
113-
| AbstractMap<Identity,Entry<?>> | remove | Object |
74+
| AbstractMap<Identity,Object> | containsKey | Object |
75+
| AbstractMap<Identity,Object> | containsValue | Object |
76+
| AbstractMap<Identity,Object> | equals | Object |
77+
| AbstractMap<Identity,Object> | get | Object |
78+
| AbstractMap<Identity,Object> | put | Identity |
79+
| AbstractMap<Identity,Object> | put | Object |
80+
| AbstractMap<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
81+
| AbstractMap<Identity,Object> | remove | Object |
11482
| AbstractMap<K,V> | containsKey | Object |
11583
| AbstractMap<K,V> | containsValue | Object |
11684
| AbstractMap<K,V> | equals | Object |
@@ -176,16 +144,6 @@ methodWithDuplicate
176144
| Collection<K> | retainAll | Collection<?> |
177145
| Collection<K> | toArray | IntFunction<T[]> |
178146
| Collection<K> | toArray | T[] |
179-
| Collection<Runnable> | add | Runnable |
180-
| Collection<Runnable> | addAll | Collection<? extends Runnable> |
181-
| Collection<Runnable> | contains | Object |
182-
| Collection<Runnable> | containsAll | Collection<?> |
183-
| Collection<Runnable> | remove | Object |
184-
| Collection<Runnable> | removeAll | Collection<?> |
185-
| Collection<Runnable> | removeIf | Predicate<? super Runnable> |
186-
| Collection<Runnable> | retainAll | Collection<?> |
187-
| Collection<Runnable> | toArray | IntFunction<T[]> |
188-
| Collection<Runnable> | toArray | T[] |
189147
| Collection<String> | add | String |
190148
| Collection<String> | addAll | Collection<? extends String> |
191149
| Collection<String> | contains | Object |
@@ -325,36 +283,35 @@ methodWithDuplicate
325283
| Map | replace | K |
326284
| Map | replace | V |
327285
| Map | replaceAll | BiFunction<? super K,? super V,? extends V> |
328-
| Map<Identity,Entry<?>> | compute | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
329-
| Map<Identity,Entry<?>> | compute | Identity |
330-
| Map<Identity,Entry<?>> | computeIfAbsent | Function<? super Identity,? extends Entry<?>> |
331-
| Map<Identity,Entry<?>> | computeIfAbsent | Identity |
332-
| Map<Identity,Entry<?>> | computeIfPresent | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
333-
| Map<Identity,Entry<?>> | computeIfPresent | Identity |
334-
| Map<Identity,Entry<?>> | containsKey | Object |
335-
| Map<Identity,Entry<?>> | containsValue | Object |
336-
| Map<Identity,Entry<?>> | copyOf | Map<? extends K,? extends V> |
337-
| Map<Identity,Entry<?>> | entry | K |
338-
| Map<Identity,Entry<?>> | entry | V |
339-
| Map<Identity,Entry<?>> | forEach | BiConsumer<? super Identity,? super Entry<?>> |
340-
| Map<Identity,Entry<?>> | get | Object |
341-
| Map<Identity,Entry<?>> | getOrDefault | Entry<?> |
342-
| Map<Identity,Entry<?>> | getOrDefault | Object |
343-
| Map<Identity,Entry<?>> | merge | BiFunction<? super Entry<?>,? super Entry<?>,? extends Entry<?>> |
344-
| Map<Identity,Entry<?>> | merge | Entry<?> |
345-
| Map<Identity,Entry<?>> | merge | Identity |
346-
| Map<Identity,Entry<?>> | of | K |
347-
| Map<Identity,Entry<?>> | of | V |
348-
| Map<Identity,Entry<?>> | ofEntries | Entry<? extends K,? extends V>[] |
349-
| Map<Identity,Entry<?>> | put | Entry<?> |
350-
| Map<Identity,Entry<?>> | put | Identity |
351-
| Map<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
352-
| Map<Identity,Entry<?>> | putIfAbsent | Entry<?> |
353-
| Map<Identity,Entry<?>> | putIfAbsent | Identity |
354-
| Map<Identity,Entry<?>> | remove | Object |
355-
| Map<Identity,Entry<?>> | replace | Entry<?> |
356-
| Map<Identity,Entry<?>> | replace | Identity |
357-
| Map<Identity,Entry<?>> | replaceAll | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
286+
| Map<Identity,Object> | compute | BiFunction<? super Identity,? super Object,? extends Object> |
287+
| Map<Identity,Object> | compute | Identity |
288+
| Map<Identity,Object> | computeIfAbsent | Function<? super Identity,? extends Object> |
289+
| Map<Identity,Object> | computeIfAbsent | Identity |
290+
| Map<Identity,Object> | computeIfPresent | BiFunction<? super Identity,? super Object,? extends Object> |
291+
| Map<Identity,Object> | computeIfPresent | Identity |
292+
| Map<Identity,Object> | containsKey | Object |
293+
| Map<Identity,Object> | containsValue | Object |
294+
| Map<Identity,Object> | copyOf | Map<? extends K,? extends V> |
295+
| Map<Identity,Object> | entry | K |
296+
| Map<Identity,Object> | entry | V |
297+
| Map<Identity,Object> | forEach | BiConsumer<? super Identity,? super Object> |
298+
| Map<Identity,Object> | get | Object |
299+
| Map<Identity,Object> | getOrDefault | Object |
300+
| Map<Identity,Object> | merge | BiFunction<? super Object,? super Object,? extends Object> |
301+
| Map<Identity,Object> | merge | Identity |
302+
| Map<Identity,Object> | merge | Object |
303+
| Map<Identity,Object> | of | K |
304+
| Map<Identity,Object> | of | V |
305+
| Map<Identity,Object> | ofEntries | Entry<? extends K,? extends V>[] |
306+
| Map<Identity,Object> | put | Identity |
307+
| Map<Identity,Object> | put | Object |
308+
| Map<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
309+
| Map<Identity,Object> | putIfAbsent | Identity |
310+
| Map<Identity,Object> | putIfAbsent | Object |
311+
| Map<Identity,Object> | remove | Object |
312+
| Map<Identity,Object> | replace | Identity |
313+
| Map<Identity,Object> | replace | Object |
314+
| Map<Identity,Object> | replaceAll | BiFunction<? super Identity,? super Object,? extends Object> |
358315
| Map<K,V> | compute | BiFunction<? super K,? super V,? extends V> |
359316
| Map<K,V> | compute | K |
360317
| Map<K,V> | computeIfAbsent | Function<? super K,? extends V> |

‎java/ql/test-kotlin2/library-tests/reflection/reflection.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ compGenerated
329329
| file://<external>/SignStyle.class:0:0:0:0 | getEntries | Default property accessor |
330330
| file://<external>/StackWalker$ExtendedOption.class:0:0:0:0 | getEntries | Default property accessor |
331331
| file://<external>/StackWalker$Option.class:0:0:0:0 | getEntries | Default property accessor |
332+
| file://<external>/String.class:0:0:0:0 | getChars | Forwarder for a Kotlin class inheriting an interface default method |
332333
| file://<external>/String.class:0:0:0:0 | isEmpty | Forwarder for a Kotlin class inheriting an interface default method |
333334
| file://<external>/TextStyle.class:0:0:0:0 | getEntries | Default property accessor |
334335
| file://<external>/Thread$State.class:0:0:0:0 | getEntries | Default property accessor |

0 commit comments

Comments
 (0)