summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-12-19 11:21:05 -0800
committerPaul Phillips <paulp@improving.org>2012-12-19 11:21:05 -0800
commitf274490de15a148452958bf897dc40f897069205 (patch)
tree2e8c2f274e483e774251a15f1f35954092b41bfb /test/files
parent8d2505da041b902b4c4304ca783d5a6b8b9b6c52 (diff)
parent0429f0fd9224499cd8b606490d04b1a8dcffbca8 (diff)
downloadscala-f274490de15a148452958bf897dc40f897069205.tar.gz
scala-f274490de15a148452958bf897dc40f897069205.tar.bz2
scala-f274490de15a148452958bf897dc40f897069205.zip
Merge pull request #1727 from scalamacros/ticket/6548
SI-6548 reflection now correctly enters jinners
Diffstat (limited to 'test/files')
-rw-r--r--test/files/lib/javac-artifacts.jar.desired.sha12
-rw-r--r--test/files/run/t6548.check2
-rw-r--r--test/files/run/t6548.scala12
3 files changed, 15 insertions, 1 deletions
diff --git a/test/files/lib/javac-artifacts.jar.desired.sha1 b/test/files/lib/javac-artifacts.jar.desired.sha1
index 8dbbc1d451..a49c986386 100644
--- a/test/files/lib/javac-artifacts.jar.desired.sha1
+++ b/test/files/lib/javac-artifacts.jar.desired.sha1
@@ -1 +1 @@
-c5788c5e518eb267445c5a995fd98b2210f90a58 ?javac-artifacts.jar
+61931a51bb1a2d308d214b96d06e9a8808515dcf ?javac-artifacts.jar
diff --git a/test/files/run/t6548.check b/test/files/run/t6548.check
new file mode 100644
index 0000000000..e82cae110a
--- /dev/null
+++ b/test/files/run/t6548.check
@@ -0,0 +1,2 @@
+false
+List(JavaAnnotationWithNestedEnum(value = VALUE))
diff --git a/test/files/run/t6548.scala b/test/files/run/t6548.scala
new file mode 100644
index 0000000000..be3eb5b932
--- /dev/null
+++ b/test/files/run/t6548.scala
@@ -0,0 +1,12 @@
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{currentMirror => cm}
+
+class Bean {
+ @JavaAnnotationWithNestedEnum(JavaAnnotationWithNestedEnum.Value.VALUE)
+ def value = 1
+}
+
+object Test extends App {
+ println(cm.staticClass("Bean").isCaseClass)
+ println(typeOf[Bean].declaration(newTermName("value")).annotations)
+}