3 files changed, 14 insertions, 7 deletions
diff --git a/test/files/jvm5/SourceAnnotation.java b/test/files/jvm5/SourceAnnotation.java
index a124ee3ee1..36725aa5b6 100644
--- a/test/files/jvm5/SourceAnnotation.java
+++ b/test/files/jvm5/SourceAnnotation.java
@@ -4,6 +4,6 @@ import java.lang.annotation.*;
 
 @Retention(value=RetentionPolicy.RUNTIME)
 public @interface SourceAnnotation {
-   public String url();
-   public String mail();
+   public String value();
+   public String mail() default "bill.gates@bloodsuckers.com";
 }
diff --git a/test/files/jvm5/attributes.check b/test/files/jvm5/attributes.check
index c0cc0aee03..06d35ddb48 100644
--- a/test/files/jvm5/attributes.check
+++ b/test/files/jvm5/attributes.check
@@ -1,4 +1,6 @@
 class java.rmi.RemoteException
 class java.io.IOException
 @java.lang.Deprecated()
-@test.SourceAnnotation(url=http://scala.epfl.ch, mail=scala@lists.epfl.ch)
+@test.SourceAnnotation(mail=scala@lists.epfl.ch, value=http://scala.epfl.ch)
+@test.SourceAnnotation(mail=you@bloodsuckers.com, value=http://bloodsuckers.com)
+@test.SourceAnnotation(mail=bill.gates@bloodsuckers.com, value=http://bloodsuckers.com)
diff --git a/test/files/jvm5/attributes.scala b/test/files/jvm5/attributes.scala
index 3e59af28c6..fa5ab1476b 100644
--- a/test/files/jvm5/attributes.scala
+++ b/test/files/jvm5/attributes.scala
@@ -68,11 +68,16 @@ public class Main {
 */
 object Test4 {
   import test.SourceAnnotation // defined in SourceAnnotation.java
-  @SourceAnnotation(){val url = "http://scala.epfl.ch", val mail = "scala@lists.epfl.ch"}
-  class Foo
+  @SourceAnnotation{val value = "http://scala.epfl.ch", val mail = "scala@lists.epfl.ch"}
+  class Foo1
+  @SourceAnnotation("http://bloodsuckers.com") { val mail = "you@bloodsuckers.com" }
+  class Foo2
+  @SourceAnnotation("http://bloodsuckers.com")
+  class Foo3
   def run: Unit = {
-    val clazz = classOf[Foo]
-    clazz.getAnnotations foreach Console.println
+    classOf[Foo1].getAnnotations foreach Console.println
+    classOf[Foo2].getAnnotations foreach Console.println
+    classOf[Foo3].getAnnotations foreach Console.println
   }
 }