Replace @native with external in tests

This commit is contained in:
Ilya Gorbunov
2017-01-26 04:13:39 +03:00
parent 20f175d091
commit 3be1174824
16 changed files with 18 additions and 33 deletions
@@ -1,5 +1,3 @@
// !DIAGNOSTICS: -DEPRECATION
open class A
interface I
@@ -10,8 +8,6 @@ external class <!EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE!>C<!> : A
external class <!EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE!>D<!> : B, I
@native class <!EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE!>N<!> : A()
external interface <!EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE!>K<!> : I
external enum class E {
@@ -73,10 +73,3 @@ public external interface K : I {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@kotlin.js.native public final class N : A {
public constructor N()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -1,4 +1,3 @@
// !DIAGNOSTICS: -DEPRECATION
object O
class TopLevel {
@@ -10,8 +9,6 @@ class TopLevel {
<!NESTED_EXTERNAL_DECLARATION!>external fun bar(): Int<!>
<!NESTED_EXTERNAL_DECLARATION!>@native fun baz(): Int<!>
val x = "a"
<!NESTED_EXTERNAL_DECLARATION!>external val y: String<!>
@@ -15,7 +15,6 @@ public final class TopLevel {
public external final val y: kotlin.String
public final val O.u: kotlin.String
public final external fun bar(): kotlin.Int
@kotlin.js.native public final fun baz(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -1,6 +1,6 @@
package test
@native fun foo(ignore: dynamic): String
external fun foo(ignore: dynamic): String
@JsName("foo")
fun foo() = "K"
@@ -1,8 +1,8 @@
package test
@native fun foo(): dynamic
external fun foo(): dynamic
@native fun bar(): dynamic
external fun bar(): dynamic
fun box(): String {
val foo = "local foo;"
@@ -14,7 +14,7 @@ class B : A() {
}
}
@native fun bar(a: A)
external fun bar(a: A)
fun box(): String {
bar(A())
@@ -1,9 +1,9 @@
// FILE: castToNativeClassChecked.kt
@native abstract class S() {
external abstract class S() {
abstract fun foo(): String
}
@native class A(x: String) {
external class A(x: String) {
fun foo(): String = definedExternally
}
@@ -1,9 +1,9 @@
// FILE: castToNativeInterface.kt
@native interface I {
external interface I {
fun foo(): String
}
@native class A(x: String) : I {
external class A(x: String) : I {
override fun foo(): String = definedExternally
}
@@ -1,4 +1,4 @@
@native interface I {
external interface I {
fun foo(): String
}
@@ -1,4 +1,4 @@
@native interface I {
external interface I {
fun foo(): String
}
@@ -1,5 +1,5 @@
// FILE: castToTypeParamBoundedByNativeInterface.kt
@native interface I {
external interface I {
fun foo(): String
}
@@ -7,9 +7,9 @@ interface J {
fun bar(): String
}
@native abstract class B() : I
external abstract class B() : I
@native class A(x: String) : B() {
external class A(x: String) : B {
override fun foo(): String = definedExternally
}
+2 -2
View File
@@ -1,8 +1,8 @@
data class A(val number: Int)
@native fun foo(first: A, second: A): Boolean
external fun foo(first: A, second: A): Boolean
@native class B(value: Int)
external class B(value: Int)
fun box(): String {
val a = A(23)
@@ -6,7 +6,7 @@ inline fun <reified T : Any> log(x: T) {
global += T::class.js.name + ": " + x
}
@native class C {
external class C {
override fun toString() = definedExternally
}
@@ -1,4 +1,4 @@
@native interface I {
external interface I {
fun foo(): String
}
fun createObject(): Any? = null
@@ -1,4 +1,4 @@
@native open class A
external open class A
interface I