[TEST] Migrate duplicating javac tests to new test runners

Also minimize scope of DiagnosticUsingJavac tests to
 `compiler/testData/diagnostics/tests/javac`. This is fine since
 javac compilation mode is still not finished and no one not going to
 support it

compiler/testData/diagnostics/tests/javac/Annotations.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/ann.java
 package a;
 

compiler/testData/diagnostics/tests/javac/fieldsResolution/AsteriskStaticImportsAmbiguity.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/fieldsResolution/BinaryInitializers.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/fieldsResolution/ConstantByFqName.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/fieldsResolution/ConstantValues.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/fieldsResolution/ConstantValuesFromKtFile.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: test.kt
 package a
 

compiler/testData/diagnostics/tests/javac/fieldsResolution/FieldFromOuterClass.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/fieldsResolution/InheritedField.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/fieldsResolution/MultipleOuters.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/X.java
 package a;
 

compiler/testData/diagnostics/tests/javac/fieldsResolution/ResolutionPriority.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/fieldsResolution/SameFieldInSupertypes.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/fieldsResolution/StaticImport.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/fieldsResolution/StaticImportsAmbiguity.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/imports/AllUnderImportsAmbiguity.fir.kt

@@ -0,0 +1,27 @@
+// FILE: a/x.java
+package a;
+
+public class x {}
+
+// FILE: b/x.java
+package b;
+
+public class x {}
+
+// FILE: c/d.java
+package c;
+
+import a.*;
+import b.*;
+
+public class d {
+    public x x() { return null; }
+} 
+
+// FILE: c/c.kt
+package c
+
+import a.*
+import b.*
+
+fun test(): x = d().x()

compiler/testData/diagnostics/tests/javac/imports/AllUnderImportsLessPriority.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/X.java
 package a;
 

compiler/testData/diagnostics/tests/javac/imports/ClassImportsConflicting.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // SKIP_JAVAC
 // FILE: b.kt
 package b

compiler/testData/diagnostics/tests/javac/imports/CurrentPackageAndAllUnderImport.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/X.java
 package a;
 

compiler/testData/diagnostics/tests/javac/imports/CurrentPackageAndExplicitImport.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/Y.java
 package a;
 

compiler/testData/diagnostics/tests/javac/imports/CurrentPackageAndExplicitNestedImport.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/X.java
 package a;
 

compiler/testData/diagnostics/tests/javac/imports/CurrentPackageAndNestedAsteriskImport.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/X.java
 package a;
 

compiler/testData/diagnostics/tests/javac/imports/ImportGenericVsPackage.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/imports/ImportProtectedClass.fir.kt

@@ -0,0 +1,19 @@
+// FILE: p/Foo.java
+package p;
+
+public class Foo {
+   protected static class Nested {} 
+}
+
+// FILE: foo.kt
+package a
+
+import p.Foo
+import p.Foo.Nested
+
+class Bar : Foo() {
+    protected fun foo(): Nested? = null
+}
+
+private fun foo(): Nested? = null
+private fun bar(): p.Foo.Nested? = null

compiler/testData/diagnostics/tests/javac/imports/ImportTwoTimes.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: weatherForecast/Weather.java
 package weatherForecast;
 

compiler/testData/diagnostics/tests/javac/imports/ImportTwoTimesStar.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: weatherForecast/Weather.java
 package weatherForecast;
 

compiler/testData/diagnostics/tests/javac/imports/NestedAndTopLevelClassClash.fir.kt

@@ -0,0 +1,38 @@
+// SKIP_JAVAC
+// FILE: a/B.java
+package a;
+
+public class B {}
+
+// FILE: a/D.java
+package a;
+
+public class D {
+    public static class B {}
+}
+
+// FILE: b/A1.java
+package b;
+
+import a.B;
+import a.D.B;
+
+public class A1 {
+    public B getB() { return null; }
+}
+
+// FILE: b/A2.java
+package b;
+
+import a.*;
+import a.D.*;
+
+public class A2 {
+    public B getB() { return null; }
+}
+
+// FILE: a.kt
+package b
+
+fun test() = A1().getB()
+fun test2() = A2().getB()

compiler/testData/diagnostics/tests/javac/imports/NestedClassClash.fir.kt

