Fix tests affected by annotation wrapping changes

This commit is contained in:
Dmitry Jemerov
2017-07-20 12:32:13 +02:00
parent 5128b8a409
commit fbcc519098
4 changed files with 17 additions and 8 deletions
@@ -56,7 +56,8 @@ class Variety<C> {
var <T> List<T>.genVarL: T where T : C var <T> List<T>.genVarL: T where T : C
get() = last() get() = last()
set(p) {} set(p) {}
@MemAnn val annotatedVal = 0 @MemAnn
val annotatedVal = 0
var byVar by Delegates.notNull<Int>() var byVar by Delegates.notNull<Int>()
lateinit var lateVal: String lateinit var lateVal: String
final val finalVal = 0 final val finalVal = 0
+4 -2
View File
@@ -12,12 +12,14 @@ import javaApi.*
@Anon7(String::class, StringBuilder::class) @Anon7(String::class, StringBuilder::class)
@Anon8(classes = arrayOf(String::class, StringBuilder::class)) @Anon8(classes = arrayOf(String::class, StringBuilder::class))
internal class C { internal class C {
@Anon5(1) @Deprecated("") private val field1 = 0 @Anon5(1)
@Deprecated("") private val field1 = 0
@Anon5(1) @Anon5(1)
private val field2 = 0 private val field2 = 0
@Anon5(1) var field3 = 0 @Anon5(1)
var field3 = 0
@Anon5(1) @Anon5(1)
var field4 = 0 var field4 = 0
@@ -1,8 +1,11 @@
class WithModifiersOnAccessors { class WithModifiersOnAccessors {
@get:Synchronized @set:Synchronized var sync = 0 @get:Synchronized
@set:Synchronized
var sync = 0
@get:Strictfp var strict = 0.0 @get:Strictfp
var strict = 0.0
@Synchronized private fun methSync() {} @Synchronized private fun methSync() {}
@Strictfp protected fun methStrict() {} @Strictfp protected fun methStrict() {}
} }
@@ -1,10 +1,13 @@
// ERROR: This annotation is not applicable to target 'member property with backing field' // ERROR: This annotation is not applicable to target 'member property with backing field'
internal class A { internal class A {
@Deprecated("") @Deprecated("")
@Volatile var field1 = 0 @Volatile
var field1 = 0
@Transient var field2 = 1 @Transient
var field2 = 1
// Should work even for bad modifiers // Should work even for bad modifiers
@Strictfp var field3 = 2.0 @Strictfp
var field3 = 2.0
} }