azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[TEST] Migrate duplicating javac tests to new test runners

Browse Source 
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
This commit is contained in:
Dmitriy Novozhilov
2020-12-15 15:22:48 +03:00
parent b44dc55109
commit 61302a2e08
156 changed files with 1631 additions and 35369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/javac/inners/ComplexCase.kt
Vendored
+39
View File
@@ -0,0 +1,39 @@
// FIR_IDENTICAL
// FILE: p1/I.java
package p1;
public interface I {}
// FILE: p2/I.java
package p2;
public class I {}
// FILE: p/X.java
package p;
import p1.*;
import p2.I;
public class X {
public class I1<I> {
public I getI() { return null; }
}
public static class N {
public I getI() { return null; }
public class I<I> {
public I getI() { return null; }
}
}
public class I {
public I getI() { return null; }
}
public I getI() { return null; }
}
compiler/testData/diagnostics/tests/javac/inners/ComplexCase.txt
Vendored
+63
View File
@@ -0,0 +1,63 @@
package
package p {
public open class X {
public constructor X()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getI(): p.X.I!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open inner class I {
public constructor I()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getI(): p.X.I!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open inner class I1</*0*/ I : kotlin.Any!> {
public constructor I1</*0*/ I : kotlin.Any!>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getI(): I!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open class N {
public constructor N()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getI(): p.X.N.I<(raw) kotlin.Any!>!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open inner class I</*0*/ I : kotlin.Any!> {
public constructor I</*0*/ I : kotlin.Any!>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getI(): I!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}
}
package p1 {
public interface I {
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
}
}
package p2 {
public open class I {
public constructor I()
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
}
}
compiler/testData/diagnostics/tests/javac/inners/ComplexCase2.kt
Vendored
+42
View File
@@ -0,0 +1,42 @@
// FIR_IDENTICAL
// FILE: p1/I.java
package p1;
public interface I {}
// FILE: p2/I.java
package p2;
public class I {}
// FILE: p/X.java
package p;
import p1.*;
import p2.I;
public class X {
public class I1<I> {
public I getI() { return null; }
}
public class N {
public I getI() { return null; }
public class I {}
private class M<I, I1> {
public I getI() { return null; }
public I1 getI1() { return null; }
class I1 {
I1 getI1() { return null; }
}
}
}
public I getI() { return null; }
}
compiler/testData/diagnostics/tests/javac/inners/ComplexCase2.txt
Vendored
+71
View File
@@ -0,0 +1,71 @@
package
package p {
public open class X {
public constructor X()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getI(): p2.I!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open inner class I1</*0*/ I : kotlin.Any!> {
public constructor I1</*0*/ I : kotlin.Any!>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getI(): I!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open inner class N {
public constructor N()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getI(): p.X.N.I!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open inner class I {
public constructor I()
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
}
private open inner class M</*0*/ I : kotlin.Any!, /*1*/ I1 : kotlin.Any!> {
private constructor M</*0*/ I : kotlin.Any!, /*1*/ I1 : kotlin.Any!>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getI(): I!
public open fun getI1(): I1!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public/*package*/ open inner class I1 /*captured type parameters: /*0*/ I : kotlin.Any!, /*1*/ I1 : kotlin.Any!*/ {
public/*package*/ constructor I1()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public/*package*/ open fun getI1(): p.X.N.M<I!, I1!>.I1!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}
}
}
package p1 {
public interface I {
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
}
}
package p2 {
public open class I {
public constructor I()
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
}
}
compiler/testData/diagnostics/tests/javac/inners/CurrentPackageAndInner.kt
Vendored
+26
View File
@@ -0,0 +1,26 @@
// FIR_IDENTICAL
// FILE: a/x.java
package a;
public class x {
public b getB() { return null; }
public class b {
public b getB() { return null; }
}
}
// FILE: a/b.java
package a;
public class b {}
// FILE: test/test.kt
package test
import a.x
fun test() = x().getB()
fun test2() = test().getB()
compiler/testData/diagnostics/tests/javac/inners/CurrentPackageAndInner.txt
Vendored
+32
View File
@@ -0,0 +1,32 @@
package
package a {
public open class b {
public constructor b()
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 open class x {
public constructor x()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open inner class b {
public constructor b()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}
package test {
public fun test(): a.x.b!
public fun test2(): a.x.b!
}
compiler/testData/diagnostics/tests/javac/inners/ImportThriceNestedClass.kt
Vendored
+49
View File
@@ -0,0 +1,49 @@
// FIR_IDENTICAL
// FILE: a/x.java
package a;
public class x {
public b getB() { return null; }
public static class b {
public b getB() { return null; }
public static class b {
public b getB() { return null; }
public static class b {
public b getB() { return null; }
}
}
}
}
// FILE: b/x.java
package b;
import a.x.b.b.b;
public class x {
public b getB() { return null; }
}
// FILE: b/y.java
package b;
import a.x.b.b.*;
public class y {
public b getB() { return null; }
}
// FILE: b/test.kt
package b
fun test() = x().getB()
fun test2() = y().getB()
compiler/testData/diagnostics/tests/javac/inners/ImportThriceNestedClass.txt
Vendored
+57
View File
@@ -0,0 +1,57 @@
package
package a {
public open class x {
public constructor x()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open class b {
public constructor b()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open class b {
public constructor b()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b.b.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open class b {
public constructor b()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b.b.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}
}
}
package b {
public fun test(): a.x.b.b.b!
public fun test2(): a.x.b.b.b!
public open class x {
public constructor x()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b.b.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open class y {
public constructor y()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b.b.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/javac/inners/InnerInInner.kt
Vendored
+28
View File
@@ -0,0 +1,28 @@
// FIR_IDENTICAL
// FILE: a/x.java
package a;
public class x {
public b getB() { return null; }
public class b {
public b getB() { return null; }
public class b {
public b getB() { return null; }
}
}
}
// FILE: test.kt
package a
fun test() = x().getB()
fun test2() = test().getB()
fun test3() = test2().getB()
compiler/testData/diagnostics/tests/javac/inners/InnerInInner.txt
Vendored
+31
View File
@@ -0,0 +1,31 @@
package
package a {
public fun test(): a.x.b!
public fun test2(): a.x.b.b!
public fun test3(): a.x.b.b!
public open class x {
public constructor x()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open inner class b {
public constructor b()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open inner class b {
public constructor b()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}
}
compiler/testData/diagnostics/tests/javac/inners/Nested.kt
Vendored
+24
View File
@@ -0,0 +1,24 @@
// FIR_IDENTICAL
// FILE: p/p.kt
package p
object Object {
sealed class Sealed1 {
sealed class Sealed2 {
}
}
}
// FILE: a/x.java
package a;
import p.Object;
public class x {
public Object.Sealed1.Sealed2 getSealed2() { return null; };
}
// FILE: test.kt
package a
fun test() = x().getSealed2()
compiler/testData/diagnostics/tests/javac/inners/Nested.txt
Vendored
+37
View File
@@ -0,0 +1,37 @@
package
package a {
public fun test(): p.Object.Sealed1.Sealed2!
public open class x {
public constructor x()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getSealed2(): p.Object.Sealed1.Sealed2!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
package p {
public object Object {
private constructor Object()
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 sealed class Sealed1 {
private constructor Sealed1()
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 sealed class Sealed2 {
private constructor Sealed2()
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
}
}
}
}
compiler/testData/diagnostics/tests/javac/inners/ThriceNestedClass.kt
Vendored
+33
View File
@@ -0,0 +1,33 @@
// FIR_IDENTICAL
// FILE: a/x.java
package a;
public class x {
public b getB() { return null; }
public static class b {
public b getB() { return null; }
public static class b {
public b getB() { return null; }
public static class b {
public b getB() { return null; }
}
}
}
}
// FILE: test.kt
package a
fun test() = x().getB()
fun test2() = test().getB()
fun test3() = test2().getB()
fun test4() = test3().getB()
compiler/testData/diagnostics/tests/javac/inners/ThriceNestedClass.txt
Vendored
+40
View File
@@ -0,0 +1,40 @@
package
package a {
public fun test(): a.x.b!
public fun test2(): a.x.b.b!
public fun test3(): a.x.b.b.b!
public fun test4(): a.x.b.b.b!
public open class x {
public constructor x()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open class b {
public constructor b()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open class b {
public constructor b()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b.b.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open class b {
public constructor b()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getB(): a.x.b.b.b!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}
}
}