From 4b811a36395c8775e526f6aa2e98a064de374c5d Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 9 May 2017 11:49:59 +0200
Subject: [PATCH] Fix tests

---
 .../plainTextConversion/IntoRawStringLiteral.expected.kt    | 1 -
 .../plainTextConversion/IntoStringLiteral.expected.kt       | 5 ++---
 ...uote.expected.kt => MultiLineToTripleQuotes.expected.kt} | 0
 ...MultiLineToTripleQuote.kt => MultiLineToTripleQuotes.kt} | 0
 ...ltiLinetoTripleQuote.txt => MultiLineToTripleQuotes.txt} | 0
 .../copy/LiteralTextToKotlinCopyPasteTestGenerated.java     | 6 +++---
 6 files changed, 5 insertions(+), 7 deletions(-)
 rename idea/testData/copyPaste/plainTextLiteral/{MultiLineToTripleQuote.expected.kt => MultiLineToTripleQuotes.expected.kt} (100%)
 rename idea/testData/copyPaste/plainTextLiteral/{MultiLineToTripleQuote.kt => MultiLineToTripleQuotes.kt} (100%)
 rename idea/testData/copyPaste/plainTextLiteral/{MultiLinetoTripleQuote.txt => MultiLineToTripleQuotes.txt} (100%)

diff --git a/idea/testData/copyPaste/plainTextConversion/IntoRawStringLiteral.expected.kt b/idea/testData/copyPaste/plainTextConversion/IntoRawStringLiteral.expected.kt
index 184fc0803a4..3f3cc7ac62c 100644
--- a/idea/testData/copyPaste/plainTextConversion/IntoRawStringLiteral.expected.kt
+++ b/idea/testData/copyPaste/plainTextConversion/IntoRawStringLiteral.expected.kt
@@ -2,6 +2,5 @@ fun foo() {
     val v = """
 ArrayList<String> list = new ArrayList<String>();
 // NO_CONVERSION_EXPECTED
-
 """
 }
diff --git a/idea/testData/copyPaste/plainTextConversion/IntoStringLiteral.expected.kt b/idea/testData/copyPaste/plainTextConversion/IntoStringLiteral.expected.kt
index 81764d82f77..bf4af898571 100644
--- a/idea/testData/copyPaste/plainTextConversion/IntoStringLiteral.expected.kt
+++ b/idea/testData/copyPaste/plainTextConversion/IntoStringLiteral.expected.kt
@@ -1,5 +1,4 @@
 fun foo() {
-    val v = "ArrayList<String> list = new ArrayList<String>();
-// NO_CONVERSION_EXPECTED
-    "
+    val v = "ArrayList<String> list = new ArrayList<String>();\n" +
+            "// NO_CONVERSION_EXPECTED"
 }
diff --git a/idea/testData/copyPaste/plainTextLiteral/MultiLineToTripleQuote.expected.kt b/idea/testData/copyPaste/plainTextLiteral/MultiLineToTripleQuotes.expected.kt
similarity index 100%
rename from idea/testData/copyPaste/plainTextLiteral/MultiLineToTripleQuote.expected.kt
rename to idea/testData/copyPaste/plainTextLiteral/MultiLineToTripleQuotes.expected.kt
diff --git a/idea/testData/copyPaste/plainTextLiteral/MultiLineToTripleQuote.kt b/idea/testData/copyPaste/plainTextLiteral/MultiLineToTripleQuotes.kt
similarity index 100%
rename from idea/testData/copyPaste/plainTextLiteral/MultiLineToTripleQuote.kt
rename to idea/testData/copyPaste/plainTextLiteral/MultiLineToTripleQuotes.kt
diff --git a/idea/testData/copyPaste/plainTextLiteral/MultiLinetoTripleQuote.txt b/idea/testData/copyPaste/plainTextLiteral/MultiLineToTripleQuotes.txt
similarity index 100%
rename from idea/testData/copyPaste/plainTextLiteral/MultiLinetoTripleQuote.txt
rename to idea/testData/copyPaste/plainTextLiteral/MultiLineToTripleQuotes.txt
diff --git a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/LiteralTextToKotlinCopyPasteTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/LiteralTextToKotlinCopyPasteTestGenerated.java
index 4dcc40f54c9..17bf4e81daa 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/LiteralTextToKotlinCopyPasteTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/LiteralTextToKotlinCopyPasteTestGenerated.java
@@ -48,9 +48,9 @@ public class LiteralTextToKotlinCopyPasteTestGenerated extends AbstractLiteralTe
         doTest(fileName);
     }
 
-    @TestMetadata("MultiLinetoTripleQuote.txt")
-    public void testMultiLinetoTripleQuote() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextLiteral/MultiLinetoTripleQuote.txt");
+    @TestMetadata("MultiLineToTripleQuotes.txt")
+    public void testMultiLineToTripleQuotes() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/plainTextLiteral/MultiLineToTripleQuotes.txt");
         doTest(fileName);
     }