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

[TD] Update diagnostics test data due to new test runners

Browse Source 
Update includes:
- Changing syntax of `OI/`NI` tags from `<!NI;TAG!>` to `<!TAG{NI}!>`
- Fix some incorrect directives
- Change order of diagnostics in some places
- Remove ignored diagnostics from FIR test data (previously `DIAGNOSTICS` didn't work)
- Update FIR dumps in some places and add `FIR_IDENTICAL` if needed
- Replace all JAVAC_SKIP with SKIP_JAVAC directive
This commit is contained in:
Dmitriy Novozhilov
2020-12-07 10:08:56 +03:00
parent 1d04fecd29
commit e6b5cb5216
1823 changed files with 3014 additions and 2662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.fir.kt
Vendored
+1 -1
View File
@@ -18,4 +18,4 @@ fun test(mc1: MyClass, mc2: MyClass2) {
use(a, b, c)
}
fun use(vararg a: Any?) = a
fun use(vararg a: Any?) = a
compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt
Vendored
+2 -2
View File
@@ -12,10 +12,10 @@ class MyClass2 {}
fun test(mc1: MyClass, mc2: MyClass2) {
val (<!OPERATOR_MODIFIER_REQUIRED!>a<!>, b) = <!COMPONENT_FUNCTION_MISSING, COMPONENT_FUNCTION_MISSING!>mc1<!>
val (c) = <!NI;COMPONENT_FUNCTION_MISSING, OI;COMPONENT_FUNCTION_AMBIGUITY!>mc2<!>
val (c) = <!COMPONENT_FUNCTION_AMBIGUITY{OI}, COMPONENT_FUNCTION_MISSING{NI}!>mc2<!>
//a,b,c are error types
use(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>, <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!>, <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>c<!>)
}
fun use(vararg a: Any?) = a
fun use(vararg a: Any?) = a
compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.fir.kt
Vendored
+5 -5
View File
@@ -3,10 +3,10 @@
// KT-3464 Front-end shouldn't allow override modifier in class declaration
override class A {
override companion <!REDECLARATION!>object<!> {}
open companion <!MANY_COMPANION_OBJECTS, REDECLARATION!>object<!> {}
abstract companion <!MANY_COMPANION_OBJECTS, REDECLARATION!>object<!> {}
final companion <!MANY_COMPANION_OBJECTS, REDECLARATION!>object<!> {}
override companion object {}
open companion object {}
abstract companion object {}
final companion object {}
}
override object B1 {}
@@ -16,4 +16,4 @@ final object B4 {}
override enum class C {}
override interface D {}
override annotation class E
override annotation class E
compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt
Vendored
+1 -1
View File
@@ -16,4 +16,4 @@ final object B4 {}
<!WRONG_MODIFIER_TARGET!>override<!> enum class C {}
<!WRONG_MODIFIER_TARGET!>override<!> interface D {}
<!WRONG_MODIFIER_TARGET!>override<!> annotation class E
<!WRONG_MODIFIER_TARGET!>override<!> annotation class E
compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.kt
Vendored
+2 -2
View File
@@ -11,10 +11,10 @@ fun test() {
<!WRONG_MODIFIER_TARGET!>const<!> val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING!><T><!> a3 = 0
<!INAPPLICABLE_LATEINIT_MODIFIER, INAPPLICABLE_LATEINIT_MODIFIER, INAPPLICABLE_LATEINIT_MODIFIER!>lateinit<!> val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING!><T><!> a4 = 0
val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING!><T><!> a5 by Delegate<Int>()
val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING!><T><!> a6 by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>Delegate<<!UNRESOLVED_REFERENCE!>T<!>>()<!>
val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING!><T><!> a6 by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!>Delegate<<!UNRESOLVED_REFERENCE!>T<!>>()<!>
}
class Delegate<F> {
operator fun getValue(thisRef: Any?, property: KProperty<*>): String = ""
operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) {}
}
}
compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.kt
Vendored
+2 -2
View File
@@ -11,10 +11,10 @@ fun test() {
<!WRONG_MODIFIER_TARGET!>const<!> val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS!><T><!> a3 = 0
<!INAPPLICABLE_LATEINIT_MODIFIER, INAPPLICABLE_LATEINIT_MODIFIER, INAPPLICABLE_LATEINIT_MODIFIER!>lateinit<!> val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS!><T><!> a4 = 0
val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS!><T><!> a5 by Delegate<Int>()
val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS!><T><!> a6 by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>Delegate<<!UNRESOLVED_REFERENCE!>T<!>>()<!>
val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS!><T><!> a6 by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!>Delegate<<!UNRESOLVED_REFERENCE!>T<!>>()<!>
}
class Delegate<F> {
operator fun getValue(thisRef: Any?, property: KProperty<*>): String = ""
operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) {}
}
}
compiler/testData/diagnostics/tests/declarationChecks/mulitpleVarargParameters.fir.kt
Vendored
+3 -3
View File
@@ -2,7 +2,7 @@
fun test(vararg x1: Int, vararg x2: Int) {
fun test2(vararg x1: Int, vararg x2: Int) {
class LocalClass(vararg x1: Int, vararg x2: Int) {
<!PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED!>constructor(vararg x1: Int, vararg x2: Int, xx: Int)<!> {}
constructor(vararg x1: Int, vararg x2: Int, xx: Int) {}
}
fun test3(vararg x1: Int, vararg x2: Int) {}
}
@@ -20,7 +20,7 @@ abstract class C(vararg x1: Int, vararg x2: Int, b: Boolean) {
abstract fun test2(vararg x1: Int, vararg x2: Int)
class CC(vararg x1: Int, vararg x2: Int, b: Boolean) {
<!PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED!>constructor(vararg x1: Int, vararg x2: Int)<!> {}
constructor(vararg x1: Int, vararg x2: Int) {}
fun test(vararg x1: Int, vararg x2: Int) {}
}
}
@@ -29,7 +29,7 @@ object O {
fun test(vararg x1: Int, vararg x2: Int) {}
class CC(vararg x1: Int, vararg x2: Int, b: Boolean) {
<!PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED!>constructor(vararg x1: Int, vararg x2: Int)<!> {}
constructor(vararg x1: Int, vararg x2: Int) {}
fun test(vararg x1: Int, vararg x2: Int) {}
}
}
compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.kt
Vendored
+9 -9
View File
@@ -7,8 +7,8 @@ fun test() {
val x = fun <!ANONYMOUS_FUNCTION_WITH_NAME!>named1<!>(x: Int): Int { return 1 }
x checkType { _<Function1<Int, Int>>() }
foo <!NI;TYPE_MISMATCH!>{ <!EXPECTED_TYPE_MISMATCH("() -> Int")!>fun named2(): Int {return 1}<!> }<!>
foo(<!NI;TYPE_MISMATCH!>{ <!EXPECTED_TYPE_MISMATCH!>fun named3() = 1<!> }<!>)
foo <!TYPE_MISMATCH{NI}!>{ <!EXPECTED_TYPE_MISMATCH("() -> Int")!>fun named2(): Int {return 1}<!> }<!>
foo(<!TYPE_MISMATCH{NI}!>{ <!EXPECTED_TYPE_MISMATCH!>fun named3() = 1<!> }<!>)
val x1 =
<!INVALID_IF_AS_EXPRESSION!>if<!> (1 == 1)
@@ -27,15 +27,15 @@ fun test() {
<!SYNTAX!><!>fun named7() = 1
val x3 = when (1) {
0 -> <!OI;EXPECTED_TYPE_MISMATCH!>fun <!NI;ANONYMOUS_FUNCTION_WITH_NAME!>named8<!>(): Int {return 1}<!>
else -> <!OI;EXPECTED_TYPE_MISMATCH!>fun <!NI;ANONYMOUS_FUNCTION_WITH_NAME!>named9<!>() = 1<!>
0 -> <!EXPECTED_TYPE_MISMATCH{OI}!>fun <!ANONYMOUS_FUNCTION_WITH_NAME{NI}!>named8<!>(): Int {return 1}<!>
else -> <!EXPECTED_TYPE_MISMATCH{OI}!>fun <!ANONYMOUS_FUNCTION_WITH_NAME{NI}!>named9<!>() = 1<!>
}
val x31 = when (1) {
0 -> {
<!OI;EXPECTED_TYPE_MISMATCH!>fun named10(): Int {return 1}<!>
<!EXPECTED_TYPE_MISMATCH{OI}!>fun named10(): Int {return 1}<!>
}
else -> <!OI;EXPECTED_TYPE_MISMATCH!>fun <!NI;ANONYMOUS_FUNCTION_WITH_NAME!>named11<!>() = 1<!>
else -> <!EXPECTED_TYPE_MISMATCH{OI}!>fun <!ANONYMOUS_FUNCTION_WITH_NAME{NI}!>named11<!>() = 1<!>
}
val x4 = {
@@ -65,11 +65,11 @@ fun success() {
val y = when (1) {
0 -> {
<!OI;EXPECTED_TYPE_MISMATCH!>fun named4(): Int {return 1}<!>
<!EXPECTED_TYPE_MISMATCH{OI}!>fun named4(): Int {return 1}<!>
}
else -> {
<!OI;EXPECTED_TYPE_MISMATCH!>fun named5(): Int {return 1}<!>
<!EXPECTED_TYPE_MISMATCH{OI}!>fun named5(): Int {return 1}<!>
}
}
y checkType { <!OI;TYPE_MISMATCH!>_<!><Unit>() }
y checkType { <!TYPE_MISMATCH{OI}!>_<!><Unit>() }
}
compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin.fir.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UPPER_BOUND_VIOLATED
//// FILE: D.java
// FILE: D.java
public interface D<W> {}
// FILE: Q.java
compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UPPER_BOUND_VIOLATED
//// FILE: D.java
// FILE: D.java
public interface D<W> {}
// FILE: Q.java
compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin2.fir.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UPPER_BOUND_VIOLATED
//// FILE: D.java
// FILE: D.java
public interface D<W> {}
// FILE: Q.java
@@ -13,4 +13,4 @@ public interface C<X> extends D<P<X,X>> {}
public interface P<Y1, Y2> extends Q<C<Y1>, C<D<Y2>>> {}
// FILE: 1.kt
interface P1<YY1, YY2> : P<YY1, YY2>
interface P1<YY1, YY2> : P<YY1, YY2>
compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin2.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UPPER_BOUND_VIOLATED
//// FILE: D.java
// FILE: D.java
public interface D<W> {}
// FILE: Q.java
@@ -13,4 +13,4 @@ public interface C<X> extends D<P<X,X>> {}
public interface P<Y1, Y2> extends Q<C<Y1>, C<D<Y2>>> {}
// FILE: 1.kt
<!EXPANSIVE_INHERITANCE_IN_JAVA!>interface P1<YY1, YY2> : P<YY1, YY2><!>
<!EXPANSIVE_INHERITANCE_IN_JAVA!>interface P1<YY1, YY2> : P<YY1, YY2><!>