diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/files/jvm/future-awaitall-zero.check | 1 | ||||
-rw-r--r-- | test/files/jvm/future-awaitall-zero.scala | 17 | ||||
-rw-r--r-- | test/files/jvm/t1449.check | 1 | ||||
-rw-r--r-- | test/files/jvm/t1449.scala | 15 | ||||
-rw-r--r-- | test/files/neg/names-defaults-neg-ref.check | 2 | ||||
-rw-r--r-- | test/files/pos/t2809.scala | 20 | ||||
-rw-r--r-- | test/files/run/ReverseSeqView.scala | 25 |
7 files changed, 80 insertions, 1 deletions
diff --git a/test/files/jvm/future-awaitall-zero.check b/test/files/jvm/future-awaitall-zero.check new file mode 100644 index 0000000000..d86bac9de5 --- /dev/null +++ b/test/files/jvm/future-awaitall-zero.check @@ -0,0 +1 @@ +OK diff --git a/test/files/jvm/future-awaitall-zero.scala b/test/files/jvm/future-awaitall-zero.scala new file mode 100644 index 0000000000..49c51f2c7e --- /dev/null +++ b/test/files/jvm/future-awaitall-zero.scala @@ -0,0 +1,17 @@ +import scala.actors.Futures._ +import scala.actors.Actor._ + +object Test { + def main(args: Array[String]) { + val ft1 = future { reactWithin(1000) { + case _ => println("FAIL") + } } + + val ft2 = future { reactWithin(2000) { + case _ => println("FAIL") + } } + + val res = awaitAll(0, ft1, ft2) + println("OK") + } +} diff --git a/test/files/jvm/t1449.check b/test/files/jvm/t1449.check new file mode 100644 index 0000000000..d81cc0710e --- /dev/null +++ b/test/files/jvm/t1449.check @@ -0,0 +1 @@ +42 diff --git a/test/files/jvm/t1449.scala b/test/files/jvm/t1449.scala new file mode 100644 index 0000000000..08c153afc0 --- /dev/null +++ b/test/files/jvm/t1449.scala @@ -0,0 +1,15 @@ +import scala.actors.Actor._ +import scala.actors.Future +import scala.actors.Futures._ +object Test { + def main(args: Array[String]) { + val a = actor { + react { + case ft: Future[a] => + println(ft()) + } + } + val ft = future { 42 } + a ! ft + } +} diff --git a/test/files/neg/names-defaults-neg-ref.check b/test/files/neg/names-defaults-neg-ref.check index ac37816762..00052c72dc 100644 --- a/test/files/neg/names-defaults-neg-ref.check +++ b/test/files/neg/names-defaults-neg-ref.check @@ -2,7 +2,7 @@ names-defaults-neg-ref.scala:3: error: in anonymous class $anon, multiple overlo The members with defaults are defined in trait B2235 and trait A2235. new A2235 with B2235 ^ -names-defaults-neg-ref.scala:7: error: in class A, multiple overloaded alternatives of method foo define default arguments() +names-defaults-neg-ref.scala:7: error: in class A, multiple overloaded alternatives of method foo define default arguments. class A { ^ names-defaults-neg-ref.scala:17: error: in class C, multiple overloaded alternatives of method bar define default arguments. diff --git a/test/files/pos/t2809.scala b/test/files/pos/t2809.scala new file mode 100644 index 0000000000..1f68b0b07a --- /dev/null +++ b/test/files/pos/t2809.scala @@ -0,0 +1,20 @@ +package p1 { + abstract class T1 { + protected def bug(p: Int = 1): Int // without 'protected' compiles fine + } +} +package p2 { // all being in the same package compiles fine + import p1._ + abstract class T2 extends T1 { + class A { + bug() + } + } + + abstract class T3 extends T2 { + class A { + bug() + } + } +} + diff --git a/test/files/run/ReverseSeqView.scala b/test/files/run/ReverseSeqView.scala new file mode 100644 index 0000000000..836e4d6a1f --- /dev/null +++ b/test/files/run/ReverseSeqView.scala @@ -0,0 +1,25 @@ + + + + + + +object Test extends Application { + + val lstv = List(1, 2, 3).view + val lstvr = lstv.reverse + assert(lstvr.iterator.toList == List(3, 2, 1)) + assert(lstvr.reverse == List(1, 2, 3)) + assert(lstvr.reverseIterator.toList == List(1, 2, 3)) + assert(lstvr.reverseMap(_ + 1) == List(2, 3, 4)) + +} + + + + + + + + + |