From bf0798ca86b8d887fbc40755f125251e17df182c Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 3 Apr 2015 16:43:18 +0300
Subject: [PATCH] Added test

---
 .../conversion/ConversionInCorrectContext.dependency.kt     | 3 +++
 .../conversion/ConversionInCorrectContext.expected.kt       | 3 +++
 .../copyPaste/conversion/ConversionInCorrectContext.java    | 5 +++++
 .../copyPaste/conversion/ConversionInCorrectContext.to.kt   | 1 +
 .../copy/JavaToKotlinCopyPasteConversionTestGenerated.java  | 6 ++++++
 5 files changed, 18 insertions(+)
 create mode 100644 idea/testData/copyPaste/conversion/ConversionInCorrectContext.dependency.kt
 create mode 100644 idea/testData/copyPaste/conversion/ConversionInCorrectContext.expected.kt
 create mode 100644 idea/testData/copyPaste/conversion/ConversionInCorrectContext.java
 create mode 100644 idea/testData/copyPaste/conversion/ConversionInCorrectContext.to.kt

diff --git a/idea/testData/copyPaste/conversion/ConversionInCorrectContext.dependency.kt b/idea/testData/copyPaste/conversion/ConversionInCorrectContext.dependency.kt
new file mode 100644
index 00000000000..3c0c0b230d5
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/ConversionInCorrectContext.dependency.kt
@@ -0,0 +1,3 @@
+class Dependency {
+    fun getInt(): Int = 1
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/ConversionInCorrectContext.expected.kt b/idea/testData/copyPaste/conversion/ConversionInCorrectContext.expected.kt
new file mode 100644
index 00000000000..d7026fe8098
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/ConversionInCorrectContext.expected.kt
@@ -0,0 +1,3 @@
+fun foo(p: Dependency): Double {
+    return p.getInt().toDouble() // explicit conversion to Double must be added on conversion (if type Dependency) is correctly resolved
+}
diff --git a/idea/testData/copyPaste/conversion/ConversionInCorrectContext.java b/idea/testData/copyPaste/conversion/ConversionInCorrectContext.java
new file mode 100644
index 00000000000..21b92a99ef7
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/ConversionInCorrectContext.java
@@ -0,0 +1,5 @@
+class C {
+<selection>    double foo(Dependency p) {
+        return p.getInt(); // explicit conversion to Double must be added on conversion (if type Dependency) is correctly resolved
+    }
+</selection>}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/ConversionInCorrectContext.to.kt b/idea/testData/copyPaste/conversion/ConversionInCorrectContext.to.kt
new file mode 100644
index 00000000000..81389d50841
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/ConversionInCorrectContext.to.kt
@@ -0,0 +1 @@
+<caret>
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
index e091b476373..95f98b34eba 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
@@ -78,6 +78,12 @@ public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaTo
         doTest(fileName);
     }
 
+    @TestMetadata("ConversionInCorrectContext.java")
+    public void testConversionInCorrectContext() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ConversionInCorrectContext.java");
+        doTest(fileName);
+    }
+
     @TestMetadata("HalfTheWhiteSpace.java")
     public void testHalfTheWhiteSpace() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java");