diff options
| author | mihaylov <mihaylov@epfl.ch> | 2007-02-21 16:43:30 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2007-02-21 16:43:30 +0000 |
| commit | cb7f66a22c9167a7e8ffce042a4bf1c5c9849a89 (patch) | |
| tree | 220bf1701d5f55c7e3d902d5a9cc75e035fddbca /test | |
| parent | 5c7809eab475a1bb0841e0be919ebfa3b283ef8e (diff) | |
| download | scala-cb7f66a22c9167a7e8ffce042a4bf1c5c9849a89.tar.gz scala-cb7f66a22c9167a7e8ffce042a4bf1c5c9849a89.tar.bz2 scala-cb7f66a22c9167a7e8ffce042a4bf1c5c9849a89.zip | |
Fixed a name clash in the test suite (jvm/unitt...
Fixed a name clash in the test suite (jvm/unittest_io vs
jvm5/attributes)
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/jvm5/SourceAnnotation.java (renamed from test/files/jvm5/Source.java) | 4 | ||||
| -rw-r--r-- | test/files/jvm5/attributes.check | 2 | ||||
| -rw-r--r-- | test/files/jvm5/attributes.scala | 7 | ||||
| -rw-r--r-- | test/files/lib/annotations.jar.desired.sha1 | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/test/files/jvm5/Source.java b/test/files/jvm5/SourceAnnotation.java index 36cf37ad3d..a124ee3ee1 100644 --- a/test/files/jvm5/Source.java +++ b/test/files/jvm5/SourceAnnotation.java @@ -1,9 +1,9 @@ -//package attributes; +package test; import java.lang.annotation.*; @Retention(value=RetentionPolicy.RUNTIME) -@interface Source { +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 |