Improved test case for annotations with array c...

Improved test case for annotations with array constants

5 files changed, 19 insertions, 9 deletions

diff --git a/test/files/jvm5/SourceAnnotation.java b/test/files/jvm5/SourceAnnotation.java
index 36725aa5b6..047751ddfe 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 value();
-   public String mail() default "bill.gates@bloodsuckers.com";
+    public String value();
+    public String[] mails() default { "bill.gates@bloodsuckers.com" };
 }
diff --git a/test/files/jvm5/annotations.check b/test/files/jvm5/annotations.check
index a4e3d7420b..9219c7bdb5 100644
--- a/test/files/jvm5/annotations.check
+++ b/test/files/jvm5/annotations.check
@@ -1,8 +1,8 @@
 class java.rmi.RemoteException
 class java.io.IOException
 @java.lang.Deprecated()
-@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)
+@test.SourceAnnotation(mails={scala@lists.epfl.ch,scala-lounge@lists.epfl.ch}, value=http://scala-lang.org)
+@test.SourceAnnotation(mails={you@bloodsuckers.com}, value=http://bloodsuckers.com)
+@test.SourceAnnotation(mails={bill.gates@bloodsuckers.com}, value=http://bloodsuckers.com)
 0
 99
diff --git a/test/files/jvm5/annotations.scala b/test/files/jvm5/annotations.scala
index f7fe903d84..121cb152b8 100644
--- a/test/files/jvm5/annotations.scala
+++ b/test/files/jvm5/annotations.scala
@@ -67,16 +67,18 @@ public class Main {
 */
 object Test4 {
   import test.SourceAnnotation // defined in SourceAnnotation.java
-  @SourceAnnotation{val value = "http://scala-lang.org", val mail = "scala@lists.epfl.ch"}
+  @SourceAnnotation{val value = "http://scala-lang.org",
+                    val mails = Array("scala@lists.epfl.ch", "scala-lounge@lists.epfl.ch")}
   class Foo1
-  @SourceAnnotation("http://bloodsuckers.com") { val mail = "you@bloodsuckers.com" }
+  @SourceAnnotation("http://bloodsuckers.com") { val mails = Array("you@bloodsuckers.com") }
   class Foo2
   @SourceAnnotation("http://bloodsuckers.com")
   class Foo3
   def run {
     def printSourceAnnotation(a: Any) {
       val ann = a.asInstanceOf[SourceAnnotation]
-      Console.println("@test.SourceAnnotation(mail=" + ann.mail + ", value=" + ann.value + ")")
+      Console.println("@test.SourceAnnotation(mails=" + ann.mails.deepMkString("{", ",", "}") +
+                      ", value=" + ann.value + ")")
     }
     classOf[Foo1].getAnnotations foreach printSourceAnnotation
     classOf[Foo2].getAnnotations foreach printSourceAnnotation
diff --git a/test/files/jvm5/mkAnnotationsJar.sh b/test/files/jvm5/mkAnnotationsJar.sh
new file mode 100755
index 0000000000..f32441aa76
--- /dev/null
+++ b/test/files/jvm5/mkAnnotationsJar.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+OBJDIR=./classes
+
+mkdir -p ${OBJDIR}
+javac -d ${OBJDIR} -source 1.5 SourceAnnotation.java
+jar cf ../lib/annotations.jar -C ${OBJDIR} .
+rm -rf ${OBJDIR}
diff --git a/test/files/lib/annotations.jar.desired.sha1 b/test/files/lib/annotations.jar.desired.sha1
index 1600a6cff1..e0b68725c5 100644
--- a/test/files/lib/annotations.jar.desired.sha1
+++ b/test/files/lib/annotations.jar.desired.sha1
@@ -1 +1 @@
-1c8b7d7d273e2a358bd37a36e8b91d656c758467 ?annotations.jar
+283564a7790aca840aea8d93695e823aa29ba8b3 ?annotations.jar