summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-06-27 15:06:59 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-06-27 15:06:59 -0700
commit628740149af8568452315c27d4f4c264af697e57 (patch)
treeb384ec7cd77190d2609a5d1c90a203eb6186f05f /test/files/pos
parentf9030a2823a86b32239d03c87d299fd376d0623a (diff)
parentcac899c29ee4e8f1e47a85171a5b58bf60ae8a02 (diff)
downloadscala-628740149af8568452315c27d4f4c264af697e57.tar.gz
scala-628740149af8568452315c27d4f4c264af697e57.tar.bz2
scala-628740149af8568452315c27d4f4c264af697e57.zip
Merge pull request #2677 from jannic/SI-3936
SI-3936 - add test case to show that SI-3936 is already fixed
Diffstat (limited to 'test/files/pos')
-rw-r--r--test/files/pos/t3936/BlockingQueue.java3
-rw-r--r--test/files/pos/t3936/Queue.java2
-rw-r--r--test/files/pos/t3936/Test.scala4
3 files changed, 9 insertions, 0 deletions
diff --git a/test/files/pos/t3936/BlockingQueue.java b/test/files/pos/t3936/BlockingQueue.java
new file mode 100644
index 0000000000..b902d4528d
--- /dev/null
+++ b/test/files/pos/t3936/BlockingQueue.java
@@ -0,0 +1,3 @@
+package pack;
+import java.util.Queue;
+public interface BlockingQueue<E> extends Queue<E> { }
diff --git a/test/files/pos/t3936/Queue.java b/test/files/pos/t3936/Queue.java
new file mode 100644
index 0000000000..25c9087601
--- /dev/null
+++ b/test/files/pos/t3936/Queue.java
@@ -0,0 +1,2 @@
+package pack;
+public interface Queue { }
diff --git a/test/files/pos/t3936/Test.scala b/test/files/pos/t3936/Test.scala
new file mode 100644
index 0000000000..c867a05ec9
--- /dev/null
+++ b/test/files/pos/t3936/Test.scala
@@ -0,0 +1,4 @@
+package pack
+trait Test {
+ val b: BlockingQueue[Nothing]
+}