Move resolveAnnotations tests into diagnostics tests

compiler/testData/diagnostics/tests/annotations/parameters/byte.kt

@@ -0,0 +1,12 @@
+package test
+
+annotation class Ann(
+        val b1: Byte,
+        val b2: Byte,
+        val b3: Byte,
+        val b4: Byte
+)
+
+@Ann(1, 1.toByte(), 128.toByte(), 128) class MyClass
+
+// EXPECTED: @Ann(b1 = 1.toByte(), b2 = 1.toByte(), b3 = -128.toByte(), b4 = 128)

compiler/testData/diagnostics/tests/annotations/parameters/char.kt

@@ -0,0 +1,16 @@
+package test
+
+annotation class Ann(
+        val b1: Char,
+        val b2: Char,
+        val b3: Int,
+        val b4: Long,
+        val b5: Byte,
+        val b6: Short,
+        val b7: Double,
+        val b8: Float
+)
+
+@Ann('c', 99.toChar(), 'c'.toInt(), 'c'.toLong(), 'c'.toByte(), 'c'.toShort(), 'c'.toDouble(), 'c'.toFloat()) class MyClass
+
+// EXPECTED: @Ann(b1 = \u0063 ('c'), b2 = \u0063 ('c'), b3 = 99, b4 = 99.toLong(), b5 = 99.toByte(), b6 = 99.toShort(), b7 = 99.0.toDouble(), b8 = 99.0.toFloat())

compiler/testData/diagnostics/tests/annotations/parameters/double.kt

@@ -0,0 +1,12 @@
+package test
+
+annotation class Ann(
+        val b1: Double,
+        val b2: Double,
+        val b3: Double,
+        val b4: Double
+)
+
+@Ann(1.0, 1.toDouble(), 1.7976931348623157E309.toDouble(), 1.7976931348623157E309) class MyClass
+
+// EXPECTED: @Ann(b1 = 1.0.toDouble(), b2 = 1.0.toDouble(), b3 = Infinity.toDouble(), b4 = Infinity.toDouble())

compiler/testData/diagnostics/tests/annotations/parameters/expressions/andAnd.kt

@@ -0,0 +1,10 @@
+package test
+
+annotation class Ann(
+        val b1: Boolean,
+        val b2: Boolean
+)
+
+@Ann(true && false, true && true) class MyClass
+
+// EXPECTED: @Ann(b1 = false, b2 = true)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/boolean.kt

@@ -0,0 +1,11 @@
+package test
+
+annotation class Ann(
+        val b1: Boolean,
+        val b2: Boolean,
+        val b3: Boolean
+)
+
+@Ann(true and false, false or true, true xor false) class MyClass
+
+// EXPECTED: @Ann(b1 = false, b2 = true, b3 = true)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/char.kt

@@ -0,0 +1,7 @@
+package test
+
+annotation class Ann(val c1: Char)
+
+@Ann('a' - 'a') class MyClass
+
+// EXPECTED: @Ann(c1 = 0)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/compositeCallBinary.kt

@@ -0,0 +1,11 @@
+package test
+
+annotation class Ann(
+        val p1: Int,
+        val p2: Int,
+        val p3: Int
+)
+
+@Ann(1.toInt().plus(1), 1.minus(1.toInt()), 1.toInt().times(1.toInt())) class MyClass
+
+// EXPECTED: @Ann(p1 = 2, p2 = 0, p3 = 1)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/divide.kt

@@ -0,0 +1,12 @@
+package test
+
+annotation class Ann(
+        val b: Byte,
+        val s: Short,
+        val i: Int,
+        val l: Long
+)
+
+@Ann(1 / 1, 1 / 1, 1 / 1, 1 / 1) class MyClass
+
+// EXPECTED: @Ann(b = 1.toByte(), i = 1, l = 1.toLong(), s = 1.toShort())

compiler/testData/diagnostics/tests/annotations/parameters/expressions/double.kt

