From fbcc519098204e70cf5271145a5aa89b860c3fb0 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 20 Jul 2017 12:32:13 +0200
Subject: [PATCH] Fix tests affected by annotation wrapping changes

---
 .../copy/kt18149/after/refactor/copy2/test.kt            | 3 ++-
 .../fileOrElement/annotations/annotationUsages.kt        | 6 ++++--
 .../modifiersToAnnotationsFromPropertyAccessors.kt       | 7 +++++--
 .../fileOrElement/field/volatileTransientAndStrictFp.kt  | 9 ++++++---
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/idea/testData/refactoring/copy/kt18149/after/refactor/copy2/test.kt b/idea/testData/refactoring/copy/kt18149/after/refactor/copy2/test.kt
index 4201fe58970..1d1b84c733c 100644
--- a/idea/testData/refactoring/copy/kt18149/after/refactor/copy2/test.kt
+++ b/idea/testData/refactoring/copy/kt18149/after/refactor/copy2/test.kt
@@ -56,7 +56,8 @@ class Variety<C> {
     var <T> List<T>.genVarL: T where T : C
         get() = last()
         set(p) {}
-    @MemAnn val annotatedVal = 0
+    @MemAnn
+    val annotatedVal = 0
     var byVar by Delegates.notNull<Int>()
     lateinit var lateVal: String
     final val finalVal = 0
diff --git a/j2k/testData/fileOrElement/annotations/annotationUsages.kt b/j2k/testData/fileOrElement/annotations/annotationUsages.kt
index 8d12cf6ef88..20fddfbf1cd 100644
--- a/j2k/testData/fileOrElement/annotations/annotationUsages.kt
+++ b/j2k/testData/fileOrElement/annotations/annotationUsages.kt
@@ -12,12 +12,14 @@ import javaApi.*
 @Anon7(String::class, StringBuilder::class)
 @Anon8(classes = arrayOf(String::class, StringBuilder::class))
 internal class C {
-    @Anon5(1) @Deprecated("") private val field1 = 0
+    @Anon5(1)
+    @Deprecated("") private val field1 = 0
 
     @Anon5(1)
     private val field2 = 0
 
-    @Anon5(1) var field3 = 0
+    @Anon5(1)
+    var field3 = 0
 
     @Anon5(1)
     var field4 = 0
diff --git a/j2k/testData/fileOrElement/annotations/modifiersToAnnotationsFromPropertyAccessors.kt b/j2k/testData/fileOrElement/annotations/modifiersToAnnotationsFromPropertyAccessors.kt
index 5899d518056..e932ab784b8 100644
--- a/j2k/testData/fileOrElement/annotations/modifiersToAnnotationsFromPropertyAccessors.kt
+++ b/j2k/testData/fileOrElement/annotations/modifiersToAnnotationsFromPropertyAccessors.kt
@@ -1,8 +1,11 @@
 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() {}
     @Strictfp protected fun methStrict() {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt b/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt
index b614fdd4a04..447477f100c 100644
--- a/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt
+++ b/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt
@@ -1,10 +1,13 @@
 // ERROR: This annotation is not applicable to target 'member property with backing field'
 internal class A {
     @Deprecated("")
-    @Volatile var field1 = 0
+    @Volatile
+    var field1 = 0
 
-    @Transient var field2 = 1
+    @Transient
+    var field2 = 1
 
     // Should work even for bad modifiers
-    @Strictfp var field3 = 2.0
+    @Strictfp
+    var field3 = 2.0
 }
\ No newline at end of file