From 1b32071acef5c7c2c08e21ee577c7cc709876ffa Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Sat, 3 May 2014 13:31:27 +0200
Subject: More tests

---
 .../disabled/java-interop/pos/t1409/AbstractImpl.java  |  3 +++
 .../disabled/java-interop/pos/t1409/ConcreteImpl.scala |  3 +++
 .../java-interop/pos/t1409/OuterInterface.java         |  5 +++++
 .../disabled/java-interop/pos/t1459/AbstractBase.java  |  5 +++++
 tests/disabled/java-interop/pos/t1459/App.scala        | 18 ++++++++++++++++++
 tests/disabled/java-interop/pos/t1459/Caller.java      |  7 +++++++
 .../pos/t1642/JavaCallingScalaHashMap.java             |  8 ++++++++
 7 files changed, 49 insertions(+)
 create mode 100644 tests/disabled/java-interop/pos/t1409/AbstractImpl.java
 create mode 100644 tests/disabled/java-interop/pos/t1409/ConcreteImpl.scala
 create mode 100644 tests/disabled/java-interop/pos/t1409/OuterInterface.java
 create mode 100755 tests/disabled/java-interop/pos/t1459/AbstractBase.java
 create mode 100755 tests/disabled/java-interop/pos/t1459/App.scala
 create mode 100755 tests/disabled/java-interop/pos/t1459/Caller.java
 create mode 100644 tests/disabled/java-interop/pos/t1642/JavaCallingScalaHashMap.java

(limited to 'tests/disabled/java-interop')

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>();
+    }
+}
-- 
cgit v1.2.3