summaryrefslogtreecommitdiff
path: root/test/files/jvm5
diff options
context:
space:
mode:
Diffstat (limited to 'test/files/jvm5')
-rw-r--r--test/files/jvm5/annotations.check6
-rw-r--r--test/files/jvm5/annotations.scala20
2 files changed, 13 insertions, 13 deletions
diff --git a/test/files/jvm5/annotations.check b/test/files/jvm5/annotations.check
index 449d3d9ab8..f16a1ffc0c 100644
--- a/test/files/jvm5/annotations.check
+++ b/test/files/jvm5/annotations.check
@@ -13,11 +13,11 @@ class Test4$Foo3
@test.SourceAnnotation(mails={bill.gates@bloodsuckers.com}, value=file:///dev/null)
private int Test4$Foo4.x
-@test.SourceAnnotation(mails={bill.gates@bloodsuckers.com}, value=file:///dev/null)
-public int Test4$Foo4.x()
-
@test.SourceAnnotation(mails={bill.gates@bloodsuckers.com}, value=file:///dev/zero)
public int Test4$Foo4.bar()
+@test.SourceAnnotation(mails={bill.gates@bloodsuckers.com}, value=file:///dev/null)
+public int Test4$Foo4.x()
+
0
99
diff --git a/test/files/jvm5/annotations.scala b/test/files/jvm5/annotations.scala
index c850796e59..9d755a71c0 100644
--- a/test/files/jvm5/annotations.scala
+++ b/test/files/jvm5/annotations.scala
@@ -5,7 +5,7 @@ object Test1 {
}
def run {
val method = classOf[Foo].getMethod("foo", Array())
- method.getExceptionTypes foreach Console.println
+ method.getExceptionTypes foreach println
}
}
@@ -19,7 +19,7 @@ object Test2 {
}
def run {
val method = classOf[Reader].getMethod("read", Array())
- method.getExceptionTypes foreach Console.println
+ method.getExceptionTypes foreach println
}
}
@@ -43,7 +43,7 @@ object Test3 {
def run {
val method = classOf[Foo].getMethod("foo", Array())
val annotation = method.getAnnotation(classOf[Deprecated])
- Console.println(annotation)
+ println(annotation)
}
}
@@ -88,14 +88,14 @@ object Test4 {
// against difference in the JVMs (e.g. Sun's vs IBM's)
def printSourceAnnotation(a: Annotation) {
val ann = a.asInstanceOf[SourceAnnotation]
- Console.println("@test.SourceAnnotation(mails=" + ann.mails.deepMkString("{", ",", "}") +
- ", value=" + ann.value + ")")
+ println("@test.SourceAnnotation(mails=" + ann.mails.deepMkString("{", ",", "}") +
+ ", value=" + ann.value + ")")
}
val anns = target.getAnnotations()
anns foreach printSourceAnnotation
if (anns.length > 0) {
- Console.println(target)
- Console.println
+ println(target)
+ println
}
}
printSourceAnnotations(classOf[Foo1])
@@ -123,14 +123,14 @@ object Test5 {
}
def run {
val count = new Count
- Console.println(count.get)
+ println(count.get)
count.set(99)
- Console.println(count.get)
+ println(count.get)
}
}
object Test {
- def main(args: Array[String]): Unit = {
+ def main(args: Array[String]) {
Test1.run
Test2.run
Test3.run // requires the use of -target:jvm-1.5