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

Tests: remove diagnostic tests which are present elsewhere

Browse Source 
- `typeParameterWithTwoBounds.kt` is already present in
  `diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/`.
- `clashWithCompanionObjectField.kt` is already present in
  `codegen/box/fieldRename/jvmFieldNoClash1.kt`.
- `jvmFieldAndJavaGetter.kt` is already present in
  `codegen/box/jvmField/noClashWithInheritedJavaMethod.kt`.

In case of two latter tests on JvmField, there's (correctly) no error
reported in JVM IR, which is why those are box tests.
This commit is contained in:
Alexander Udalov
2024-03-12 12:25:42 +01:00
committed by Space Team
parent c62fe0d107
commit 81a9f5654e
14 changed files with 0 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/redeclarations/typeParameterWithTwoBounds.fir.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
interface Foo
interface Bar
fun <T> foo(x: T): T where T: Foo, T: Bar {null!!}
fun foo(x: Foo): Foo {null!!}
fun foo(x: Bar): Bar {null!!}
compiler/testData/diagnostics/tests/redeclarations/typeParameterWithTwoBounds.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
interface Foo
interface Bar
<!CONFLICTING_JVM_DECLARATIONS!>fun <T> foo(x: T): T<!> where T: Foo, T: Bar {null!!}
<!CONFLICTING_JVM_DECLARATIONS!>fun foo(x: Foo): Foo<!> {null!!}
fun foo(x: Bar): Bar {null!!}
compiler/testData/diagnostics/tests/redeclarations/typeParameterWithTwoBounds.txt
Vendored
-17
View File
@@ -1,17 +0,0 @@
package
public fun foo(/*0*/ x: Bar): Bar
public fun foo(/*0*/ x: Foo): Foo
public fun </*0*/ T : Foo> foo(/*0*/ x: T): T where T : Bar
public interface Bar {
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 interface Foo {
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/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.fir.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
class A {
@JvmField val clash = 1;
companion object {
val clash = 1;
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
class A {
<!CONFLICTING_JVM_DECLARATIONS!>@JvmField val clash<!> = 1;
companion object {
<!CONFLICTING_JVM_DECLARATIONS!>val clash<!> = 1;
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.txt
Vendored
-17
View File
@@ -1,17 +0,0 @@
package
public final class A {
public constructor A()
@field:kotlin.jvm.JvmField public final val clash: kotlin.Int = 1
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()
public final val clash: kotlin.Int = 1
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/testsWithStdLib/jvmFieldAndJavaGetter.fir.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
// MODULE: lib
// FILE: TestA.java
public abstract class TestA {
public abstract int getProp();
}
// MODULE: main(lib)
// FILE: TestB.kt
abstract class TestB : TestA() {
@JvmField
protected var prop: Int = 0
}
compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
// MODULE: lib
// FILE: TestA.java
public abstract class TestA {
public abstract int getProp();
}
// MODULE: main(lib)
// FILE: TestB.kt
abstract class TestB : TestA() {
<!ACCIDENTAL_OVERRIDE!>@JvmField
protected var prop: Int<!> = 0
}
compiler/testData/diagnostics/testsWithStdLib/jvmFieldAndJavaGetter.txt
Vendored
-23
View File
@@ -1,23 +0,0 @@
// -- Module: <lib> --
package
public abstract class TestA {
public constructor TestA()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun getProp(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
// -- Module: <main> --
package
public abstract class TestB : TestA {
public constructor TestB()
@field:kotlin.jvm.JvmField protected final var prop: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ /*fake_override*/ fun getProp(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}