diff options
author | michelou <michelou@epfl.ch> | 2007-04-10 15:53:35 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2007-04-10 15:53:35 +0000 |
commit | 10cbf9df8d32e7e2af44ef412239e21824fdaec3 (patch) | |
tree | d2ef67c5185931ab4251cd893e197e8c02c69a6a /test | |
parent | 1f2b7055e45dc6dff6540f611cd5a631ea3e1fdb (diff) | |
download | scala-10cbf9df8d32e7e2af44ef412239e21824fdaec3.tar.gz scala-10cbf9df8d32e7e2af44ef412239e21824fdaec3.tar.bz2 scala-10cbf9df8d32e7e2af44ef412239e21824fdaec3.zip |
added options to scaladoc Ant task
removed several unchecked warnings
Diffstat (limited to 'test')
-rw-r--r-- | test/files/jvm5/annotations.check | 2 | ||||
-rw-r--r-- | test/files/jvm5/annotations.scala | 7 | ||||
-rw-r--r-- | test/files/run/regularpatmatnew.scala | 111 |
3 files changed, 62 insertions, 58 deletions
diff --git a/test/files/jvm5/annotations.check b/test/files/jvm5/annotations.check index efdd54a237..a4e3d7420b 100644 --- a/test/files/jvm5/annotations.check +++ b/test/files/jvm5/annotations.check @@ -1,7 +1,7 @@ class java.rmi.RemoteException class java.io.IOException @java.lang.Deprecated() -@test.SourceAnnotation(mail=scala@lists.epfl.ch, value=http://scala.epfl.ch) +@test.SourceAnnotation(mail=scala@lists.epfl.ch, value=http://scala-lang.org) @test.SourceAnnotation(mail=you@bloodsuckers.com, value=http://bloodsuckers.com) @test.SourceAnnotation(mail=bill.gates@bloodsuckers.com, value=http://bloodsuckers.com) 0 diff --git a/test/files/jvm5/annotations.scala b/test/files/jvm5/annotations.scala index e81aa863a8..a58921adef 100644 --- a/test/files/jvm5/annotations.scala +++ b/test/files/jvm5/annotations.scala @@ -1,5 +1,3 @@ -import java.lang.Deprecated - object Test1 { class Foo { @remote @@ -37,6 +35,7 @@ public class Main { } */ object Test3 { + import java.lang.Deprecated class Foo { @Deprecated def foo: Unit = () @@ -62,13 +61,13 @@ public class Main { Annotation[] annotations = clazz.getAnnotations(); for (int i = 0; i < annotations.length; i++) System.out.println(annotations[i]); - // @test.Main$Source(url=http://scala.epfl.ch, mail=scala@lists.epfl.ch) + // @test.Main$Source(url=http://scala-lang.org, mail=scala@lists.epfl.ch) } } */ object Test4 { import test.SourceAnnotation // defined in SourceAnnotation.java - @SourceAnnotation{val value = "http://scala.epfl.ch", val mail = "scala@lists.epfl.ch"} + @SourceAnnotation{val value = "http://scala-lang.org", val mail = "scala@lists.epfl.ch"} class Foo1 @SourceAnnotation("http://bloodsuckers.com") { val mail = "you@bloodsuckers.com" } class Foo2 diff --git a/test/files/run/regularpatmatnew.scala b/test/files/run/regularpatmatnew.scala index a3401b2b7e..0457cd6d6c 100644 --- a/test/files/run/regularpatmatnew.scala +++ b/test/files/run/regularpatmatnew.scala @@ -1,7 +1,7 @@ object Test { import scala.testing.SUnit._ - def main(args:Array[String]): Unit = { + def main(args: Array[String]) { val tr = new TestResult new TestSuite( @@ -11,23 +11,23 @@ object Test { new Test04, new Test05, new Test06, - new Test07 + new Test07, + new Test08 ).run(tr) - for(val f <- tr.failures()) - Console println f + for (val f <- tr.failures()) println(f) } class Test01 extends TestCase("uno (all ignoring patterns on List)") { - def doMatch(l:List[String]):String = l match { - case List(_*) => "ok" + def doMatch(xs: List[String]): String = xs match { + case List(_*) => "ok" } - override def runTest() = { - val list1 = List(); - assertEquals(doMatch(list1), "ok"); - val list2 = List("1","2","3"); - assertEquals(doMatch(list2), "ok"); + override def runTest() { + val list1 = List() + assertEquals(doMatch(list1), "ok") + val list2 = List("1","2","3") + assertEquals(doMatch(list2), "ok") } } @@ -45,33 +45,33 @@ object Test { */ class Test02 extends TestCase("due (all ignoring patterns on Seq)") { - def doMatch(l:Seq[String]):String = l match { - case Seq(_*) => "ok" + def doMatch(l: Seq[String]): String = l match { + case Seq(_*) => "ok" } - override def runTest() = { - val list1 = List(); - assertEquals(doMatch(list1), "ok"); - val list2 = List("1","2","3"); - assertEquals(doMatch(list2), "ok"); - val array3 = Array[String](); - assertEquals(doMatch(array3), "ok"); - val array4 = Array[String]("ga","gu"); - assertEquals(doMatch(array4), "ok"); + override def runTest() { + val list1 = List() + assertEquals(doMatch(list1), "ok") + val list2 = List("1", "2", "3") + assertEquals(doMatch(list2), "ok") + val array3 = Array[String]() + assertEquals(doMatch(array3), "ok") + val array4 = Array[String]("ga", "gu") + assertEquals(doMatch(array4), "ok") } } class Test03 extends TestCase("tre (right-ignoring patterns on List, defaults)") { - def doMatch(l:List[String]):String = l match { - case List(_,_,_,_*) => "ok" - case _ => "not ok" + def doMatch(xs: List[String]): String = xs match { + case List(_,_,_,_*) => "ok" + case _ => "not ok" } - override def runTest() = { - val list1 = List(); - assertEquals(doMatch(list1), "not ok"); - val list2 = List("1","2","3"); - assertEquals(doMatch(list2), "ok"); - val list3 = List("1","2","3","4"); - assertEquals(doMatch(list3), "ok"); + override def runTest() { + val list1 = List() + assertEquals(doMatch(list1), "not ok") + val list2 = List("1","2","3") + assertEquals(doMatch(list2), "ok") + val list3 = List("1","2","3","4") + assertEquals(doMatch(list3), "ok") } } @@ -81,20 +81,16 @@ object Test { override def runTest() = { val a = Foo(0, 'a') match { - case Foo(i, c, chars @ _*) => - c - case _ => - null + case Foo(i, c, chars @ _*) => c + case _ => null } - assertEquals(a,'a') + assertEquals(a, 'a') val b = Foo(0, 'a') match { - case Foo(i, chars @ _*) => - 'b' - case _ => - null + case Foo(i, chars @ _*) => 'b' + case _ => null } - assertEquals(b,'b') + assertEquals(b, 'b') } } @@ -104,7 +100,7 @@ object Test { case class Foo() extends Con case class Bar(xs:Con*) extends Con - override def runTest() = { + override def runTest() { val res = (Bar(Foo()):Con) match { case Bar(xs@_*) => xs // this should be optimized away to a pattern Bar(xs) case _ => Nil @@ -115,18 +111,15 @@ object Test { class Test06 extends TestCase("sei (not regular) fancy guards / bug#644 ") { - case class A(i:Any) + case class A(i: Any) - def doMatch(x:Any, bla:int) = x match { - case x:A if (bla==1) => - 0 - case A(1) => - 1 - case A(A(1)) => - 2 + def doMatch(x: Any, bla: int) = x match { + case x:A if (bla==1) => 0 + case A(1) => 1 + case A(A(1)) => 2 } - override def runTest(): Unit= { + override def runTest() { assertEquals(doMatch(A(null),1), 0) assertEquals(doMatch(A(1),2), 1) assertEquals(doMatch(A(A(1)),2), 2) @@ -135,7 +128,7 @@ object Test { } class Test07 extends TestCase("sette List of chars") { - def doMatch1(xs:List[char]) = xs match { + def doMatch1(xs: List[char]) = xs match { case List(x, y, _*) => x::y::Nil } def doMatch2(xs:List[char]) = xs match { @@ -150,4 +143,16 @@ object Test { //assertEquals(doMatch3(List('a','b','c','d')), List('d')) } } + + class Test08 extends TestCase("backquoted identifiers in pattern") { + override def runTest() { + val xs = List(2, 3) + val ys = List(1, 2, 3) match { + case x :: `xs` => xs + case _ => Nil + } + assertEquals(xs, ys) + } + } + } |