Revert "enhance tests (mostly codegen)" temporarily

This reverts commit 95f9bcbacb.
This commit is contained in:
Stepan Koltsov
2012-05-01 21:21:46 +04:00
parent 035fd686e0
commit d71723131d
43 changed files with 44 additions and 379 deletions
@@ -12,7 +12,7 @@ class ArrayWrapper<T>() {
}
fun get(index: Int): T {
return contents.get(index).sure()
return contents.get(index)
}
}
@@ -15,7 +15,7 @@ class ArrayWrapper<T>() {
}
fun get(index: Int): T {
return contents.get(index).sure()
return contents.get(index)
}
}
@@ -15,7 +15,7 @@ class ArrayWrapper<T>() {
}
fun get(index: Int): T {
return contents.get(index).sure()
return contents.get(index)
}
}
@@ -15,7 +15,7 @@ class ArrayWrapper<T>() {
}
fun get(index: Int): T {
return contents.get(index).sure()
return contents.get(index)
}
}
@@ -19,28 +19,28 @@ fun box() : String {
val c1: java.lang.Iterable<Int> = MyCollection1()
sum = 0
for (el in c1) {
sum = sum + el.sure()
sum = sum + el
}
if(sum != 15) return "c1 failed"
val c2 = MyCollection1()
sum = 0
for (el in c2) {
sum = sum + el.sure()
sum = sum + el
}
if(sum != 15) return "c2 failed"
val c3: Iterable<Int> = MyCollection2()
sum = 0
for (el in c3) {
sum = sum + el.sure()
sum = sum + el
}
if(sum != 15) return "c3 failed"
val c4 = MyCollection2()
sum = 0
for (el in c4) {
sum = sum + el.sure()
sum = sum + el
}
if(sum != 15) return "c4 failed"
@@ -50,7 +50,7 @@ fun box() : String {
}
sum = 0
for (el in a) {
sum = sum + el.sure()
sum = sum + el
}
if(sum != 10) return "a failed"
@@ -69,7 +69,7 @@ fun box() : String {
val c7 = MyCollection5()
sum = 0
for (el in c7) {
sum = sum + el.sure()
sum = sum + el
}
if(sum != 0) return "c7 failed"
+18 -16
View File
@@ -1,3 +1,5 @@
import java.util.ArrayList
class MyNumber(val i: Int) {
fun inc(): MyNumber = MyNumber(i+1)
}
@@ -50,26 +52,25 @@ fun test6() : Boolean {
return true
}
class MyArrayList<T>(var value: T) {
fun get(index: Int): T {
if (index != 17)
throw Exception()
return value
}
fun set(index: Int, value: T): Unit {
if (index != 17)
throw Exception()
this.value = value
}
}
fun test7() : Boolean {
var mnr = MyArrayList<MyNumber>(MyNumber(42))
mnr[17]++
if (mnr[17].i != 43) return false
var mnr = ArrayList<MyNumber>()
mnr.add(MyNumber(42))
mnr[0]++
if (mnr[0].i != 43) return false
return true
}
fun test8() : Boolean {
var mnr = ArrayList<MyNumber>()
mnr.add(MyNumber(42))
mnr.add(MyNumber(41))
mnr[1] = mnr[0]++
if (mnr[0].i != 43) return false
if (mnr[1].i != 42) return false
return true
}
fun box() : String {
var m = MyNumber(42)
@@ -81,6 +82,7 @@ fun box() : String {
if (!test5()) return "fail test 5"
if (!test6()) return "fail test 6"
if (!test7()) return "fail test 7"
if (!test8()) return "fail test 8"
++m
@@ -14,5 +14,5 @@ var <T> ArrayList<T>.length : Int
set(value: Int) = throw java.lang.Error()
var <T> ArrayList<T>.last : T
get() = get(size()-1).sure()
get() = get(size()-1)
set(el : T) { set(size()-1, el) }
@@ -1,7 +1,7 @@
import java.util.ArrayList
class N() : ArrayList<Any>() {
override fun add(el: Any?) : Boolean {
override fun add(el: Any) : Boolean {
if (!super<ArrayList>.add(el)) {
throw Exception()
}