Merge "diagnostic with Java 8" tests with general diagnostic tests

2017-08-01 10:49:08 -07:00
parent 8db736e2b4
commit 770441c212
70 changed files with 346 additions and 458 deletions
@@ -0,0 +1,8 @@
+// FULL_JDK
+// SKIP_TXT
+
+import java.util.regex.Pattern
+
+val strs: List<String> = listOf("regex1", "regex2")
+
+val patterns: List<Pattern> = strs.map(Pattern::compile)
@@ -0,0 +1,21 @@
+// FULL_JDK
+
+abstract class A : MutableList<String> {
+    override fun sort(/*0*/ p0: java.util.Comparator<in String>) {
+        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET!>sort<!>(p0)
+    }
+}
+
+fun foo(x: MutableList<String>, y: java.util.ArrayList<String>, z: A, p: java.util.Comparator<in String>) {
+    x.<!DEPRECATION_ERROR!>sort<!>(p)
+    y.<!DEPRECATION_ERROR!>sort<!>(p)
+
+    z.<!DEPRECATION_ERROR!>sort<!>(p)
+}
+
+fun bar(x: MutableList<String>, y: java.util.ArrayList<String>, z: A) {
+    x.<!DEPRECATION_ERROR!>sort<!> { a, b -> a.length - b.length }
+    y.<!DEPRECATION_ERROR!>sort<!> { a, b -> a.length - b.length }
+
+    z.<!DEPRECATION_ERROR!>sort<!> { a, b -> a.length - b.length }
+}
@@ -0,0 +1,39 @@
+package
+
+public fun bar(/*0*/ x: kotlin.collections.MutableList<kotlin.String>, /*1*/ y: java.util.ArrayList<kotlin.String>, /*2*/ z: A): kotlin.Unit
+public fun foo(/*0*/ x: kotlin.collections.MutableList<kotlin.String>, /*1*/ y: java.util.ArrayList<kotlin.String>, /*2*/ z: A, /*3*/ p: java.util.Comparator<in kotlin.String>): kotlin.Unit
+
+public abstract class A : kotlin.collections.MutableList<kotlin.String> {
+    public constructor A()
+    public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.Consumer<in kotlin.String!>!): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
+    public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String>
+    public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String>
+    public open override /*1*/ /*fake_override*/ fun parallelStream(): java.util.stream.Stream<kotlin.String>
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun removeIf(/*0*/ p0: java.util.function.Predicate<in kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun replaceAll(/*0*/ p0: java.util.function.UnaryOperator<kotlin.String>): kotlin.Unit
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String
+    public open override /*1*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun sort(/*0*/ p0: java.util.Comparator<in kotlin.String>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun spliterator(): java.util.Spliterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun stream(): java.util.stream.Stream<kotlin.String>
+    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String>
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
@@ -0,0 +1,65 @@
+// !CHECK_TYPE
+// !LANGUAGE: -AdditionalBuiltInsMembers
+// SKIP_TXT
+// FULL_JDK
+
+class A : java.util.ArrayList<String>() {
+    // `stream` is defined in ArrayList, so it was impossible to override it in 1.0
+    <!NOTHING_TO_OVERRIDE!>override<!> fun stream(): java.util.stream.Stream<String> = super.<!UNRESOLVED_REFERENCE!>stream<!>()
+
+    // `sort` is defined in ArrayList, so it was possible to override it in 1.0
+    override fun sort(c: Comparator<in String>?) {
+        super.sort(c)
+    }
+}
+
+class A1 : java.util.ArrayList<String>() {
+    // `stream` is defined in ArrayList, so it was possible to declare it in 1.0 without an 'override' keyword
+    fun stream(): java.util.stream.Stream<String> = super.<!UNRESOLVED_REFERENCE!>stream<!>()
+
+    // `sort` is defined in ArrayList, so it was impossible to declare it in 1.0 without an 'override' keyword
+    fun <!VIRTUAL_MEMBER_HIDDEN!>sort<!>(c: Comparator<in String>?) {
+        super.sort(c)
+    }
+}
+
+interface A2 : List<String> {
+    <!NOTHING_TO_OVERRIDE!>override<!> fun stream(): java.util.stream.Stream<String> = null!!
+}
+
+class B : <!NONE_APPLICABLE!>Throwable<!>("", null, false, false)
+
+class B1 : RuntimeException() {
+    <!NOTHING_TO_OVERRIDE!>override<!> fun fillInStackTrace(): Throwable { // 'override' keyword must be prohibited, as it was in 1.0.x
+        return this
+    }
+}
+
+class A3(val x: List<String>) : List<String> by x
+
+fun Throwable.fillInStackTrace() = 1
+
+fun foo(x: List<String>, y: Throwable, z: A3) {
+    x.<!UNRESOLVED_REFERENCE!>stream<!>()
+    java.util.ArrayList<String>().<!UNRESOLVED_REFERENCE!>stream<!>()
+
+    y.fillInStackTrace() checkType { _<Int>() }
+
+    HashMap<String, Int>().getOrDefault(Any(), null)
+
+    // Falls back to extension in stdlib
+    y.printStackTrace()
+
+    z.<!UNRESOLVED_REFERENCE!>stream<!>()
+}
+
+interface X {
+    fun foo(): Int = 1
+    val hidden: Boolean
+}
+
+class Y : X {
+    // There should not be UNSUPPORTED_FEATURE diagnostic
+    override fun foo() = 1
+    override var hidden: Boolean = true
+}