@@ -0,0 +1,40 @@
+// SKIP_JAVAC
+// FILE: a/A.java
+package a;
+
+public class A {
+    public static class B {}
+}
+
+// FILE: a/D.java
+package a;
+
+public class D {
+    public static class B {}
+}
+
+// FILE: b/A1.java
+package b;
+
+import a.A.B;
+import a.D.B;
+
+public class A1 {
+    public B getB() { return null; }
+}
+
+// FILE: b/A2.java
+package b;
+
+import a.A.*;
+import a.D.*;
+
+public class A2 {
+    public B getB() { return null; }
+}
+
+// FILE: a.kt
+package b
+
+fun test() = A1().getB()
+fun test2() = A2().getB()

compiler/testData/diagnostics/tests/javac/imports/PackageExplicitAndStartImport.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/imports/PackagePrivateAndPublicNested.fir.kt

@@ -0,0 +1,19 @@
+// FILE: p/Foo.java
+package p;
+
+class Foo {
+    public static class Nested {}
+}
+
+// FILE: foo.kt
+package a
+
+import p.Foo
+import p.Foo.Nested
+
+class Bar : <!EXPOSED_SUPER_CLASS, HIDDEN!>Foo<!>() {
+    protected fun <!EXPOSED_FUNCTION_RETURN_TYPE!>foo<!>(): Nested? = null
+}
+
+private fun foo(): Nested? = null
+private fun bar(): p.Foo.Nested? = null

compiler/testData/diagnostics/tests/javac/imports/TopLevelClassVsPackage.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/b.java
 package a;
 

compiler/testData/diagnostics/tests/javac/imports/TopLevelClassVsPackage2.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: foo/a/b.java
 package foo.a;
 

compiler/testData/diagnostics/tests/javac/inheritance/IheritanceOfInner.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/d.java
 package a;
 

compiler/testData/diagnostics/tests/javac/inheritance/InheritanceAmbiguity.fir.kt

@@ -0,0 +1,27 @@
+// FILE: a/x.java
+package a;
+
+public class x {
+    public class Z {}
+}
+
+// FILE: a/i.java
+package a;
+
+public interface i {
+    public class Z {}
+}
+
+// FILE: a/y.java
+package a;
+
+public class y extends x implements i {
+
+    public Z getZ() { return null; }
+
+}
+
+// FILE: test.kt
+package a
+
+fun test() = y().getZ()

compiler/testData/diagnostics/tests/javac/inheritance/InheritanceAmbiguity2.fir.kt

@@ -0,0 +1,30 @@
+// FILE: a/x.java
+package a;
+
+public class x {
+    public class Z {}
+}
+
+// FILE: a/i.java
+package a;
+
+public interface i {
+    public class Z {}
+}
+
+// FILE: a/i2.java
+package a;
+
+public interface i2 extends i {}
+
+// FILE: a/y.java
+package a;
+
+public class y extends x implements i2 {
+    public Z getZ() { return null; }
+}
+
+// FILE: test.kt
+package a
+
+fun test() = y().getZ()

compiler/testData/diagnostics/tests/javac/inheritance/InheritanceAmbiguity3.fir.kt

@@ -0,0 +1,25 @@
+// FILE: a/i.java
+package a;
+
+public interface i {
+    public class Z {}
+}
+
+// FILE: a/i2.java
+package a;
+
+public interface i2 {
+    public class Z {}
+}
+
+// FILE: a/x.java
+package a;
+
+public class x implements i, i2 {
+    public Z getZ() { return null; }
+}
+
+// FILE: test.kt
+package a
+
+fun test() = x().getZ()

compiler/testData/diagnostics/tests/javac/inheritance/InheritanceAmbiguity4.fir.kt

@@ -2,7 +2,7 @@
 package a;
 
 public class x {
-    private class O {}
+    class O {}
 }
 
 // FILE: a/x1.java

compiler/testData/diagnostics/tests/javac/inheritance/InheritanceWithKotlin.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: test/UseKotlinInner.java
 package test;
 

compiler/testData/diagnostics/tests/javac/inheritance/InheritanceWithKotlinClasses.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/k.kt
 package a
 

compiler/testData/diagnostics/tests/javac/inheritance/InheritedInner.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/inheritance/InheritedInner2.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/inheritance/InheritedInnerAndSupertypeWithSameName.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/inheritance/InheritedInnerUsageInInner.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/inheritance/InheritedKotlinInner.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.kt
 package a
 

compiler/testData/diagnostics/tests/javac/inheritance/InnerAndInheritedInner.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/inheritance/ManyInheritedClasses.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/inheritance/SameInnersInSupertypeAndSupertypesSupertype.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;
 

compiler/testData/diagnostics/tests/javac/inheritance/SuperTypeWithSameInner.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;