diff options
author | Martin Odersky <odersky@gmail.com> | 2014-05-07 19:09:52 +0200 |
---|---|---|
committer | Samuel Gruetter <samuel.gruetter@epfl.ch> | 2014-05-20 13:38:49 +0200 |
commit | 27081ae59ba5b00b6ae05bb3cdd9c3ff7db0a28e (patch) | |
tree | ab350b5ef2d7b9adc29fe715be2efb4681970127 /tests/disabled/java-interop | |
parent | fb3dba1bac13a755d2304928cbd49e7dde6f1bf9 (diff) | |
download | dotty-27081ae59ba5b00b6ae05bb3cdd9c3ff7db0a28e.tar.gz dotty-27081ae59ba5b00b6ae05bb3cdd9c3ff7db0a28e.tar.bz2 dotty-27081ae59ba5b00b6ae05bb3cdd9c3ff7db0a28e.zip |
Tests pos/23xx to 24xx.
Diffstat (limited to 'tests/disabled/java-interop')
-rw-r--r-- | tests/disabled/java-interop/pos/t2377/Q.java | 12 | ||||
-rw-r--r-- | tests/disabled/java-interop/pos/t2377/a.scala | 8 | ||||
-rw-r--r-- | tests/disabled/java-interop/pos/t2409/J.java | 4 | ||||
-rw-r--r-- | tests/disabled/java-interop/pos/t2409/t2409.scala | 1 | ||||
-rw-r--r-- | tests/disabled/java-interop/pos/t2413/TestJava.java | 7 | ||||
-rw-r--r-- | tests/disabled/java-interop/pos/t2413/TestScalac.scala | 23 | ||||
-rwxr-xr-x | tests/disabled/java-interop/pos/t2433/A.java | 4 | ||||
-rwxr-xr-x | tests/disabled/java-interop/pos/t2433/B.java | 4 | ||||
-rwxr-xr-x | tests/disabled/java-interop/pos/t2433/Test.scala | 3 | ||||
-rw-r--r-- | tests/disabled/java-interop/pos/t2464/JavaOne.java | 5 | ||||
-rw-r--r-- | tests/disabled/java-interop/pos/t2464/ScalaOne_1.scala | 6 | ||||
-rw-r--r-- | tests/disabled/java-interop/pos/t2464/t2464_2.scala | 3 |
12 files changed, 80 insertions, 0 deletions
diff --git a/tests/disabled/java-interop/pos/t2377/Q.java b/tests/disabled/java-interop/pos/t2377/Q.java new file mode 100644 index 000000000..e3d11c70e --- /dev/null +++ b/tests/disabled/java-interop/pos/t2377/Q.java @@ -0,0 +1,12 @@ +public final class Q { + public static final class Stage { + public static Builder newBuilder() { return new Builder(); } + public static final class Builder { } + public Builder toBuilder() { return newBuilder(); } + } + public static final class WorkUnit { + public static Builder newBuilder() { return new Builder(); } + public static final class Builder { } + public Builder toBuilder() { return newBuilder(); } + } +} diff --git a/tests/disabled/java-interop/pos/t2377/a.scala b/tests/disabled/java-interop/pos/t2377/a.scala new file mode 100644 index 000000000..bda59ce0d --- /dev/null +++ b/tests/disabled/java-interop/pos/t2377/a.scala @@ -0,0 +1,8 @@ +import Q._ + +class Bop(var workUnit: WorkUnit) { + def addStages(stageBuilder: Stage.Builder): Unit = { + val builder = workUnit.toBuilder + () + } +} diff --git a/tests/disabled/java-interop/pos/t2409/J.java b/tests/disabled/java-interop/pos/t2409/J.java new file mode 100644 index 000000000..6b7c45ff6 --- /dev/null +++ b/tests/disabled/java-interop/pos/t2409/J.java @@ -0,0 +1,4 @@ +class J { + static class J2 { } + J(J2 j2) { } +} diff --git a/tests/disabled/java-interop/pos/t2409/t2409.scala b/tests/disabled/java-interop/pos/t2409/t2409.scala new file mode 100644 index 000000000..0412f7d82 --- /dev/null +++ b/tests/disabled/java-interop/pos/t2409/t2409.scala @@ -0,0 +1 @@ +object S { new J(null) } diff --git a/tests/disabled/java-interop/pos/t2413/TestJava.java b/tests/disabled/java-interop/pos/t2413/TestJava.java new file mode 100644 index 000000000..252c01fbc --- /dev/null +++ b/tests/disabled/java-interop/pos/t2413/TestJava.java @@ -0,0 +1,7 @@ +package pack; + +public class TestJava { + protected String repeatParam(String ... items) { + return "nothing"; + } +} diff --git a/tests/disabled/java-interop/pos/t2413/TestScalac.scala b/tests/disabled/java-interop/pos/t2413/TestScalac.scala new file mode 100644 index 000000000..098e852dd --- /dev/null +++ b/tests/disabled/java-interop/pos/t2413/TestScalac.scala @@ -0,0 +1,23 @@ +import pack.TestJava + +class Foo extends TestJava { + + // THIS METHOD YIELDS TO CRASH +/* def foomethod : Option[String] => Unit = { + case None => + val path = repeatParam("s","a","b","c") + () + case Some(error) => + () + } + + // THIS IS OK + def foomethod2 : String = repeatParam("s","a"); + + // THIS IS OK + val aVal = repeatParam("1","2","3") */ + + // THIS YIELDS TO CRASH + for (a <- 1 to 4 ; anotherVal = repeatParam("1","2","3")) + yield anotherVal +} diff --git a/tests/disabled/java-interop/pos/t2433/A.java b/tests/disabled/java-interop/pos/t2433/A.java new file mode 100755 index 000000000..340690c40 --- /dev/null +++ b/tests/disabled/java-interop/pos/t2433/A.java @@ -0,0 +1,4 @@ +class A223 extends B223.Inner { + static class Inner {} + void foo() {} +}
\ No newline at end of file diff --git a/tests/disabled/java-interop/pos/t2433/B.java b/tests/disabled/java-interop/pos/t2433/B.java new file mode 100755 index 000000000..151dd71ca --- /dev/null +++ b/tests/disabled/java-interop/pos/t2433/B.java @@ -0,0 +1,4 @@ +class B223 { + static class Inner {} + void m(A223.Inner x) {} +}
\ No newline at end of file diff --git a/tests/disabled/java-interop/pos/t2433/Test.scala b/tests/disabled/java-interop/pos/t2433/Test.scala new file mode 100755 index 000000000..02fd89b64 --- /dev/null +++ b/tests/disabled/java-interop/pos/t2433/Test.scala @@ -0,0 +1,3 @@ +object Test { + (new A223).foo() +} diff --git a/tests/disabled/java-interop/pos/t2464/JavaOne.java b/tests/disabled/java-interop/pos/t2464/JavaOne.java new file mode 100644 index 000000000..ff36868a0 --- /dev/null +++ b/tests/disabled/java-interop/pos/t2464/JavaOne.java @@ -0,0 +1,5 @@ +class ClassTwo { + public static class Child { + public void func2() {return ;} + } +} diff --git a/tests/disabled/java-interop/pos/t2464/ScalaOne_1.scala b/tests/disabled/java-interop/pos/t2464/ScalaOne_1.scala new file mode 100644 index 000000000..1caf8ecae --- /dev/null +++ b/tests/disabled/java-interop/pos/t2464/ScalaOne_1.scala @@ -0,0 +1,6 @@ +class ScalaClassOne extends ClassTwo.Child { + def func4() = { + func2 + } +} + diff --git a/tests/disabled/java-interop/pos/t2464/t2464_2.scala b/tests/disabled/java-interop/pos/t2464/t2464_2.scala new file mode 100644 index 000000000..13a52c952 --- /dev/null +++ b/tests/disabled/java-interop/pos/t2464/t2464_2.scala @@ -0,0 +1,3 @@ +object Test { + val c1 = new ScalaClassOne +} |