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.

36 files changed, 124 insertions, 0 deletions

diff --git a/test/files/pos5/chang/Outer.java b/test/files/pos5/chang/Outer.java
new file mode 100644
index 0000000000..acdb4e2904
--- /dev/null
+++ b/test/files/pos5/chang/Outer.java
@@ -0,0 +1,11 @@
+package com.netgents.hello;
+
+public class Outer<A> {
+
+  public Inner inner = new Inner();
+
+  public class Inner {
+
+    public A a;
+  }
+}
diff --git a/test/files/pos5/chang/Test.scala b/test/files/pos5/chang/Test.scala
new file mode 100644
index 0000000000..9bb745e377
--- /dev/null
+++ b/test/files/pos5/chang/Test.scala
@@ -0,0 +1,3 @@
+object Test extends Application {
+  new com.netgents.hello.Outer[String]
+}
diff --git a/test/files/pos5/ilya/J.java b/test/files/pos5/ilya/J.java
new file mode 100644
index 0000000000..c44169ca1b
--- /dev/null
+++ b/test/files/pos5/ilya/J.java
@@ -0,0 +1,14 @@
+package test;
+
+class Foo {
+}
+
+class Boo<T extends Foo>{}
+
+class Bar<BooT extends Boo<FooT>, FooT extends Foo>{
+ private final int myInt;
+
+ public Bar(int i) {
+   myInt = i;
+ }
+}
\ No newline at end of file
diff --git a/test/files/pos5/ilya/S.scala b/test/files/pos5/ilya/S.scala
new file mode 100644
index 0000000000..952c004ccc
--- /dev/null
+++ b/test/files/pos5/ilya/S.scala
@@ -0,0 +1,5 @@
+package test
+
+class ScBar[BooT <: Boo[FooT], FooT <: Foo](i: Int) extends Bar[BooT, FooT](i) {
+
+}
diff --git a/test/files/pos5/misc-pos.log b/test/files/pos5/misc-pos.log
new file mode 100644
index 0000000000..b921dd4d64
--- /dev/null
+++ b/test/files/pos5/misc-pos.log
@@ -0,0 +1,4 @@
+A.java:3: error: illegal cyclic reference involving object A
+import static test.A.STATE.UNDEF;
+       ^
+one error found
diff --git a/test/files/pos5/t1101/J.java b/test/files/pos5/t1101/J.java
new file mode 100644
index 0000000000..2bc1d53e09
--- /dev/null
+++ b/test/files/pos5/t1101/J.java
@@ -0,0 +1 @@
+class J { enum E { E1 } }
diff --git a/test/files/pos5/t1101/S.scala b/test/files/pos5/t1101/S.scala
new file mode 100644
index 0000000000..af7a591e58
--- /dev/null
+++ b/test/files/pos5/t1101/S.scala
@@ -0,0 +1 @@
+class S { val x: J.E = null; System.out.println(J.E.E1) }
diff --git a/test/files/pos5/t1102/J.java b/test/files/pos5/t1102/J.java
new file mode 100644
index 0000000000..530102b91c
--- /dev/null
+++ b/test/files/pos5/t1102/J.java
@@ -0,0 +1,4 @@
+class J {
+	enum E { E1 }
+	void foo(E e) { }
+}
diff --git a/test/files/pos5/t1102/S.scala b/test/files/pos5/t1102/S.scala
new file mode 100644
index 0000000000..9beee8d901
--- /dev/null
+++ b/test/files/pos5/t1102/S.scala
@@ -0,0 +1 @@
+class S(j:J) { j.foo(J.E.E1) }
diff --git a/test/files/pos5/t1150/J.java b/test/files/pos5/t1150/J.java
new file mode 100644
index 0000000000..68fa04a178
--- /dev/null
+++ b/test/files/pos5/t1150/J.java
@@ -0,0 +1,4 @@
+class J {
+	static void bbb (Boolean b) { }
+	static void ddd (Double d) { }
+}
diff --git a/test/files/pos5/t1150/S.scala b/test/files/pos5/t1150/S.scala
new file mode 100644
index 0000000000..41dd064037
--- /dev/null
+++ b/test/files/pos5/t1150/S.scala
@@ -0,0 +1,4 @@
+object S {
+  J.bbb(new java.lang.Boolean(true))
+  J.ddd(new java.lang.Double(0))
+}
diff --git a/test/files/pos5/t1152/J.java b/test/files/pos5/t1152/J.java
new file mode 100644
index 0000000000..6e562e573d
--- /dev/null
+++ b/test/files/pos5/t1152/J.java
@@ -0,0 +1 @@
+class J { java.util.List<String> k = null;  }
diff --git a/test/files/pos5/t1152/S.scala b/test/files/pos5/t1152/S.scala
new file mode 100644
index 0000000000..7f751c5090
--- /dev/null
+++ b/test/files/pos5/t1152/S.scala
@@ -0,0 +1,2 @@
+class S2(fn:(J)=>Any)
+object S { new S2(_.k) }
diff --git a/test/files/pos5/t1176/J.java b/test/files/pos5/t1176/J.java
new file mode 100644
index 0000000000..0d82c75fcb
--- /dev/null
+++ b/test/files/pos5/t1176/J.java
@@ -0,0 +1,4 @@
+class J {
+	J() { }
+	J( java.util.Collection<?> collection ) { }
+}
diff --git a/test/files/pos5/t1176/S.scala b/test/files/pos5/t1176/S.scala
new file mode 100644
index 0000000000..a7fc3e0cea
--- /dev/null
+++ b/test/files/pos5/t1176/S.scala
@@ -0,0 +1 @@
+class S { new J }
diff --git a/test/files/pos5/t1186.java b/test/files/pos5/t1186.java
new file mode 100644
index 0000000000..c1bfcecab8
--- /dev/null
+++ b/test/files/pos5/t1186.java
@@ -0,0 +1,8 @@
+import scala.collection.immutable.Map;
+
+class Test {
+
+  void foo() {
+      Map<String, String> map = null;
+  }
+}
\ No newline at end of file
diff --git a/test/files/pos5/t1196/J.java b/test/files/pos5/t1196/J.java
new file mode 100644
index 0000000000..2ec7a711bb
--- /dev/null
+++ b/test/files/pos5/t1196/J.java
@@ -0,0 +1 @@
+class J { static void foo(Class c) { } }
diff --git a/test/files/pos5/t1196/S.scala b/test/files/pos5/t1196/S.scala
new file mode 100644
index 0000000000..f17cd249a7
--- /dev/null
+++ b/test/files/pos5/t1196/S.scala
@@ -0,0 +1 @@
+object S { J.foo(null) }
diff --git a/test/files/pos5/t1197/J.java b/test/files/pos5/t1197/J.java
new file mode 100644
index 0000000000..b4e0a4255c
--- /dev/null
+++ b/test/files/pos5/t1197/J.java
@@ -0,0 +1,2 @@
+class J { interface K { } }
+
diff --git a/test/files/pos5/t1197/S.scala b/test/files/pos5/t1197/S.scala
new file mode 100644
index 0000000000..7c9c15440f
--- /dev/null
+++ b/test/files/pos5/t1197/S.scala
@@ -0,0 +1,2 @@
+object S extends J.K
+
diff --git a/test/files/pos5/t1203/J.java b/test/files/pos5/t1203/J.java
new file mode 100644
index 0000000000..7fae118e04
--- /dev/null
+++ b/test/files/pos5/t1203/J.java
@@ -0,0 +1 @@
+interface J { int j = 200 ; }
diff --git a/test/files/pos5/t1203/S.scala b/test/files/pos5/t1203/S.scala
new file mode 100644
index 0000000000..68eac4bf6d
--- /dev/null
+++ b/test/files/pos5/t1203/S.scala
@@ -0,0 +1 @@
+object S { J.j }
diff --git a/test/files/pos5/t1230/J.java b/test/files/pos5/t1230/J.java
new file mode 100644
index 0000000000..35aefd2505
--- /dev/null
+++ b/test/files/pos5/t1230/J.java
@@ -0,0 +1 @@
+class J { public int foo ; }
diff --git a/test/files/pos5/t1230/S.scala b/test/files/pos5/t1230/S.scala
new file mode 100644
index 0000000000..f8a691b6de
--- /dev/null
+++ b/test/files/pos5/t1230/S.scala
@@ -0,0 +1 @@
+object S extends Application { (new J).foo = 5 }
diff --git a/test/files/pos5/t1231/J.java b/test/files/pos5/t1231/J.java
new file mode 100644
index 0000000000..1dfc9490eb
--- /dev/null
+++ b/test/files/pos5/t1231/J.java
@@ -0,0 +1 @@
+enum J { j1 }
\ No newline at end of file
diff --git a/test/files/pos5/t1231/S.scala b/test/files/pos5/t1231/S.scala
new file mode 100644
index 0000000000..ee08866e04
--- /dev/null
+++ b/test/files/pos5/t1231/S.scala
@@ -0,0 +1 @@
+object S extends Application { println(J.j1) }
diff --git a/test/files/jvm5/t1464.check b/test/pending/jvm5/t1464.check
index c508d5366f..c508d5366f 100644
--- a/test/files/jvm5/t1464.check
+++ b/test/pending/jvm5/t1464.check
diff --git a/test/files/jvm5/t1464/MyTrait.scala b/test/pending/jvm5/t1464/MyTrait.scala
index 0b8ccc412b..0b8ccc412b 100644
--- a/test/files/jvm5/t1464/MyTrait.scala
+++ b/test/pending/jvm5/t1464/MyTrait.scala
diff --git a/test/files/jvm5/t1464/Test.java b/test/pending/jvm5/t1464/Test.java
index 235848b1df..235848b1df 100644
--- a/test/files/jvm5/t1464/Test.java
+++ b/test/pending/jvm5/t1464/Test.java
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")
+}