SI-9013 SI-1459 Tests for inherited @varargs annotations

8 files changed, 78 insertions, 0 deletions

diff --git a/test/files/run/t1459.check b/test/files/run/t1459.check
new file mode 100644
index 0000000000..93b4c5a810
--- /dev/null
+++ b/test/files/run/t1459.check
@@ -0,0 +1,3 @@
+JavaPrinter: one two three 
+InheritingPrinter extends JavaPrinter: one two three 
+ScalaPrinter: onetwothree
diff --git a/test/files/run/t1459/InheritingPrinter.scala b/test/files/run/t1459/InheritingPrinter.scala
new file mode 100644
index 0000000000..70301307f5
--- /dev/null
+++ b/test/files/run/t1459/InheritingPrinter.scala
@@ -0,0 +1,6 @@
+class InheritingPrinter extends JavaPrinter {
+  override def doit(s: String*) {
+    print("InheritingPrinter extends ")
+    super.doit(s: _*);
+  }
+}
\ No newline at end of file
diff --git a/test/files/run/t1459/JavaPrinter.java b/test/files/run/t1459/JavaPrinter.java
new file mode 100644
index 0000000000..3912ea613a
--- /dev/null
+++ b/test/files/run/t1459/JavaPrinter.java
@@ -0,0 +1,7 @@
+public class JavaPrinter implements VarArg {
+  public void doit(String... s) {
+    System.out.print("JavaPrinter: ");
+    for(String str : s)
+      System.out.print(str + " ");
+  }
+}
diff --git a/test/files/run/t1459/ScalaPrinter.scala b/test/files/run/t1459/ScalaPrinter.scala
new file mode 100644
index 0000000000..46305804c2
--- /dev/null
+++ b/test/files/run/t1459/ScalaPrinter.scala
@@ -0,0 +1,6 @@
+class ScalaPrinter extends VarArg {
+  override def doit(s: String*) = {
+    print("ScalaPrinter: ")
+    s.foreach(print _)
+  }
+}
\ No newline at end of file
diff --git a/test/files/run/t1459/Test.java b/test/files/run/t1459/Test.java
new file mode 100644
index 0000000000..3cf91e2e8b
--- /dev/null
+++ b/test/files/run/t1459/Test.java
@@ -0,0 +1,15 @@
+public class Test {
+  public static void main(String[] args) {
+    VarArg jp = new JavaPrinter();
+    VarArg ip = new InheritingPrinter();
+    VarArg sp = new ScalaPrinter();
+    doYourThing(jp);
+    doYourThing(ip);
+    doYourThing(sp);
+  }
+
+  public static void doYourThing(VarArg va) {
+    va.doit("one", "two", "three");
+    System.out.println();
+  }
+}
diff --git a/test/files/run/t1459/VarArg.java b/test/files/run/t1459/VarArg.java
new file mode 100644
index 0000000000..7039f99e7b
--- /dev/null
+++ b/test/files/run/t1459/VarArg.java
@@ -0,0 +1,3 @@
+public interface VarArg {
+  void doit(String... s);
+}
diff --git a/test/files/run/t9013/Test.java b/test/files/run/t9013/Test.java
new file mode 100644
index 0000000000..14152b16ac
--- /dev/null
+++ b/test/files/run/t9013/Test.java
@@ -0,0 +1,20 @@
+import java.util.Comparator;
+
+public class Test {
+  public static void main(String[] args) {
+    ClassImplementsClass c = new ClassImplementsClass();
+
+    c.x("a", "b", "c");
+    c.y("a", "b", "c");
+    c.z("a", "b", "c");
+
+    VarargAbstractClass i = new ClassImplementsClass();
+
+    i.x("a", "b", "c");
+    i.y("a", "b", "c");
+    // System.out.println(i.z("a", "b", "c")); // still incurs a LinkageError.
+    // Perhaps due to Uncurry:
+    //   > for every repeated Java parameter `x: T...' --> x: Array[T], except:
+    //   >    if T is an unbounded abstract type, replace --> x: Array[Object]
+  }
+}
diff --git a/test/files/run/t9013/test.scala b/test/files/run/t9013/test.scala
new file mode 100644
index 0000000000..073f8d086f
--- /dev/null
+++ b/test/files/run/t9013/test.scala
@@ -0,0 +1,18 @@
+import scala.annotation.varargs
+
+abstract class VarargAbstractClass[T] {
+  @varargs
+  def x(els: String*): Int
+
+  @varargs
+  def y(els: String*): Int
+
+  @varargs
+  def z(els: T*): Int
+}
+class ClassImplementsClass extends VarargAbstractClass[String] {
+
+  override def x(els: String*): Int = els.length
+  override def y(els: String*): Int = els.length
+  override def z(els: String*): Int = els.length
+}