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

Skip to content

Commit de9648e

Browse files
smowtonigfoo
smowton
authored and
igfoo
committed
Accept test changes
- generics gains extra excluded generic "specialisations" (specifically raw types) - java_properties stops overwriting the Java extractor's output, which specifically flags isDefConstructor which kotlinc does not - types naturally gains a lot of new raw types
1 parent 239aab6 commit de9648e

5 files changed

Lines changed: 123 additions & 26 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
classLocations
2+
| main.A | A.class:0:0:0:0 | A.class:0:0:0:0 |
23
| main.A | A.java:3:14:3:14 | A.java:3:14:3:14 |
3-
| main.A | file:///!unknown-binary-location/main/A.class:0:0:0:0 | file:///!unknown-binary-location/main/A.class:0:0:0:0 |
44
| main.A<Integer> | A.class:0:0:0:0 | A.class:0:0:0:0 |
55
| main.A<Object> | file:///!unknown-binary-location/main/A.class:0:0:0:0 | file:///!unknown-binary-location/main/A.class:0:0:0:0 |
66
| main.A<String> | A.class:0:0:0:0 | A.class:0:0:0:0 |
@@ -14,7 +14,6 @@ classLocations
1414
callableLocations
1515
| A.fn | A.class:0:0:0:0 | A.class:0:0:0:0 |
1616
| A.fn | A.java:4:17:4:18 | A.java:4:17:4:18 |
17-
| A.fn | file:///!unknown-binary-location/main/A.class:0:0:0:0 | file:///!unknown-binary-location/main/A.class:0:0:0:0 |
1817
| A<Integer>.fn | A.class:0:0:0:0 | A.class:0:0:0:0 |
1918
| A<Object>.fn | file:///!unknown-binary-location/main/A.class:0:0:0:0 | file:///!unknown-binary-location/main/A.class:0:0:0:0 |
2019
| A<String>.fn | A.class:0:0:0:0 | A.class:0:0:0:0 |

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ generics.kt:
7676
# 11| 5: [BlockStmt] { ... }
7777
# 11| 0: [SuperConstructorInvocationStmt] super(...)
7878
# 11| 1: [BlockStmt] { ... }
79-
# 13| 3: [Class,GenericType,ParameterizedType] C1
79+
# 13| 4: [Class,GenericType,ParameterizedType] C1
8080
#-----| -2: (Generic Parameters)
8181
# 13| 0: [TypeVariable] T
8282
# 13| 1: [TypeVariable] W
@@ -113,7 +113,7 @@ generics.kt:
113113
# 16| 0: [TypeAccess] U
114114
# 16| 1: [TypeAccess] U
115115
# 16| 0: [VarAccess] u
116-
# 20| 4: [Class] C2
116+
# 20| 6: [Class] C2
117117
# 20| 1: [Constructor] C2
118118
# 20| 5: [BlockStmt] { ... }
119119
# 20| 0: [SuperConstructorInvocationStmt] super(...)
@@ -124,7 +124,7 @@ generics.kt:
124124
#-----| 4: (Parameters)
125125
# 21| 0: [Parameter] p
126126
# 21| 5: [BlockStmt] { ... }
127-
# 36| 5: [Class,GenericType,ParameterizedType] BoundedTest
127+
# 36| 7: [Class,GenericType,ParameterizedType] BoundedTest
128128
#-----| -2: (Generic Parameters)
129129
# 36| 0: [TypeVariable] T
130130
# 36| 1: [TypeVariable] S
@@ -137,7 +137,7 @@ generics.kt:
137137
# 38| 0: [Parameter] s
138138
# 38| 1: [Parameter] t
139139
# 38| 5: [BlockStmt] { ... }
140-
# 42| 6: [Class,GenericType,ParameterizedType] Outer
140+
# 42| 8: [Class,GenericType,ParameterizedType] Outer
141141
#-----| -2: (Generic Parameters)
142142
# 42| 0: [TypeVariable] T1
143143
# 42| 1: [TypeVariable] T2
@@ -187,7 +187,7 @@ generics.kt:
187187
# 51| -3: [TypeAccess] Nested1<Integer,String>
188188
# 51| 0: [TypeAccess] Integer
189189
# 51| 1: [TypeAccess] String
190-
# 56| 7: [Class,GenericType,ParameterizedType] Class1
190+
# 56| 9: [Class,GenericType,ParameterizedType] Class1
191191
#-----| -2: (Generic Parameters)
192192
# 56| 0: [TypeVariable] T1
193193
# 56| 1: [Constructor] Class1

‎java/ql/test/kotlin/library-tests/java_properties/PrintAst.expected‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Prop.java:
22
# 0| [CompilationUnit] Prop
33
# 2| 1: [Class] Prop
4-
# 2| 1: [Constructor] Prop
54
# 4| 2: [Method] getFoo
65
# 4| 3: [TypeAccess] String
76
# 4| 5: [BlockStmt] { ... }

‎java/ql/test/kotlin/library-tests/reflection/PrintAst.expected‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ reflection.kt:
957957
# 86| 5: [BlockStmt] { ... }
958958
# 86| 0: [SuperConstructorInvocationStmt] super(...)
959959
# 86| 1: [BlockStmt] { ... }
960-
# 89| 7: [Method] test
960+
# 89| 8: [Method] test
961961
# 89| 5: [BlockStmt] { ... }
962962
# 90| 0: [ExprStmt] <Expr>;
963963
# 90| 0: [MethodAccess] fn11(...)
@@ -998,7 +998,7 @@ reflection.kt:
998998
# 90| 1: [TypeAccess] Inner<String>
999999
# 90| 0: [TypeAccess] String
10001000
# 90| 0: [ThisAccess] this
1001-
# 105| 5: [Class] Base1
1001+
# 105| 6: [Class] Base1
10021002
# 105| 1: [Constructor] Base1
10031003
#-----| 4: (Parameters)
10041004
# 105| 0: [Parameter] prop1
@@ -1025,7 +1025,7 @@ reflection.kt:
10251025
# 105| 2: [FieldDeclaration] int prop1;
10261026
# 105| -1: [TypeAccess] int
10271027
# 105| 0: [VarAccess] prop1
1028-
# 107| 6: [Class] Derived1
1028+
# 107| 7: [Class] Derived1
10291029
# 107| 1: [Constructor] Derived1
10301030
#-----| 4: (Parameters)
10311031
# 107| 0: [Parameter] prop1
@@ -1075,7 +1075,7 @@ reflection.kt:
10751075
# 109| -3: [TypeAccess] KMutableProperty0<Integer>
10761076
# 109| 0: [TypeAccess] Integer
10771077
# 109| 0: [ThisAccess] this
1078-
# 113| 7: [Class] LocalFn
1078+
# 113| 8: [Class] LocalFn
10791079
# 113| 1: [Constructor] LocalFn
10801080
# 113| 5: [BlockStmt] { ... }
10811081
# 113| 0: [SuperConstructorInvocationStmt] super(...)

0 commit comments

Comments
 (0)