summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2013-06-19 13:20:40 -0700
committerEugene Burmako <xeno.by@gmail.com>2013-06-19 13:20:40 -0700
commit319c260c7af1fae843fc7c5677de0bc20051f51e (patch)
treec56d4c7bd8b0a61c15653daf2f422b214969a47e /test/files/pos
parentf467940e5980621f8c288f8d47656061b1a0f15d (diff)
parent5c4be4057a8ececee7d260623fdc58f09ee4a09d (diff)
downloadscala-319c260c7af1fae843fc7c5677de0bc20051f51e.tar.gz
scala-319c260c7af1fae843fc7c5677de0bc20051f51e.tar.bz2
scala-319c260c7af1fae843fc7c5677de0bc20051f51e.zip
Merge pull request #2628 from retronym/ticket/7364
SI-7364 Allow raw types in parent position in Java sources
Diffstat (limited to 'test/files/pos')
-rw-r--r--test/files/pos/t7364/BadList.java3
-rw-r--r--test/files/pos/t7364/UseIt.scala4
-rw-r--r--test/files/pos/t7364b/BadList_1.java3
-rw-r--r--test/files/pos/t7364b/UseIt_2.scala5
4 files changed, 15 insertions, 0 deletions
diff --git a/test/files/pos/t7364/BadList.java b/test/files/pos/t7364/BadList.java
new file mode 100644
index 0000000000..2692fa085f
--- /dev/null
+++ b/test/files/pos/t7364/BadList.java
@@ -0,0 +1,3 @@
+public class BadList extends java.util.ArrayList {
+ public java.util.ArrayList foo() { return null; }
+}
diff --git a/test/files/pos/t7364/UseIt.scala b/test/files/pos/t7364/UseIt.scala
new file mode 100644
index 0000000000..3847165323
--- /dev/null
+++ b/test/files/pos/t7364/UseIt.scala
@@ -0,0 +1,4 @@
+class UseIt {
+ val list = new BadList
+ list.foo()
+}
diff --git a/test/files/pos/t7364b/BadList_1.java b/test/files/pos/t7364b/BadList_1.java
new file mode 100644
index 0000000000..fbb428adba
--- /dev/null
+++ b/test/files/pos/t7364b/BadList_1.java
@@ -0,0 +1,3 @@
+public class BadList_1 extends java.util.ArrayList {
+ public java.util.ArrayList foo() { return null; }
+}
diff --git a/test/files/pos/t7364b/UseIt_2.scala b/test/files/pos/t7364b/UseIt_2.scala
new file mode 100644
index 0000000000..06b50f6766
--- /dev/null
+++ b/test/files/pos/t7364b/UseIt_2.scala
@@ -0,0 +1,5 @@
+class UseIt {
+ val list = new BadList_1
+ list.foo()
+ list.set(0, list.get(0))
+}