From a452fa2b85da4fc44af444bfe3f5d32afe6f5503 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Fri, 3 Jun 2016 00:18:50 +0200 Subject: Move java tests relying on type parameters to pending Currently, the classfiles emitted by dotty do not contain the type parameters information that javac relies on. Fixing this is tracked by #1303. --- tests/pending/pos/java-interop/t1263/Test.java | 17 +++++++++++++++++ tests/pending/pos/java-interop/t1263/test.scala | 10 ++++++++++ tests/pending/pos/java-interop/t1745/J.java | 10 ++++++++++ tests/pending/pos/java-interop/t1745/S.scala | 7 +++++++ tests/pos/java-interop/t1263/Test.java | 17 ----------------- tests/pos/java-interop/t1263/test.scala | 10 ---------- tests/pos/java-interop/t1745/J.java | 10 ---------- tests/pos/java-interop/t1745/S.scala | 7 ------- 8 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 tests/pending/pos/java-interop/t1263/Test.java create mode 100644 tests/pending/pos/java-interop/t1263/test.scala create mode 100644 tests/pending/pos/java-interop/t1745/J.java create mode 100644 tests/pending/pos/java-interop/t1745/S.scala delete mode 100644 tests/pos/java-interop/t1263/Test.java delete mode 100644 tests/pos/java-interop/t1263/test.scala delete mode 100644 tests/pos/java-interop/t1745/J.java delete mode 100644 tests/pos/java-interop/t1745/S.scala (limited to 'tests') diff --git a/tests/pending/pos/java-interop/t1263/Test.java b/tests/pending/pos/java-interop/t1263/Test.java new file mode 100644 index 000000000..1718a9909 --- /dev/null +++ b/tests/pending/pos/java-interop/t1263/Test.java @@ -0,0 +1,17 @@ +package test; + +import java.rmi.RemoteException; + +import test.Map; + +@SuppressWarnings("unchecked") +public class Test implements Map { + public Map.MapTo plus(String o) { + return null; + } + + public int $tag() throws RemoteException { + return 0; + } +} + diff --git a/tests/pending/pos/java-interop/t1263/test.scala b/tests/pending/pos/java-interop/t1263/test.scala new file mode 100644 index 000000000..92d8c1cdf --- /dev/null +++ b/tests/pending/pos/java-interop/t1263/test.scala @@ -0,0 +1,10 @@ +package test + +trait Map[A, +B] { + def plus(key: A): MapTo = new MapTo(key) + + class MapTo(key: A) { + def arrow [B1 >: B](value: B1) = null + } +} + diff --git a/tests/pending/pos/java-interop/t1745/J.java b/tests/pending/pos/java-interop/t1745/J.java new file mode 100644 index 000000000..8444eabb2 --- /dev/null +++ b/tests/pending/pos/java-interop/t1745/J.java @@ -0,0 +1,10 @@ +class J { + S1 s1; + S2 s2; + + String s = bar(S3.foo(), S3.bar("def")); + + private String bar(String s1, String s2) { + return s1 + s2; + } +} diff --git a/tests/pending/pos/java-interop/t1745/S.scala b/tests/pending/pos/java-interop/t1745/S.scala new file mode 100644 index 000000000..84c437133 --- /dev/null +++ b/tests/pending/pos/java-interop/t1745/S.scala @@ -0,0 +1,7 @@ +case class S1(n: Int) { } +case class S2(n: Int, p: Int) { } +class S3 { } +object S3 { + def foo() = "abc" + def bar[T](x: T): T = x +} diff --git a/tests/pos/java-interop/t1263/Test.java b/tests/pos/java-interop/t1263/Test.java deleted file mode 100644 index 1718a9909..000000000 --- a/tests/pos/java-interop/t1263/Test.java +++ /dev/null @@ -1,17 +0,0 @@ -package test; - -import java.rmi.RemoteException; - -import test.Map; - -@SuppressWarnings("unchecked") -public class Test implements Map { - public Map.MapTo plus(String o) { - return null; - } - - public int $tag() throws RemoteException { - return 0; - } -} - diff --git a/tests/pos/java-interop/t1263/test.scala b/tests/pos/java-interop/t1263/test.scala deleted file mode 100644 index 92d8c1cdf..000000000 --- a/tests/pos/java-interop/t1263/test.scala +++ /dev/null @@ -1,10 +0,0 @@ -package test - -trait Map[A, +B] { - def plus(key: A): MapTo = new MapTo(key) - - class MapTo(key: A) { - def arrow [B1 >: B](value: B1) = null - } -} - diff --git a/tests/pos/java-interop/t1745/J.java b/tests/pos/java-interop/t1745/J.java deleted file mode 100644 index 8444eabb2..000000000 --- a/tests/pos/java-interop/t1745/J.java +++ /dev/null @@ -1,10 +0,0 @@ -class J { - S1 s1; - S2 s2; - - String s = bar(S3.foo(), S3.bar("def")); - - private String bar(String s1, String s2) { - return s1 + s2; - } -} diff --git a/tests/pos/java-interop/t1745/S.scala b/tests/pos/java-interop/t1745/S.scala deleted file mode 100644 index 84c437133..000000000 --- a/tests/pos/java-interop/t1745/S.scala +++ /dev/null @@ -1,7 +0,0 @@ -case class S1(n: Int) { } -case class S2(n: Int, p: Int) { } -class S3 { } -object S3 { - def foo() = "abc" - def bar[T](x: T): T = x -} -- cgit v1.2.3