From be8b31e82bca95503d04bfd1a92b4fa0e26ee29d Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 21 Sep 2016 22:00:05 +0300
Subject: [PATCH] Removed redundant and confusing .after files in negative
 tests

---
 .../autoImports/delegateNoOperator.test       |  5 -----
 .../indexCallExtensionGetNoOperator.test      |  5 -----
 ...lNoImportWhenGetNeededButSetAvailable.test |  4 ----
 ...lNoImportWhenSetNeededButGetAvailable.test |  4 ----
 .../invokeExtensionNoOperator.test            | 20 -------------------
 .../memberImportNotForClassFunction.test      | 13 ------------
 .../memberImportNotForClassProperty.test      | 14 -------------
 .../memberImportNotForJavaNonStaticField.test | 14 -------------
 ...memberImportNotForJavaNonStaticMethod.test | 13 ------------
 .../memberImportNotForTopLevelFunction.test   | 13 ------------
 ...clarationExtensionComponentNoOperator.test |  5 -----
 .../AbstractQuickFixMultiFileTest.java        |  3 +++
 12 files changed, 3 insertions(+), 110 deletions(-)

diff --git a/idea/testData/quickfix/autoImports/delegateNoOperator.test b/idea/testData/quickfix/autoImports/delegateNoOperator.test
index 180acc4ccec..ff6116101c4 100644
--- a/idea/testData/quickfix/autoImports/delegateNoOperator.test
+++ b/idea/testData/quickfix/autoImports/delegateNoOperator.test
@@ -14,8 +14,3 @@ package a
 import kotlin.reflect.KProperty
 
 fun String.getValue(x: Any?, y: KProperty<*>) = ""
-
-
-
-// FILE: first.after.kt
-// Should not be checked
\ No newline at end of file
diff --git a/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test b/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test
index 0b251b99a1a..0e54b9cdbba 100644
--- a/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test
+++ b/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test
@@ -25,8 +25,3 @@ package some
 public class Some
 
 fun Some.get(s: String) {}
-
-
-
-// FILE: first.after.kt
-// Should not be checked
diff --git a/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test b/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test
index 20513c9fe8f..b1f06066631 100644
--- a/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test
+++ b/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test
@@ -25,7 +25,3 @@ package some
 public class Some
 
 operator fun Some.get(s: String) {}
-
-
-// FILE: first.after.kt
-// Empty File
\ No newline at end of file
diff --git a/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test b/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test
index 4cba4fd70d0..198093257ad 100644
--- a/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test
+++ b/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test
@@ -25,7 +25,3 @@ package some
 public class Some
 
 operator fun Some.set(s: String) {}
-
-
-// FILE: first.after.kt
-// Empty File
\ No newline at end of file
diff --git a/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test b/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test
index d1097d9808d..59f9511fc26 100644
--- a/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test
+++ b/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test
@@ -25,23 +25,3 @@ public class Some
 
 fun Some.invoke(s: String) {}
 //-----------------------
-
-
-// FILE: first.after.kt
-// "Import" "true"
-// ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function 'invoke()' is not found
-// ACTION: Create extension function 'invoke'
-// ACTION: Create member function 'invoke'
-
-
-package testing
-
-import some.Some
-import some.invoke
-
-fun testing() {
-    <caret>Some()("str")
-}
-//-----------------------
-
-
diff --git a/idea/testData/quickfix/autoImports/memberImportNotForClassFunction.test b/idea/testData/quickfix/autoImports/memberImportNotForClassFunction.test
index 9dc332a146d..85977ba299c 100644
--- a/idea/testData/quickfix/autoImports/memberImportNotForClassFunction.test
+++ b/idea/testData/quickfix/autoImports/memberImportNotForClassFunction.test
@@ -18,16 +18,3 @@ class Foo {
     fun foobar() {
     }
 }
