Kotlin: Update methods test

Author: igfoo

java/ql/test/kotlin/library-tests/methods/dataClass.kt

@@ -1 +1 @@
-data class DataClass(val x: Int, val y: String)
+data class DataClass(val x: Int, var y: String)

java/ql/test/kotlin/library-tests/methods/exprs.expected

@@ -89,13 +89,19 @@
 | dataClass.kt:1:22:1:31 | this.x | VarAccess |
 | dataClass.kt:1:22:1:31 | x | VarAccess |
 | dataClass.kt:1:22:1:31 | x | VarAccess |
+| dataClass.kt:1:34:1:46 | ...=... | AssignExpr |
 | dataClass.kt:1:34:1:46 | ...=... | KtInitializerAssignExpr |
+| dataClass.kt:1:34:1:46 | <set-?> | VarAccess |
 | dataClass.kt:1:34:1:46 | String | TypeAccess |
 | dataClass.kt:1:34:1:46 | String | TypeAccess |
 | dataClass.kt:1:34:1:46 | String | TypeAccess |
 | dataClass.kt:1:34:1:46 | String | TypeAccess |
+| dataClass.kt:1:34:1:46 | String | TypeAccess |
+| dataClass.kt:1:34:1:46 | Unit | TypeAccess |
+| dataClass.kt:1:34:1:46 | this | ThisAccess |
 | dataClass.kt:1:34:1:46 | this | ThisAccess |
 | dataClass.kt:1:34:1:46 | this.y | VarAccess |
+| dataClass.kt:1:34:1:46 | this.y | VarAccess |
 | dataClass.kt:1:34:1:46 | y | VarAccess |
 | dataClass.kt:1:34:1:46 | y | VarAccess |
 | methods2.kt:4:1:5:1 | Unit | TypeAccess |

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

@@ -1,15 +1,16 @@
 methods
 | clinit.kt:0:0:0:0 | ClinitKt | clinit.kt:0:0:0:0 | <clinit> | <clinit>() |  |  |
-| clinit.kt:0:0:0:0 | ClinitKt | clinit.kt:3:1:3:24 | getTopLevelInt | getTopLevelInt() | public, static |  |
-| clinit.kt:0:0:0:0 | ClinitKt | clinit.kt:3:1:3:24 | setTopLevelInt | setTopLevelInt(int) | public, static |  |
+| clinit.kt:0:0:0:0 | ClinitKt | clinit.kt:3:1:3:24 | getTopLevelInt | getTopLevelInt() | public, static | Compiler generated |
+| clinit.kt:0:0:0:0 | ClinitKt | clinit.kt:3:1:3:24 | setTopLevelInt | setTopLevelInt(int) | public, static | Compiler generated |
 | dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | component1 | component1() | public | Compiler generated |
 | dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | component2 | component2() | public | Compiler generated |
 | dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | copy | copy(int,java.lang.String) | public | Compiler generated |
 | dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | equals | equals(java.lang.Object) | override, public | Compiler generated |
 | dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | hashCode | hashCode() | override, public | Compiler generated |
 | dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | toString | toString() | override, public | Compiler generated |
-| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:22:1:31 | getX | getX() | public |  |
-| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:34:1:46 | getY | getY() | public |  |
+| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:22:1:31 | getX | getX() | public | Compiler generated |
+| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:34:1:46 | getY | getY() | public | Compiler generated |
+| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:34:1:46 | setY | setY(java.lang.String) | public | Compiler generated |
 | methods2.kt:0:0:0:0 | Methods2Kt | methods2.kt:4:1:5:1 | fooBarTopLevelMethod | fooBarTopLevelMethod(int,int) | public, static |  |
 | methods2.kt:7:1:10:1 | Class2 | methods2.kt:8:5:9:5 | fooBarClassMethod | fooBarClassMethod(int,int) | public |  |
 | methods3.kt:0:0:0:0 | Methods3Kt | methods3.kt:3:1:3:42 | fooBarTopLevelMethodExt | fooBarTopLevelMethodExt(int,int) | public, static |  |

java/ql/test/kotlin/library-tests/methods/methods.ql

@@ -1,11 +1,15 @@
 import java
 
-query predicate methods(RefType declType, Method m, string signature, string modifiers, string compilerGenerated) {
+query predicate methods(
+  RefType declType, Method m, string signature, string modifiers, string compilerGenerated
+) {
   m.fromSource() and
   declType = m.getDeclaringType() and
   signature = m.getSignature() and
   modifiers = concat(string s | m.hasModifier(s) | s, ", ") and
-  if m.isCompilerGenerated() then compilerGenerated = "Compiler generated" else compilerGenerated = ""
+  if m.isCompilerGenerated()
+  then compilerGenerated = "Compiler generated"
+  else compilerGenerated = ""
 }
 
 query predicate constructors(RefType declType, Constructor c, string signature) {

java/ql/test/kotlin/library-tests/methods/parameters.expected

@@ -2,6 +2,7 @@
 | dataClass.kt:0:0:0:0 | copy | dataClass.kt:1:22:1:31 | x | 0 |
 | dataClass.kt:0:0:0:0 | copy | dataClass.kt:1:34:1:46 | y | 1 |
 | dataClass.kt:0:0:0:0 | equals | dataClass.kt:0:0:0:0 | other | 0 |
+| dataClass.kt:1:34:1:46 | setY | dataClass.kt:1:34:1:46 | <set-?> | 0 |
 | methods2.kt:4:1:5:1 | fooBarTopLevelMethod | methods2.kt:4:26:4:31 | x | 0 |
 | methods2.kt:4:1:5:1 | fooBarTopLevelMethod | methods2.kt:4:34:4:39 | y | 1 |
 | methods2.kt:8:5:9:5 | fooBarClassMethod | methods2.kt:8:27:8:32 | x | 0 |