javac-wrapper: refactoring, fixes and tests

compiler/testData/diagnostics/tests/generics/PseudoRawTypes.javac.txt

@@ -0,0 +1,13 @@
+package
+
+package test {
+    public fun foo(/*0*/ u: test.Usage): kotlin.Unit
+
+    public open class Usage {
+        public constructor Usage()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public/*package*/ open fun foo(/*0*/ c: kotlin.collections.(Mutable)Collection<*>!): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}

compiler/testData/diagnostics/tests/generics/PseudoRawTypes.kt

@@ -1,3 +1,4 @@
+// JAVAC_EXPECTED_FILE
 // FILE: java/util/Collection.java
 package java.util;
 

compiler/testData/diagnostics/tests/generics/PseudoRawTypes.txt

@@ -1,5 +1,73 @@
 package
 
+package java {
+
+    package java.awt {
+
+        package java.awt.event {
+        }
+    }
+
+    package java.beans {
+
+        package java.beans.beancontext {
+        }
+    }
+
+    package java.io {
+    }
+
+    package java.lang {
+
+        package java.lang.annotation {
+        }
+
+        package java.lang.reflect {
+        }
+    }
+
+    package java.net {
+    }
+
+    package java.nio {
+
+        package java.nio.charset {
+        }
+    }
+
+    package java.rmi {
+    }
+
+    package java.security {
+    }
+
+    package java.sql {
+    }
+
+    package java.util {
+
+        public open class Collection {
+            public constructor Collection()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open fun foo(): kotlin.Unit
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+
+        package java.util.concurrent {
+
+            package java.util.concurrent.atomic {
+            }
+
+            package java.util.concurrent.locks {
+            }
+        }
+
+        package java.util.regex {
+        }
+    }
+}
+
 package test {
     public fun foo(/*0*/ u: test.Usage): kotlin.Unit
 

compiler/testData/diagnostics/tests/generics/innerClasses/iterator.javac.txt

@@ -0,0 +1,34 @@
+package
+
+public fun </*0*/ E> commonSupertype(/*0*/ x: E, /*1*/ y: E): E
+public fun foo(): kotlin.Unit
+
+public final class A</*0*/ T> : java.util.AbstractCollection<T> {
+    public constructor A</*0*/ T>()
+    public open override /*1*/ val size: kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
+    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 isEmpty(): kotlin.Boolean
+    public open override /*1*/ fun iterator(): A<T>.MyIt
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
+    public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public final inner class MyIt /*captured type parameters: /*0*/ T*/ : kotlin.collections.MutableIterator<T> {
+        public constructor MyIt()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ fun hasNext(): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ fun next(): T
+        public open override /*1*/ fun remove(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}

compiler/testData/diagnostics/tests/generics/innerClasses/iterator.kt

@@ -1,5 +1,6 @@
 // !CHECK_TYPE
 // !DIAGNOSTICS: -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_VARIABLE
+// JAVAC_EXPECTED_FILE
 import java.util.*
 
 class A<T> : AbstractCollection<T>() {

compiler/testData/diagnostics/tests/generics/kt9985.kt

@@ -5,7 +5,7 @@
 
 public class B<T> {
     public String gav() {
-        return ""
+        return "";
     }
 
     public static <T> B<T> create() {

compiler/testData/diagnostics/tests/generics/wildcardInValueParameter.kt

@@ -1,3 +1,4 @@
+// JAVAC_SKIP
 // FILE: JavaClass.java
 public class JavaClass {
     public void foo(? x) {}