@@ -0,0 +1,11 @@
+package test
+
+annotation class Ann(
+        val d1: Double,
+        val d2: Double,
+        val d3: Double
+)
+
+@Ann(1.0 + 1.0, 1.0 + 1, 1 + 1.0) class MyClass
+
+// EXPECTED: @Ann(d1 = 2.0.toDouble(), d2 = 2.0.toDouble(), d3 = 2.0.toDouble())

compiler/testData/diagnostics/tests/annotations/parameters/expressions/eqeq.kt

@@ -0,0 +1,13 @@
+package test
+
+annotation class Ann(
+        val b1: Boolean,
+        val b2: Boolean,
+        val b3: Boolean,
+        val b4: Boolean,
+        val b5: Boolean
+)
+
+@Ann(1 == 2, 1.0 == 2.0, 'b' == 'a', "a" == "b", "a" == "a") class MyClass
+
+// EXPECTED: @Ann(b1 = false, b2 = false, b3 = false, b4 = false, b5 = true)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/escapedString.kt

@@ -0,0 +1,7 @@
+package test
+
+annotation class Ann(val s1: String)
+
+@Ann(s1 = "\$ab") class MyClass
+
+// EXPECTED: @Ann(s1 = "$ab")

compiler/testData/diagnostics/tests/annotations/parameters/expressions/float.kt

@@ -0,0 +1,12 @@
+package test
+
+
+annotation class Ann(
+        val d1: Float,
+        val d2: Float,
+        val d3: Double
+)
+
+@Ann(1.toFloat() + 1.toFloat(), 1.toFloat() + 1, 1.toFloat() + 1.0) class MyClass
+
+// EXPECTED: @Ann(d1 = 2.0.toFloat(), d2 = 2.0.toFloat(), d3 = 2.0.toDouble())

compiler/testData/diagnostics/tests/annotations/parameters/expressions/gt.kt

@@ -0,0 +1,17 @@
+package test
+
+annotation class Ann(
+        val b1: Boolean,
+        val b2: Boolean,
+        val b3: Boolean,
+        val b4: Boolean,
+        val b5: Boolean,
+        val b6: Boolean
+)
+
+val a = 1
+val b = 2
+
+@Ann(1 > 2, 1.0 > 2.0, 2 > a, b > a, 'b' > 'a', "a" > "b") class MyClass
+
+// EXPECTED: @Ann(b1 = false, b2 = false, b3 = true, b4 = true, b5 = true, b6 = false)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/gteq.kt

@@ -0,0 +1,12 @@
+package test
+
+annotation class Ann(
+        val b1: Boolean,
+        val b2: Boolean,
+        val b3: Boolean,
+        val b4: Boolean
+)
+
+@Ann(1 >= 2, 1.0 >= 2.0, 1 >= 1, 1.0 >= 1.0) class MyClass
+
+// EXPECTED: @Ann(b1 = false, b2 = false, b3 = true, b4 = true)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/intrincics.kt

@@ -0,0 +1,13 @@
+package test
+
+annotation class Ann(p1: Int,
+                     p2: Short,
+                     p3: Byte,
+                     p4: Int,
+                     p5: Int,
+                     p6: Int
+                     )
+
+@Ann(1 or 1, 1 and 1, 1 xor 1, 1 shl 1, 1 shr 1, 1 ushr 1) class MyClass
+
+// EXPECTED: @Ann(p1 = 1, p2 = 1.toShort(), p3 = 0.toByte(), p4 = 2, p5 = 0, p6 = 0)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/labeled.kt

@@ -0,0 +1,7 @@
+package test
+
+annotation class Ann(i: Double)
+
+@Ann(A@ 1.0) class MyClass
+
+// EXPECTED: @Ann(i = 1.0.toDouble())

compiler/testData/diagnostics/tests/annotations/parameters/expressions/long.kt

@@ -0,0 +1,11 @@
+package test
+
+annotation class Ann(
+        val l1: Long,
+        val l2: Long,
+        val l3: Long
+)
+
+@Ann(1 + 1, java.lang.Long.MAX_VALUE + 1 - 1, java.lang.Long.MAX_VALUE - 1) class MyClass
+
+// EXPECTED: @Ann(l1 = 2.toLong(), l2 = 9223372036854775807.toLong(), l3 = 9223372036854775806.toLong())

