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

Tests: move more diagnostic tests to testsWithJvmBackend

Browse Source 
In this commit, tests where backend diagnostics were reported correctly
are being moved.

FirScopeDumpHandler was added to FIR diagnostic tests with JVM backend
to support `SCOPE_DUMP` in `overridesBuiltinNoMagic.kt` and
`charAtAndOverload.kt`.
This commit is contained in:
Alexander Udalov
2024-03-12 12:25:42 +01:00
committed by Space Team
parent 56a1a3153b
commit d986e0ee9c
43 changed files with 296 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.fir.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class A {
@kotlin.jvm.JvmOverloads fun foo(s: String = "") {
}
fun foo() {
}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class A {
<!CONFLICTING_JVM_DECLARATIONS!>@kotlin.jvm.JvmOverloads fun foo(s: String = "")<!> {
}
<!CONFLICTING_JVM_DECLARATIONS!>fun foo()<!> {
}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt
Vendored
-10
View File
@@ -1,10 +0,0 @@
package
public final class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Unit
@kotlin.jvm.JvmOverloads public final fun foo(/*0*/ s: kotlin.String = ...): 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/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.fir.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
open class Base {
fun foo() {}
}
class Derived : Base() {
companion object {
@JvmStatic fun foo() {}
}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
open class Base {
fun foo() {}
}
class Derived : Base() {
companion object {
<!ACCIDENTAL_OVERRIDE!>@JvmStatic fun foo()<!> {}
}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.txt
Vendored
-25
View File
@@ -1,25 +0,0 @@
package
public open class Base {
public constructor Base()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class Derived : Base {
public constructor Derived()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmStatic public final fun foo(): 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/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.fir.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
open class Base {
fun `foo$default`(i: Int, mask: Int, mh: Any) {}
}
object Derived : Base() {
@JvmStatic fun foo(i: Int = 0) {}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
open class Base {
fun `foo$default`(i: Int, mask: Int, mh: Any) {}
}
object Derived : Base() {
<!ACCIDENTAL_OVERRIDE!>@JvmStatic fun foo(i: Int = 0)<!> {}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.txt
Vendored
-18
View File
@@ -1,18 +0,0 @@
package
public open class Base {
public constructor Base()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun `foo$default`(/*0*/ i: kotlin.Int, /*1*/ mask: kotlin.Int, /*2*/ mh: kotlin.Any): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public object Derived : Base {
private constructor Derived()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmStatic public final fun foo(/*0*/ i: kotlin.Int = ...): kotlin.Unit
public final override /*1*/ /*fake_override*/ fun `foo$default`(/*0*/ i: kotlin.Int, /*1*/ mask: kotlin.Int, /*2*/ mh: kotlin.Any): 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/testsWithStdLib/duplicateJvmSignature/statics/jjk.fir.kt
Vendored
-31
View File
@@ -1,31 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// FILE: A.java
public class A {
public static void foo() {}
public static void baz(String s) {}
}
// FILE: B.java
public class B extends A {
public static void bar(int i) {}
}
// FILE: K.kt
open class K : B() {
companion object {
@JvmStatic
fun foo() {}
@JvmStatic
fun foo(a: Any) {}
@JvmStatic
fun bar(i: Int) {}
@JvmStatic
fun bar(i: String) {}
@JvmStatic
fun baz(i: Int) {}
}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.kt
Vendored
-31
View File
@@ -1,31 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// FILE: A.java
public class A {
public static void foo() {}
public static void baz(String s) {}
}
// FILE: B.java
public class B extends A {
public static void bar(int i) {}
}
// FILE: K.kt
open class K : B() {
companion object {
<!ACCIDENTAL_OVERRIDE!>@JvmStatic
fun foo()<!> {}
@JvmStatic
fun foo(a: Any) {}
<!ACCIDENTAL_OVERRIDE!>@JvmStatic
fun bar(i: Int)<!> {}
@JvmStatic
fun bar(i: String) {}
@JvmStatic
fun baz(i: Int) {}
}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.txt
Vendored
-43
View File
@@ -1,43 +0,0 @@
package
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
// Static members
public open fun baz(/*0*/ s: kotlin.String!): kotlin.Unit
public open fun foo(): kotlin.Unit
}
public open class B : A {
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
// Static members
public open fun bar(/*0*/ i: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun baz(/*0*/ s: kotlin.String!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
}
public open class K : B {
public constructor K()
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 companion object Companion {
private constructor Companion()
@kotlin.jvm.JvmStatic public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit
@kotlin.jvm.JvmStatic public final fun bar(/*0*/ i: kotlin.String): kotlin.Unit
@kotlin.jvm.JvmStatic public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmStatic public final fun foo(): kotlin.Unit
@kotlin.jvm.JvmStatic public final fun foo(/*0*/ a: kotlin.Any): 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/testsWithStdLib/duplicateJvmSignature/statics/jk.fir.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// FILE: A.java
public class A {
public static void foo() {}
public static void baz(String s) {}
}
// FILE: K.kt
open class K : A() {
companion object {
@JvmStatic
fun foo() {}
@JvmStatic
fun foo(i: Int) {}
@JvmStatic
fun baz(i: Int) {}
}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// FILE: A.java
public class A {
public static void foo() {}
public static void baz(String s) {}
}
// FILE: K.kt
open class K : A() {
companion object {
<!ACCIDENTAL_OVERRIDE!>@JvmStatic
fun foo()<!> {}
@JvmStatic
fun foo(i: Int) {}
@JvmStatic
fun baz(i: Int) {}
}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.txt
Vendored
-29
View File
@@ -1,29 +0,0 @@
package
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
// Static members
public open fun baz(/*0*/ s: kotlin.String!): kotlin.Unit
public open fun foo(): kotlin.Unit
}
public open class K : A {
public constructor K()
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 companion object Companion {
private constructor Companion()
@kotlin.jvm.JvmStatic public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmStatic public final fun foo(): kotlin.Unit
@kotlin.jvm.JvmStatic public final fun foo(/*0*/ i: kotlin.Int): 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/testsWithStdLib/duplicateJvmSignature/statics/jkjk.fir.kt
Vendored
-36
View File
@@ -1,36 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// FILE: A.java
public class A {
public static void foo() {}
public static void baz(String s) {}
}
// FILE: B.kt
open class B : A() {
}
// FILE: C.java
public class C extends B {
public static void bar(int i) {}
}
// FILE: K.kt
open class K : C() {
companion object {
@JvmStatic
fun foo() {}
@JvmStatic
fun foo(a: Any) {}
@JvmStatic
fun bar(i: Int) {}
@JvmStatic
fun bar(i: String) {}
@JvmStatic
fun baz(i: Int) {}
}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.kt
Vendored
-36
View File
@@ -1,36 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// FILE: A.java
public class A {
public static void foo() {}
public static void baz(String s) {}
}
// FILE: B.kt
open class B : A() {
}
// FILE: C.java
public class C extends B {
public static void bar(int i) {}
}
// FILE: K.kt
open class K : C() {
companion object {
<!ACCIDENTAL_OVERRIDE!>@JvmStatic
fun foo()<!> {}
@JvmStatic
fun foo(a: Any) {}
<!ACCIDENTAL_OVERRIDE!>@JvmStatic
fun bar(i: Int)<!> {}
@JvmStatic
fun bar(i: String) {}
@JvmStatic
fun baz(i: Int) {}
}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.txt
Vendored
-50
View File
@@ -1,50 +0,0 @@
package
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
// Static members
public open fun baz(/*0*/ s: kotlin.String!): kotlin.Unit
public open fun foo(): kotlin.Unit
}
public open class B : A {
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 C : B {
public constructor C()
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 bar(/*0*/ i: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun baz(/*0*/ s: kotlin.String!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
}
public open class K : C {
public constructor K()
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 companion object Companion {
private constructor Companion()
@kotlin.jvm.JvmStatic public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit
@kotlin.jvm.JvmStatic public final fun bar(/*0*/ i: kotlin.String): kotlin.Unit
@kotlin.jvm.JvmStatic public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmStatic public final fun foo(): kotlin.Unit
@kotlin.jvm.JvmStatic public final fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}