Generate Secondary Constructor: Fix test data loading. Add test with non-generic Java superclass

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) {
 
     }
 }

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() {

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() {
 

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) {
+
+    }
+}

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() {
+
+    }
+}

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() {
+
+    }
+}