From cb7f66a22c9167a7e8ffce042a4bf1c5c9849a89 Mon Sep 17 00:00:00 2001 From: mihaylov Date: Wed, 21 Feb 2007 16:43:30 +0000 Subject: Fixed a name clash in the test suite (jvm/unitt... Fixed a name clash in the test suite (jvm/unittest_io vs jvm5/attributes) --- test/files/jvm5/Source.java | 9 --------- test/files/jvm5/SourceAnnotation.java | 9 +++++++++ test/files/jvm5/attributes.check | 2 +- test/files/jvm5/attributes.scala | 7 ++----- test/files/lib/annotations.jar.desired.sha1 | 2 +- 5 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 test/files/jvm5/Source.java create mode 100644 test/files/jvm5/SourceAnnotation.java (limited to 'test') diff --git a/test/files/jvm5/Source.java b/test/files/jvm5/Source.java deleted file mode 100644 index 36cf37ad3d..0000000000 --- a/test/files/jvm5/Source.java +++ /dev/null @@ -1,9 +0,0 @@ -//package attributes; - -import java.lang.annotation.*; - -@Retention(value=RetentionPolicy.RUNTIME) -@interface Source { - public String url(); - public String mail(); -} diff --git a/test/files/jvm5/SourceAnnotation.java b/test/files/jvm5/SourceAnnotation.java new file mode 100644 index 0000000000..a124ee3ee1 --- /dev/null +++ b/test/files/jvm5/SourceAnnotation.java @@ -0,0 +1,9 @@ +package test; + +import java.lang.annotation.*; + +@Retention(value=RetentionPolicy.RUNTIME) +public @interface SourceAnnotation { + public String url(); + public String mail(); +} diff --git a/test/files/jvm5/attributes.check b/test/files/jvm5/attributes.check index 35d0c8212d..c0cc0aee03 100644 --- a/test/files/jvm5/attributes.check +++ b/test/files/jvm5/attributes.check @@ -1,4 +1,4 @@ class java.rmi.RemoteException class java.io.IOException @java.lang.Deprecated() -@Source(url=http://scala.epfl.ch, mail=scala@lists.epfl.ch) +@test.SourceAnnotation(url=http://scala.epfl.ch, mail=scala@lists.epfl.ch) diff --git a/test/files/jvm5/attributes.scala b/test/files/jvm5/attributes.scala index b3fa59f1cc..3e59af28c6 100644 --- a/test/files/jvm5/attributes.scala +++ b/test/files/jvm5/attributes.scala @@ -67,11 +67,8 @@ public class Main { } */ object Test4 { - //import java.lang.annotation._ - //@Retention(RetentionPolicy.RUNTIME) - //class Source(url: String, mail: String) extends scala.Annotation - //import Source - @Source(){val url = "http://scala.epfl.ch", val mail = "scala@lists.epfl.ch"} + import test.SourceAnnotation // defined in SourceAnnotation.java + @SourceAnnotation(){val url = "http://scala.epfl.ch", val mail = "scala@lists.epfl.ch"} class Foo def run: Unit = { val clazz = classOf[Foo] diff --git a/test/files/lib/annotations.jar.desired.sha1 b/test/files/lib/annotations.jar.desired.sha1 index e67a34a1f3..d899c93a8c 100644 --- a/test/files/lib/annotations.jar.desired.sha1 +++ b/test/files/lib/annotations.jar.desired.sha1 @@ -1 +1 @@ -11f9e02bcb7332d5acccbb6dde233c722131747e ?annotations.jar +cda1225f6c63ed896c59c30ba7aa27ce78a54879 ?annotations.jar -- cgit v1.2.3