From 3be1174824e78e417e451a521ffafae7bd28442f Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 26 Jan 2017 04:13:39 +0300 Subject: [PATCH] Replace @native with external in tests --- .../diagnostics/testsWithJsStdLib/native/inheritance.kt | 4 ---- .../diagnostics/testsWithJsStdLib/native/inheritance.txt | 7 ------- .../diagnostics/testsWithJsStdLib/native/nested.kt | 3 --- .../diagnostics/testsWithJsStdLib/native/nested.txt | 1 - .../testData/box/nameClashes/nativeAndTopLevelFunction.kt | 2 +- .../box/nameClashes/nativeDeclarationAndLocalVar.kt | 4 ++-- .../testData/box/native/callbackOptionalParameter.kt | 2 +- .../testData/box/native/castToNativeClassChecked.kt | 4 ++-- .../testData/box/native/castToNativeInterface.kt | 4 ++-- .../testData/box/native/castToNativeInterfaceChecked.kt | 2 +- .../testData/box/native/castToNullableNativeInterface.kt | 2 +- .../box/native/castToTypeParamBoundedByNativeInterface.kt | 6 +++--- js/js.translator/testData/box/native/equalsMangling.kt | 4 ++-- .../box/native/nativeClassAsReifiedTypeArgument.kt | 2 +- .../testData/box/native/safeCastToNativeInterface.kt | 2 +- .../testData/box/rtti/subclassOfNativeIsInterface.kt | 2 +- 16 files changed, 18 insertions(+), 33 deletions(-) diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/inheritance.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/inheritance.kt index c649b761956..005a78cc4e9 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/inheritance.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/inheritance.kt @@ -1,5 +1,3 @@ -// !DIAGNOSTICS: -DEPRECATION - open class A interface I @@ -10,8 +8,6 @@ external class C : A external class D : B, I -@native class N : A() - external interface K : I external enum class E { diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/inheritance.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/inheritance.txt index c62083a1d1f..be9795e3307 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/inheritance.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/inheritance.txt @@ -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 -} diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nested.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nested.kt index 2628f68a5da..459d8e12857 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nested.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nested.kt @@ -1,4 +1,3 @@ -// !DIAGNOSTICS: -DEPRECATION object O class TopLevel { @@ -10,8 +9,6 @@ class TopLevel { external fun bar(): Int - @native fun baz(): Int - val x = "a" external val y: String diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nested.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nested.txt index bdd86daba13..75300e3fdc4 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nested.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nested.txt @@ -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 diff --git a/js/js.translator/testData/box/nameClashes/nativeAndTopLevelFunction.kt b/js/js.translator/testData/box/nameClashes/nativeAndTopLevelFunction.kt index 6e2ac5f5907..7f59c22a91f 100644 --- a/js/js.translator/testData/box/nameClashes/nativeAndTopLevelFunction.kt +++ b/js/js.translator/testData/box/nameClashes/nativeAndTopLevelFunction.kt @@ -1,6 +1,6 @@ package test -@native fun foo(ignore: dynamic): String +external fun foo(ignore: dynamic): String @JsName("foo") fun foo() = "K" diff --git a/js/js.translator/testData/box/nameClashes/nativeDeclarationAndLocalVar.kt b/js/js.translator/testData/box/nameClashes/nativeDeclarationAndLocalVar.kt index 61e25581108..91691f26d2b 100644 --- a/js/js.translator/testData/box/nameClashes/nativeDeclarationAndLocalVar.kt +++ b/js/js.translator/testData/box/nameClashes/nativeDeclarationAndLocalVar.kt @@ -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;" diff --git a/js/js.translator/testData/box/native/callbackOptionalParameter.kt b/js/js.translator/testData/box/native/callbackOptionalParameter.kt index fe18d7335d0..5843bf8cbbc 100644 --- a/js/js.translator/testData/box/native/callbackOptionalParameter.kt +++ b/js/js.translator/testData/box/native/callbackOptionalParameter.kt @@ -14,7 +14,7 @@ class B : A() { } } -@native fun bar(a: A) +external fun bar(a: A) fun box(): String { bar(A()) diff --git a/js/js.translator/testData/box/native/castToNativeClassChecked.kt b/js/js.translator/testData/box/native/castToNativeClassChecked.kt index 51ef84a70bf..580e935511a 100644 --- a/js/js.translator/testData/box/native/castToNativeClassChecked.kt +++ b/js/js.translator/testData/box/native/castToNativeClassChecked.kt @@ -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 } diff --git a/js/js.translator/testData/box/native/castToNativeInterface.kt b/js/js.translator/testData/box/native/castToNativeInterface.kt index ec4fa3362e8..3b9c028a134 100644 --- a/js/js.translator/testData/box/native/castToNativeInterface.kt +++ b/js/js.translator/testData/box/native/castToNativeInterface.kt @@ -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 } diff --git a/js/js.translator/testData/box/native/castToNativeInterfaceChecked.kt b/js/js.translator/testData/box/native/castToNativeInterfaceChecked.kt index 96b2a42f311..2f9146e2b2b 100644 --- a/js/js.translator/testData/box/native/castToNativeInterfaceChecked.kt +++ b/js/js.translator/testData/box/native/castToNativeInterfaceChecked.kt @@ -1,4 +1,4 @@ -@native interface I { +external interface I { fun foo(): String } diff --git a/js/js.translator/testData/box/native/castToNullableNativeInterface.kt b/js/js.translator/testData/box/native/castToNullableNativeInterface.kt index 9ffac1c230e..823a1d253d7 100644 --- a/js/js.translator/testData/box/native/castToNullableNativeInterface.kt +++ b/js/js.translator/testData/box/native/castToNullableNativeInterface.kt @@ -1,4 +1,4 @@ -@native interface I { +external interface I { fun foo(): String } diff --git a/js/js.translator/testData/box/native/castToTypeParamBoundedByNativeInterface.kt b/js/js.translator/testData/box/native/castToTypeParamBoundedByNativeInterface.kt index 4273968d646..40383c4effc 100644 --- a/js/js.translator/testData/box/native/castToTypeParamBoundedByNativeInterface.kt +++ b/js/js.translator/testData/box/native/castToTypeParamBoundedByNativeInterface.kt @@ -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 } diff --git a/js/js.translator/testData/box/native/equalsMangling.kt b/js/js.translator/testData/box/native/equalsMangling.kt index a165cb1acb8..6f3f7ee16ca 100644 --- a/js/js.translator/testData/box/native/equalsMangling.kt +++ b/js/js.translator/testData/box/native/equalsMangling.kt @@ -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) diff --git a/js/js.translator/testData/box/native/nativeClassAsReifiedTypeArgument.kt b/js/js.translator/testData/box/native/nativeClassAsReifiedTypeArgument.kt index 7f3cb903b99..436ef6e7014 100644 --- a/js/js.translator/testData/box/native/nativeClassAsReifiedTypeArgument.kt +++ b/js/js.translator/testData/box/native/nativeClassAsReifiedTypeArgument.kt @@ -6,7 +6,7 @@ inline fun log(x: T) { global += T::class.js.name + ": " + x } -@native class C { +external class C { override fun toString() = definedExternally } diff --git a/js/js.translator/testData/box/native/safeCastToNativeInterface.kt b/js/js.translator/testData/box/native/safeCastToNativeInterface.kt index 67890280809..5150237d0e0 100644 --- a/js/js.translator/testData/box/native/safeCastToNativeInterface.kt +++ b/js/js.translator/testData/box/native/safeCastToNativeInterface.kt @@ -1,4 +1,4 @@ -@native interface I { +external interface I { fun foo(): String } fun createObject(): Any? = null diff --git a/js/js.translator/testData/box/rtti/subclassOfNativeIsInterface.kt b/js/js.translator/testData/box/rtti/subclassOfNativeIsInterface.kt index faef815873f..9e4c057c3a4 100644 --- a/js/js.translator/testData/box/rtti/subclassOfNativeIsInterface.kt +++ b/js/js.translator/testData/box/rtti/subclassOfNativeIsInterface.kt @@ -1,4 +1,4 @@ -@native open class A +external open class A interface I