Skip to content

Commit 39f92e9

Browse files
IdrissRioIdrissRio
authored
Merge pull request #21494 from github/idrissrio/java/jdk26
Java: Accept new test results after JDK 26 extractor upgrade
2 parents e259ebe + 6f199b9 commit 39f92e9

File tree

13 files changed

+43
-10
lines changed

13 files changed

+43
-10
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ methodWithDuplicate
196196
| List | listIterator | int |
197197
| List | of | E |
198198
| List | of | E[] |
199+
| List | ofLazy | IntFunction<? extends E> |
200+
| List | ofLazy | int |
199201
| List | remove | Object |
200202
| List | remove | int |
201203
| List | removeAll | Collection<?> |
@@ -222,6 +224,8 @@ methodWithDuplicate
222224
| List<E> | listIterator | int |
223225
| List<E> | of | E |
224226
| List<E> | of | E[] |
227+
| List<E> | ofLazy | IntFunction<? extends E> |
228+
| List<E> | ofLazy | int |
225229
| List<E> | remove | Object |
226230
| List<E> | remove | int |
227231
| List<E> | removeAll | Collection<?> |
@@ -248,6 +252,8 @@ methodWithDuplicate
248252
| List<String> | listIterator | int |
249253
| List<String> | of | E |
250254
| List<String> | of | E[] |
255+
| List<String> | ofLazy | IntFunction<? extends E> |
256+
| List<String> | ofLazy | int |
251257
| List<String> | remove | Object |
252258
| List<String> | remove | int |
253259
| List<String> | removeAll | Collection<?> |
@@ -280,6 +286,8 @@ methodWithDuplicate
280286
| Map | of | K |
281287
| Map | of | V |
282288
| Map | ofEntries | Entry<? extends K,? extends V>[] |
289+
| Map | ofLazy | Function<? super K,? extends V> |
290+
| Map | ofLazy | Set<? extends K> |
283291
| Map | put | K |
284292
| Map | put | V |
285293
| Map | putAll | Map<? extends K,? extends V> |
@@ -310,6 +318,8 @@ methodWithDuplicate
310318
| Map<Identity,Object> | of | K |
311319
| Map<Identity,Object> | of | V |
312320
| Map<Identity,Object> | ofEntries | Entry<? extends K,? extends V>[] |
321+
| Map<Identity,Object> | ofLazy | Function<? super K,? extends V> |
322+
| Map<Identity,Object> | ofLazy | Set<? extends K> |
313323
| Map<Identity,Object> | put | Identity |
314324
| Map<Identity,Object> | put | Object |
315325
| Map<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
@@ -341,6 +351,8 @@ methodWithDuplicate
341351
| Map<K,V> | of | K |
342352
| Map<K,V> | of | V |
343353
| Map<K,V> | ofEntries | Entry<? extends K,? extends V>[] |
354+
| Map<K,V> | ofLazy | Function<? super K,? extends V> |
355+
| Map<K,V> | ofLazy | Set<? extends K> |
344356
| Map<K,V> | put | K |
345357
| Map<K,V> | put | V |
346358
| Map<K,V> | putAll | Map<? extends K,? extends V> |
@@ -370,6 +382,8 @@ methodWithDuplicate
370382
| Map<Object,Object> | of | K |
371383
| Map<Object,Object> | of | V |
372384
| Map<Object,Object> | ofEntries | Entry<? extends K,? extends V>[] |
385+
| Map<Object,Object> | ofLazy | Function<? super K,? extends V> |
386+
| Map<Object,Object> | ofLazy | Set<? extends K> |
373387
| Map<Object,Object> | put | Object |
374388
| Map<Object,Object> | putAll | Map<? extends Object,? extends Object> |
375389
| Map<Object,Object> | putIfAbsent | Object |
@@ -397,6 +411,8 @@ methodWithDuplicate
397411
| Map<String,String> | of | K |
398412
| Map<String,String> | of | V |
399413
| Map<String,String> | ofEntries | Entry<? extends K,? extends V>[] |
414+
| Map<String,String> | ofLazy | Function<? super K,? extends V> |
415+
| Map<String,String> | ofLazy | Set<? extends K> |
400416
| Map<String,String> | put | String |
401417
| Map<String,String> | putAll | Map<? extends String,? extends String> |
402418
| Map<String,String> | putIfAbsent | String |

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,8 @@ methodWithDuplicate
191191
| List | listIterator | int |
192192
| List | of | E |
193193
| List | of | E[] |
194+
| List | ofLazy | IntFunction<? extends E> |
195+
| List | ofLazy | int |
194196
| List | remove | Object |
195197
| List | remove | int |
196198
| List | removeAll | Collection<?> |
@@ -216,6 +218,8 @@ methodWithDuplicate
216218
| List<E> | listIterator | int |
217219
| List<E> | of | E |
218220
| List<E> | of | E[] |
221+
| List<E> | ofLazy | IntFunction<? extends E> |
222+
| List<E> | ofLazy | int |
219223
| List<E> | remove | Object |
220224
| List<E> | remove | int |
221225
| List<E> | removeAll | Collection<?> |
@@ -242,6 +246,8 @@ methodWithDuplicate
242246
| List<String> | listIterator | int |
243247
| List<String> | of | E |
244248
| List<String> | of | E[] |
249+
| List<String> | ofLazy | IntFunction<? extends E> |
250+
| List<String> | ofLazy | int |
245251
| List<String> | remove | Object |
246252
| List<String> | remove | int |
247253
| List<String> | removeAll | Collection<?> |
@@ -274,6 +280,8 @@ methodWithDuplicate
274280
| Map | of | K |
275281
| Map | of | V |
276282
| Map | ofEntries | Entry<? extends K,? extends V>[] |
283+
| Map | ofLazy | Function<? super K,? extends V> |
284+
| Map | ofLazy | Set<? extends K> |
277285
| Map | put | K |
278286
| Map | put | V |
279287
| Map | putAll | Map<? extends K,? extends V> |
@@ -303,6 +311,8 @@ methodWithDuplicate
303311
| Map<Identity,Object> | of | K |
304312
| Map<Identity,Object> | of | V |
305313
| Map<Identity,Object> | ofEntries | Entry<? extends K,? extends V>[] |
314+
| Map<Identity,Object> | ofLazy | Function<? super K,? extends V> |
315+
| Map<Identity,Object> | ofLazy | Set<? extends K> |
306316
| Map<Identity,Object> | put | Identity |
307317
| Map<Identity,Object> | put | Object |
308318
| Map<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
@@ -333,6 +343,8 @@ methodWithDuplicate
333343
| Map<K,V> | of | K |
334344
| Map<K,V> | of | V |
335345
| Map<K,V> | ofEntries | Entry<? extends K,? extends V>[] |
346+
| Map<K,V> | ofLazy | Function<? super K,? extends V> |
347+
| Map<K,V> | ofLazy | Set<? extends K> |
336348
| Map<K,V> | put | K |
337349
| Map<K,V> | put | V |
338350
| Map<K,V> | putAll | Map<? extends K,? extends V> |
@@ -361,6 +373,8 @@ methodWithDuplicate
361373
| Map<Object,Object> | of | K |
362374
| Map<Object,Object> | of | V |
363375
| Map<Object,Object> | ofEntries | Entry<? extends K,? extends V>[] |
376+
| Map<Object,Object> | ofLazy | Function<? super K,? extends V> |
377+
| Map<Object,Object> | ofLazy | Set<? extends K> |
364378
| Map<Object,Object> | put | Object |
365379
| Map<Object,Object> | putAll | Map<? extends Object,? extends Object> |
366380
| Map<Object,Object> | putIfAbsent | Object |
@@ -388,6 +402,8 @@ methodWithDuplicate
388402
| Map<String,String> | of | K |
389403
| Map<String,String> | of | V |
390404
| Map<String,String> | ofEntries | Entry<? extends K,? extends V>[] |
405+
| Map<String,String> | ofLazy | Function<? super K,? extends V> |
406+
| Map<String,String> | ofLazy | Set<? extends K> |
391407
| Map<String,String> | put | String |
392408
| Map<String,String> | putAll | Map<? extends String,? extends String> |
393409
| Map<String,String> | putIfAbsent | String |

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ compGenerated
266266
| file://<external>/AccessFlag$Location.class:0:0:0:0 | getEntries | Default property accessor |
267267
| file://<external>/AccessFlag.class:0:0:0:0 | getEntries | Default property accessor |
268268
| file://<external>/AccessMode.class:0:0:0:0 | getEntries | Default property accessor |
269+
| file://<external>/ByteOrder.class:0:0:0:0 | getEntries | Default property accessor |
269270
| file://<external>/CharProgression.class:0:0:0:0 | forEach | Forwarder for a Kotlin class inheriting an interface default method |
270271
| file://<external>/CharProgression.class:0:0:0:0 | spliterator | Forwarder for a Kotlin class inheriting an interface default method |
271272
| file://<external>/CharRange.class:0:0:0:0 | forEach | Forwarder for a Kotlin class inheriting an interface default method |

