Skip to content

Commit b720d6c

Browse files
Add more varargs tests
Also move some disabled tests to run tests, and rename vararg-extend-java to varargs-extend-java
1 parent 6d245fb commit b720d6c

File tree

14 files changed

+45
-62
lines changed

14 files changed

+45
-62
lines changed

tests/disabled/java-interop/failing/t1459/AbstractBase.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

tests/disabled/java-interop/failing/t1459/App.scala

Lines changed: 0 additions & 18 deletions
This file was deleted.

tests/disabled/java-interop/failing/t2569/Child.scala

Lines changed: 0 additions & 9 deletions
This file was deleted.

tests/disabled/java-interop/failing/t2569/Parent.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

tests/disabled/java-interop/failing/varargs-bridge/A.java

Lines changed: 0 additions & 8 deletions
This file was deleted.

tests/disabled/java-interop/failing/varargs-bridge/B.scala

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import scala.annotation.varargs
2+
3+
abstract class Abs {
4+
@varargs def counter(s: String*) = ()
5+
}
6+
7+
trait T {
8+
@varargs def counter(s: String*): Unit
9+
}
10+
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import scala.annotation.varargs
2+
3+
class Impl extends Abs {
4+
override def counter(s: String*): Unit = ()
5+
}
6+
7+
trait B extends T {
8+
override def counter(s: String*): Unit = ()
9+
}
10+
11+
class C extends B {
12+
override def counter(s: String*) = ()
13+
}
14+
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package base;
2+
3+
public abstract class AbstractBase {
4+
public abstract void doStuff(Object... params);
5+
}

tests/disabled/java-interop/failing/t1459/Caller.java renamed to tests/run/varargs-extend-java-2/Caller.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
public class Caller {
44
public void callDoStuff(AbstractBase impl) {
5-
impl.doStuff("abc"); // was new Object());
5+
impl.doStuff("abc");
6+
impl.doStuff(new Object());
67
}
7-
}
8+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import base._
2+
3+
object Test extends App {
4+
class Concrete extends AbstractBase {
5+
override def doStuff(params: AnyRef*): Unit = println("doStuff invoked")
6+
}
7+
8+
val impl = Concrete()
9+
impl.doStuff(null)
10+
11+
val caller = Caller()
12+
caller.callDoStuff(impl)
13+
}

0 commit comments

Comments
 (0)