summaryrefslogtreecommitdiff
path: root/test/files/pos5
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2008-10-28 22:39:53 +0000
committerPhilipp Haller <hallerp@gmail.com>2008-10-28 22:39:53 +0000
commit7e8f7199a1f2ea097243295eeb61c1a2e6155c66 (patch)
treee1e9289df3bd068693c5c690f58609eb845d67ec /test/files/pos5
parentc59f026df158ffc56277822265edfc8ff247348b (diff)
downloadscala-7e8f7199a1f2ea097243295eeb61c1a2e6155c66.tar.gz
scala-7e8f7199a1f2ea097243295eeb61c1a2e6155c66.tar.bz2
scala-7e8f7199a1f2ea097243295eeb61c1a2e6155c66.zip
Moved test requiring 1.5 javac/jvm to pos5.
Diffstat (limited to 'test/files/pos5')
-rw-r--r--test/files/pos5/t0695/JavaClass.java5
-rw-r--r--test/files/pos5/t0695/Test.scala3
-rwxr-xr-xtest/files/pos5/t1232/J.java2
-rwxr-xr-xtest/files/pos5/t1232/J2.java2
-rwxr-xr-xtest/files/pos5/t1232/S.scala2
5 files changed, 14 insertions, 0 deletions
diff --git a/test/files/pos5/t0695/JavaClass.java b/test/files/pos5/t0695/JavaClass.java
new file mode 100644
index 0000000000..a765f7e324
--- /dev/null
+++ b/test/files/pos5/t0695/JavaClass.java
@@ -0,0 +1,5 @@
+public class JavaClass<A> {
+ class InnerClass {
+ public A method() { return null; }
+ }
+}
diff --git a/test/files/pos5/t0695/Test.scala b/test/files/pos5/t0695/Test.scala
new file mode 100644
index 0000000000..7318867bf7
--- /dev/null
+++ b/test/files/pos5/t0695/Test.scala
@@ -0,0 +1,3 @@
+object Test extends JavaClass[AnyRef] {
+ var field: InnerClass = null
+}
diff --git a/test/files/pos5/t1232/J.java b/test/files/pos5/t1232/J.java
new file mode 100755
index 0000000000..af3aad928d
--- /dev/null
+++ b/test/files/pos5/t1232/J.java
@@ -0,0 +1,2 @@
+package j;
+public class J { public enum E { e1 } } \ No newline at end of file
diff --git a/test/files/pos5/t1232/J2.java b/test/files/pos5/t1232/J2.java
new file mode 100755
index 0000000000..dc117d360f
--- /dev/null
+++ b/test/files/pos5/t1232/J2.java
@@ -0,0 +1,2 @@
+import s.S;
+class J2 { } \ No newline at end of file
diff --git a/test/files/pos5/t1232/S.scala b/test/files/pos5/t1232/S.scala
new file mode 100755
index 0000000000..1b6bca7327
--- /dev/null
+++ b/test/files/pos5/t1232/S.scala
@@ -0,0 +1,2 @@
+package s
+class S { j.J.E.e1 }