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

Tests: do not report backend diagnostics if there's frontend error

Browse Source 
In most affected tests, the backend diagnostic such as "conflicting JVM
signature" or "accidental override" is directly caused by some already
existing error reported by frontend, so it doesn't make sense to check
backend diagnostics there.

Tests where that was not the case were moved/copied to
`testsWithJvmBackend`.
This commit is contained in:
Alexander Udalov
2024-03-11 22:22:03 +01:00
committed by Space Team
parent dca6c21d7f
commit 55f9f74d5c
38 changed files with 396 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.kt
Vendored
+2 -2
View File
@@ -9,8 +9,8 @@ abstract public class A implements java.util.Collection<String> {
}
// FILE: main.kt
abstract class <!CONFLICTING_JVM_DECLARATIONS!>KA<!> : A() {
<!CONFLICTING_JVM_DECLARATIONS!>override fun contains(x: String)<!> = false
abstract class KA : A() {
override fun contains(x: String) = false
}
fun foo(a: A, ka: KA) {
compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.fir.kt
Vendored
-63
View File
@@ -1,63 +0,0 @@
// ISSUE: KT-66048
// IGNORE_REVERSED_RESOLVE
// ^KT-66392
// FILE: Java1.java
public class Java1 extends KotlinClass {
@Override
public String a() {
return "2";
}
@Override
public String getB() {
return "2";
}
@Override
public String getC() {
return "2";
}
@Override
public void setC(String value) {
}
@Override
public String getD() {
return "2";
}
@Override
public void setD(String value) {
}
@Override
public String getE() {
return "2";
}
@Override
public String getF() {
return "2";
}
}
// FILE: test.kt
open class KotlinClass {
open fun a() = "1"
open val b = "1"
open var c = "1"
open var d: String = "1"
open var e = "1"
open var f: String = "1"
}
class B : Java1() {
override fun a(): <!RETURN_TYPE_MISMATCH_ON_OVERRIDE!>String?<!> = super.a()
override val b: <!PROPERTY_TYPE_MISMATCH_ON_OVERRIDE!>String?<!> = super.b
override var c: <!VAR_TYPE_MISMATCH_ON_OVERRIDE!>String?<!> = super.c
override var d: <!VAR_TYPE_MISMATCH_ON_OVERRIDE!>String?<!> = super.d
override var e: <!VAR_TYPE_MISMATCH_ON_OVERRIDE!>String?<!> = super.e
override var f: <!VAR_TYPE_MISMATCH_ON_OVERRIDE!>String?<!> = super.f
}
compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt
Vendored
+3 -2
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// ISSUE: KT-66048
// IGNORE_REVERSED_RESOLVE
// ^KT-66392
@@ -58,6 +59,6 @@ class B : Java1() {
override val b: <!PROPERTY_TYPE_MISMATCH_ON_OVERRIDE!>String?<!> = super.b
override var c: <!VAR_TYPE_MISMATCH_ON_OVERRIDE!>String?<!> = super.c
override var d: <!VAR_TYPE_MISMATCH_ON_OVERRIDE!>String?<!> = super.d
<!ACCIDENTAL_OVERRIDE!>override var e: <!VAR_TYPE_MISMATCH_ON_OVERRIDE!>String?<!><!> = super.e
<!ACCIDENTAL_OVERRIDE!>override var f: <!VAR_TYPE_MISMATCH_ON_OVERRIDE!>String?<!><!> = super.f
override var e: <!VAR_TYPE_MISMATCH_ON_OVERRIDE!>String?<!> = super.e
override var f: <!VAR_TYPE_MISMATCH_ON_OVERRIDE!>String?<!> = super.f
}