compiler/testData/diagnostics/tests/annotations/parameters/expressions/lt.kt

@@ -0,0 +1,17 @@
+package test
+
+annotation class Ann(
+        val b1: Boolean,
+        val b2: Boolean,
+        val b3: Boolean,
+        val b4: Boolean,
+        val b5: Boolean,
+        val b6: Boolean
+)
+
+val a = 1
+val b = 2
+
+@Ann(1 < 2, 1.0 < 2.0, 2 < a, b < a, 'b' < 'a', "a" < "b") class MyClass
+
+// EXPECTED: @Ann(b1 = true, b2 = true, b3 = false, b4 = false, b5 = false, b6 = true)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/lteq.kt

@@ -0,0 +1,12 @@
+package test
+
+annotation class Ann(
+        val b1: Boolean,
+        val b2: Boolean,
+        val b3: Boolean,
+        val b4: Boolean
+)
+
+@Ann(1 <= 2, 1.0 <= 2.0, 1 <= 1, 1.0 <= 1.0) class MyClass
+
+// EXPECTED: @Ann(b1 = true, b2 = true, b3 = true, b4 = true)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/maxValue.kt

@@ -0,0 +1,21 @@
+package test
+
+annotation class Ann(
+        val p1: Byte,
+        val p2: Short,
+        val p3: Int,
+        val p4: Int,
+        val p5: Long,
+        val p6: Long
+)
+
+@Ann(
+    p1 = java.lang.Byte.MAX_VALUE + 1,
+    p2 = java.lang.Short.MAX_VALUE + 1,
+    p3 = java.lang.Integer.MAX_VALUE + 1,
+    p4 = java.lang.Integer.MAX_VALUE + 1,
+    p5 = java.lang.Integer.MAX_VALUE + 1.toLong(),
+    p6 = java.lang.Long.MAX_VALUE + 1
+) class MyClass
+
+// EXPECTED: @Ann(p1 = 128, p2 = 32768, p3 = -2147483648, p4 = -2147483648, p5 = 2147483648.toLong(), p6 = -9223372036854775808.toLong())

compiler/testData/diagnostics/tests/annotations/parameters/expressions/maxValueByte.kt

@@ -0,0 +1,19 @@
+package test
+
+annotation class Ann(
+        val p1: Byte,
+        val p2: Byte,
+        val p3: Int,
+        val p4: Int,
+        val p5: Byte
+)
+
+@Ann(
+    p1 = java.lang.Byte.MAX_VALUE + 1,
+    p2 = 1 + 1,
+    p3 = java.lang.Byte.MAX_VALUE + 1,
+    p4 = 1.toByte() + 1.toByte(),
+    p5 = 1.toByte() + 1.toByte()
+) class MyClass
+
+// EXPECTED: @Ann(p1 = 128, p2 = 2.toByte(), p3 = 128, p4 = 2, p5 = 2)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/maxValueInt.kt

@@ -0,0 +1,19 @@
+package test
+
+annotation class Ann(
+        val p1: Int,
+        val p2: Int,
+        val p3: Long,
+        val p4: Long,
+        val p5: Int
+)
+
+@Ann(
+    p1 = java.lang.Integer.MAX_VALUE + 1,
+    p2 = 1 + 1,
+    p3 = java.lang.Integer.MAX_VALUE + 1,
+    p4 = 1.toInt() + 1.toInt(),
+    p5 = 1.toInt() + 1.toInt()
+) class MyClass
+
+// EXPECTED: @Ann(p1 = -2147483648, p2 = 2, p3 = -2147483648, p4 = 2, p5 = 2)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/miltiply.kt

@@ -0,0 +1,12 @@
+package test
+
+annotation class Ann(
+        val b: Byte,
+        val s: Short,
+        val i: Int,
+        val l: Long
+)
+
+@Ann(1 * 1, 1 * 1, 1 * 1, 1 * 1) class MyClass
+
+// EXPECTED: @Ann(b = 1.toByte(), i = 1, l = 1.toLong(), s = 1.toShort())

