javac-wrapper: refactoring, fixes and tests

compiler/testData/diagnostics/tests/j+k/sam/privateCandidatesWithWrongArguments.javac.txt

@@ -0,0 +1,25 @@
+package
+
+package bar {
+    public fun main(): kotlin.Unit
+}
+
+package foo {
+
+    public open class A {
+        public constructor A()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public interface B {
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public abstract fun g(): kotlin.Unit
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+
+        // Static members
+        public/*package*/ open fun f(/*0*/ b: foo.A.B!): kotlin.Unit
+    }
+}

compiler/testData/diagnostics/tests/j+k/sam/privateCandidatesWithWrongArguments.kt

@@ -1,3 +1,4 @@
+// JAVAC_EXPECTED_FILE
 // FILE: foo/A.java
 package foo;
 

compiler/testData/diagnostics/tests/j+k/sam/privateCandidatesWithWrongArguments.txt

@@ -3,3 +3,23 @@ package
 package bar {
     public fun main(): kotlin.Unit
 }
+
+package foo {
+
+    public open class A {
+        public constructor A()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public interface B {
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public abstract fun g(): kotlin.Unit
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+
+        // Static members
+        public/*package*/ open fun f(/*0*/ b: foo.A.B!): kotlin.Unit
+    }
+}

compiler/testData/diagnostics/tests/j+k/sam/staticSamFromImportWithStar.txt

@@ -1,5 +1,18 @@
 package
 
+package a {
+
+    public open class Statics {
+        public constructor Statics()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        // Static members
+        public open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
+    }
+}
+
 package b {
     public fun test(): kotlin.Unit
 }

compiler/testData/diagnostics/tests/j+k/sam/staticSamWithExplicitImport.txt

@@ -1,5 +1,18 @@
 package
 
+package a {
+
+    public open class Statics {
+        public constructor Statics()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        // Static members
+        public open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
+    }
+}
+
 package b {
     public fun test(): kotlin.Unit
 }