Kotlin: Test tweaks for the diags consistency query

igfoo · igfoo · commit 63b64e4daa2d · 2022-10-25T16:26:11.000+01:00
diff --git a/java/ql/test/kotlin/library-tests/annotation_classes/def.kt b/java/ql/test/kotlin/library-tests/annotation_classes/def.kt
@@ -1,3 +1,5 @@
 
 annotation class SomeAnnotation
 
+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
+// Diagnostic Matches: Unknown location for kotlin.Metadata
diff --git a/java/ql/test/kotlin/library-tests/annotations/jvmName/test.kt b/java/ql/test/kotlin/library-tests/annotations/jvmName/test.kt
@@ -15,4 +15,12 @@ class X {
 
 annotation class Ann(
     val p: Int,
-    @get:JvmName("w") val q: Int)
+    @get:JvmName("w") val q: Int)
+
+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
+// Diagnostic Matches: Incomplete annotation: @kotlin.jvm.JvmName(name="changeY")
+// Diagnostic Matches: Incomplete annotation: @kotlin.jvm.JvmName(name="getX_prop")
+// Diagnostic Matches: Incomplete annotation: @kotlin.jvm.JvmName(name="method")
+// Diagnostic Matches: Incomplete annotation: @kotlin.jvm.JvmName(name="y")
+// Diagnostic Matches: Unknown location for kotlin.Metadata
+// Diagnostic Matches: Unknown location for kotlin.jvm.JvmName
diff --git a/java/ql/test/kotlin/library-tests/arrays-with-variances/takesArrayList.kt b/java/ql/test/kotlin/library-tests/arrays-with-variances/takesArrayList.kt
@@ -110,3 +110,8 @@ public class TakesArrayList {
   fun inInArrayComparableAny(c: Comparable<Array<in Array<in Any>>>) { }
 
 }
+
+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
+// Diagnostic Matches: Unknown location for kotlin.Metadata
+// Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull
+// Diagnostic Matches: Unknown location for org.jetbrains.annotations.NotNull
diff --git a/java/ql/test/kotlin/library-tests/comments/comments.expected b/java/ql/test/kotlin/library-tests/comments/comments.expected
@@ -15,6 +15,7 @@ comments
 | comments.kt:71:9:73:11 | /**\n         * An anonymous function comment\n         */ | /**\n         * An anonymous function comment\n         */ |
 | comments.kt:79:9:81:11 | /**\n         * A local function comment\n         */ | /**\n         * A local function comment\n         */ |
 | comments.kt:88:10:90:11 | /**\n         * An anonymous object comment\n         */ | /**\n         * An anonymous object comment\n         */ |
+| comments.kt:95:1:95:163 | // Diagnostic Matches: % Couldn't get owner of KDoc. The comment is extracted without an owner.  ...while extracting a file (comments.kt) at %comments.kt:1:1:96:0% | // Diagnostic Matches: % Couldn't get owner of KDoc. The comment is extracted without an owner.  ...while extracting a file (comments.kt) at %comments.kt:1:1:96:0% |
 commentOwners
 | comments.kt:4:1:11:3 | /**\n * A group of *members*.\n *\n * This class has no useful logic; it's just a documentation example.\n *\n * @property name the name of this group.\n * @constructor Creates an empty group.\n */ | comments.kt:12:1:31:1 | Group |
 | comments.kt:4:1:11:3 | /**\n * A group of *members*.\n *\n * This class has no useful logic; it's just a documentation example.\n *\n * @property name the name of this group.\n * @constructor Creates an empty group.\n */ | comments.kt:12:1:31:1 | Group |
@@ -39,6 +40,7 @@ commentNoOwners
 | comments.kt:1:1:1:25 | /** Kdoc with no owner */ |
 | comments.kt:24:9:24:25 | // A line comment |
 | comments.kt:28:5:30:6 | /*\n    A block comment\n    */ |
+| comments.kt:95:1:95:163 | // Diagnostic Matches: % Couldn't get owner of KDoc. The comment is extracted without an owner.  ...while extracting a file (comments.kt) at %comments.kt:1:1:96:0% |
 commentSections
 | comments.kt:1:1:1:25 | /** Kdoc with no owner */ | Kdoc with no owner |
 | comments.kt:4:1:11:3 | /**\n * A group of *members*.\n *\n * This class has no useful logic; it's just a documentation example.\n *\n * @property name the name of this group.\n * @constructor Creates an empty group.\n */ | A group of *members*.\n\nThis class has no useful logic; it's just a documentation example.\n\n |