compiler/testData/diagnostics/tests/annotations/parameters/expressions/minus.kt

@@ -0,0 +1,12 @@
+package test
+
+annotation class Ann(
+        val b: Byte,
+        val s: Short,
+        val i: Int,
+        val l: Long
+)
+
+@Ann(1 - 1, 1 - 1, 1 - 1, 1 - 1) class MyClass
+
+// EXPECTED: @Ann(b = 0.toByte(), i = 0, l = 0.toLong(), s = 0.toShort())

compiler/testData/diagnostics/tests/annotations/parameters/expressions/mod.kt

@@ -0,0 +1,12 @@
+package test
+
+annotation class Ann(
+        val b: Byte,
+        val s: Short,
+        val i: Int,
+        val l: Long
+)
+
+@Ann(1 % 1, 1 % 1, 1 % 1, 1 % 1) class MyClass
+
+// EXPECTED: @Ann(b = 0.toByte(), i = 0, l = 0.toLong(), s = 0.toShort())

compiler/testData/diagnostics/tests/annotations/parameters/expressions/multilineString.kt

@@ -0,0 +1,7 @@
+package test
+
+annotation class Ann(val s1: String)
+
+@Ann(s1 = """a""" + "b") class MyClass
+
+// EXPECTED: @Ann(s1 = "ab")

compiler/testData/diagnostics/tests/annotations/parameters/expressions/not.kt

@@ -0,0 +1,11 @@
+package test
+
+annotation class Ann(
+        val b1: Boolean,
+        val b2: Boolean,
+        val b3: Boolean
+)
+
+@Ann(!true, !false) class MyClass
+
+// EXPECTED: @Ann(b1 = false, b2 = true)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/noteq.kt

@@ -0,0 +1,13 @@
+package test
+
+annotation class Ann(
+        val b1: Boolean,
+        val b2: Boolean,
+        val b3: Boolean,
+        val b4: Boolean,
+        val b5: Boolean
+)
+
+@Ann(1 != 2, 1.0 != 2.0, 'b' != 'a', "a" != "b", "a" != "a") class MyClass
+
+// EXPECTED: @Ann(b1 = true, b2 = true, b3 = true, b4 = true, b5 = false)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/orOr.kt

@@ -0,0 +1,10 @@
+package test
+
+annotation class Ann(
+        val b1: Boolean,
+        val b2: Boolean
+)
+
+@Ann(true || false, true || true) class MyClass
+
+// EXPECTED: @Ann(b1 = true, b2 = true)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/paranthesized.kt

@@ -0,0 +1,7 @@
+package test
+
+annotation class Ann(i: Int)
+
+@Ann((1 + 2) * 2) class MyClass
+
+// EXPECTED: @Ann(i = 6)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/plus.kt

@@ -0,0 +1,12 @@
+package test
+
+annotation class Ann(
+        val b: Byte,
+        val s: Short,
+        val i: Int,
+        val l: Long
+)
+
+@Ann(1 + 1, 1 + 1, 1 + 1, 1 + 1) class MyClass
+
+// EXPECTED: @Ann(b = 2.toByte(), i = 2, l = 2.toLong(), s = 2.toShort())

compiler/testData/diagnostics/tests/annotations/parameters/expressions/simpleCallBinary.kt

@@ -0,0 +1,13 @@
+package test
+
+annotation class Ann(
+        val p1: Int,
+        val p2: Int,
+        val p3: Int,
+        val p4: Int,
+        val p5: Int
+)
+
+@Ann(1.plus(1), 1.minus(1), 1.times(1), 1.div(1), 1.rem(1)) class MyClass
+
+// EXPECTED: @Ann(p1 = 2, p2 = 0, p3 = 1, p4 = 1, p5 = 0)

compiler/testData/diagnostics/tests/annotations/parameters/expressions/stringPlusInt.kt

@@ -0,0 +1,7 @@
+package test
+
+annotation class Ann(val s1: String)
+
+@Ann(s1 = "a" + 1) class MyClass
+
+// EXPECTED: @Ann(s1 = "a1")

