evicts javac-artifacts.jar

Apparently, the usual _1, _2, _3... naming scheme also works for java
files, which need to be compiled together with partests. This allows us
to get rid of javac-artifacts.jar.

3 files changed, 9 insertions, 2 deletions

diff --git a/test/files/run/t7008/Impls_Macros_1.scala b/test/files/run/t7008/Impls_Macros_2.scala
index f2eb7425f5..7a17314085 100644
--- a/test/files/run/t7008/Impls_Macros_1.scala
+++ b/test/files/run/t7008/Impls_Macros_2.scala
@@ -3,7 +3,7 @@ import scala.reflect.macros.Context
 
 object Macros {
   def impl(c: Context) = {
-    val decls = c.typeOf[JavaClassWithCheckedExceptions[_]].declarations.toList
+    val decls = c.typeOf[JavaClassWithCheckedExceptions_1[_]].declarations.toList
     val s = decls.sortBy(_.name.toString).map(decl => (s"${decl.name}: ${decl.annotations}")).mkString(scala.compat.Platform.EOL)
     c.universe.reify(println(c.literal(s).splice))
   }
diff --git a/test/files/run/t7008/JavaClassWithCheckedExceptions_1.java b/test/files/run/t7008/JavaClassWithCheckedExceptions_1.java
new file mode 100644
index 0000000000..dda2128302
--- /dev/null
+++ b/test/files/run/t7008/JavaClassWithCheckedExceptions_1.java
@@ -0,0 +1,7 @@
+class JavaClassWithCheckedExceptions_1<E1 extends Exception>  {
+  public JavaClassWithCheckedExceptions_1() throws NullPointerException {}
+
+  public void bar() throws E1 {}
+  public void baz(int x) throws IllegalStateException {}
+  public <E2 extends Exception> void foo() throws E2 {}
+}
\ No newline at end of file
diff --git a/test/files/run/t7008/Test_2.scala b/test/files/run/t7008/Test_3.scala
index b67faa327f..b2961a829e 100644
--- a/test/files/run/t7008/Test_2.scala
+++ b/test/files/run/t7008/Test_3.scala
@@ -4,6 +4,6 @@ object Test extends App {
   Macros.foo
   println("=============")
 
-  val decls = typeOf[JavaClassWithCheckedExceptions[_]].declarations.toList
+  val decls = typeOf[JavaClassWithCheckedExceptions_1[_]].declarations.toList
   decls sortBy (_.name.toString) foreach (decl => println(s"${decl.name}: ${decl.annotations}"))
 }
\ No newline at end of file