JS: replace noImpl with definedExternally in tests

This commit is contained in:
Alexey Andreev
2017-01-23 15:55:21 +03:00
parent 71a5d8a4ee
commit aedf8bd232
69 changed files with 326 additions and 326 deletions
@@ -5,7 +5,7 @@ package lib
fun foo() = 23
external fun bar(): Int = noImpl
external fun bar(): Int = definedExternally
inline fun baz() = 99
@@ -7,10 +7,10 @@ val foo = 23
val boo: Int
get() = 42
external val bar: Int = noImpl
external val bar: Int = definedExternally
external val far: Int
get() = noImpl
get() = definedExternally
// TODO: annotations like this are not serialized properly. Uncomment after KT-14529 gets fixed
/*
+3 -3
View File
@@ -1,10 +1,10 @@
package foo
external var bar: dynamic = noImpl
external var bar: dynamic = definedExternally
external var arr: dynamic = noImpl
external var arr: dynamic = definedExternally
external var baz: dynamic = noImpl
external var baz: dynamic = definedExternally
object t {
override fun toString() = "object t {}"
@@ -6,6 +6,6 @@ fun String.replaceAll(regexp: String, replacement: String): String = replace(Reg
inline fun String.search(regexp: RegExp): Int = asDynamic().search(regexp)
external class RegExp(regexp: String, flags: String = noImpl) {
fun exec(s: String): Array<String>? = noImpl
external class RegExp(regexp: String, flags: String = definedExternally) {
fun exec(s: String): Array<String>? = definedExternally
}
@@ -6,13 +6,13 @@ public fun public_baz(i: Int) {
log = "public_baz"
}
external public fun public_baz(a: String) {
noImpl
definedExternally
}
internal fun internal_baz(i: Int) {
}
internal external fun internal_baz(a: String) {
noImpl
definedExternally
}
private fun getCurrentPackage(): dynamic = js("_").foo
@@ -20,7 +20,7 @@ private fun getCurrentPackage(): dynamic = js("_").foo
private fun private_baz(i: Int) {
}
private external fun private_baz(a: String) {
noImpl
definedExternally
}
public class PublicClass {
@@ -1,7 +1,7 @@
package foo
external interface A {
val bar: Int? get() = noImpl
val bar: Int? get() = definedExternally
fun foo(): String
}
+1 -1
View File
@@ -1 +1 @@
external public fun parseInt(s: String, radix: Int = noImpl): Int = noImpl
external public fun parseInt(s: String, radix: Int = definedExternally): Int = definedExternally
+1 -1
View File
@@ -137,7 +137,7 @@ inline fun <T, R> T.performWithFail2(job: (T)-> R, failJob: (e: RuntimeException
}
external object Number {
fun parseInt(str: String): Int = noImpl
fun parseInt(str: String): Int = definedExternally
}
inline fun String.toInt2(): Int = this.toInt()
+2 -2
View File
@@ -2,10 +2,10 @@
package foo
@JsModule("lib")
external class A(x: Int = noImpl) {
external class A(x: Int = definedExternally) {
val x: Int
fun foo(y: Int): Int = noImpl
fun foo(y: Int): Int = definedExternally
}
fun box(): String {
+1 -1
View File
@@ -2,7 +2,7 @@
package foo
@JsModule("lib")
external fun foo(y: Int): Int = noImpl
external fun foo(y: Int): Int = definedExternally
fun box(): String {
assertEquals(65, foo(42))
@@ -2,7 +2,7 @@ package foo
@JsModule("lib")
@JsNonModule
external fun foo(y: Int): Int = noImpl
external fun foo(y: Int): Int = definedExternally
fun box(): String {
assertEquals(65, foo(42))
@@ -3,7 +3,7 @@ package foo
@JsModule("lib-foo")
@JsNonModule
external fun foo(x: Int): Int = noImpl
external fun foo(x: Int): Int = definedExternally
fun box(): String {
assertEquals(65, foo(42))
@@ -4,12 +4,12 @@ package foo
@JsModule("libfoo")
@JsNonModule
external fun foo(x: Int): Int = noImpl
external fun foo(x: Int): Int = definedExternally
@JsModule("libbar")
@JsNonModule
@JsName("baz")
external fun bar(x: Int): Int = noImpl
external fun bar(x: Int): Int = definedExternally
fun box(): String {
assertEquals(65, foo(42))
+2 -2
View File
@@ -3,9 +3,9 @@ package foo
@JsModule("lib")
external object A {
val x: Int = noImpl
val x: Int = definedExternally
fun foo(y: Int): Int = noImpl
fun foo(y: Int): Int = definedExternally
}
fun box(): String {
+6 -6
View File
@@ -5,7 +5,7 @@ package foo
external class A(x: Int) {
val x: Int
fun foo(y: Int): Int = noImpl
fun foo(y: Int): Int = definedExternally
class Nested {
val y: Int
@@ -13,16 +13,16 @@ external class A(x: Int) {
}
external object B {
val x: Int = noImpl
val x: Int = definedExternally
fun foo(y: Int): Int = noImpl
fun foo(y: Int): Int = definedExternally
}
external fun foo(y: Int): Int = noImpl
external fun foo(y: Int): Int = definedExternally
external val bar: Int = noImpl
external val bar: Int = definedExternally
external var mbar: Int = noImpl
external var mbar: Int = definedExternally
fun box(): String {
val a = A(23)
@@ -3,29 +3,29 @@
@file:JsModule("lib")
package foo
external class A(x: Int = noImpl) {
external class A(x: Int = definedExternally) {
val x: Int
fun foo(y: Int): Int = noImpl
fun foo(y: Int): Int = definedExternally
}
external object B {
val x: Int = noImpl
val x: Int = definedExternally
fun foo(y: Int): Int = noImpl
fun foo(y: Int): Int = definedExternally
}
external fun foo(y: Int): Int = noImpl
external fun foo(y: Int): Int = definedExternally
external val bar: Int = noImpl
external val bar: Int = definedExternally
external var mbar: Int = noImpl
external var mbar: Int = definedExternally
// FILE: lib2.kt
package foo
external object C {
fun f(): Int = noImpl
fun f(): Int = definedExternally
}
// FILE: main.kt
@@ -2,10 +2,10 @@
@file:JsNonModule
package foo
external class A(x: Int = noImpl) {
external class A(x: Int = definedExternally) {
val x: Int
fun foo(y: Int): Int = noImpl
fun foo(y: Int): Int = definedExternally
class Nested {
val y: Int
@@ -13,16 +13,16 @@ external class A(x: Int = noImpl) {
}
external object B {
val x: Int = noImpl
val x: Int = definedExternally
fun foo(y: Int): Int = noImpl
fun foo(y: Int): Int = definedExternally
}
external fun foo(y: Int): Int = noImpl
external fun foo(y: Int): Int = definedExternally
external val bar: Int = noImpl
external val bar: Int = definedExternally
external var mbar: Int = noImpl
external var mbar: Int = definedExternally
fun box(): String {
val a = A(23)
@@ -4,23 +4,23 @@
@file:JsNonModule
package foo
external class A(x: Int = noImpl) {
external class A(x: Int = definedExternally) {
val x: Int
fun foo(y: Int): Int = noImpl
fun foo(y: Int): Int = definedExternally
}
external object B {
val x: Int = noImpl
val x: Int = definedExternally
fun foo(y: Int): Int = noImpl
fun foo(y: Int): Int = definedExternally
}
external fun foo(y: Int): Int = noImpl
external fun foo(y: Int): Int = definedExternally
external val bar: Int = noImpl
external val bar: Int = definedExternally
external var mbar: Int = noImpl
external var mbar: Int = definedExternally
fun box(): String {
val a = A(23)
+1 -1
View File
@@ -2,7 +2,7 @@
package foo
@JsModule("lib")
external val foo: Int = noImpl
external val foo: Int = definedExternally
fun box(): String {
assertEquals(23, foo)
+7 -7
View File
@@ -1,31 +1,31 @@
package foo
@JsName("bar")
external fun foo(): Int = noImpl
external fun foo(): Int = definedExternally
@JsName("baz")
external val prop: Int get() = noImpl
external val prop: Int get() = definedExternally
@JsName("B")
external class A {
@JsName("g")
fun f(): Int = noImpl
fun f(): Int = definedExternally
@JsName("q")
val p: Int get() = noImpl
val p: Int get() = definedExternally
companion object {
@JsName("g")
fun f(): Int = noImpl
fun f(): Int = definedExternally
@JsName("q")
val p: Int get() = noImpl
val p: Int get() = definedExternally
}
}
@JsName("P")
external object O {
fun f(): Int = noImpl
fun f(): Int = definedExternally
}
fun box(): String {
@@ -4,23 +4,23 @@
@file:JsModule("native-lib")
package foo
external class A(x: Int = noImpl) {
external class A(x: Int = definedExternally) {
val x: Int
fun foo(y: Int): Int = noImpl
fun foo(y: Int): Int = definedExternally
}
external object B {
val x: Int = noImpl
val x: Int = definedExternally
fun foo(y: Int): Int = noImpl
fun foo(y: Int): Int = definedExternally
}
external fun foo(y: Int): Int = noImpl
external fun foo(y: Int): Int = definedExternally
external val bar: Int = noImpl
external val bar: Int = definedExternally
external var mbar: Int = noImpl
external var mbar: Int = definedExternally
// MODULE: main(lib)
// FILE: main.kt
@@ -4,7 +4,7 @@
}
@native class A(x: String) {
fun foo(): String = noImpl
fun foo(): String = definedExternally
}
fun createObject(): Any = A("fail: CCE not thrown")
@@ -4,7 +4,7 @@
}
@native class A(x: String) : I {
override fun foo(): String = noImpl
override fun foo(): String = definedExternally
}
fun createObject(): Any = A("OK")
@@ -10,7 +10,7 @@ interface J {
@native abstract class B() : I
@native class A(x: String) : B() {
override fun foo(): String = noImpl
override fun foo(): String = definedExternally
}
fun createObject(): Any = A("OK")
+2 -2
View File
@@ -1,8 +1,8 @@
package foo
external class A(b: Int) {
fun g(): Int = noImpl
fun m(): Int = noImpl
fun g(): Int = definedExternally
fun m(): Int = definedExternally
}
+1 -1
View File
@@ -5,7 +5,7 @@ external class A(c: Int) {
companion object {
val g: Int
val c: String = noImpl
val c: String = definedExternally
}
}
@@ -3,13 +3,13 @@ package foo
internal external open class A(a: Int) {
val a: Int
fun g(): Int = noImpl
fun m(): Int = noImpl
fun g(): Int = definedExternally
fun m(): Int = definedExternally
public open fun foo(i: Int): String = noImpl
public fun boo(i: Int): String = noImpl
public open fun foo(i: Int): String = definedExternally
public fun boo(i: Int): String = definedExternally
@JsName("bar")
open fun baz(i: Int): String = noImpl
open fun baz(i: Int): String = definedExternally
}
internal class B(val b: Int) : A(b / 2) {
+1 -1
View File
@@ -12,7 +12,7 @@ external interface LastError {
val message: String
}
external val chrome: Chrome = noImpl
external val chrome: Chrome = definedExternally
fun box(): String {
val lastError = chrome.extension.lastError?.message
@@ -7,7 +7,7 @@ inline fun <reified T : Any> log(x: T) {
}
@native class C {
override fun toString() = noImpl
override fun toString() = definedExternally
}
fun box(): String {
@@ -3,34 +3,34 @@ package foo
@JsName("Object")
external class JsObject {
@nativeGetter
operator fun get(a: String): Any? = noImpl
operator fun get(a: String): Any? = definedExternally
@nativeSetter
operator fun set(a: String, v: Any?): Unit = noImpl
operator fun set(a: String, v: Any?): Unit = definedExternally
@nativeGetter
fun take(a: Int): Any? = noImpl
fun take(a: Int): Any? = definedExternally
@nativeSetter
fun put(a: Int, v: Any?): Unit = noImpl
fun put(a: Int, v: Any?): Unit = definedExternally
}
@nativeGetter
operator fun JsObject.get(a: Int): Any? = noImpl
operator fun JsObject.get(a: Int): Any? = definedExternally
@nativeSetter
operator fun JsObject.set(a: Int, v: Any?): Unit = noImpl
operator fun JsObject.set(a: Int, v: Any?): Unit = definedExternally
@nativeGetter
fun JsObject.take(a: String): Any? = noImpl
fun JsObject.take(a: String): Any? = definedExternally
@nativeSetter
fun JsObject.put(a: String, v: Any?): Unit = noImpl
fun JsObject.put(a: String, v: Any?): Unit = definedExternally
object t{}
external fun getTestObject(): JsObject = noImpl
external fun getTestObject(): JsObject = definedExternally
fun test(obj: JsObject, key: String, oldValue: Any?, newValue: Any) {
assertEquals(oldValue, obj[key])
+4 -4
View File
@@ -2,17 +2,17 @@ package foo
external class Function(vararg argsAndCode: String) {
@nativeInvoke
operator fun invoke(a: Any?): Any? = noImpl
operator fun invoke(a: Any?): Any? = definedExternally
@nativeInvoke
fun baz(a: Any?, b: Any?): Any? = noImpl
fun baz(a: Any?, b: Any?): Any? = definedExternally
}
@nativeInvoke
operator fun Function.invoke(a: Any?, b: Any?): Any? = noImpl
operator fun Function.invoke(a: Any?, b: Any?): Any? = definedExternally
@nativeInvoke
fun Function.bar(a: Any?, b: Any?): Any? = noImpl
fun Function.bar(a: Any?, b: Any?): Any? = definedExternally
object t{}
+47 -47
View File
@@ -82,33 +82,33 @@ fun box(): String {
external object Object {
object Object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
val a: String = definedExternally
var b: String = definedExternally
fun test(): Int = definedExternally
@JsName("AnotherClass")
class Class(a: String) {
val a: String
var b: String = noImpl
fun test(): Int = noImpl
var b: String = definedExternally
fun test(): Int = definedExternally
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
val a: String = definedExternally
var b: String = definedExternally
fun test(): Int = definedExternally
}
}
}
class Class(a: String) {
val a: String
var b: String = noImpl
fun test(): Int = noImpl
var b: String = definedExternally
fun test(): Int = definedExternally
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
val a: String = definedExternally
var b: String = definedExternally
fun test(): Int = definedExternally
}
}
@@ -118,34 +118,34 @@ external object Object {
fun test(): Int
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
val a: String = definedExternally
var b: String = definedExternally
fun test(): Int = definedExternally
}
}
val a: Trait = noImpl
var b: String = noImpl
fun test(): Int = noImpl
val a: Trait = definedExternally
var b: String = definedExternally
fun test(): Int = definedExternally
}
@JsName("SomeClass")
external class Class {
object Object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
val a: String = definedExternally
var b: String = definedExternally
fun test(): Int = definedExternally
}
class Class(a: String) {
val a: String
var b: String = noImpl
fun test(): Int = noImpl
var b: String = definedExternally
fun test(): Int = definedExternally
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
val a: String = definedExternally
var b: String = definedExternally
fun test(): Int = definedExternally
}
}
@@ -155,37 +155,37 @@ external class Class {
fun test(): Int
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
val a: String = definedExternally
var b: String = definedExternally
fun test(): Int = definedExternally
}
}
companion object {
@JsName("aaa")
val a: Trait = noImpl
var b: String = noImpl
fun test(): Int = noImpl
val a: Trait = definedExternally
var b: String = definedExternally
fun test(): Int = definedExternally
}
}
external interface Trait {
@JsName("SomeObject")
object Object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
val a: String = definedExternally
var b: String = definedExternally
fun test(): Int = definedExternally
}
class Class(a: String) {
val a: String
var b: String = noImpl
fun test(): Int = noImpl
var b: String = definedExternally
fun test(): Int = definedExternally
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
val a: String = definedExternally
var b: String = definedExternally
fun test(): Int = definedExternally
}
}
@@ -196,15 +196,15 @@ external interface Trait {
fun test(): Int
companion object {
val a: String = noImpl
var b: String = noImpl
fun test(): Int = noImpl
val a: String = definedExternally
var b: String = definedExternally
fun test(): Int = definedExternally
}
}
companion object {
val a: Trait = noImpl
var b: String = noImpl
fun test(): Int = noImpl
val a: Trait = definedExternally
var b: String = definedExternally
fun test(): Int = definedExternally
}
}
@@ -1,7 +1,7 @@
external open class A {
open fun f(x: Int): String = noImpl
open fun f(x: Int): String = definedExternally
open fun f(x: String): String = noImpl
open fun f(x: String): String = definedExternally
}
class B : A() {
@@ -9,7 +9,7 @@ internal class B {
}
internal external fun nativeBox(b: B): String = noImpl
internal external fun nativeBox(b: B): String = definedExternally
fun box(): String {
val r = nativeBox(B())
@@ -4,7 +4,7 @@ external class A(v: String) {
val v: String
}
external fun bar(a: A, extLambda: A.(Int, String) -> String): String = noImpl
external fun bar(a: A, extLambda: A.(Int, String) -> String): String = definedExternally
fun box(): String {
val a = A("test")
@@ -3,7 +3,7 @@ package foo
external class A(v: String) {
val v: String
fun m(i:Int, s:String): String = noImpl
fun m(i:Int, s:String): String = definedExternally
}
fun bar(a: A, extLambda: A.(Int, String) -> String): String = a.(extLambda)(4, "boo")
@@ -8,7 +8,7 @@ class B(v: String): A(v) {
override fun m(i:Int, s:String): String = "B.m ${this.v} $i $s"
}
external fun bar(a: A, extLambda: A.(Int, String) -> String): String = noImpl
external fun bar(a: A, extLambda: A.(Int, String) -> String): String = definedExternally
fun A.topLevelExt(i:Int, s:String): String = "A::topLevelExt ${this.v} $i $s"
@@ -1,6 +1,6 @@
package foo
external fun nativeFun(i:Int, s:String): String = noImpl
external fun nativeFun(i:Int, s:String): String = definedExternally
fun bar(funRef: (Int, String) -> String): String = funRef(4, "boo")
@@ -1,6 +1,6 @@
package foo
external fun run(i:Int, s:String, funRef: (Int, String) -> String): String = noImpl
external fun run(i:Int, s:String, funRef: (Int, String) -> String): String = definedExternally
fun funTopLevel(i:Int, s:String): String = "funTopLevel $i $s"
+1 -1
View File
@@ -22,7 +22,7 @@ val EXPECTED_NEWLINE_FOR_EACH = """Hello
"""
external var buffer: String = noImpl
external var buffer: String = definedExternally
fun test(expected: String, initCode: String, getResult: () -> String) {
buffer = ""
+1 -1
View File
@@ -1,5 +1,5 @@
package foo
external fun returnFalse(): Boolean = noImpl
external fun returnFalse(): Boolean = definedExternally
fun box() = if (!returnFalse()) "OK" else "fail"
+1 -1
View File
@@ -1,6 +1,6 @@
package foo
external val c: Any? = noImpl
external val c: Any? = definedExternally
fun box(): String {
if (c != null) return "fail1"
+13 -13
View File
@@ -1,12 +1,12 @@
package foo
external fun paramCount(vararg a: Int): Int = noImpl
external fun paramCount(vararg a: Int): Int = definedExternally
@JsName("paramCount")
external fun anotherParamCount(vararg a: Int): Int = noImpl
external fun anotherParamCount(vararg a: Int): Int = definedExternally
@JsName("paramCount")
external fun <T> genericParamCount(vararg a: T): Int = noImpl
external fun <T> genericParamCount(vararg a: T): Int = definedExternally
// test spread operator
fun count(vararg a: Int) = paramCount(*a)
@@ -14,19 +14,19 @@ fun count(vararg a: Int) = paramCount(*a)
// test spread operator
fun anotherCount(vararg a: Int) = anotherParamCount(*a)
external fun test3(bar: Bar, dummy: Int, vararg args: Int): Boolean = noImpl
external fun test3(bar: Bar, dummy: Int, vararg args: Int): Boolean = definedExternally
external class Bar(size: Int, order: Int = noImpl) {
external class Bar(size: Int, order: Int = definedExternally) {
val size: Int
fun test(order: Int, dummy: Int, vararg args: Int): Boolean = noImpl
fun test(order: Int, dummy: Int, vararg args: Int): Boolean = definedExternally
companion object {
fun startNewTest(): Boolean = noImpl
var hasOrderProblem: Boolean = noImpl
fun startNewTest(): Boolean = definedExternally
var hasOrderProblem: Boolean = definedExternally
}
}
external object obj {
fun test(size: Int, vararg args: Int): Boolean = noImpl
fun test(size: Int, vararg args: Int): Boolean = definedExternally
}
fun spreadInMethodCall(size: Int, vararg args: Int) = Bar(size).test(0, 1, *args)
@@ -35,7 +35,7 @@ fun spreadInObjectMethodCall(size: Int, vararg args: Int) = obj.test(size, *args
fun spreadInPackageMethodCall(size: Int, vararg args: Int) = test3(Bar(size), 1, *args)
external fun testNativeVarargWithFunLit(vararg args: Int, f: (a: IntArray) -> Boolean): Boolean = noImpl
external fun testNativeVarargWithFunLit(vararg args: Int, f: (a: IntArray) -> Boolean): Boolean = definedExternally
fun testSpreadOperatorWithSafeCall(a: Bar?, expected: Boolean?, vararg args: Int): Boolean {
return a?.test(0, 1, *args) == expected
@@ -50,11 +50,11 @@ fun testCallOrder(vararg args: Int) =
Bar(args.size, 0).test(1, 1, *args) && Bar(args.size, 2).test(3, 1, *args) &&
!Bar.hasOrderProblem
external fun sumOfParameters(x: Int, y: Int, vararg a: Int): Int = noImpl
external fun sumOfParameters(x: Int, y: Int, vararg a: Int): Int = definedExternally
external fun sumFunValuesOnParameters(x: Int, y: Int, vararg a: Int, f: (Int) -> Int): Int = noImpl
external fun sumFunValuesOnParameters(x: Int, y: Int, vararg a: Int, f: (Int) -> Int): Int = definedExternally
external fun <T> idArrayVarArg(vararg a: Array<T>): Array<T> = noImpl
external fun <T> idArrayVarArg(vararg a: Array<T>): Array<T> = definedExternally
fun box(): String {
if (paramCount() != 0)
+4 -4
View File
@@ -2,15 +2,15 @@ package foo
external class A(x: Int) {
var x: Int
get() = noImpl
set(value) = noImpl
get() = definedExternally
set(value) = definedExternally
fun foo(): Int = noImpl
fun foo(): Int = definedExternally
class B(value: Int) {
val value: Int
fun bar(): Int = noImpl
fun bar(): Int = definedExternally
}
}