-
-//FILE: main.after.kt
-// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
-// ERROR: Unresolved reference: foobar
-// ACTION: Create function 'foobar'
-// ACTION: Rename reference
-
-//KT-9009
-
-
-fun f() {
-    foobar<caret>()
-}
\ No newline at end of file
diff --git a/idea/testData/quickfix/autoImports/memberImportNotForClassProperty.test b/idea/testData/quickfix/autoImports/memberImportNotForClassProperty.test
index a7ad17816af..a9b891825ee 100644
--- a/idea/testData/quickfix/autoImports/memberImportNotForClassProperty.test
+++ b/idea/testData/quickfix/autoImports/memberImportNotForClassProperty.test
@@ -19,17 +19,3 @@ package bar
 class Foo {
     var foobar = "foobar"
 }
-
-//FILE: main.after.kt
-// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
-// ERROR: Unresolved reference: foobar
-// ACTION: Create local variable 'foobar'
-// ACTION: Create property 'foobar'
-// ACTION: Rename reference
-
-//KT-9009
-
-
-fun f() {
-    foobar<caret> = "barfoo"
-}
\ No newline at end of file
diff --git a/idea/testData/quickfix/autoImports/memberImportNotForJavaNonStaticField.test b/idea/testData/quickfix/autoImports/memberImportNotForJavaNonStaticField.test
index 148381b1a20..59db5c7e853 100644
--- a/idea/testData/quickfix/autoImports/memberImportNotForJavaNonStaticField.test
+++ b/idea/testData/quickfix/autoImports/memberImportNotForJavaNonStaticField.test
@@ -19,17 +19,3 @@ package bar
 public class Foo {
     public foobar = "foobar"
 }
-
-//FILE: main.after.kt
-// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
-// ERROR: Unresolved reference: foobar
-// ACTION: Create local variable 'foobar'
-// ACTION: Create property 'foobar'
-// ACTION: Rename reference
-
-//KT-9009
-
-
-fun f() {
-    foobar<caret> = "barfoo"
-}
\ No newline at end of file
diff --git a/idea/testData/quickfix/autoImports/memberImportNotForJavaNonStaticMethod.test b/idea/testData/quickfix/autoImports/memberImportNotForJavaNonStaticMethod.test
index 4980250472c..871d8a3db27 100644
--- a/idea/testData/quickfix/autoImports/memberImportNotForJavaNonStaticMethod.test
+++ b/idea/testData/quickfix/autoImports/memberImportNotForJavaNonStaticMethod.test
@@ -19,16 +19,3 @@ public class Foo {
     {
     }
 }
-
-//FILE: main.after.kt
-// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
-// ERROR: Unresolved reference: foobar
-// ACTION: Create function 'foobar'
-// ACTION: Rename reference
-
-//KT-9009
-
-
-fun f() {
-    foobar<caret>()
-}
\ No newline at end of file
diff --git a/idea/testData/quickfix/autoImports/memberImportNotForTopLevelFunction.test b/idea/testData/quickfix/autoImports/memberImportNotForTopLevelFunction.test
index 6a0d2f0f9bd..a4901e25704 100644
--- a/idea/testData/quickfix/autoImports/memberImportNotForTopLevelFunction.test
+++ b/idea/testData/quickfix/autoImports/memberImportNotForTopLevelFunction.test
@@ -17,16 +17,3 @@ package bar
 
 fun foobar() {
 }
-
-//FILE: main.after.kt
-// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
-// ERROR: Unresolved reference: foobar
-// ACTION: Create function 'foobar'
-// ACTION: Rename reference
-
-//KT-9009
-
-
-fun f() {
-    foobar<caret>()
-}
\ No newline at end of file
diff --git a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test
index e7251d14747..c48979d2e78 100644
--- a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test
+++ b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test
@@ -23,8 +23,3 @@ public class Some
 
 fun Some.component1() = 1
 operator fun Some.component2() = 3
-//-----------------------
-
-
-// FILE: first.after.kt
-// -- Empty file --
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
index 76153f01bbd..aff168ecd89 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
@@ -302,6 +302,9 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer
                             KotlinTestUtils.assertEqualsToFile(new File(beforeFileName), actualTestFile.toString());
                         }
                     }
+                    else {
+                        assertNull(".after file should not exist", afterFile);
+                    }
                 }
                 catch (ComparisonFailure e) {
                     throw e;