Fix deprecations in testData: js semantics.

This commit is contained in:
Ilya Gorbunov
2015-09-15 20:19:57 +03:00
parent 92e66b0d81
commit 0e3e33e5c1
46 changed files with 119 additions and 121 deletions
@@ -9,7 +9,7 @@ package foo
data class PairArray<T, R>(val fst: Array<T>, val snd: Array<R>)
inline fun moveTo(source: Array<Int>, sink: Array<Int>): PairArray<Int, Int> {
val size = source.size
val size = source.size()
for (i in 1..size) {
val element = source[0]
source.splice(0, 1)
@@ -20,8 +20,8 @@ inline fun moveTo(source: Array<Int>, sink: Array<Int>): PairArray<Int, Int> {
}
fun box(): String {
val expected = PairArray<Int, Int>(array(), array(1,2,3,4))
assertEquals(expected, moveTo(array(3, 4), array(1, 2)))
val expected = PairArray<Int, Int>(arrayOf(), arrayOf(1,2,3,4))
assertEquals(expected, moveTo(arrayOf(3, 4), arrayOf(1, 2)))
return "OK"
}
+1 -1
View File
@@ -8,7 +8,7 @@ inline fun syntaxTestInline() {
for (i in 1..10)
result += 1
for (i in array(10).indices)
for (i in arrayOf(10).indices)
result += i
while (result < 30)
@@ -20,9 +20,9 @@ internal fun sumEven(a: Array<Int>): Int {
}
fun box(): String {
assertEquals(0, sumEven(array()))
assertEquals(6, sumEven(array(1,2,3,4)))
assertEquals(12, sumEven(array(1,2,3,4,6,7,9)))
assertEquals(0, sumEven(arrayOf()))
assertEquals(6, sumEven(arrayOf(1,2,3,4)))
assertEquals(12, sumEven(arrayOf(1,2,3,4,6,7,9)))
return "OK"
}
@@ -31,10 +31,10 @@ internal fun maxBySquare(a: Array<Int>, r: Result): Result {
}
fun box(): String {
var r1 = maxBySquare(array(1,2,3,4,5), Result())
var r1 = maxBySquare(arrayOf(1,2,3,4,5), Result())
assertEquals(Result(5, 6), r1)
var r2 = maxBySquare(array(-5,1,2,3,4), Result())
var r2 = maxBySquare(arrayOf(-5,1,2,3,4), Result())
assertEquals(Result(-5, 6), r2)
return "OK"
+1 -1
View File
@@ -30,7 +30,7 @@ internal fun test3(list: Array<String>): String {
fun box(): String {
assertEquals("", test1())
assertEquals("abc", test2())
assertEquals("abcd", test3(array("a", "b", "c", "d")))
assertEquals("abcd", test3(arrayOf("a", "b", "c", "d")))
return "OK"
}