From 2c5959b3a52b468e123a1f75d47cf053ce1e272a Mon Sep 17 00:00:00 2001
From: Ondrej Lhotak <olhotak@uwaterloo.ca>
Date: Wed, 8 Oct 2014 16:55:49 +0200
Subject: support running java-interop tests

---
 tests/disabled/java-interop/pos/t1751/A1_2.scala        | 2 --
 tests/disabled/java-interop/pos/t1751/A2_1.scala        | 2 --
 tests/disabled/java-interop/pos/t1751/SuiteClasses.java | 3 ---
 tests/disabled/java-interop/pos/t1782/Test_1.scala      | 2 +-
 tests/disabled/java-interop/pos/t2409/J.java            | 4 ----
 tests/disabled/java-interop/pos/t2409/t2409.scala       | 1 -
 tests/disabled/java-interop/pos/t294/Ann.java           | 3 ---
 tests/disabled/java-interop/pos/t294/Ann2.java          | 3 ---
 tests/disabled/java-interop/pos/t294/Test_1.scala       | 7 -------
 tests/disabled/java-interop/pos/t294/Test_2.scala       | 1 -
 10 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 tests/disabled/java-interop/pos/t1751/A1_2.scala
 delete mode 100644 tests/disabled/java-interop/pos/t1751/A2_1.scala
 delete mode 100644 tests/disabled/java-interop/pos/t1751/SuiteClasses.java
 delete mode 100644 tests/disabled/java-interop/pos/t2409/J.java
 delete mode 100644 tests/disabled/java-interop/pos/t2409/t2409.scala
 delete mode 100644 tests/disabled/java-interop/pos/t294/Ann.java
 delete mode 100644 tests/disabled/java-interop/pos/t294/Ann2.java
 delete mode 100644 tests/disabled/java-interop/pos/t294/Test_1.scala
 delete mode 100644 tests/disabled/java-interop/pos/t294/Test_2.scala

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

diff --git a/tests/disabled/java-interop/pos/t1751/A1_2.scala b/tests/disabled/java-interop/pos/t1751/A1_2.scala
deleted file mode 100644
index 354d5eecd..000000000
--- a/tests/disabled/java-interop/pos/t1751/A1_2.scala
+++ /dev/null
@@ -1,2 +0,0 @@
-@SuiteClasses(Array(classOf[A2]))
-class A1
diff --git a/tests/disabled/java-interop/pos/t1751/A2_1.scala b/tests/disabled/java-interop/pos/t1751/A2_1.scala
deleted file mode 100644
index c768062e4..000000000
--- a/tests/disabled/java-interop/pos/t1751/A2_1.scala
+++ /dev/null
@@ -1,2 +0,0 @@
-@SuiteClasses(Array())
-class A2
diff --git a/tests/disabled/java-interop/pos/t1751/SuiteClasses.java b/tests/disabled/java-interop/pos/t1751/SuiteClasses.java
deleted file mode 100644
index a415e4f57..000000000
--- a/tests/disabled/java-interop/pos/t1751/SuiteClasses.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public @interface SuiteClasses {
-    public Class<?>[] value();
-}
diff --git a/tests/disabled/java-interop/pos/t1782/Test_1.scala b/tests/disabled/java-interop/pos/t1782/Test_1.scala
index 6467a74c2..47495c082 100644
--- a/tests/disabled/java-interop/pos/t1782/Test_1.scala
+++ b/tests/disabled/java-interop/pos/t1782/Test_1.scala
@@ -1,6 +1,6 @@
 @ImplementedBy(classOf[Provider])
 trait Service {
-  def someMethod()
+  def someMethod(): Unit
 }
 
 class Provider
diff --git a/tests/disabled/java-interop/pos/t2409/J.java b/tests/disabled/java-interop/pos/t2409/J.java
deleted file mode 100644
index 6b7c45ff6..000000000
--- a/tests/disabled/java-interop/pos/t2409/J.java
+++ /dev/null
@@ -1,4 +0,0 @@
-class J {
-	static class J2 { }
-	J(J2 j2) { }
-}
diff --git a/tests/disabled/java-interop/pos/t2409/t2409.scala b/tests/disabled/java-interop/pos/t2409/t2409.scala
deleted file mode 100644
index 0412f7d82..000000000
--- a/tests/disabled/java-interop/pos/t2409/t2409.scala
+++ /dev/null
@@ -1 +0,0 @@
-object S { new J(null) }
diff --git a/tests/disabled/java-interop/pos/t294/Ann.java b/tests/disabled/java-interop/pos/t294/Ann.java
deleted file mode 100644
index 934ca4629..000000000
--- a/tests/disabled/java-interop/pos/t294/Ann.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public @interface Ann {
-    public Ann2[] nested();
-}
diff --git a/tests/disabled/java-interop/pos/t294/Ann2.java b/tests/disabled/java-interop/pos/t294/Ann2.java
deleted file mode 100644
index 025b79e79..000000000
--- a/tests/disabled/java-interop/pos/t294/Ann2.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public @interface Ann2 {
-    public int value();
-}
diff --git a/tests/disabled/java-interop/pos/t294/Test_1.scala b/tests/disabled/java-interop/pos/t294/Test_1.scala
deleted file mode 100644
index ff1f34b10..000000000
--- a/tests/disabled/java-interop/pos/t294/Test_1.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-// also test pickling of java annotations; Test_2.scala will
-// read this class file
-@Ann(nested = Array(new Ann2(10))) class Test {
-  @Ann2(100) var ctx: Object = _
-  @Ann(nested = Array()) def foo = 10
-  @Ann(nested = Array(new Ann2(10), new Ann2(23))) val bam = -3
-}
diff --git a/tests/disabled/java-interop/pos/t294/Test_2.scala b/tests/disabled/java-interop/pos/t294/Test_2.scala
deleted file mode 100644
index 9fb1c6e17..000000000
--- a/tests/disabled/java-interop/pos/t294/Test_2.scala
+++ /dev/null
@@ -1 +0,0 @@
-class Test2 extends Test
-- 
cgit v1.2.3