From 3d0d82b8629026b438f522b8877f39121b1c057c Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Fri, 1 Jul 2016 16:17:39 +0300
Subject: [PATCH] Fix tests for move: check applicability from changed text

Presentation status has stopped working after https://github.com/JetBrains/intellij-community/commit/18ce2c6070667608d9bf5a18926778187564fd19
---
 .../classInitializerAtClassInitializer1.kt           |  4 ++--
 .../classInitializerAtClassInitializer1.kt.after     |  4 ++--
 .../classInitializerAtClassInitializer2.kt           |  4 ++--
 .../classInitializerAtClassInitializer2.kt.after     |  4 ++--
 .../moveUpDown/parametersAndArguments/funParams1.kt  |  4 +---
 .../parametersAndArguments/funParams1.kt.after       |  4 +---
 .../moveUpDown/parametersAndArguments/funParams2.kt  |  4 +---
 .../parametersAndArguments/funParams2.kt.after       |  4 +---
 .../moveUpDown/parametersAndArguments/funParams3.kt  |  4 +---
 .../parametersAndArguments/funParams3.kt.after       |  4 +---
 .../moveUpDown/parametersAndArguments/funParams4.kt  |  4 +---
 .../parametersAndArguments/funParams4.kt.after       |  4 +---
 .../moveUpDown/parametersAndArguments/funParams5.kt  |  4 +---
 .../moveUpDown/parametersAndArguments/funParams6.kt  |  4 +---
 .../codeInsight/moveUpDown/AbstractCodeMoverTest.kt  | 12 +++++++-----
 15 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt b/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt
index 76e9953ee4f..cf8f6c75ac7 100644
--- a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt
+++ b/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt
@@ -1,9 +1,9 @@
 // MOVE: down
 class A {
     <caret>init {
-
+        // First
     }
     init {
-
+        // Second
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt.after b/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt.after
index 4a116a9ab85..7c938e9af3b 100644
--- a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt.after
@@ -1,9 +1,9 @@
 // MOVE: down
 class A {
     init {
-
+        // Second
     }
     <caret>init {
-
+        // First
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt b/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt
index 3b4fabd203f..3f598dda438 100644
--- a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt
+++ b/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt
@@ -1,9 +1,9 @@
 // MOVE: up
 class A {
     init {
-
+        // First
     }
     <caret>init {
-
+        // Second
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt.after b/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt.after
index 47663965f40..a6f371e7c12 100644
--- a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt.after
@@ -1,9 +1,9 @@
 // MOVE: up
 class A {
     <caret>init {
-
+        // Second
     }
     init {
-
+        // First
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt
index 60e5b97d227..a72178b0a76 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt
@@ -1,8 +1,6 @@
 // MOVE: down
 class A {
-    fun foo<T,
-            U,
-            W>(
+    fun <T, U, W> foo(
             b:<caret> Int,
             a: Int,
             c: Int
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt.after
index 531a44c072d..a61b57b687d 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt.after
@@ -1,8 +1,6 @@
 // MOVE: down
 class A {
-    fun foo<T,
-            U,
-            W>(
+    fun <T, U, W> foo(
             a: Int,
             b:<caret> Int,
             c: Int
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt
index 205d73a9464..a26bbe5ea7f 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt
@@ -1,8 +1,6 @@
 // MOVE: down
 class A {
-    fun foo<T,
-            U,
-            W>(
+    fun <T, U, W> foo(
             b: Int,
             <caret>a: Int,
             c: Int
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt.after
index 2ef442f4b5a..7603d1aa84e 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt.after
@@ -1,8 +1,6 @@
 // MOVE: down
 class A {
-    fun foo<T,
-            U,
-            W>(
+    fun <T, U, W> foo(
             b: Int,
             c: Int,
             <caret>a: Int
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt
index 69c0c137b69..6c5e80305e6 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt
@@ -1,8 +1,6 @@
 // MOVE: up
 class A {
-    fun foo<T,
-            U,
-            W>(
+    fun <T, U, W> foo(
             a: Int,
             b:<caret> Int,
             c: Int
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after
index eec35aab54e..26ca1ccf1b7 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after
@@ -1,8 +1,6 @@
 // MOVE: up
 class A {
-    fun foo<T,
-            U,
-            W>(
+    fun <T, U, W> foo(
             b:<caret> Int,
             a: Int,
             c: Int
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt
index 36c6660a3a3..76c81041731 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt
@@ -1,8 +1,6 @@
 // MOVE: up
 class A {
-    fun foo<T,
-            U,
-            W>(
+    fun <T, U, W> foo(
             b: Int,
             c: Int
             <caret>a: Int,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt.after
index 55efd6fb3f1..b501794dfb0 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt.after
@@ -1,8 +1,6 @@
 // MOVE: up
 class A {
-    fun foo<T,
-            U,
-            W>(
+    fun <T, U, W> foo(
             b: Int,
             <caret>a: Int,
             c: Int
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams5.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams5.kt
index d2658f779af..5d3ba0e8f77 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams5.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams5.kt
@@ -1,9 +1,7 @@
 // MOVE: down
 // IS_APPLICABLE: false
 class A {
-    fun foo<T,
-            U,
-            W>(
+    fun <T, U, W> foo(
             b: Int,
             c: Int
             <caret>a: Int,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams6.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams6.kt
index 1944a7fc433..2cb2d11335a 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams6.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams6.kt
@@ -1,9 +1,7 @@
 // MOVE: up
 // IS_APPLICABLE: false
 class A {
-    fun foo<T,
-            U,
-            W>(
+    fun <T, U, W> foo(
             b: Int<caret>,
             c: Int
             a: Int,
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt
index e819df601d9..2ed069da3fe 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt
@@ -99,13 +99,15 @@ abstract class AbstractCodeMoverTest : LightCodeInsightTestCase() {
             val editor = LightPlatformCodeInsightTestCase.getEditor()
             val dataContext = LightPlatformCodeInsightTestCase.getCurrentEditorDataContext()
 
-            val presentation = Presentation()
-            action.update(editor, presentation, dataContext)
-            TestCase.assertEquals(isApplicableExpected, presentation.isEnabled)
+            val before = editor.document.text
+            runWriteAction { action.actionPerformed(editor, dataContext) }
+
+            val after = editor.document.text
+            val actionDoesNothing = after == before
+
+            TestCase.assertEquals(isApplicableExpected, !actionDoesNothing)
 
             if (isApplicableExpected) {
-                runWriteAction { action.actionPerformed(editor, dataContext) }
-
                 val afterFilePath = path + ".after"
                 try {
                     checkResultByFile(afterFilePath)