Skip to content

Commit 3c5b9ce

Browse files
committed
Kotlin: Make the enum test more precise
In Kotlin 2 mode, there are more library classes matching Enum%, so the output was spuriously different.
1 parent 6400492 commit 3c5b9ce

File tree

2 files changed

+17
-35
lines changed

2 files changed

+17
-35
lines changed

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

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,16 @@
11
#select
2-
| addAll |
3-
| addRange |
4-
| allOf |
5-
| asIterator |
6-
| clone |
7-
| compareTo |
8-
| complement |
9-
| complementOf |
10-
| copyOf |
11-
| describeConstable |
12-
| equals |
13-
| finalize |
14-
| forEach |
15-
| getDeclaringClass |
16-
| hasMoreElements |
17-
| hashCode |
18-
| name |
19-
| nextElement |
20-
| noneOf |
21-
| of |
22-
| ordinal |
23-
| parallelStream |
24-
| range |
25-
| resolveConstantDesc |
26-
| spliterator |
27-
| stream |
28-
| toArray |
29-
| toString |
30-
| typeCheck |
31-
| usesEnum |
32-
| valueOf |
33-
| writeReplace |
2+
| Enum<E> | clone |
3+
| Enum<E> | compareTo |
4+
| Enum<E> | describeConstable |
5+
| Enum<E> | equals |
6+
| Enum<E> | finalize |
7+
| Enum<E> | getDeclaringClass |
8+
| Enum<E> | hashCode |
9+
| Enum<E> | name |
10+
| Enum<E> | ordinal |
11+
| Enum<E> | toString |
12+
| Enum<E> | valueOf |
13+
| EnumUserKt | usesEnum |
3414
enumConstants
3515
| enumUser.kt:3:16:3:17 | A |
3616
| enumUser.kt:3:19:3:20 | B |
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import java
22

3-
from Method m
4-
where m.getDeclaringType().getName().matches("Enum%")
5-
select m.getName()
3+
from Method m, Type t
4+
where
5+
t = m.getDeclaringType() and
6+
t.getName() = ["Enum<E>", "EnumUserKt"]
7+
select t.getName(), m.getName()
68

79
query predicate enumConstants(EnumConstant ec) { ec.fromSource() }

0 commit comments

Comments
 (0)