azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicate tests from JS compiler test set. Merge chages to common compiler tests

Browse Source
This commit is contained in:
Svyatoslav Kuzmich
2019-02-18 15:40:23 +03:00
parent a736756ceb
commit beb5f73a2b
80 changed files with 56 additions and 2086 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/testData/box/examples/basicproperty.kt
Vendored
-25
View File
@@ -1,25 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1300
open class M() {
open var b: Int = 0
}
class N() : M() {
val a: Int
get() {
super.b = super.b + 1
return super.b + 1
}
override var b: Int = a + 1
val superb: Int
get() = super.b
}
fun box(): String {
val n = N()
n.a
n.b
n.superb
if (n.b == 3 && n.a == 4 && n.superb == 3) return "OK";
return "fail";
}
js/js.translator/testData/box/examples/classObject.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1288
class C() {
companion object {
fun create() = C()
}
}
fun box(): String {
val c = C.create()
return if (c is C) "OK" else "fail"
}
js/js.translator/testData/box/examples/closureWithParameter.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1282
fun box(): String {
return apply("OK", { arg: String -> arg })
}
fun apply(arg: String, f: (p: String) -> String): String {
return f(arg)
}
js/js.translator/testData/box/examples/closureWithParameterAndBoxing.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1282
fun box(): String {
return if (apply(5) { arg: Int -> arg + 13 } == 18) "OK" else "fail"
}
fun apply(arg: Int, f: (p: Int) -> Int): Int {
return f(arg)
}
js/js.translator/testData/box/examples/doubleEnclosedLocalVariable.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1283
fun box(): String {
val cl = 39
return if (sum(200, { val ff = { cl }; ff() }) == 239) "OK" else "FAIL"
}
fun sum(arg: Int, f: () -> Int): Int {
return arg + f()
}
js/js.translator/testData/box/examples/enclosed.kt
Vendored
-43
View File
@@ -1,43 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1318
interface BK {
fun x(): Int = 50
}
interface K : BK {
override fun x(): Int = super.x() * 2
}
open class M() {
open fun x(): Int = 10
open var y = 500
}
open class N() : M(), K {
override fun x(): Int = 20
override var y = 200
inner open class C() : K {
fun test1() = x()
fun test2() = super<M>@N.x()
fun test3() = super<K>@N.x()
fun test4() = super<K>.x()
fun test5() = y
fun test6(): Int {
super<M>@N.y += 200
return super<M>@N.y
}
}
}
fun box(): String {
if (N().C().test1() != 100) return "test1 fail";
if (N().C().test2() != 10) return "test2 fail";
if (N().C().test3() != 100) return "test3 fail";
if (N().C().test4() != 100) return "test4 fail";
if (N().C().test5() != 200) return "test5 fail";
if (N().C().test6() != 700) return "test6 fail";
return "OK";
}
js/js.translator/testData/box/examples/enclosingLocalVariable.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1284
fun box(): String {
val cl = 39
return if (sum(200, { val m = { val r = { cl }; r() }; m() }) == 239) "OK" else "FAIL"
}
fun sum(arg: Int, f: () -> Int): Int {
return arg + f()
}
js/js.translator/testData/box/examples/extensionClosure.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1284
class Point(val x: Int, val y: Int)
fun box(): String {
val answer = apply(Point(3, 5), { scalar: Int ->
Point(x * scalar, y * scalar)
})
return if (answer.x == 6 && answer.y == 10) "OK" else "FAIL"
}
fun apply(arg: Point, f: Point.(scalar: Int) -> Point): Point {
return arg.f(2)
}
js/js.translator/testData/box/examples/funDelegation.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1297
open class Base() {
fun n(n: Int): Int = n + 1
}
interface Abstract {
}
class Derived1() : Base(), Abstract {
}
class Derived2() : Abstract, Base() {
}
fun test(s: Base): Boolean = s.n(238) == 239
fun box(): String {
if (!test(Base())) return "Fail #1"
if (!test(Derived1())) return "Fail #2"
if (!test(Derived2())) return "Fail #3"
return "OK"
}
js/js.translator/testData/box/examples/incrementProperty.kt
Vendored
-15
View File
@@ -1,15 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1284
class Slot() {
var vitality: Int = 10000
fun increaseVitality(delta: Int) {
vitality = vitality + delta
if (vitality > 65535) vitality = 65535;
}
}
fun box(): String {
val s = Slot()
s.increaseVitality(1000)
if (s.vitality == 11000) return "OK" else return "fail"
}
js/js.translator/testData/box/examples/inheritance.kt
Vendored
-49
View File
@@ -1,49 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1319
// Changed when traits were introduced. May not make sense any more
open class X(val x: Int) {
}
interface Y {
abstract val y: Int
}
class YImpl(override val y: Int) : Y {
}
class Point(x: Int, yy: Int) : X(x), Y {
override val y: Int = yy
}
interface Abstract {
}
class P1(x: Int, yy: Y) : Abstract, X(x), Y by yy {
}
class P2(x: Int, yy: Y) : X(x), Abstract, Y by yy {
}
class P3(x: Int, yy: Y) : X(x), Y by yy, Abstract {
}
class P4(x: Int, yy: Y) : Y by yy, Abstract, X(x) {
}
fun box(): String {
if (X(239).x != 239) return "FAIL #1"
if (YImpl(239).y != 239) return "FAIL #2"
val p = Point(240, -1)
if (p.x + p.y != 239) return "FAIL #3"
val y = YImpl(-1)
val p1 = P1(240, y)
if (p1.x + p1.y != 239) return "FAIL #4"
val p2 = P2(240, y)
if (p2.x + p2.y != 239) return "FAIL #5"
val p3 = P3(240, y)
if (p3.x + p3.y != 239) return "FAIL #6"
val p4 = P4(240, y)
if (p4.x + p4.y != 239) return "FAIL #7"
return "OK"
}
js/js.translator/testData/box/examples/inheritedInnerClass.kt
Vendored
-15
View File
@@ -1,15 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1291
class Outer() {
open class InnerBase() {
}
class InnerDerived() : InnerBase() {
}
public val foo: InnerBase? = InnerDerived()
}
fun box(): String {
val o = Outer()
return if (o.foo === null) "fail" else "OK"
}
js/js.translator/testData/box/examples/inheritedMethod.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1292
open class Foo() {
fun xyzzy(): String = "xyzzy"
}
class Bar() : Foo() {
fun test(): String = xyzzy()
}
fun box(): String {
val bar = Bar()
val f = bar.test()
return if (f == "xyzzy") "OK" else "fail"
}
js/js.translator/testData/box/examples/initializerBlock.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1282
class C() {
public var f: Int
init {
f = 610
}
}
fun box(): String {
val c = C()
if (c.f != 610) return "fail"
return "OK"
}
js/js.translator/testData/box/examples/initializerBlockDImpl.kt
Vendored
-20
View File
@@ -1,20 +0,0 @@
// KJS_WITH_FULL_RUNTIME
// EXPECTED_REACHABLE_NODES: 1517
class World() {
public val items: ArrayList<Item> = ArrayList<Item>()
inner class Item() {
init {
items.add(this)
}
}
val foo = Item()
}
fun box() : String {
val w = World()
if (w.items.size != 1) return "fail"
return "OK"
}
js/js.translator/testData/box/examples/innerClass.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// KJS_WITH_FULL_RUNTIME
// EXPECTED_REACHABLE_NODES: 1288
class Outer(val foo: StringBuilder) {
inner class Inner() {
fun len(): Int {
return foo.length
}
}
fun test(): Inner {
return Inner()
}
}
fun box(): String {
val sb = StringBuilder("xyzzy")
val o = Outer(sb)
val i = o.test()
val l = i.len()
return if (l != 5) "fail" else "OK"
}
js/js.translator/testData/box/examples/kt242.kt
Vendored
-28
View File
@@ -1,28 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1280
fun box(): String {
val i: Int? = 7
val j: Int? = null
val k = 7
//verify errors
if (i == 7) {
}
if (7 == i) {
}
if (j == 7) {
}
if (7 == j) {
}
if (i == k) {
}
if (k == i) {
}
if (j == k) {
}
if (k == j) {
}
return "OK"
}
js/js.translator/testData/box/examples/overloadBinaryOperator.kt
Vendored
-26
View File
@@ -1,26 +0,0 @@
// KJS_WITH_FULL_RUNTIME
// EXPECTED_REACHABLE_NODES: 1518
class ArrayWrapper<T>() {
val contents = ArrayList<T>()
fun add(item: T) {
contents.add(item)
}
operator fun plus(b: ArrayWrapper<T>): ArrayWrapper<T> {
val result = ArrayWrapper<T>()
result.contents.addAll(contents)
result.contents.addAll(b.contents)
return result
}
}
fun box(): String {
val v1 = ArrayWrapper<String>()
val v2 = ArrayWrapper<String>()
v1.add("foo")
v2.add("bar")
val v3 = v1 + v2
return if (v3.contents.size == 2) "OK" else "fail"
}
js/js.translator/testData/box/examples/overloadPlusAssignReturn.kt
Vendored
-28
View File
@@ -1,28 +0,0 @@
// KJS_WITH_FULL_RUNTIME
// EXPECTED_REACHABLE_NODES: 1519
class ArrayWrapper<T>() {
val contents = ArrayList<T>()
fun add(item: T) {
contents.add(item)
}
operator fun plusAssign(rhs: ArrayWrapper<T>) {
contents.addAll(rhs.contents)
}
fun get(index: Int): T {
return contents.get(index)
}
}
fun box(): String {
var v1 = ArrayWrapper<String>()
val v2 = ArrayWrapper<String>()
v1.add("foo")
val v3 = v1
v2.add("bar")
v1 += v2
return if (v1.contents.size == 2 && v3.contents.size == 2) "OK" else "fail"
}
js/js.translator/testData/box/examples/overloadPlusToPlusAssign.kt
Vendored
-31
View File
@@ -1,31 +0,0 @@
// KJS_WITH_FULL_RUNTIME
// EXPECTED_REACHABLE_NODES: 1519
class ArrayWrapper<T>() {
val contents = ArrayList<T>()
fun add(item: T) {
contents.add(item)
}
operator fun plus(rhs: ArrayWrapper<T>): ArrayWrapper<T> {
val result = ArrayWrapper<T>()
result.contents.addAll(contents)
result.contents.addAll(rhs.contents)
return result
}
fun get(index: Int): T {
return contents.get(index)
}
}
fun box(): String {
var v1 = ArrayWrapper<String>()
val v2 = ArrayWrapper<String>()
v1.add("foo")
val v3 = v1
v2.add("bar")
v1 += v2
return if (v1.contents.size == 2 && v3.contents.size == 1) "OK" else "fail"
}
js/js.translator/testData/box/examples/overloadUnaryOperator.kt
Vendored
-29
View File
@@ -1,29 +0,0 @@
// KJS_WITH_FULL_RUNTIME
// EXPECTED_REACHABLE_NODES: 1519
class ArrayWrapper<T>() {
val contents = ArrayList<T>()
fun add(item: T) {
contents.add(item)
}
operator fun unaryMinus(): ArrayWrapper<T> {
val result = ArrayWrapper<T>()
result.contents.addAll(contents)
result.contents.reverse()
return result
}
operator fun get(index: Int): T {
return contents.get(index)
}
}
fun box(): String {
val v1 = ArrayWrapper<String>()
v1.add("foo")
v1.add("bar")
val v2 = -v1
return if (v2[0] == "bar" && v2[1] == "foo") "OK" else "fail"
}
js/js.translator/testData/box/examples/propertyDelegation.kt
Vendored
-37
View File
@@ -1,37 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1299
open class Base() {
val plain = 239
public val read: Int
get() = 239
public var readwrite: Int = 0
get() = field + 1
set(n: Int) {
field = n
}
}
interface Abstract {
}
class Derived1() : Base(), Abstract {
}
class Derived2() : Abstract, Base() {
}
fun code(s: Base): Int {
if (s.plain != 239) return 1
if (s.read != 239) return 2
s.readwrite = 238
if (s.readwrite != 239) return 3
return 0
}
fun test(s: Base): Boolean = code(s) == 0
fun box(): String {
if (!test(Base())) return "Fail #1"
if (!test(Derived1())) return "Fail #2"
if (!test(Derived2())) return "Fail #3"
return "OK"
}
js/js.translator/testData/box/examples/propertyInInitializer.kt
Vendored
-17
View File
@@ -1,17 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1291
class Outer() {
val s = "xyzzy"
open inner class InnerBase(public val name: String) {
}
inner class InnerDerived() : InnerBase(s) {
}
val x = InnerDerived()
}
fun box(): String {
val o = Outer()
return if (o.x.name != "xyzzy") "fail" else "OK"
}
js/js.translator/testData/box/examples/rightHandOverride.kt
Vendored
-22
View File
@@ -1,22 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1293
// Changed when traits were introduced. May not make sense any more
interface Left {
}
open class Right() {
open fun f() = 42
}
class D() : Left, Right() {
override fun f() = 239
}
fun box(): String {
val r: Right = Right()
val d: D = D()
if (r.f() != 42) return "Fail #1"
if (d.f() != 239) return "Fail #2"
return "OK"
}
js/js.translator/testData/box/examples/simplestClosure.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1282
fun box(): String {
return invoker({ "OK" })
}
fun invoker(gen: () -> String): String {
return gen()
}
js/js.translator/testData/box/examples/simplestClosureAndBoxing.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1282
fun box(): String {
return if (int_invoker({ 7 }) == 7) "OK" else "fail"
}
fun int_invoker(gen: () -> Int): Int {
return gen()
}
js/js.translator/testData/box/examples/traitproperty.kt
Vendored
-32
View File
@@ -1,32 +0,0 @@
// EXPECTED_REACHABLE_NODES: 1296
interface M {
var backingB: Int
var b: Int
get() = backingB
set(value: Int) {
backingB = value
}
}
class N() : M {
override var backingB: Int = 0
val a: Int
get() {
super.b = super.b + 1
return super.b + 1
}
override var b: Int = a + 1
val superb: Int
get() = super.b
}
fun box(): String {
val n = N()
n.a
n.b
n.superb
if (n.b == 3 && n.a == 4 && n.superb == 3) return "OK";
return "fail";
}