migrated tests to new syntax /*tests fail due to migrated size problem*/

This commit is contained in:
Pavel Talanov
2012-01-06 13:59:53 +04:00
parent 3a259131c1
commit c12e37f227
33 changed files with 530 additions and 806 deletions
+458 -734
View File
File diff suppressed because it is too large Load Diff
@@ -1,7 +1,7 @@
fun box() : String {
return apply( "OK", {(arg: String) => arg } )
return apply( "OK", {(arg: String) -> arg } )
}
fun apply(arg : String, f : fun (p:String) : String) : String {
fun apply(arg : String, f : (p:String) -> String) : String {
return f(arg)
}
@@ -1,7 +1,7 @@
fun box() : String {
return if (apply( 5, {(arg: Int) => arg + 13 } ) == 18) "OK" else "fail"
return if (apply( 5, {(arg: Int) -> arg + 13 } ) == 18) "OK" else "fail"
}
fun apply(arg : Int, f : fun (p:Int) : Int) : Int {
fun apply(arg : Int, f : (p:Int) -> Int) : Int {
return f(arg)
}
@@ -3,6 +3,6 @@ fun box() : String {
return if (sum(200, { val ff = {cl}; ff() }) == 239) "OK" else "FAIL"
}
fun sum(arg:Int, f : fun () : Int) : Int {
fun sum(arg:Int, f : () -> Int) : Int {
return arg + f()
}
@@ -3,6 +3,6 @@ fun box() : String {
return if (sum(200, { val m = { val r = { cl }; r() }; m() }) == 239) "OK" else "FAIL"
}
fun sum(arg:Int, f : fun () : Int) : Int {
fun sum(arg:Int, f : () -> Int) : Int {
return arg + f()
}
@@ -1,10 +1,10 @@
class Point(val x:Int, val y:Int) {
fun mul() : fun (scalar:Int):Point {
return { (scalar:Int):Point => Point(x * scalar, y * scalar) }
fun mul() : (scalar:Int)->Point {
return { (scalar:Int):Point -> Point(x * scalar, y * scalar) }
}
}
val m = Point(2, 3).mul() : fun (scalar:Int):Point
val m = Point(2, 3).mul() : (scalar:Int)->Point
fun box() : String {
val answer = m(5)
@@ -1,6 +1,6 @@
import java.util.*
fun <T> ArrayList<T>.findAll(predicate: fun (T) : Boolean): ArrayList<T> {
fun <T> ArrayList<T>.findAll(predicate: (T) -> Boolean): ArrayList<T> {
val result = ArrayList<T>()
for(val t in this) {
if (predicate(t)) result.add(t)
@@ -17,6 +17,6 @@ fun box(): String {
list.add(5)
val m: ArrayList<Int> = list.findAll<Int>({(name: Int) => name < 4})
val m: ArrayList<Int> = list.findAll<Int>({(name: Int) -> name < 4})
return if (m.size() == 2) "OK" else "fail"
}
@@ -2,6 +2,6 @@ fun box() : String {
return invoker( {"OK"} )
}
fun invoker(gen : fun () : String) : String {
fun invoker(gen : () -> String) : String {
return gen()
}
@@ -2,6 +2,6 @@ fun box() : String {
return if (int_invoker( { 7 } ) == 7) "OK" else "fail"
}
fun int_invoker(gen : fun () : Int) : Int {
fun int_invoker(gen : () -> Int) : Int {
return gen()
}
@@ -1,13 +1,13 @@
class Point(val x : Int, val y : Int)
fun box() : String {
val answer = apply(Point(3, 5), { Point.(scalar : Int) : Point =>
val answer = apply(Point(3, 5), { Point.(scalar : Int) : Point ->
Point(x * scalar, y * scalar)
})
return if (answer.x == 6 && answer.y == 10) "OK" else "FAIL"
}
fun apply(arg:Point, f : fun Point.(scalar : Int) : Point) : Point {
fun apply(arg:Point, f : Point.(scalar : Int) -> Point) : Point {
return arg.f(2)
}
@@ -2,7 +2,7 @@ package foo
fun box() : Boolean {
var sum = 0
val adder = {(a: Int) => sum += a }
val adder = {(a: Int) -> sum += a }
adder(3)
adder(2)
return sum == 5
@@ -1,9 +1,9 @@
package foo
fun box() : String {
return apply( "OK", {(arg: String) => arg } )
return apply( "OK", {(arg: String) -> arg } )
}
fun apply(arg : String, f : fun (p:String) : String) : String {
fun apply(arg : String, f : (p:String) -> String) : String {
return f(arg)
}
@@ -1,9 +1,9 @@
package foo
fun box() : String {
return if (apply( 5, {(arg: Int) => arg + 13 } ) == 18) "OK" else "fail"
return if (apply( 5, {(arg: Int) -> arg + 13 } ) == 18) "OK" else "fail"
}
fun apply(arg : Int, f : fun (p:Int) : Int) : Int {
fun apply(arg : Int, f : (p:Int) -> Int) : Int {
return f(arg)
}
@@ -1,10 +1,10 @@
class Point(val x:Int, val y:Int) {
fun mul() : fun (scalar:Int):Point {
return { (scalar:Int):Point => Point(x * scalar, y * scalar) }
fun mul() : (scalar:Int)->Point {
return { (scalar:Int):Point -> Point(x * scalar, y * scalar) }
}
}
val m = Point(2, 3).mul() : fun (scalar:Int):Point
val m = Point(2, 3).mul() : (scalar:Int)->Point
fun box() : String {
val answer = m(5)
@@ -2,7 +2,7 @@ package foo
fun box() : Boolean {
var sum = 0
val addFive = {(a: Int) => a + 5 }
val addFive = {(a: Int) -> a + 5 }
sum = addFive(sum)
return sum == 5
}
@@ -1,10 +1,10 @@
package foo
fun apply(f : fun(Int) : Int, t : Int) : Int {
fun apply(f : (Int) -> Int, t : Int) : Int {
return f(t)
}
fun box() : Boolean {
return apply({(a: Int) => a + 5 }, 3) == 8
return apply({(a: Int) -> a + 5 }, 3) == 8
}
@@ -4,7 +4,7 @@ var b = 0
fun loop(var times : Int) {
while(times > 0) {
val u : fun(value : Int) : Unit = {
val u = {(value : Int) ->
b = b + 1
}
u(times--)
@@ -5,7 +5,7 @@ class M() {
fun eval() {
var d = {
var c = {Int.() => this + 3}
var c = {Int.() -> this + 3}
m += 3.c()
}
d();
@@ -1,7 +1,7 @@
package foo
fun apply(i : Int, f : fun Int.(Int) : Int) = i.f(1);
fun apply(i : Int, f : Int.(Int) -> Int) = i.f(1);
fun box() : Boolean {
return (apply(1, {i => i + this})) == 2
return (apply(1, {i -> i + this})) == 2
}
@@ -1,10 +1,10 @@
package foo
import java.util.ArrayList;
import java.util.ArrayList;
fun box() : Boolean {
val a = ArrayList<Int>();
a.add(1)
a.add(2)
return (a.size == 2) && (a.get(1) == 2) && (a.get(0) == 1);
}
fun box() : Boolean {
val a = ArrayList<Int>();
a.add(1)
a.add(2)
return (a.size == 2) && (a.get(1) == 2) && (a.get(0) == 1);
}
@@ -7,7 +7,7 @@ class A() {
fun box() : Boolean {
var a = null : A?
when(a) {
is A? => return true
else => return false
is A? -> return true
else -> return false
}
}
@@ -5,13 +5,13 @@ fun box() : Int {
val d = 5
var z = 0
when(c) {
is 5, is 3 => z++;
else => {z = -1000;}
is 5, is 3 -> z++;
else -> {z = -1000;}
}
when(d) {
is 5, is 3 => z++;
else => {z = -1000;}
is 5, is 3 -> z++;
else -> {z = -1000;}
}
return z
}
@@ -4,9 +4,9 @@ package foo
fun box() : Boolean {
return (when(1) {
is 2 => 3
is 1 => 1
else => 5
is 2 -> 3
is 1 -> 1
else -> 5
} == 1)
}
@@ -7,9 +7,9 @@ class A() {
fun box() : Boolean {
var a = 0
when(A()) {
is A => a++;
is A => a++;
else => a++;
is A -> a++;
is A -> a++;
else -> a++;
}
return (a == 1)
}
@@ -6,7 +6,7 @@ class A() {
fun box() : Boolean {
when(A()) {
!is A => return false;
else => return true;
!is A -> return false;
else -> return true;
}
}
@@ -3,8 +3,8 @@ package foo
fun box() : Boolean {
var a = 4
when(a) {
!is 3 => {a = 10;}
!is 4 => {a = 20;}
!is 3 -> {a = 10;}
!is 4 -> {a = 20;}
}
return (a == 10)
}
@@ -6,7 +6,7 @@ class A() {
fun box() : Boolean {
when(A()) {
is A => return true;
else => return false;
is A -> return true;
else -> return false;
}
}
@@ -3,8 +3,8 @@ package foo
fun box() : Boolean {
var a = 4
when(a) {
is 3 => {a = 10;}
is 4 => {a = 20;}
is 3 -> {a = 10;}
is 4 -> {a = 20;}
}
return (a == 20)
}
@@ -13,13 +13,13 @@ fun box() : Boolean {
var a = A() : Any?
var b = null : Any?
when(a) {
is null => c = 10;
is B => c = 10000
is A => c = 20;
is null -> c = 10;
is B -> c = 10000
is A -> c = 20;
}
when(b) {
is null => c += 5
is B => c += 100
is null -> c += 5
is B -> c += 100
}
return (c == 25)
}
@@ -1,6 +1,6 @@
package foo
val f = {(i : Int) => i + 1}
val f = {(i : Int) -> i + 1}
val a = Array(3, f)
@@ -1,6 +1,6 @@
package foo
val a1 = Array<Int>(3, {(i : Int) => i})
val a1 = Array<Int>(3, {(i : Int) -> i})
fun box() : Boolean{
val i = a1.iterator()
@@ -1,9 +1,9 @@
fun main(args : Array<String>) {
val language = if (args.size == 0) "EN" else args[0]
System.out?.println(when (language) {
"EN" => "Hello!"
"FR" => "Salut!"
"IT" => "Ciao!"
else => "Sorry, I can't greet you in $language yet"
"EN" -> "Hello!"
"FR" -> "Salut!"
"IT" -> "Ciao!"
else -> "Sorry, I can't greet you in $language yet"
})
}
@@ -7,10 +7,10 @@ fun main(args : Array<String>) {
fun cases(obj : Any) {
when(obj) {
1 => System.out?.println("One")
"Hello" => System.out?.println("Greeting")
!is String => System.out?.println("Not a string")
else => System.out?.println("Unknown")
1 -> System.out?.println("One")
"Hello" -> System.out?.println("Greeting")
!is String -> System.out?.println("Not a string")
else -> System.out?.println("Unknown")
}
}