diff --git a/java/ql/test/kotlin/library-tests/comments/comments.kt b/java/ql/test/kotlin/library-tests/comments/comments.kt
@@ -90,4 +90,6 @@ class XX {
          */
          X() {
     }
-}
+}
+
+// Diagnostic Matches: % Couldn't get owner of KDoc. The comment is extracted without an owner.  ...while extracting a file (comments.kt) at %comments.kt:1:1:96:0%
diff --git a/java/ql/test/kotlin/library-tests/controlflow/basic/Test.kt b/java/ql/test/kotlin/library-tests/controlflow/basic/Test.kt
@@ -122,3 +122,5 @@ fun fn_when(x: Boolean, y: Boolean) {
 			else -> false
 		} -> { } }
 }
+
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Int.dec in java.lang.Integer  ...while extracting a call (<no name>) at %Test.kt:40:4:40:6%
diff --git a/java/ql/test/kotlin/library-tests/controlflow/dominance/Test.kt b/java/ql/test/kotlin/library-tests/controlflow/dominance/Test.kt
@@ -98,3 +98,5 @@ TODO
 	}
 
 }
+
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Int.dec in java.lang.Integer  ...while extracting a call (<no name>) at %Test.kt:40:4:40:6%
diff --git a/java/ql/test/kotlin/library-tests/controlflow/dominance/Test2.kt b/java/ql/test/kotlin/library-tests/controlflow/dominance/Test2.kt
@@ -35,3 +35,5 @@ public class Test2 {
 		}
 	}
 }
+
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Int.dec in java.lang.Integer  ...while extracting a call (<no name>) at %Test2.kt:34:4:34:6%
diff --git a/java/ql/test/kotlin/library-tests/dataflow/func/kotlinx_coroutines_stubs.kt b/java/ql/test/kotlin/library-tests/dataflow/func/kotlinx_coroutines_stubs.kt
@@ -30,4 +30,6 @@ public fun <T> CoroutineScope.async(
     block: suspend CoroutineScope.() -> T
 ): Deferred<T> {
     return null!!
-}
+}
+
+// Diagnostic Matches: % Couldn't get owner of KDoc. The comment is extracted without an owner.  ...while extracting a file (kotlinx_coroutines_stubs.kt) at %kotlinx_coroutines_stubs.kt:1:1:36:0%
diff --git a/java/ql/test/kotlin/library-tests/exprs/exprs.kt b/java/ql/test/kotlin/library-tests/exprs/exprs.kt
@@ -338,3 +338,15 @@ fun unaryExprs(i: Int, d: Double, b: Byte, s: Short, l: Long, f: Float) {
     +f
     -f
 }
+
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Byte.dec in java.lang.Byte %
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Byte.inc in java.lang.Byte %
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Byte.toInt in java.lang.Byte %
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Int.dec in java.lang.Integer %
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Int.inc in java.lang.Integer %
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Int.rangeTo in java.lang.Integer %
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Short.inc in java.lang.Short %
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Short.dec in java.lang.Short %
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Short.toInt in java.lang.Short %
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Long.dec in java.lang.Long %
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Long.inc in java.lang.Long %
diff --git a/java/ql/test/kotlin/library-tests/extensions/extensions.kt b/java/ql/test/kotlin/library-tests/extensions/extensions.kt
@@ -29,4 +29,9 @@ fun foo() {
     "someString".bar("foo")
     fun String.baz(p1: String): String { return "Baz" }
     "someString".baz("bazParam")
-}
+}
+
+// Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull
+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
+// Diagnostic Matches: Unknown location for kotlin.Metadata
+// Diagnostic Matches: Unknown location for org.jetbrains.annotations.NotNull
diff --git a/java/ql/test/kotlin/library-tests/generics-location/generics.kt b/java/ql/test/kotlin/library-tests/generics-location/generics.kt
@@ -8,4 +8,7 @@ class B<T> {
         val b0 = B<String>()
         val b1 = B<Any>()
     }
-}
+}
+
+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
+// Diagnostic Matches: Unknown location for kotlin.Metadata
diff --git a/java/ql/test/kotlin/library-tests/generics/generics.kt b/java/ql/test/kotlin/library-tests/generics/generics.kt
@@ -61,3 +61,5 @@ class Class1<T1> {
         Local<Int>().fn2(t, "")
     }
 }
+
+// Diagnostic Matches: % Found more type arguments than parameters: foo.bar.Class1  ...while extracting a enclosing class (fn1) at %generics.kt:57:5:62:5%
diff --git a/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.kt b/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.kt
@@ -3,3 +3,6 @@ public class Test() {
   internal constructor(x: Int, y: Int) : this() { }
 
 }
+
+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
+// Diagnostic Matches: Unknown location for kotlin.Metadata
diff --git a/java/ql/test/kotlin/library-tests/internal-public-alias/test.kt b/java/ql/test/kotlin/library-tests/internal-public-alias/test.kt
@@ -10,3 +10,6 @@ public class Test {
   internal fun internalFun() = 3
 
 }
