Skip to content

Commit 6c8105f

Browse files
authored
Merge pull request github#15568 from github/alexet/kotlin-jdk-change
Kotlin: Compile tests using the same jdk as the java tests.
2 parents e620bfa + d892a04 commit 6c8105f

File tree

4 files changed

+30
-1
lines changed

4 files changed

+30
-1
lines changed

java/ql/test-kotlin1/library-tests/compilation-units/cus.expected

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
| ArrayList$ArrayListSpliterator | .../ArrayList$ArrayListSpliterator.class:0:0:0:0 |
55
| List | .../List.class:0:0:0:0 |
66
| ListIterator | .../ListIterator.class:0:0:0:0 |
7+
| MemorySessionImpl$ResourceList | .../MemorySessionImpl$ResourceList.class:0:0:0:0 |
8+
| MemorySessionImpl$ResourceList$ResourceCleanup | .../MemorySessionImpl$ResourceList$ResourceCleanup.class:0:0:0:0 |
79
| MutableList | .../MutableList.class:0:0:0:0 |
810
| MutableListIterator | .../MutableListIterator.class:0:0:0:0 |
911
| test | .../test.kt:0:0:0:0 |

java/ql/test-kotlin1/library-tests/enum/test.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
| kotlin.Enum | Enum | compareTo |
3838
| kotlin.Enum | Enum | describeConstable |
3939
| kotlin.Enum | Enum | equals |
40-
| kotlin.Enum | Enum | finalize |
4140
| kotlin.Enum | Enum | getDeclaringClass |
4241
| kotlin.Enum | Enum | hashCode |
4342
| kotlin.Enum | Enum | name |

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ methodWithDuplicate
1616
| AbstractCollection<E> | removeAll | Collection<?> |
1717
| AbstractCollection<E> | retainAll | Collection<?> |
1818
| AbstractCollection<E> | toArray | T[] |
19+
| AbstractCollection<Runnable> | add | Runnable |
20+
| AbstractCollection<Runnable> | addAll | Collection<? extends Runnable> |
21+
| AbstractCollection<Runnable> | contains | Object |
22+
| AbstractCollection<Runnable> | containsAll | Collection<?> |
23+
| AbstractCollection<Runnable> | remove | Object |
24+
| AbstractCollection<Runnable> | removeAll | Collection<?> |
25+
| AbstractCollection<Runnable> | retainAll | Collection<?> |
26+
| AbstractCollection<Runnable> | toArray | T[] |
1927
| AbstractCollection<String> | add | String |
2028
| AbstractCollection<String> | addAll | Collection<? extends String> |
2129
| AbstractCollection<String> | contains | Object |
@@ -139,6 +147,17 @@ methodWithDuplicate
139147
| Collection<K> | retainAll | Collection<?> |
140148
| Collection<K> | toArray | IntFunction<T[]> |
141149
| Collection<K> | toArray | T[] |
150+
| Collection<Runnable> | add | Runnable |
151+
| Collection<Runnable> | addAll | Collection<? extends Runnable> |
152+
| Collection<Runnable> | contains | Object |
153+
| Collection<Runnable> | containsAll | Collection<?> |
154+
| Collection<Runnable> | equals | Object |
155+
| Collection<Runnable> | remove | Object |
156+
| Collection<Runnable> | removeAll | Collection<?> |
157+
| Collection<Runnable> | removeIf | Predicate<? super Runnable> |
158+
| Collection<Runnable> | retainAll | Collection<?> |
159+
| Collection<Runnable> | toArray | IntFunction<T[]> |
160+
| Collection<Runnable> | toArray | T[] |
142161
| Collection<String> | add | String |
143162
| Collection<String> | addAll | Collection<? extends String> |
144163
| Collection<String> | contains | Object |
@@ -191,6 +210,8 @@ methodWithDuplicate
191210
| List<E> | add | int |
192211
| List<E> | addAll | Collection<? extends E> |
193212
| List<E> | addAll | int |
213+
| List<E> | addFirst | E |
214+
| List<E> | addLast | E |
194215
| List<E> | contains | Object |
195216
| List<E> | containsAll | Collection<?> |
196217
| List<E> | copyOf | Collection<? extends E> |

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,15 @@ compGenerated
269269
| file://<external>/CharRange.class:0:0:0:0 | spliterator | Forwarder for a Kotlin class inheriting an interface default method |
270270
| file://<external>/Class2.class:0:0:0:0 | getValue | Default property accessor |
271271
| file://<external>/Class2.class:0:0:0:0 | getValue | Default property accessor |
272+
| file://<external>/EnumEntries.class:0:0:0:0 | addFirst | Forwarder for a Kotlin class inheriting an interface default method |
273+
| file://<external>/EnumEntries.class:0:0:0:0 | addLast | Forwarder for a Kotlin class inheriting an interface default method |
272274
| file://<external>/EnumEntries.class:0:0:0:0 | forEach | Forwarder for a Kotlin class inheriting an interface default method |
275+
| file://<external>/EnumEntries.class:0:0:0:0 | getFirst | Forwarder for a Kotlin class inheriting an interface default method |
276+
| file://<external>/EnumEntries.class:0:0:0:0 | getLast | Forwarder for a Kotlin class inheriting an interface default method |
273277
| file://<external>/EnumEntries.class:0:0:0:0 | parallelStream | Forwarder for a Kotlin class inheriting an interface default method |
278+
| file://<external>/EnumEntries.class:0:0:0:0 | removeFirst | Forwarder for a Kotlin class inheriting an interface default method |
279+
| file://<external>/EnumEntries.class:0:0:0:0 | removeLast | Forwarder for a Kotlin class inheriting an interface default method |
280+
| file://<external>/EnumEntries.class:0:0:0:0 | reversed | Forwarder for a Kotlin class inheriting an interface default method |
274281
| file://<external>/EnumEntries.class:0:0:0:0 | spliterator | Forwarder for a Kotlin class inheriting an interface default method |
275282
| file://<external>/EnumEntries.class:0:0:0:0 | stream | Forwarder for a Kotlin class inheriting an interface default method |
276283
| file://<external>/EnumEntries.class:0:0:0:0 | toArray | Forwarder for a Kotlin class inheriting an interface default method |

0 commit comments

Comments
 (0)