summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
Diffstat (limited to 'test/files')
-rw-r--r--test/files/pos/t1782/Test_1.scala5
-rw-r--r--test/files/run/names-defaults.check1
-rw-r--r--test/files/run/names-defaults.scala1
3 files changed, 7 insertions, 0 deletions
diff --git a/test/files/pos/t1782/Test_1.scala b/test/files/pos/t1782/Test_1.scala
index 021dfc6d53..e61ef8eaf5 100644
--- a/test/files/pos/t1782/Test_1.scala
+++ b/test/files/pos/t1782/Test_1.scala
@@ -8,4 +8,9 @@ class Provider
{
// test enumeration java annotations
@Ann(Days.Friday) def someMethod() = ()
+
+ // #2103
+ @scala.reflect.BeanProperty
+ @Ann(value = Days.Sunday)
+ val t2103 = "test"
}
diff --git a/test/files/run/names-defaults.check b/test/files/run/names-defaults.check
index 5c2290acf9..e9381760ce 100644
--- a/test/files/run/names-defaults.check
+++ b/test/files/run/names-defaults.check
@@ -96,6 +96,7 @@ test5
4
test5
5
+10: 2
slkdfj1
1
lskfdjlk
diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala
index 0e5a268e62..162c0bc43e 100644
--- a/test/files/run/names-defaults.scala
+++ b/test/files/run/names-defaults.scala
@@ -177,6 +177,7 @@ object Test extends Application {
println(argName) // should be 4
test5 { argName = 5 }
println(argName) // should be 5
+ val a = test1(a = 10, b = "2") // local values a and b exist, but not ambiuous since they're val's
// dependent types and copy method