+
+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
+// Diagnostic Matches: Unknown location for kotlin.Metadata
diff --git a/java/ql/test/kotlin/library-tests/java-lang-number-conversions/test.kt b/java/ql/test/kotlin/library-tests/java-lang-number-conversions/test.kt
@@ -1 +1,8 @@
 fun f(n: Number, b: Byte) = n.toByte() + n.toShort() + n.toInt() + n.toLong() + n.toFloat() + n.toDouble() + b.toByte() + b.toShort() + b.toInt() + b.toLong() + b.toFloat() + b.toDouble()
+
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Byte.toByte in java.lang.Byte  ...while extracting a call (<no name>) at %test.kt:1:112:1:119%
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Byte.toDouble in java.lang.Byte  ...while extracting a call (<no name>) at %test.kt:1:178:1:187%
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Byte.toFloat in java.lang.Byte  ...while extracting a call (<no name>) at %test.kt:1:164:1:172%
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Byte.toInt in java.lang.Byte  ...while extracting a call (<no name>) at %test.kt:1:139:1:145%
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Byte.toLong in java.lang.Byte  ...while extracting a call (<no name>) at %test.kt:1:151:1:158%
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Byte.toShort in java.lang.Byte  ...while extracting a call (<no name>) at %test.kt:1:125:1:133%
diff --git a/java/ql/test/kotlin/library-tests/java-map-methods/test.kt b/java/ql/test/kotlin/library-tests/java-map-methods/test.kt
@@ -28,3 +28,5 @@ fun special(n: Number, m: Map<String, String>, s: String, l: MutableList<Int>) {
     m.entries.first().key
     m.entries.first().value
 }
+
+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Number.toChar in java.lang.Number %
diff --git a/java/ql/test/kotlin/library-tests/java_and_kotlin/Kotlin.kt b/java/ql/test/kotlin/library-tests/java_and_kotlin/Kotlin.kt
@@ -13,3 +13,10 @@ class Dkotlin : Base() {
     override fun fn0(x: Int): String = super.fn0(x)
     override suspend fun fn1(x: Int): String = super.fn1(x)
 }
+
+// Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull
+// Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.Nullable
+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
+// Diagnostic Matches: Unknown location for kotlin.Metadata
+// Diagnostic Matches: Unknown location for org.jetbrains.annotations.NotNull
+// Diagnostic Matches: Unknown location for org.jetbrains.annotations.Nullable
diff --git a/java/ql/test/kotlin/library-tests/java_and_kotlin_internal/Kotlin.kt b/java/ql/test/kotlin/library-tests/java_and_kotlin_internal/Kotlin.kt
@@ -2,3 +2,6 @@ public class Kotlin {
 	internal fun kotlinFun() {
 	}
 }
+
+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
+// Diagnostic Matches: Unknown location for kotlin.Metadata
diff --git a/java/ql/test/kotlin/library-tests/jvmoverloads_flow/test.kt b/java/ql/test/kotlin/library-tests/jvmoverloads_flow/test.kt
@@ -85,3 +85,14 @@ public class TestDefaultParameterReference {
   }
 
 }
+
+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
+// Diagnostic Matches: Unknown location for kotlin.Metadata
+// Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull
+// Diagnostic Matches: Unknown location for org.jetbrains.annotations.NotNull
+// Diagnostic Matches: Completion failure for type: kotlin.jvm.JvmOverloads
+// Diagnostic Matches: Completion failure for type: kotlin.jvm.JvmStatic
+// Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.Nullable
+// Diagnostic Matches: Unknown location for kotlin.jvm.JvmOverloads
+// Diagnostic Matches: Unknown location for kotlin.jvm.JvmStatic
+// Diagnostic Matches: Unknown location for org.jetbrains.annotations.Nullable
diff --git a/java/ql/test/kotlin/library-tests/jvmoverloads_generics/test.kt b/java/ql/test/kotlin/library-tests/jvmoverloads_generics/test.kt
@@ -4,3 +4,10 @@ public class A {
   fun <T> genericFunctionWithOverloads(x: T? = null, y: List<T>? = null, z: T? = null): T? = z
 
 }
+
+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
+// Diagnostic Matches: Unknown location for kotlin.Metadata
+// Diagnostic Matches: Completion failure for type: kotlin.jvm.JvmOverloads
+// Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.Nullable
+// Diagnostic Matches: Unknown location for kotlin.jvm.JvmOverloads
+// Diagnostic Matches: Unknown location for org.jetbrains.annotations.Nullable
diff --git a/java/ql/test/kotlin/library-tests/jvmstatic-annotation/test.kt b/java/ql/test/kotlin/library-tests/jvmstatic-annotation/test.kt
@@ -65,3 +65,10 @@ fun externalUser() {
   NonCompanion.propWithStaticSetter = NonCompanion.propWithStaticGetter
 
 }
