diff options
author | David MacIver <david.maciver@gmail.com> | 2008-10-30 23:21:27 +0000 |
---|---|---|
committer | David MacIver <david.maciver@gmail.com> | 2008-10-30 23:21:27 +0000 |
commit | bcbf5a12672f5b364c24398b6d98cd04ecb2e2be (patch) | |
tree | 6249bd524b6c0270db505f9698f6789a9c18ff62 /test/pending | |
parent | 99529c51c054b3873442c5cbef34b81b84798434 (diff) | |
download | scala-bcbf5a12672f5b364c24398b6d98cd04ecb2e2be.tar.gz scala-bcbf5a12672f5b364c24398b6d98cd04ecb2e2be.tar.bz2 scala-bcbf5a12672f5b364c24398b6d98cd04ecb2e2be.zip |
Martin's tests for mixed Scala/Java.
A couple things are in pending because of partest weirdness. As far as I
can tell they work but partest is doing the wrong thing with them. I'll
open a ticket.
Diffstat (limited to 'test/pending')
-rw-r--r-- | test/pending/jvm5/t1464.check | 1 | ||||
-rw-r--r-- | test/pending/jvm5/t1464/MyTrait.scala | 5 | ||||
-rw-r--r-- | test/pending/jvm5/t1464/Test.java | 6 | ||||
-rw-r--r-- | test/pending/pos5/ilya2/A.scala | 3 | ||||
-rw-r--r-- | test/pending/pos5/ilya2/B.java | 6 | ||||
-rw-r--r-- | test/pending/pos5/ilya2/Nullable.java | 7 | ||||
-rw-r--r-- | test/pending/pos5/misc/A.java | 13 | ||||
-rw-r--r-- | test/pending/pos5/misc/B.scala | 7 | ||||
-rw-r--r-- | test/pending/pos5/misc/J.java | 4 | ||||
-rw-r--r-- | test/pending/pos5/misc/S.scala | 4 |
10 files changed, 56 insertions, 0 deletions
diff --git a/test/pending/jvm5/t1464.check b/test/pending/jvm5/t1464.check new file mode 100644 index 0000000000..c508d5366f --- /dev/null +++ b/test/pending/jvm5/t1464.check @@ -0,0 +1 @@ +false diff --git a/test/pending/jvm5/t1464/MyTrait.scala b/test/pending/jvm5/t1464/MyTrait.scala new file mode 100644 index 0000000000..0b8ccc412b --- /dev/null +++ b/test/pending/jvm5/t1464/MyTrait.scala @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..235848b1df --- /dev/null +++ b/test/pending/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/pending/pos5/ilya2/A.scala b/test/pending/pos5/ilya2/A.scala new file mode 100644 index 0000000000..923b50f04d --- /dev/null +++ b/test/pending/pos5/ilya2/A.scala @@ -0,0 +1,3 @@ +class A { + def foo = new B().bar(null) +} diff --git a/test/pending/pos5/ilya2/B.java b/test/pending/pos5/ilya2/B.java new file mode 100644 index 0000000000..4771493fdd --- /dev/null +++ b/test/pending/pos5/ilya2/B.java @@ -0,0 +1,6 @@ +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 new file mode 100644 index 0000000000..ebbb013d7e --- /dev/null +++ b/test/pending/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 ""; +} diff --git a/test/pending/pos5/misc/A.java b/test/pending/pos5/misc/A.java new file mode 100644 index 0000000000..bc8ea48dd0 --- /dev/null +++ b/test/pending/pos5/misc/A.java @@ -0,0 +1,13 @@ +package test; + +import static test.A.STATE.UNDEF; + +class A { + + public STATE state = UNDEF; + + protected static enum STATE { + UNDEF + } + +}
\ No newline at end of file diff --git a/test/pending/pos5/misc/B.scala b/test/pending/pos5/misc/B.scala new file mode 100644 index 0000000000..a6889e3c8b --- /dev/null +++ b/test/pending/pos5/misc/B.scala @@ -0,0 +1,7 @@ +package test + +class B { + + def myA = new A() + +}
\ No newline at end of file diff --git a/test/pending/pos5/misc/J.java b/test/pending/pos5/misc/J.java new file mode 100644 index 0000000000..4805791154 --- /dev/null +++ b/test/pending/pos5/misc/J.java @@ -0,0 +1,4 @@ +class J { + void f (@Override{ name = value } int x) {} + void g (String ... x) {} +} diff --git a/test/pending/pos5/misc/S.scala b/test/pending/pos5/misc/S.scala new file mode 100644 index 0000000000..c5bfb26f18 --- /dev/null +++ b/test/pending/pos5/misc/S.scala @@ -0,0 +1,4 @@ +object Test extends J { + def h(xs: String*) {} + g("a", "b", "c") +} |