Fix tests in DiagnosticsTestWithStdLibGenerated with NI

This commit is contained in:
Dmitriy Novozhilov
2019-01-30 13:08:22 +03:00
parent 98810ba750
commit 0501a108c0
73 changed files with 507 additions and 218 deletions
@@ -1,4 +1,5 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE
// !WITH_NEW_INFERENCE
import java.util.*
fun bar(): String? = null
@@ -9,12 +10,12 @@ fun fooHashSet() {
x.add(<!TYPE_MISMATCH!>bar()<!>)
x.add("")
val b1: MutableSet<String?> = <!TYPE_MISMATCH!>x<!>
val b1: MutableSet<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b2: MutableSet<String> = x
val b3: Set<String?> = x
val b4: Collection<String?> = x
val b6: MutableCollection<String?> = <!TYPE_MISMATCH!>x<!>
val b6: MutableCollection<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
}
fun fooTreeSet() {
@@ -23,12 +24,12 @@ fun fooTreeSet() {
x.add(<!TYPE_MISMATCH!>bar()<!>)
x.add("")
val b1: MutableSet<String?> = <!TYPE_MISMATCH!>x<!>
val b1: MutableSet<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b2: MutableSet<String> = x
val b3: Set<String?> = x
val b4: Collection<String?> = x
val b6: MutableCollection<String?> = <!TYPE_MISMATCH!>x<!>
val b6: MutableCollection<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
}
fun fooLinkedHashSet() {
@@ -37,10 +38,10 @@ fun fooLinkedHashSet() {
x.add(<!TYPE_MISMATCH!>bar()<!>)
x.add("")
val b1: MutableSet<String?> = <!TYPE_MISMATCH!>x<!>
val b1: MutableSet<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b2: MutableSet<String> = x
val b3: Set<String?> = x
val b4: Collection<String?> = x
val b6: MutableCollection<String?> = <!TYPE_MISMATCH!>x<!>
val b6: MutableCollection<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
}