diff options
Diffstat (limited to 'test/files/jvm')
22 files changed, 15 insertions, 77 deletions
diff --git a/test/files/jvm/NestedAnnotations.java b/test/files/jvm/NestedAnnotations.java deleted file mode 100644 index 8f2327dcce..0000000000 --- a/test/files/jvm/NestedAnnotations.java +++ /dev/null @@ -1,25 +0,0 @@ -package test; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -public class NestedAnnotations { - - @OuterAnno(inner=@InnerAnno(name="inner")) - String field; - - @Target({FIELD}) - @Retention(RUNTIME) - public static @interface InnerAnno { - String name(); - } - - @Target({FIELD}) - @Retention(RUNTIME) - public static @interface OuterAnno { - InnerAnno inner(); - } -} diff --git a/test/files/jvm/OuterEnum.java b/test/files/jvm/OuterEnum.java deleted file mode 100644 index 75d3f34223..0000000000 --- a/test/files/jvm/OuterEnum.java +++ /dev/null @@ -1,5 +0,0 @@ -package enums; - -public class OuterEnum { - public enum Foo { Bar } -} diff --git a/test/files/jvm/OuterTParams.java b/test/files/jvm/OuterTParams.java deleted file mode 100644 index 1d3db49fcf..0000000000 --- a/test/files/jvm/OuterTParams.java +++ /dev/null @@ -1,6 +0,0 @@ -public class OuterTParams<A> { - class InnerClass { - // Cannot parse method signature: "()TA;" - public A method() { return null; } - } -} diff --git a/test/files/jvm/SourceAnnotation.java b/test/files/jvm/SourceAnnotation.java deleted file mode 100644 index 047751ddfe..0000000000 --- a/test/files/jvm/SourceAnnotation.java +++ /dev/null @@ -1,9 +0,0 @@ -package test; - -import java.lang.annotation.*; - -@Retention(value=RetentionPolicy.RUNTIME) -public @interface SourceAnnotation { - public String value(); - public String[] mails() default { "bill.gates@bloodsuckers.com" }; -} diff --git a/test/files/jvm/deprecation.cmds b/test/files/jvm/deprecation.cmds new file mode 100644 index 0000000000..4c0f73c58b --- /dev/null +++ b/test/files/jvm/deprecation.cmds @@ -0,0 +1,3 @@ +javac Defs.java +scalac Test_1.scala +javac Use_2.java diff --git a/test/files/jvm/genericNest/genericNest.jar.desired.sha1 b/test/files/jvm/genericNest/genericNest.jar.desired.sha1 new file mode 100644 index 0000000000..e9321262f2 --- /dev/null +++ b/test/files/jvm/genericNest/genericNest.jar.desired.sha1 @@ -0,0 +1 @@ +b1ec8a095cec4902b3609d74d274c04365c59c04 ?genericNest.jar diff --git a/test/files/jvm/genericNest.scala b/test/files/jvm/genericNest/genericNest.scala index c1b0210117..c1b0210117 100644 --- a/test/files/jvm/genericNest.scala +++ b/test/files/jvm/genericNest/genericNest.scala diff --git a/test/files/jvm/inner.scala b/test/files/jvm/inner.scala index d6b055e998..d0d2226de6 100644 --- a/test/files/jvm/inner.scala +++ b/test/files/jvm/inner.scala @@ -53,7 +53,7 @@ class A { } object Scalatest { - private val outputdir = System.getProperty("partest.output", "inner-jvm.obj") + private val outputdir = System.getProperty("partest.output", "inner.obj") private val scalalib = System.getProperty("partest.lib", "") private val classpath = outputdir + File.pathSeparator + scalalib private val javabin = { diff --git a/test/files/jvm/lib/annotations.jar.desired.sha1 b/test/files/jvm/lib/annotations.jar.desired.sha1 new file mode 100644 index 0000000000..2b4292d796 --- /dev/null +++ b/test/files/jvm/lib/annotations.jar.desired.sha1 @@ -0,0 +1 @@ +02fe2ed93766323a13f22c7a7e2ecdcd84259b6c ?annotations.jar diff --git a/test/files/jvm/lib/nest.jar.desired.sha1 b/test/files/jvm/lib/nest.jar.desired.sha1 new file mode 100644 index 0000000000..674ca79a5b --- /dev/null +++ b/test/files/jvm/lib/nest.jar.desired.sha1 @@ -0,0 +1 @@ +cd33e0a0ea249eb42363a2f8ba531186345ff68c ?nest.jar diff --git a/test/files/jvm/methvsfield/methvsfield.jar.desired.sha1 b/test/files/jvm/methvsfield/methvsfield.jar.desired.sha1 new file mode 100644 index 0000000000..8c01532b88 --- /dev/null +++ b/test/files/jvm/methvsfield/methvsfield.jar.desired.sha1 @@ -0,0 +1 @@ +be8454d5e7751b063ade201c225dcedefd252775 ?methvsfield.jar diff --git a/test/files/jvm/methvsfield.java b/test/files/jvm/methvsfield/methvsfield.java index dadc98669a..dadc98669a 100644 --- a/test/files/jvm/methvsfield.java +++ b/test/files/jvm/methvsfield/methvsfield.java diff --git a/test/files/jvm/methvsfield.scala b/test/files/jvm/methvsfield/methvsfield.scala index e9795ec6a8..e9795ec6a8 100644 --- a/test/files/jvm/methvsfield.scala +++ b/test/files/jvm/methvsfield/methvsfield.scala diff --git a/test/files/jvm/mkAnnotationsJar.sh b/test/files/jvm/mkAnnotationsJar.sh deleted file mode 100755 index 3d69351165..0000000000 --- a/test/files/jvm/mkAnnotationsJar.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -############################################################################## -# Author : Nikolay Mihaylov -############################################################################## - -############################################################################## -# variables - -OBJDIR=./classes - -if [ -z "${JAVA_HOME}" ]; then - echo "environment variable JAVA_HOME is undefined." - exit -fi - -JAVAC=${JAVA_HOME}/bin/javac -JAVAC_OPTIONS="-source 1.5 -target 1.5" - -JAR=${JAVA_HOME}/bin/jar - -############################################################################## -# commands - -mkdir -p ${OBJDIR} -${JAVAC} ${JAVAC_OPTIONS} -d ${OBJDIR} SourceAnnotation.java NestedAnnotations.java -${JAR} cf ../lib/annotations.jar -C ${OBJDIR} . -rm -rf ${OBJDIR} diff --git a/test/files/jvm/nest.java b/test/files/jvm/nest/nest.java index 3f6f0bebbd..3f6f0bebbd 100644 --- a/test/files/jvm/nest.java +++ b/test/files/jvm/nest/nest.java diff --git a/test/files/jvm/nest.scala b/test/files/jvm/nest/nest.scala index 3ab62484fa..3ab62484fa 100644 --- a/test/files/jvm/nest.scala +++ b/test/files/jvm/nest/nest.scala diff --git a/test/files/jvm/outerEnum/enums.jar.desired.sha1 b/test/files/jvm/outerEnum/enums.jar.desired.sha1 new file mode 100644 index 0000000000..46cd8e92cf --- /dev/null +++ b/test/files/jvm/outerEnum/enums.jar.desired.sha1 @@ -0,0 +1 @@ +981392dbd1f727b152cd1c908c5fce60ad9d07f7 ?enums.jar diff --git a/test/files/jvm/outerEnum.scala b/test/files/jvm/outerEnum/outerEnum.scala index 18794b7dbe..18794b7dbe 100644 --- a/test/files/jvm/outerEnum.scala +++ b/test/files/jvm/outerEnum/outerEnum.scala diff --git a/test/files/jvm/t1652.check b/test/files/jvm/t1652.check deleted file mode 100644 index dfa480ce6e..0000000000 --- a/test/files/jvm/t1652.check +++ /dev/null @@ -1,2 +0,0 @@ -OK1 -OK2 diff --git a/test/files/jvm/t2470.cmds b/test/files/jvm/t2470.cmds new file mode 100644 index 0000000000..b4ef0f4aeb --- /dev/null +++ b/test/files/jvm/t2470.cmds @@ -0,0 +1,3 @@ +javac Action.java Task.java +scalac Test_1.scala +scalac Read_Classfile_2.scala diff --git a/test/files/jvm/t3003.cmds b/test/files/jvm/t3003.cmds new file mode 100644 index 0000000000..c00396627c --- /dev/null +++ b/test/files/jvm/t3003.cmds @@ -0,0 +1,2 @@ +javac Annot.java +scalac Test_1.scala diff --git a/test/files/jvm/unittest_io.scala b/test/files/jvm/unittest_io.scala index 0cf1165ec8..80d33d8433 100644 --- a/test/files/jvm/unittest_io.scala +++ b/test/files/jvm/unittest_io.scala @@ -16,7 +16,7 @@ it is split on several lines. isn't it? """) def runTest() = assertEquals("wrong number of lines",src.getLines("\n").toList.length,5) // five new lines in there - //for(val line <- src.getLines) { + //for (line <- src.getLines) { // Console.print(line) //} } |