‎java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
| Test.java:0:0:0:0 | Test | Test.java:1:1:1:1 | Test | Compact source file 'Test' contains implicit class 'Test' |
1+
| Test.java:0:0:0:0 | Test | Test.java:1:1:29:1 | Test | Compact source file 'Test' contains implicit class 'Test' |

‎java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| Test.java:1:1:1:1 | Test | implicit |
1+
| Test.java:1:1:29:1 | Test | implicit |
22
| Test.java:25:7:25:16 | NotCompact | not implicit |

‎java/ql/test/library-tests/compact-source-files/MethodInCompactSource.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Test.java:1:1:1:1 | <clinit> | in compact source |
2-
| Test.java:1:1:1:1 | <obinit> | in compact source |
1+
| Test.java:1:1:29:1 | <clinit> | in compact source |
2+
| Test.java:1:1:29:1 | <obinit> | in compact source |
33
| Test.java:5:6:5:9 | main | in compact source |
44
| Test.java:11:6:11:16 | processData | in compact source |
55
| Test.java:16:14:16:31 | updatePrivateField | in compact source |

‎java/ql/test/library-tests/compact-source-files/options‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
//semmle-extractor-options: --javac-args --release 25 --enable-preview
1+
//semmle-extractor-options: --javac-args --release 25

‎java/ql/test/library-tests/dataflow/kdf/options‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
//semmle-extractor-options: --javac-args --enable-preview --release 25
1+
//semmle-extractor-options: --javac-args --release 25

‎java/ql/test/library-tests/dataflow/scoped-values/options‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
//semmle-extractor-options: --javac-args -source 25 -target 25 --enable-preview
1+
//semmle-extractor-options: --javac-args -source 25 -target 25

‎java/ql/test/library-tests/errorexpr/Test.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@ public int yieldWrapper(int x) {
1313
}
1414

1515
// Diagnostic Matches: Erroneous node in tree: (ERROR)
16-
// Diagnostic Matches: In file Test.java:8:15 no end location for JCMethodInvocation : yield(x)
1716
// Diagnostic Matches: 1 errors during annotation processing
1817
// Diagnostic Matches: Unknown or erroneous type for expression of kind ErrorExpr

0 commit comments

Comments
 (0)