summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2008-10-31 14:08:57 +0000
committerPhilipp Haller <hallerp@gmail.com>2008-10-31 14:08:57 +0000
commit448110ac1153d504795ed3b48cf5b8aa30d20410 (patch)
tree5c4989367312cdd9de4e8c8c228d52830c5e48b8 /test/files
parentc7780ded0be7cbd06ed47fc667eb3b6c4e4453f4 (diff)
downloadscala-448110ac1153d504795ed3b48cf5b8aa30d20410.tar.gz
scala-448110ac1153d504795ed3b48cf5b8aa30d20410.tar.bz2
scala-448110ac1153d504795ed3b48cf5b8aa30d20410.zip
Moved jvm5/t1464 and pos5/ilya2 from pending.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/jvm5/t1464.check1
-rw-r--r--test/files/jvm5/t1464/MyTrait.scala5
-rw-r--r--test/files/jvm5/t1464/Test.java6
-rw-r--r--test/files/pos5/ilya2/A.scala3
-rw-r--r--test/files/pos5/ilya2/B.java6
-rw-r--r--test/files/pos5/ilya2/Nullable.java7
6 files changed, 28 insertions, 0 deletions
diff --git a/test/files/jvm5/t1464.check b/test/files/jvm5/t1464.check
new file mode 100644
index 0000000000..c508d5366f
--- /dev/null
+++ b/test/files/jvm5/t1464.check
@@ -0,0 +1 @@
+false
diff --git a/test/files/jvm5/t1464/MyTrait.scala b/test/files/jvm5/t1464/MyTrait.scala
new file mode 100644
index 0000000000..0b8ccc412b
--- /dev/null
+++ b/test/files/jvm5/t1464/MyTrait.scala
@@ -0,0 +1,5 @@
+trait MyTrait {
+ type K
+ def findChildByClass[T <: K with MyTrait]: Unit
+
+}
diff --git a/test/files/jvm5/t1464/Test.java b/test/files/jvm5/t1464/Test.java
new file mode 100644
index 0000000000..235848b1df
--- /dev/null
+++ b/test/files/jvm5/t1464/Test.java
@@ -0,0 +1,6 @@
+public class Test {
+ public static void main(String[] args) {
+ Object o = new Object();
+ System.out.println(o instanceof MyTrait);
+ }
+}
diff --git a/test/files/pos5/ilya2/A.scala b/test/files/pos5/ilya2/A.scala
new file mode 100644
index 0000000000..923b50f04d
--- /dev/null
+++ b/test/files/pos5/ilya2/A.scala
@@ -0,0 +1,3 @@
+class A {
+ def foo = new B().bar(null)
+}
diff --git a/test/files/pos5/ilya2/B.java b/test/files/pos5/ilya2/B.java
new file mode 100644
index 0000000000..4771493fdd
--- /dev/null
+++ b/test/files/pos5/ilya2/B.java
@@ -0,0 +1,6 @@
+public class B {
+ public int bar(@Nullable final Object o) {
+ return 42;
+ }
+
+}
diff --git a/test/files/pos5/ilya2/Nullable.java b/test/files/pos5/ilya2/Nullable.java
new file mode 100644
index 0000000000..ebbb013d7e
--- /dev/null
+++ b/test/files/pos5/ilya2/Nullable.java
@@ -0,0 +1,7 @@
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE})
+public @interface Nullable {
+ String value() default "";
+}