+
+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
+// Diagnostic Matches: Unknown location for kotlin.Metadata
+// Diagnostic Matches: Completion failure for type: kotlin.jvm.JvmStatic
+// Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull
+// Diagnostic Matches: Unknown location for kotlin.jvm.JvmStatic
+// Diagnostic Matches: Unknown location for org.jetbrains.annotations.NotNull
diff --git a/java/ql/test/kotlin/library-tests/ministdlib/MiniStdLib.kt b/java/ql/test/kotlin/library-tests/ministdlib/MiniStdLib.kt
@@ -31,3 +31,16 @@ public class Int {
 public object Unit {
 }
 
+// Diagnostic Matches: % Can't find java.lang.Boolean
+// Diagnostic Matches: % Can't find java.lang.Byte
+// Diagnostic Matches: % Can't find java.lang.Character
+// Diagnostic Matches: % Can't find java.lang.Double
+// Diagnostic Matches: % Can't find java.lang.Float
+// Diagnostic Matches: % Can't find java.lang.Integer
+// Diagnostic Matches: % Can't find java.lang.Long
+// Diagnostic Matches: % Can't find java.lang.Short
+// Diagnostic Matches: % Can't find java.lang.Void
+// Diagnostic Matches: % Can't find kotlin.UByte
+// Diagnostic Matches: % Can't find kotlin.UInt
+// Diagnostic Matches: % Can't find kotlin.ULong
+// Diagnostic Matches: % Can't find kotlin.UShort
diff --git a/java/ql/test/kotlin/library-tests/multiple_files/file1.kt b/java/ql/test/kotlin/library-tests/multiple_files/file1.kt
@@ -11,4 +11,3 @@ class Class1 {
         kotlin.jvm.internal.collectionToArray(listOf(1))
     }
 }
-
diff --git a/java/ql/test/kotlin/library-tests/trap/diags.expected b/java/ql/test/kotlin/library-tests/trap/diags.expected
diff --git a/java/ql/test/kotlin/library-tests/trap/long_comments.kt b/java/ql/test/kotlin/library-tests/trap/long_comments.kt
diff --git a/java/ql/test/library-tests/dataflow/partial/A.java b/java/ql/test/library-tests/dataflow/partial/A.java
diff --git a/java/ql/test/query-tests/SpuriousJavadocParam/Test.java b/java/ql/test/query-tests/SpuriousJavadocParam/Test.java
diff --git a/java/ql/test/query-tests/lgtm-example-queries/Test.java b/java/ql/test/query-tests/lgtm-example-queries/Test.java

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
`1`	`1`
`2`	`2`	`annotation class SomeAnnotation`
`3`	`3`
	`4`	`+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)`
	`5`	`+// Diagnostic Matches: Unknown location for kotlin.Metadata`
Original file line number	Diff line number	Diff line change
`@@ -110,3 +110,8 @@ public class TakesArrayList {`
`110`	`110`	`fun inInArrayComparableAny(c: Comparable<Array<in Array<in Any>>>) { }`
`111`	`111`
`112`	`112`	`}`
	`113`	`+`
	`114`	`+// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)`
	`115`	`+// Diagnostic Matches: Unknown location for kotlin.Metadata`
	`116`	`+// Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull`
	`117`	`+// Diagnostic Matches: Unknown location for org.jetbrains.annotations.NotNull`
Original file line number	Diff line number	Diff line change
`@@ -90,4 +90,6 @@ class XX {`
`90`	`90`	`*/`
`91`	`91`	`X() {`
`92`	`92`	`}`
`93`		`-}`
	`93`	`+}`
	`94`	`+`
	`95`	`+// Diagnostic Matches: % Couldn't get owner of KDoc. The comment is extracted without an owner. ...while extracting a file (comments.kt) at %comments.kt:1:1:96:0%`
Original file line number	Diff line number	Diff line change
`@@ -122,3 +122,5 @@ fun fn_when(x: Boolean, y: Boolean) {`
`122`	`122`	`else -> false`
`123`	`123`	`} -> { } }`
`124`	`124`	`}`
	`125`	`+`
	`126`	`+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Int.dec in java.lang.Integer ...while extracting a call (<no name>) at %Test.kt:40:4:40:6%`
Original file line number	Diff line number	Diff line change
`@@ -98,3 +98,5 @@ TODO`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`}`
	`101`	`+`
	`102`	`+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Int.dec in java.lang.Integer ...while extracting a call (<no name>) at %Test.kt:40:4:40:6%`
Original file line number	Diff line number	Diff line change
`@@ -35,3 +35,5 @@ public class Test2 {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+// Diagnostic Matches: % Couldn't find a Java equivalent function to kotlin.Int.dec in java.lang.Integer ...while extracting a call (<no name>) at %Test2.kt:34:4:34:6%`