From 4f1d2252f0321dffcb46d09d60aeaa9d4d1dbe40 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 15 Jan 2016 22:08:47 +0300
Subject: [PATCH] Make test for replacement, which requires adding import to
 the package with operator, independent from stdlib.

---
 .../imports/addImportForOperator.after.kt         | 10 ++++++++++
 .../addImportForOperator.before.Declaration.kt    |  8 ++++++++
 .../addImportForOperator.before.Dependency.kt     |  3 +++
 .../imports/addImportForOperator.before.Main.kt   |  8 ++++++++
 .../imports/addImportRuntime.kt                   | 12 ------------
 .../imports/addImportRuntime.kt.after             | 13 -------------
 .../quickfix/QuickFixMultiFileTestGenerated.java  |  6 ++++++
 .../idea/quickfix/QuickFixTestGenerated.java      | 15 ---------------
 8 files changed, 35 insertions(+), 40 deletions(-)
 create mode 100644 idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.after.kt
 create mode 100644 idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.before.Declaration.kt
 create mode 100644 idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.before.Dependency.kt
 create mode 100644 idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.before.Main.kt
 delete mode 100644 idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportRuntime.kt
 delete mode 100644 idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportRuntime.kt.after

diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.after.kt b/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.after.kt
new file mode 100644
index 00000000000..ee4ca8889cc
--- /dev/null
+++ b/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.after.kt
@@ -0,0 +1,10 @@
+// "Replace with 'newFun(n + listOf(s))'" "true"
+
+import declaration.listOf
+import declaration.newFun
+import declaration.oldFun
+import weird.collections.plus
+
+fun foo() {
+    <caret>newFun(listOf(2) + listOf(1))
+}
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.before.Declaration.kt b/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.before.Declaration.kt
new file mode 100644
index 00000000000..3e092a76194
--- /dev/null
+++ b/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.before.Declaration.kt
@@ -0,0 +1,8 @@
+package declaration
+
+fun <T> listOf(element: T): List<T> = throw Exception()
+
+@Deprecated("", ReplaceWith("newFun(n + listOf(s))", "weird.collections.plus"))
+fun oldFun(n: List<Int>, s: Int) {}
+
+fun newFun(n: List<Int>) {}
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.before.Dependency.kt b/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.before.Dependency.kt
new file mode 100644
index 00000000000..4eb75ad9dac
--- /dev/null
+++ b/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.before.Dependency.kt
@@ -0,0 +1,3 @@
+package weird.collections
+
+operator fun <T> List<T>.plus(other: T): List<T> = throw Exception()
\ No newline at end of file
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.before.Main.kt b/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.before.Main.kt
new file mode 100644
index 00000000000..4489876f436
--- /dev/null
+++ b/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.before.Main.kt
@@ -0,0 +1,8 @@
+// "Replace with 'newFun(n + listOf(s))'" "true"
+
+import declaration.listOf
+import declaration.oldFun
+
+fun foo() {
+    <caret>oldFun(listOf(2), 1)
+}
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportRuntime.kt b/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportRuntime.kt
deleted file mode 100644
index 6ded2a4c01c..00000000000
--- a/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportRuntime.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// "Replace with 'newFun(n + java.math.BigInteger(s))'" "true"
-
-import java.math.BigInteger
-
-@Deprecated("", ReplaceWith("newFun(n + java.math.BigInteger(s))", "kotlin.math.plus"))
-fun oldFun(n: BigInteger, s: String) {}
-
-fun newFun(n: BigInteger) {}
-
-fun foo() {
-    <caret>oldFun(BigInteger("2"), "1")
-}
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportRuntime.kt.after b/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportRuntime.kt.after
deleted file mode 100644
index 604d3a87d3c..00000000000
--- a/idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportRuntime.kt.after
+++ /dev/null
@@ -1,13 +0,0 @@
-// "Replace with 'newFun(n + java.math.BigInteger(s))'" "true"
-
-import java.math.BigInteger
-import kotlin.math.plus
-
-@Deprecated("", ReplaceWith("newFun(n + java.math.BigInteger(s))", "kotlin.math.plus"))
-fun oldFun(n: BigInteger, s: String) {}
-
-fun newFun(n: BigInteger) {}
-
-fun foo() {
-    <caret>newFun(BigInteger("2") + BigInteger("1"))
-}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
index e1558112f9d..ab496090d2d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
@@ -1139,6 +1139,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Imports extends AbstractQuickFixMultiFileTest {
+            @TestMetadata("addImportForOperator.before.Main.kt")
+            public void testAddImportForOperator() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportForOperator.before.Main.kt");
+                doTestWithExtraFile(fileName);
+            }
+
             @TestMetadata("addImportFromSamePackage.before.Main.kt")
             public void testAddImportFromSamePackage() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportFromSamePackage.before.Main.kt");
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 3b44c9b91d9..c63d2ba2719 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -3931,21 +3931,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             }
         }
 
-        @TestMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Imports extends AbstractQuickFixTest {
-            @TestMetadata("addImportRuntime.kt")
-            public void testAddImportRuntime() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportRuntime.kt");
-                doTest(fileName);
-            }
-
-            public void testAllFilesPresentInImports() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/imports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
-            }
-        }
-
         @TestMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)