summaryrefslogtreecommitdiff
path: root/test/pending
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/pending
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/pending')
-rw-r--r--test/pending/jvm5/t1464/MyTrait.scala5
-rw-r--r--test/pending/jvm5/t1464/Test.java6
-rw-r--r--test/pending/pos5/ilya2/A.scala3
-rw-r--r--test/pending/pos5/ilya2/B.java6
-rw-r--r--test/pending/pos5/ilya2/Nullable.java7
5 files changed, 0 insertions, 27 deletions
diff --git a/test/pending/jvm5/t1464/MyTrait.scala b/test/pending/jvm5/t1464/MyTrait.scala
deleted file mode 100644
index 0b8ccc412b..0000000000
--- a/test/pending/jvm5/t1464/MyTrait.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-trait MyTrait {
- type K
- def findChildByClass[T <: K with MyTrait]: Unit
-
-}
diff --git a/test/pending/jvm5/t1464/Test.java b/test/pending/jvm5/t1464/Test.java
deleted file mode 100644
index 235848b1df..0000000000
--- a/test/pending/jvm5/t1464/Test.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class Test {
- public static void main(String[] args) {
- Object o = new Object();
- System.out.println(o instanceof MyTrait);
- }
-}
diff --git a/test/pending/pos5/ilya2/A.scala b/test/pending/pos5/ilya2/A.scala
deleted file mode 100644
index 923b50f04d..0000000000
--- a/test/pending/pos5/ilya2/A.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class A {
- def foo = new B().bar(null)
-}
diff --git a/test/pending/pos5/ilya2/B.java b/test/pending/pos5/ilya2/B.java
deleted file mode 100644
index 4771493fdd..0000000000
--- a/test/pending/pos5/ilya2/B.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class B {
- public int bar(@Nullable final Object o) {
- return 42;
- }
-
-}
diff --git a/test/pending/pos5/ilya2/Nullable.java b/test/pending/pos5/ilya2/Nullable.java
deleted file mode 100644
index ebbb013d7e..0000000000
--- a/test/pending/pos5/ilya2/Nullable.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import java.lang.annotation.*;
-
-@Retention(RetentionPolicy.CLASS)
-@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE})
-public @interface Nullable {
- String value() default "";
-}