[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
2020-12-15 15:22:48 +03:00
parent b44dc55109
commit 61302a2e08
156 changed files with 1631 additions and 35369 deletions
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/ann.java
 package a;

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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()
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/X.java
 package a;

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

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

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

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

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

@@ -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
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: weatherForecast/Weather.java
 package weatherForecast;

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

@@ -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()
@@ -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()
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;

@@ -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
@@ -16,4 +16,4 @@ class Bar : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER, INVISIBLE_REFERENCE!>Foo<
 }

 private fun foo(): <!INVISIBLE_REFERENCE!>Nested<!>? = null
-private fun bar(): p.<!INVISIBLE_REFERENCE!>Foo<!>.<!INVISIBLE_REFERENCE!>Nested<!>? = null
+private fun bar(): p.<!INVISIBLE_REFERENCE!>Foo<!>.<!INVISIBLE_REFERENCE!>Nested<!>? = null
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/b.java
 package a;

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

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

@@ -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()
@@ -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()
@@ -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()
@@ -2,7 +2,7 @@
 package a;

 public class x {
-    private class O {}
+    class O {}
 }

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

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

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

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

@@ -26,4 +27,4 @@ package a

 fun test1() = x1().getB()
 fun test2() = x2.<!UNRESOLVED_REFERENCE!>B<!>()
-fun test3() = x2<String>().getB()
+fun test3() = x2<String>().getB()
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: a/x.java
 package a;

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

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

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

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

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

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

--- a/Show More
+++ b/Show More