Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 45cade8

Browse files
igfooigfoo
committed
Kotlin: Accept/update tests
1 parent 1bce9a1 commit 45cade8

6 files changed

Lines changed: 47 additions & 30 deletions

File tree

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
| classes.kt:2:1:2:18 | ClassOne |
2-
| classes.kt:4:1:6:1 | ClassTwo |
3-
| classes.kt:8:1:10:1 | ClassThree |
4-
| classes.kt:12:1:15:1 | ClassFour |
5-
| classes.kt:17:1:18:1 | ClassFive |
6-
| classes.kt:28:1:30:1 | ClassSix |
7-
| classes.kt:34:1:47:1 | ClassSeven |
8-
| file://:0:0:0:0 | Any |
9-
| file://:0:0:0:0 | ClassesKt |
10-
| file://:0:0:0:0 | Unit |
1+
| classes.kt:2:1:2:18 | ClassOne | ClassOne |
2+
| classes.kt:4:1:6:1 | ClassTwo | ClassTwo |
3+
| classes.kt:8:1:10:1 | ClassThree | ClassThree |
4+
| classes.kt:12:1:15:1 | ClassFour | ClassFour |
5+
| classes.kt:17:1:18:1 | ClassFive | ClassFive |
6+
| classes.kt:28:1:30:1 | ClassSix | ClassSix |
7+
| classes.kt:34:1:47:1 | ClassSeven | ClassSeven |
8+
| file://:0:0:0:0 | Any | kotlin.Any |
9+
| file://:0:0:0:0 | Boolean | kotlin.Boolean |
10+
| file://:0:0:0:0 | ClassesKt | ClassesKt |
11+
| file://:0:0:0:0 | Int | kotlin.Int |
12+
| file://:0:0:0:0 | String | java.lang.String |
13+
| file://:0:0:0:0 | String | kotlin.String |
14+
| file://:0:0:0:0 | Unit | kotlin.Unit |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import java
22

33
from Class c
4-
select c
4+
select c, c.getQualifiedName()
55

