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/resolve/overloadConflicts/allLambdas.fir.kt
Vendored
+1 -1
View File
@@ -7,4 +7,4 @@ object X2
fun <T1> foo(x: T1, f: (T1) -> T1) = X1
fun <T2> foo(xf: () -> T2, f: (T2) -> T2) = X2
val test: X2 = foo({ 0 }, { it -> it + 1 })
val test: X2 = foo({ 0 }, { it -> it + 1 })
compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.kt
Vendored
+1 -1
View File
@@ -7,4 +7,4 @@ object X2
fun <T1> foo(x: T1, f: (T1) -> T1) = X1
fun <T2> foo(xf: () -> T2, f: (T2) -> T2) = X2
val test: X2 = <!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>foo<!>({ 0 }, { <!OI;CANNOT_INFER_PARAMETER_TYPE!>it<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1 })
val test: X2 = <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!>({ 0 }, { <!CANNOT_INFER_PARAMETER_TYPE{OI}!>it<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> 1 })
compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.kt
Vendored
+2 -2
View File
@@ -15,6 +15,6 @@ fun <E> baz(x: String, y: E) {}
fun bar(x: A<String>) {
x.<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>("")
x.<!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>baz<!>("", "")
<!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>baz<!>("", "")
x.<!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>baz<!>("", "")
<!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>baz<!>("", "")
}
compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.fir.kt
Vendored
+1 -1
View File
@@ -7,4 +7,4 @@ fun <T2 : Closeable, R2> T2.myUse(f: (T2) -> R2): R2 = f(this)
fun test1(x: Closeable) = x.myUse { 42 }
fun test2(x: Closeable) = x.myUse<Closeable, Int> { 42 }
fun test3(x: Closeable) = x.myUse<AutoCloseable, Int> { 42 } // TODO KT-10681
fun test3(x: Closeable) = x.myUse<AutoCloseable, Int> { 42 } // TODO KT-10681
compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.kt
Vendored
+1 -1
View File
@@ -7,4 +7,4 @@ fun <T2 : Closeable, R2> T2.myUse(f: (T2) -> R2): R2 = f(this)
fun test1(x: Closeable) = x.myUse { 42 }
fun test2(x: Closeable) = x.myUse<Closeable, Int> { 42 }
fun test3(x: Closeable) = x.myUse<<!OI;UPPER_BOUND_VIOLATED!>AutoCloseable<!>, Int> { 42 } // TODO KT-10681
fun test3(x: Closeable) = x.myUse<<!UPPER_BOUND_VIOLATED{OI}!>AutoCloseable<!>, Int> { 42 } // TODO KT-10681
compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.fir.kt
Vendored
+1 -1
View File
@@ -13,4 +13,4 @@ fun <T> B<T>.foo(block: (T) -> Unit) {
fun main() {
B("string").<!AMBIGUITY!>foo<!> { }
}
}
compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.kt
Vendored
+2 -2
View File
@@ -12,5 +12,5 @@ fun <T> B<T>.foo(block: (T) -> Unit) {
}
fun main() {
B("string").<!NI;OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!> { }
}
B("string").<!OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!> { }
}
compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.fir.kt
Vendored
+1 -1
View File
@@ -23,4 +23,4 @@ import b.*
fun test() {
<!AMBIGUITY!>foo<!><A> { }
}
}
compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.kt
Vendored
+2 -2
View File
@@ -22,5 +22,5 @@ import a.*
import b.*
fun test() {
<!NI;OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!><A> { }
}
<!OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!><A> { }
}
compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.fir.kt
Vendored
+1 -1
View File
@@ -21,4 +21,4 @@ import b.*
fun main() {
foo<String> { }
}
}
compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.kt
Vendored
+2 -2
View File
@@ -20,5 +20,5 @@ import a.*
import b.*
fun main() {
<!OI;OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!><String> { }
}
<!OVERLOAD_RESOLUTION_AMBIGUITY{OI}!>foo<!><String> { }
}
compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ fun overloadedFun5(s: String, vararg ss: String) = X2
val test1 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>overloadedFun5<!>("")
val test2 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>overloadedFun5<!>("", "")
val test3: X2 = <!NONE_APPLICABLE!>overloadedFun5<!>(<!DEBUG_INFO_MISSING_UNRESOLVED!>s<!> = "", <!DEBUG_INFO_MISSING_UNRESOLVED!>ss<!> = "")
val test4: X1 = overloadedFun5(ss = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, TYPE_MISMATCH!>""<!>)
val test4: X1 = overloadedFun5(ss = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, TYPE_MISMATCH!>""<!>)
compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.fir.kt
Vendored
+1 -1
View File
@@ -7,4 +7,4 @@ class A<T>
fun <T1> A<T1>.foo() = X1
fun <T2> A<out T2>.foo() = X2
fun <T> A<out T>.test() = foo() // TODO fix constraint system
fun <T> A<out T>.test() = foo() // TODO fix constraint system
compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.kt
Vendored
+1 -1
View File
@@ -7,4 +7,4 @@ class A<T>
<!CONFLICTING_OVERLOADS!>fun <T1> A<T1>.foo()<!> = X1
<!CONFLICTING_OVERLOADS!>fun <T2> A<out T2>.foo()<!> = X2
fun <T> A<out T>.test() = <!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>foo<!>() // TODO fix constraint system
fun <T> A<out T>.test() = <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!>() // TODO fix constraint system