Minor: fix broken tests

This commit is contained in:
Yan Zhulanow
2015-09-26 01:04:42 +03:00
parent 3be050640c
commit 080dcf882e
18 changed files with 21 additions and 21 deletions
@@ -9,4 +9,4 @@ class A<T> : List<String>, I<T> {
// EXIST: { lookupString: "override", itemText: "override" }
// EXIST: { itemText: "override fun hashCode(): Int {...}", tailText: null, typeText: "Any" }
// EXIST: { itemText: "override fun foo(t: T): T {...}", tailText: null, typeText: "I" }
// EXIST: { itemText: "override fun get(index: Int): String {...}", tailText: null, typeText: "List" }
// EXIST: { itemText: "override operator fun get(index: Int): String {...}", tailText: null, typeText: "List" }
@@ -17,7 +17,7 @@ class A : Base2(), I {
// EXIST: { lookupString: "override", itemText: "override" }
// EXIST: { itemText: "override fun bar() {...}", lookupString: "override", tailText: null, typeText: "Base1" }
// EXIST: { itemText: "override fun equals(other: Any?): Boolean {...}", lookupString: "override", tailText: null, typeText: "Any" }
// EXIST: { itemText: "override operator fun equals(other: Any?): Boolean {...}", lookupString: "override", tailText: null, typeText: "Any" }
// EXIST: { itemText: "override fun foo() {...}", lookupString: "override", tailText: null, typeText: "I" }
// EXIST: { itemText: "override fun hashCode(): Int {...}", lookupString: "override", tailText: null, typeText: "Any" }
// EXIST: { itemText: "override val someVal: Int", lookupString: "override", tailText: null, typeText: "I" }
@@ -3,4 +3,4 @@ class A {
o<caret>
}
// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"
// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
@@ -5,4 +5,4 @@ class A {
}
}
// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"
// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
@@ -3,4 +3,4 @@ class A {
public o<caret>
}
// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"
// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
@@ -5,4 +5,4 @@ class A {
}
}
// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"
// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
@@ -2,4 +2,4 @@ class A {
o<caret>
}
// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"
// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
@@ -4,4 +4,4 @@ class A {
}
}
// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"
// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
@@ -1,5 +1,5 @@
// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
package demo
internal class Test : Iterable<String> {
@@ -1,5 +1,5 @@
// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
package demo
import java.util.*
@@ -1,4 +1,4 @@
// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
package demo
internal class Test : Iterable<String> {
@@ -3,5 +3,5 @@ package kotlinx.android.synthetic.test.view
import kotlin.internal.flexible.ft
val android.view.View.button: ft<android.view.View, android.view.View?>
get() = findViewById(0) as? android.view.View
get() = findViewById(0)
@@ -3,7 +3,7 @@ package kotlinx.android.synthetic.test.view
import kotlin.internal.flexible.ft
val android.view.View.textView1: ft<android.view.View, android.view.View?>
get() = findViewById(0) as? android.view.View
get() = findViewById(0)
val android.view.View.textView2: ft<android.widget.TextView, android.widget.TextView?>
get() = findViewById(0) as? android.widget.TextView
@@ -3,7 +3,7 @@ package kotlinx.android.synthetic.test.view
import kotlin.internal.flexible.ft
val android.view.View.button: ft<android.view.View, android.view.View?>
get() = findViewById(0) as? android.view.View
get() = findViewById(0)
val android.view.View.button2: ft<android.widget.Button, android.widget.Button?>
get() = findViewById(0) as? android.widget.Button
@@ -3,7 +3,7 @@ package kotlinx.android.synthetic.test.view
import kotlin.internal.flexible.ft
val android.view.View.includeTag: ft<android.view.View, android.view.View?>
get() = findViewById(0) as? android.view.View
get() = findViewById(0)
val android.view.View.`fun`: ft<android.widget.TextView, android.widget.TextView?>
get() = findViewById(0) as? android.widget.TextView
@@ -3,7 +3,7 @@ package kotlinx.android.synthetic.test.view
import kotlin.internal.flexible.ft
val android.view.View.includeTag: ft<android.view.View, android.view.View?>
get() = findViewById(0) as? android.view.View
get() = findViewById(0)
val android.view.View.`fun`: ft<android.widget.TextView, android.widget.TextView?>
get() = findViewById(0) as? android.widget.TextView
@@ -3,6 +3,6 @@ package kotlinx.android.synthetic.test.view
import kotlin.internal.flexible.ft
@kotlin.internal.flexible.InvalidWidgetType("a.b.c")
val android.view.View.MyView: ft<android.view.View, android.view.View?>
get() = findViewById(0) as? android.view.View
val android.view.View.MyView: ft<a.b.c, a.b.c?>
get() = findViewById(0) as? a.b.c
@@ -4,5 +4,5 @@ import kotlin.internal.flexible.ft
@kotlin.internal.flexible.InvalidWidgetType("KeyboardView")
val android.view.View.MyKeyboardView: ft<android.view.View, android.view.View?>
get() = findViewById(0) as? android.view.View
get() = findViewById(0)