compiler/testData/diagnostics/tests/annotations/parameters/expressions/stringTemplate.kt

@@ -0,0 +1,19 @@
+package test
+
+annotation class Ann(
+        val s1: String,
+        val s2: String,
+        val s3: String,
+        val s4: String
+)
+
+val i = 1
+
+@Ann(
+    s1 = "a$i",
+    s2 = "a$i b",
+    s3 = "$i",
+    s4 = "a${i}a$i"
+) class MyClass
+
+// EXPECTED: @Ann(s1 = "a1", s2 = "a1 b", s3 = "1", s4 = "a1a1")

compiler/testData/diagnostics/tests/annotations/parameters/expressions/strings.kt

@@ -0,0 +1,9 @@
+package test
+
+annotation class Ann(val s1: String, val s2: String)
+
+val i = 1
+
+@Ann(s1 = "a" + "b", s2 = "a" + "a$i") class MyClass
+
+// EXPECTED: @Ann(s1 = "ab", s2 = "aa1")

compiler/testData/diagnostics/tests/annotations/parameters/expressions/unaryMinus.kt

@@ -0,0 +1,14 @@
+package test
+
+annotation class Ann(
+        val b1: Byte,
+        val b2: Short,
+        val b3: Int,
+        val b4: Long,
+        val b5: Double,
+        val b6: Float
+)
+
+@Ann(-1, -1, -1, -1, -1.0, -1.0.toFloat()) class MyClass
+
+// EXPECTED: @Ann(b1 = -1.toByte(), b2 = -1.toShort(), b3 = -1, b4 = -1.toLong(), b5 = -1.0.toDouble(), b6 = -1.0.toFloat())

compiler/testData/diagnostics/tests/annotations/parameters/expressions/unaryPlus.kt

@@ -0,0 +1,14 @@
+package test
+
+annotation class Ann(
+        val b1: Byte,
+        val b2: Short,
+        val b3: Int,
+        val b4: Long,
+        val b5: Double,
+        val b6: Float
+)
+
+@Ann(+1, +1, +1, +1, +1.0, +1.0.toFloat()) class MyClass
+
+// EXPECTED: @Ann(b1 = 1.toByte(), b2 = 1.toShort(), b3 = 1, b4 = 1.toLong(), b5 = 1.0.toDouble(), b6 = 1.0.toFloat())

compiler/testData/diagnostics/tests/annotations/parameters/float.kt

@@ -0,0 +1,10 @@
+package test
+
+annotation class Ann(
+        val b1: Float,
+        val b2: Float
+)
+
+@Ann(1.toFloat(), 1.0.toFloat()) class MyClass
+
+// EXPECTED: @Ann(b1 = 1.0.toFloat(), b2 = 1.0.toFloat())

compiler/testData/diagnostics/tests/annotations/parameters/int.kt

@@ -0,0 +1,12 @@
+package test
+
+annotation class Ann(
+        val b1: Int,
+        val b2: Int,
+        val b3: Int,
+        val b4: Int
+)
+
+@Ann(1, 1.toInt(), 2147483648.toInt(), 2147483648) class MyClass
+
+// EXPECTED: @Ann(b1 = 1, b2 = 1, b3 = -2147483648, b4 = 2147483648.toLong())

compiler/testData/diagnostics/tests/annotations/parameters/long.kt

@@ -0,0 +1,10 @@
+package test
+
+annotation class Ann(
+        val b1: Long,
+        val b2: Long
+)
+
+@Ann(1, 1.toLong()) class MyClass
+
+// EXPECTED: @Ann(b1 = 1.toLong(), b2 = 1.toLong())

compiler/testData/diagnostics/tests/annotations/parameters/short.kt

@@ -0,0 +1,12 @@
+package test
+
+annotation class Ann(
+        val b1: Short,
+        val b2: Short,
+        val b3: Short,
+        val b4: Short
+)
+
+@Ann(1, 1.toShort(), 32768.toShort(), 32768) class MyClass
+
+// EXPECTED: @Ann(b1 = 1.toShort(), b2 = 1.toShort(), b3 = -32768.toShort(), b4 = 32768)