Kotlin: Add test case for top level local class extraction

tamasvajk · tamasvajk · commit b4eb4ec837d1 · 2022-09-23T11:19:09.000+02:00
diff --git a/java/ql/test/kotlin/library-tests/classes/CONSISTENCY/toString.expected b/java/ql/test/kotlin/library-tests/classes/CONSISTENCY/toString.expected
@@ -0,0 +1 @@
+| Top which doesn't have exactly 1 toString |
diff --git a/java/ql/test/kotlin/library-tests/classes/PrintAst.expected b/java/ql/test/kotlin/library-tests/classes/PrintAst.expected
@@ -7,6 +7,18 @@ classes.kt:
 #   32|         0: [Parameter] s
 #   32|           0: [TypeAccess] String
 #   32|       5: [BlockStmt] { ... }
+#  158|     2: [Method] fn1
+#  158|       3: [TypeAccess] Unit
+#  158|       5: [BlockStmt] { ... }
+#  162|     3: [Method] fn2
+#  162|       3: [TypeAccess] Object
+#  162|       5: [BlockStmt] { ... }
+#  162|         0: [ReturnStmt] return ...
+#  162|           0: [StmtExpr] <Stmt>
+#  162|             0: [BlockStmt] { ... }
+#  162|               1: [ExprStmt] <Expr>;
+#  162|                 0: [ClassInstanceExpr] new (...)
+#  162|                   -3: [TypeAccess] Object
 #    2|   2: [Class] ClassOne
 #    2|     1: [Constructor] ClassOne
 #    2|       5: [BlockStmt] { ... }
@@ -558,6 +570,16 @@ classes.kt:
 #  153|               0: [ClassInstanceExpr] new Cl01(...)
 #  153|                 -3: [TypeAccess] Cl01
 #  153|                   0: [TypeAccess] U1
+#  159|   27: [Class] X
+#  159|     1: [Constructor] X
+#  159|       5: [BlockStmt] { ... }
+#  159|         0: [SuperConstructorInvocationStmt] super(...)
+#  159|         1: [BlockStmt] { ... }
+#  162|   28: [Class] 
+#  162|     1: [Constructor] 
+#  162|       5: [BlockStmt] { ... }
+#  162|         0: [SuperConstructorInvocationStmt] super(...)
+#  162|         1: [BlockStmt] { ... }
 generic_anonymous.kt:
 #    0| [CompilationUnit] generic_anonymous
 #    0|   1: [Class] Generic_anonymousKt
diff --git a/java/ql/test/kotlin/library-tests/classes/classes.expected b/java/ql/test/kotlin/library-tests/classes/classes.expected
@@ -39,6 +39,8 @@
 | classes.kt:141:13:145:13 | Cl1 | Cl0$Cl1 | final, private |
 | classes.kt:150:1:156:1 | Cl00 | Cl00 | final, public |
 | classes.kt:151:5:155:5 | Cl01 | Cl00$Cl01 | final, public |
+| classes.kt:159:5:159:14 | X | X | final, private |
+| classes.kt:162:13:162:22 |  |  | final, private |
 | generic_anonymous.kt:0:0:0:0 | Generic_anonymousKt | Generic_anonymousKt | final, public |
 | generic_anonymous.kt:1:1:9:1 | Generic | Generic | final, private |
 | generic_anonymous.kt:3:19:5:3 | new Object(...) { ... } | <anonymous class> | final, private |
diff --git a/java/ql/test/kotlin/library-tests/classes/classes.kt b/java/ql/test/kotlin/library-tests/classes/classes.kt
@@ -153,4 +153,10 @@ class Cl00<U0> {
             val x = Cl01<U1>()
         }
     }
-}
+}
+
+fun fn1() {
+    class X {}
+}
+
+fun fn2() = object { }
diff --git a/java/ql/test/kotlin/library-tests/classes/ctorCalls.expected b/java/ql/test/kotlin/library-tests/classes/ctorCalls.expected
@@ -39,6 +39,8 @@ superCall
 | classes.kt:141:13:145:13 | super(...) |
 | classes.kt:150:1:156:1 | super(...) |
 | classes.kt:151:5:155:5 | super(...) |
+| classes.kt:159:5:159:14 | super(...) |
+| classes.kt:162:13:162:22 | super(...) |
 | generic_anonymous.kt:1:1:9:1 | super(...) |
 | generic_anonymous.kt:3:19:5:3 | super(...) |
 | generic_anonymous.kt:15:1:33:1 | super(...) |
diff --git a/java/ql/test/kotlin/library-tests/classes/superTypes.expected b/java/ql/test/kotlin/library-tests/classes/superTypes.expected
@@ -44,6 +44,8 @@
 | classes.kt:141:13:145:13 | Cl1 | file://<external>/Object.class:0:0:0:0 | Object |
 | classes.kt:150:1:156:1 | Cl00 | file://<external>/Object.class:0:0:0:0 | Object |
 | classes.kt:151:5:155:5 | Cl01 | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:159:5:159:14 | X | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:162:13:162:22 |  | file://<external>/Object.class:0:0:0:0 | Object |
 | file://<external>/C1$<no name provided>$Local3.class:0:0:0:0 | Local3<Integer> | file://<external>/Object.class:0:0:0:0 | Object |
 | file://<external>/C1$Local1.class:0:0:0:0 | Local1<Integer> | file://<external>/Object.class:0:0:0:0 | Object |
 | file://<external>/C1$Local2.class:0:0:0:0 | Local2<Integer> | file://<external>/Object.class:0:0:0:0 | Object |

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+\| Top which doesn't have exactly 1 toString \|`
Original file line number	Diff line number	Diff line change
`@@ -153,4 +153,10 @@ class Cl00<U0> {`
`153`	`153`	`val x = Cl01<U1>()`
`154`	`154`	`}`
`155`	`155`	`}`
`156`		`-}`
	`156`	`+}`
	`157`	`+`
	`158`	`+fun fn1() {`
	`159`	`+ class X {}`
	`160`	`+}`
	`161`	`+`
	`162`	`+fun fn2() = object { }`