‎java/ql/test/kotlin/library-tests/generics/generics.expected‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ genericType
44
| generics.kt:13:1:18:1 | C1 | generics.kt:13:13:13:13 | W | 1 |
55
parameterizedType
66
| generics.kt:11:1:11:19 | C0 | generics.kt:11:1:11:19 | C0 | 0 | file://:0:0:0:0 | * |
7-
| generics.kt:11:1:11:19 | C0 | generics.kt:11:1:11:19 | C0 | 0 | file://:0:0:0:0 | Int |
7+
| generics.kt:11:1:11:19 | C0 | generics.kt:11:1:11:19 | C0 | 0 | file://:0:0:0:0 | Integer |
88
| generics.kt:11:1:11:19 | C0 | generics.kt:11:1:11:19 | C0 | 0 | generics.kt:7:6:7:6 | S |
99
| generics.kt:11:1:11:19 | C0 | generics.kt:11:1:11:19 | C0 | 0 | generics.kt:11:15:11:15 | V |
1010
| generics.kt:11:1:11:19 | C0 | generics.kt:11:1:11:19 | C0 | 0 | generics.kt:13:13:13:13 | W |
11-
| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 0 | file://:0:0:0:0 | Int |
11+
| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 0 | file://:0:0:0:0 | Integer |
1212
| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 0 | file://:0:0:0:0 | String |
1313
| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 0 | file://:0:0:0:0 | String |
1414
| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 0 | generics.kt:13:10:13:10 | T |
1515
| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 0 | generics.kt:15:10:15:10 | U |
16-
| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 1 | file://:0:0:0:0 | Int |
17-
| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 1 | file://:0:0:0:0 | Int |
16+
| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 1 | file://:0:0:0:0 | Integer |
17+
| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 1 | file://:0:0:0:0 | Integer |
1818
| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 1 | file://:0:0:0:0 | String |
1919
| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 1 | generics.kt:13:13:13:13 | W |
2020
| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 1 | generics.kt:15:10:15:10 | U |
@@ -25,13 +25,13 @@ genericFunction
2525
| generics.kt:21:5:21:23 | f4 | generics.kt:21:10:21:10 | P | 0 |
2626
genericCall
2727
| generics.kt:27:17:27:22 | f2(...) | generics.kt:15:10:15:10 | U | file://:0:0:0:0 | String |
28-
| generics.kt:30:17:30:21 | f2(...) | generics.kt:15:10:15:10 | U | file://:0:0:0:0 | Int |
29-
| generics.kt:32:8:32:12 | f4(...) | generics.kt:21:10:21:10 | P | file://:0:0:0:0 | Int |
28+
| generics.kt:30:17:30:21 | f2(...) | generics.kt:15:10:15:10 | U | file://:0:0:0:0 | Integer |
29+
| generics.kt:32:8:32:12 | f4(...) | generics.kt:21:10:21:10 | P | file://:0:0:0:0 | Integer |
3030
genericCtor
3131
| generics.kt:16:16:16:26 | new C1(...) | 0 | generics.kt:15:10:15:10 | U |
3232
| generics.kt:16:16:16:26 | new C1(...) | 1 | generics.kt:15:10:15:10 | U |
33-
| generics.kt:25:14:25:28 | new C1(...) | 0 | file://:0:0:0:0 | Int |
34-
| generics.kt:25:14:25:28 | new C1(...) | 1 | file://:0:0:0:0 | Int |
33+
| generics.kt:25:14:25:28 | new C1(...) | 0 | file://:0:0:0:0 | Integer |
34+
| generics.kt:25:14:25:28 | new C1(...) | 1 | file://:0:0:0:0 | Integer |
3535
| generics.kt:28:14:28:32 | new C1(...) | 0 | file://:0:0:0:0 | String |
36-
| generics.kt:28:14:28:32 | new C1(...) | 1 | file://:0:0:0:0 | Int |
37-
| generics.kt:33:21:33:29 | new C0(...) | 0 | file://:0:0:0:0 | Int |
36+
| generics.kt:28:14:28:32 | new C1(...) | 1 | file://:0:0:0:0 | Integer |
37+
| generics.kt:33:21:33:29 | new C0(...) | 0 | file://:0:0:0:0 | Integer |

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
| file1.kt:2:1:2:16 | Class1 |
2-
| file2.kt:2:1:2:16 | Class2 |
3-
| file3.kt:3:1:3:16 | Class3 |
4-
| file://:0:0:0:0 | Any |
5-
| file://:0:0:0:0 | MyJvmName |
6-
| file://:0:0:0:0 | Unit |
1+
| file1.kt:2:1:2:16 | Class1 | Class1 |
2+
| file2.kt:2:1:2:16 | Class2 | Class2 |
3+
| file3.kt:3:1:3:16 | Class3 | Class3 |
4+
| file://:0:0:0:0 | Any | kotlin.Any |
5+
| file://:0:0:0:0 | Boolean | kotlin.Boolean |
6+
| file://:0:0:0:0 | Int | kotlin.Int |
7+
| file://:0:0:0:0 | MyJvmName | MyJvmName |
8+
| file://:0:0:0:0 | String | java.lang.String |
9+
| file://:0:0:0:0 | String | kotlin.String |
10+
| file://:0:0:0:0 | Unit | kotlin.Unit |

‎java/ql/test/kotlin/library-tests/multiple_files/classes.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import java
22

33
from Class c
4-
select c
4+
select c, c.getQualifiedName()
55

‎java/ql/test/kotlin/library-tests/types/types.expected‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1-
| file://:0:0:0:0 | <nulltype> | NullType |
21
| file://:0:0:0:0 | Any | Class |
2+
| file://:0:0:0:0 | Boolean | Class |
3+
| file://:0:0:0:0 | Byte | Class |
4+
| file://:0:0:0:0 | Char | Class |
5+
| file://:0:0:0:0 | Double | Class |
6+
| file://:0:0:0:0 | Float | Class |
7+
| file://:0:0:0:0 | Int | Class |
8+
| file://:0:0:0:0 | Long | Class |
9+
| file://:0:0:0:0 | Nothing | Class |
10+
| file://:0:0:0:0 | Short | Class |
11+
| file://:0:0:0:0 | String | Class |
12+
| file://:0:0:0:0 | String | Class |
313
| file://:0:0:0:0 | Unit | Class |
414
| file://:0:0:0:0 | boolean | PrimitiveType |
515
| file://:0:0:0:0 | byte | PrimitiveType |
@@ -9,5 +19,4 @@
919
| file://:0:0:0:0 | int | PrimitiveType |
1020
| file://:0:0:0:0 | long | PrimitiveType |
1121
| file://:0:0:0:0 | short | PrimitiveType |
12-
| file://:0:0:0:0 | string | ??? |
1322
| types.kt:2:1:37:1 | Foo | Class |

0 commit comments

Comments
 (0)