From cf161f823471cc2cac33f39f398a4f67ee5b52b3 Mon Sep 17 00:00:00 2001
From: "victor.petukhov" <victor.petukhov@jetbrains.com>
Date: Fri, 15 Nov 2019 12:10:08 +0300
Subject: [PATCH] Rework `notForIncompletionCall` test

---
 .../callWithTrailingComma.after.kt            | 19 +++++++++++++++++++
 ...callWithTrailingComma.before.Dependency.kt | 13 +++++++++++++
 ...t => callWithTrailingComma.before.Main.kt} | 13 ++-----------
 .../QuickFixMultiFileTestGenerated.java       | 10 +++++-----
 4 files changed, 39 insertions(+), 16 deletions(-)
 create mode 100644 idea/testData/quickfix/autoImports/callWithTrailingComma.after.kt
 create mode 100644 idea/testData/quickfix/autoImports/callWithTrailingComma.before.Dependency.kt
 rename idea/testData/quickfix/autoImports/{mismatchingArgs/notForIncompleteCall.test => callWithTrailingComma.before.Main.kt} (60%)

diff --git a/idea/testData/quickfix/autoImports/callWithTrailingComma.after.kt b/idea/testData/quickfix/autoImports/callWithTrailingComma.after.kt
new file mode 100644
index 00000000000..2b6169a3de7
--- /dev/null
+++ b/idea/testData/quickfix/autoImports/callWithTrailingComma.after.kt
@@ -0,0 +1,19 @@
+// "Import" "true"
+// ERROR: Type mismatch: inferred type is Int but String was expected
+// ACTION: Add 'toString()' call
+// ACTION: Change parameter 'p' type of function 'foo' to 'Int'
+// ACTION: Create function 'foo'
+// COMPILER_ARGUMENTS: -XXLanguage:+TrailingCommas
+
+package main
+
+import other.foo
+
+class X {
+    fun foo(p: String) {
+    }
+
+    fun f(p: Int) {
+        foo(<selection><caret></selection>p, )
+    }
+}
diff --git a/idea/testData/quickfix/autoImports/callWithTrailingComma.before.Dependency.kt b/idea/testData/quickfix/autoImports/callWithTrailingComma.before.Dependency.kt
new file mode 100644
index 00000000000..ec4cd671da6
--- /dev/null
+++ b/idea/testData/quickfix/autoImports/callWithTrailingComma.before.Dependency.kt
@@ -0,0 +1,13 @@
+// "Import" "true"
+// ERROR: Type mismatch: inferred type is Int but String was expected
+// ACTION: Add 'toString()' call
+// ACTION: Change parameter 'p' type of function 'foo' to 'Int'
+// ACTION: Create function 'foo'
+// COMPILER_ARGUMENTS: -XXLanguage:+TrailingCommas
+
+package other
+
+import main.X
+
+fun X.foo(p: Int) {
+}
diff --git a/idea/testData/quickfix/autoImports/mismatchingArgs/notForIncompleteCall.test b/idea/testData/quickfix/autoImports/callWithTrailingComma.before.Main.kt
similarity index 60%
rename from idea/testData/quickfix/autoImports/mismatchingArgs/notForIncompleteCall.test
rename to idea/testData/quickfix/autoImports/callWithTrailingComma.before.Main.kt
index d58f378c8d3..35ba5d46af3 100644
--- a/idea/testData/quickfix/autoImports/mismatchingArgs/notForIncompleteCall.test
+++ b/idea/testData/quickfix/autoImports/callWithTrailingComma.before.Main.kt
@@ -1,10 +1,9 @@
-// FILE: first.before.kt
-// "Import" "false"
-// ERROR: The feature "trailing commas" is only available since language version 1.4
+// "Import" "true"
 // ERROR: Type mismatch: inferred type is Int but String was expected
 // ACTION: Add 'toString()' call
 // ACTION: Change parameter 'p' type of function 'foo' to 'Int'
 // ACTION: Create function 'foo'
+// COMPILER_ARGUMENTS: -XXLanguage:+TrailingCommas
 
 package main
 
@@ -16,11 +15,3 @@ class X {
         foo(<caret>p, )
     }
 }
-
-// FILE: second.kt
-package other
-
-import main.X
-
-fun X.foo(p: Int) {
-}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
index 5e857ed9a7e..85fb8912a7f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
@@ -515,6 +515,11 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
             runTest("idea/testData/quickfix/autoImports/ambiguousNamePreferWithImportsFromPackage.before.Main.kt");
         }
 
+        @TestMetadata("callWithTrailingComma.before.Main.kt")
+        public void testCallWithTrailingComma() throws Exception {
+            runTest("idea/testData/quickfix/autoImports/callWithTrailingComma.before.Main.kt");
+        }
+
         @TestMetadata("callableReferenceExtension.before.Main.kt")
         public void testCallableReferenceExtension() throws Exception {
             runTest("idea/testData/quickfix/autoImports/callableReferenceExtension.before.Main.kt");
@@ -1140,11 +1145,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
                 runTest("idea/testData/quickfix/autoImports/mismatchingArgs/namedArgument.test");
             }
 
-            @TestMetadata("notForIncompleteCall.test")
-            public void testNotForIncompleteCall() throws Exception {
-                runTest("idea/testData/quickfix/autoImports/mismatchingArgs/notForIncompleteCall.test");
-            }
-
             @TestMetadata("smartCast.test")
             public void testSmartCast() throws Exception {
                 runTest("idea/testData/quickfix/autoImports/mismatchingArgs/smartCast.test");