diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-02-18 17:12:15 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-02-18 17:12:15 +0100 |
| commit | 6242e7fc121fd5b31502119be7592ad155613d79 (patch) | |
| tree | 196d119154e314bd6cb86c3bd3a3f343a296060a | |
| parent | 594cd47565388f783b4eee9fbd8baaffbec95c0d (diff) | |
| parent | 3a6c9adad4172e8116358cf3a63a0d8ceca6796a (diff) | |
| download | scala-6242e7fc121fd5b31502119be7592ad155613d79.tar.gz scala-6242e7fc121fd5b31502119be7592ad155613d79.tar.bz2 scala-6242e7fc121fd5b31502119be7592ad155613d79.zip | |
Merge pull request #3548 from retronym/ticket/5165
SI-5165 separate compilation test Java annotations bug
| -rw-r--r-- | test/files/pos/t5165b/TestAnnotation_1.java | 11 | ||||
| -rw-r--r-- | test/files/pos/t5165b/TestObject_3.scala | 3 | ||||
| -rw-r--r-- | test/files/pos/t5165b/TestTrait_2.scala | 3 |
3 files changed, 17 insertions, 0 deletions
diff --git a/test/files/pos/t5165b/TestAnnotation_1.java b/test/files/pos/t5165b/TestAnnotation_1.java new file mode 100644 index 0000000000..02eb3f9d4c --- /dev/null +++ b/test/files/pos/t5165b/TestAnnotation_1.java @@ -0,0 +1,11 @@ +import java.lang.annotation.*; + +@Retention(RetentionPolicy.RUNTIME) +public @interface TestAnnotation_1 { + public enum TestEnumOne { A, B } + public enum TestEnumTwo { C, D } + + public TestEnumOne one(); + public TestEnumTwo two(); + public String strVal(); +} diff --git a/test/files/pos/t5165b/TestObject_3.scala b/test/files/pos/t5165b/TestObject_3.scala new file mode 100644 index 0000000000..eaf244e9d0 --- /dev/null +++ b/test/files/pos/t5165b/TestObject_3.scala @@ -0,0 +1,3 @@ + +object TestObject extends TestTrait + diff --git a/test/files/pos/t5165b/TestTrait_2.scala b/test/files/pos/t5165b/TestTrait_2.scala new file mode 100644 index 0000000000..ab4facebcd --- /dev/null +++ b/test/files/pos/t5165b/TestTrait_2.scala @@ -0,0 +1,3 @@ + +@TestAnnotation_1(one=TestAnnotation_1.TestEnumOne.A, two=TestAnnotation_1.TestEnumTwo.C, strVal="something") +trait TestTrait |