aboutsummaryrefslogtreecommitdiff
path: root/tests/disabled/java-interop
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2014-05-03 13:31:27 +0200
committerMartin Odersky <odersky@gmail.com>2014-05-12 12:50:38 +0200
commit1b32071acef5c7c2c08e21ee577c7cc709876ffa (patch)
tree6cf36469ca3a59b855a3c589b4542c19d3b30fb8 /tests/disabled/java-interop
parent8a4186ff782efefb98686aa35bf7f5dd1418210d (diff)
downloaddotty-1b32071acef5c7c2c08e21ee577c7cc709876ffa.tar.gz
dotty-1b32071acef5c7c2c08e21ee577c7cc709876ffa.tar.bz2
dotty-1b32071acef5c7c2c08e21ee577c7cc709876ffa.zip
More tests
Diffstat (limited to 'tests/disabled/java-interop')
-rw-r--r--tests/disabled/java-interop/pos/t1409/AbstractImpl.java3
-rw-r--r--tests/disabled/java-interop/pos/t1409/ConcreteImpl.scala3
-rw-r--r--tests/disabled/java-interop/pos/t1409/OuterInterface.java5
-rwxr-xr-xtests/disabled/java-interop/pos/t1459/AbstractBase.java5
-rwxr-xr-xtests/disabled/java-interop/pos/t1459/App.scala18
-rwxr-xr-xtests/disabled/java-interop/pos/t1459/Caller.java7
-rw-r--r--tests/disabled/java-interop/pos/t1642/JavaCallingScalaHashMap.java8
7 files changed, 49 insertions, 0 deletions
diff --git a/tests/disabled/java-interop/pos/t1409/AbstractImpl.java b/tests/disabled/java-interop/pos/t1409/AbstractImpl.java
new file mode 100644
index 000000000..b22a94fa1
--- /dev/null
+++ b/tests/disabled/java-interop/pos/t1409/AbstractImpl.java
@@ -0,0 +1,3 @@
+public abstract class AbstractImpl implements OuterInterface {
+ public abstract InnerInterface create();
+ }
diff --git a/tests/disabled/java-interop/pos/t1409/ConcreteImpl.scala b/tests/disabled/java-interop/pos/t1409/ConcreteImpl.scala
new file mode 100644
index 000000000..d427e957e
--- /dev/null
+++ b/tests/disabled/java-interop/pos/t1409/ConcreteImpl.scala
@@ -0,0 +1,3 @@
+class ConcreteImpl extends AbstractImpl {
+ def create : OuterInterface.InnerInterface = null
+ }
diff --git a/tests/disabled/java-interop/pos/t1409/OuterInterface.java b/tests/disabled/java-interop/pos/t1409/OuterInterface.java
new file mode 100644
index 000000000..dd288ceea
--- /dev/null
+++ b/tests/disabled/java-interop/pos/t1409/OuterInterface.java
@@ -0,0 +1,5 @@
+public interface OuterInterface {
+ public interface InnerInterface {
+ public void foo();
+ }
+ }
diff --git a/tests/disabled/java-interop/pos/t1459/AbstractBase.java b/tests/disabled/java-interop/pos/t1459/AbstractBase.java
new file mode 100755
index 000000000..492419416
--- /dev/null
+++ b/tests/disabled/java-interop/pos/t1459/AbstractBase.java
@@ -0,0 +1,5 @@
+package base;
+
+public abstract class AbstractBase {
+ public abstract void doStuff(String... params); // !!! was Object..
+} \ No newline at end of file
diff --git a/tests/disabled/java-interop/pos/t1459/App.scala b/tests/disabled/java-interop/pos/t1459/App.scala
new file mode 100755
index 000000000..36e5022e9
--- /dev/null
+++ b/tests/disabled/java-interop/pos/t1459/App.scala
@@ -0,0 +1,18 @@
+package foo
+import base._
+
+object App extends scala.App {
+ class Concrete extends AbstractBase {
+ override def doStuff(params:java.lang.String*): Unit = println("doStuff invoked")
+ }
+
+ val impl = new Concrete
+
+ //succeeds
+ impl.doStuff(null)
+
+ val caller = new Caller
+
+ // fails with AbstractMethodError
+ caller.callDoStuff(impl)
+}
diff --git a/tests/disabled/java-interop/pos/t1459/Caller.java b/tests/disabled/java-interop/pos/t1459/Caller.java
new file mode 100755
index 000000000..4ae51d8c5
--- /dev/null
+++ b/tests/disabled/java-interop/pos/t1459/Caller.java
@@ -0,0 +1,7 @@
+package base;
+
+public class Caller {
+ public void callDoStuff(AbstractBase impl) {
+ impl.doStuff("abc"); // was new Object());
+ }
+} \ No newline at end of file
diff --git a/tests/disabled/java-interop/pos/t1642/JavaCallingScalaHashMap.java b/tests/disabled/java-interop/pos/t1642/JavaCallingScalaHashMap.java
new file mode 100644
index 000000000..976e465ff
--- /dev/null
+++ b/tests/disabled/java-interop/pos/t1642/JavaCallingScalaHashMap.java
@@ -0,0 +1,8 @@
+import scala.collection.immutable.HashMap;
+import scala.collection.immutable.Map;
+
+public class JavaCallingScalaHashMap {
+ public static void main( String[] args ) {
+ Map<String, Integer> hashMap = new HashMap<String, Integer>();
+ }
+}