From 07259fa090625d829f70e9068c971d9739db99f8 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 20 Oct 2015 15:39:40 +0300
Subject: [PATCH] Generate Secondary Constructor: Fix test data loading. Add
 test with non-generic Java superclass

---
 .../secondaryConstructors/javaSupers.java        |  6 +++---
 .../generate/secondaryConstructors/javaSupers.kt |  2 +-
 .../secondaryConstructors/javaSupers.kt.after    |  6 +++---
 .../javaSupersWithGenerics.java                  |  9 +++++++++
 .../javaSupersWithGenerics.kt                    | 12 ++++++++++++
 .../javaSupersWithGenerics.kt.after              | 16 ++++++++++++++++
 .../generate/AbstractCodeInsightActionTest.kt    |  2 +-
 .../generate/CodeInsightActionTestGenerated.java |  6 ++++++
 8 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.java
 create mode 100644 idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt
 create mode 100644 idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt.after

diff --git a/idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.java b/idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.java
index e1409402ec5..c5c5978bb58 100644
--- a/idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.java
+++ b/idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.java
@@ -1,9 +1,9 @@
-public class Base<X, Y> {
-    public Base(X x) {
+public class Base {
+    public Base(int n) {
 
     }
 
-    public Base(X x, Y y) {
+    public Base(int a, int b) {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt b/idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt
index c4250f816bb..783ecf31cb0 100644
--- a/idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt
+++ b/idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt
@@ -1,5 +1,5 @@
 // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateSecondaryConstructorAction
-class Foo<U> : Base<U, Int> {<caret>
+class Foo : Base {<caret>
     val x = 1
 
     fun foo() {
diff --git a/idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt.after b/idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt.after
index 3b89bcb1ec2..0b001fe22d2 100644
--- a/idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt.after
+++ b/idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt.after
@@ -1,10 +1,10 @@
 // ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateSecondaryConstructorAction
-class Foo<U> : Base<U, Int> {
+class Foo : Base {
     val x = 1
 
-    <caret>constructor(x: U) : super(x)
+    <caret>constructor(n: Int) : super(n)
 
-    constructor(x: U, y: Int?) : super(x, y)
+    constructor(a: Int, b: Int) : super(a, b)
 
     fun foo() {
 
diff --git a/idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.java b/idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.java
new file mode 100644
index 00000000000..e1409402ec5
--- /dev/null
+++ b/idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.java
@@ -0,0 +1,9 @@
+public class Base<X, Y> {
+    public Base(X x) {
+
+    }
+
+    public Base(X x, Y y) {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt b/idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt
new file mode 100644
index 00000000000..c4250f816bb
--- /dev/null
+++ b/idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt
@@ -0,0 +1,12 @@
+// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateSecondaryConstructorAction
+class Foo<U> : Base<U, Int> {<caret>
+    val x = 1
+
+    fun foo() {
+
+    }
+
+    fun bar() {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt.after b/idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt.after
new file mode 100644
index 00000000000..3b89bcb1ec2
--- /dev/null
+++ b/idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt.after
@@ -0,0 +1,16 @@
+// ACTION_CLASS: org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateSecondaryConstructorAction
+class Foo<U> : Base<U, Int> {
+    val x = 1
+
+    <caret>constructor(x: U) : super(x)
+
+    constructor(x: U, y: Int?) : super(x, y)
+
+    fun foo() {
+
+    }
+
+    fun bar() {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt
index 3a745b71e15..f1247c4c1f4 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt
@@ -56,7 +56,7 @@ abstract class AbstractCodeInsightActionTest : JetLightCodeInsightFixtureTestCas
 
             val mainFile = File(path)
             val mainFileName = mainFile.name
-            val fileNameBase = mainFile.nameWithoutExtension
+            val fileNameBase = mainFile.nameWithoutExtension + "."
             val rootDir = mainFile.parentFile
             rootDir
                     .list { file, name ->
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/CodeInsightActionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/CodeInsightActionTestGenerated.java
index f7e1be741cc..cf3e711578d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/CodeInsightActionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/CodeInsightActionTestGenerated.java
@@ -53,6 +53,12 @@ public class CodeInsightActionTestGenerated extends AbstractCodeInsightActionTes
         doTest(fileName);
     }
 
+    @TestMetadata("javaSupersWithGenerics.kt")
+    public void testJavaSupersWithGenerics() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("properties.kt")
     public void testProperties() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/properties.kt");