bugfix: Fix tests not working on JDK 8

And enable JDK 8 tests on PRs

Author: tgodzik

.github/workflows/ci.yaml

@@ -506,7 +506,6 @@ jobs:
          || (
            github.event_name == 'pull_request'
            && !contains(github.event.pull_request.body, '[skip ci]')
-           && contains(github.event.pull_request.body, '[test_java8]')
          )
          || (
            github.event_name == 'workflow_dispatch'

compiler/test/dotty/tools/dotc/classpath/MultiReleaseJarTest.scala

@@ -15,10 +15,13 @@ import org.junit.Test
 import scala.jdk.CollectionConverters._
 import scala.util.Properties
 
+import org.junit.Assume.assumeTrue
+
 class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
 
   @Test
   def mrJar(): Unit = {
+    assumeTrue("Multi-release JARs require JDK 9+", Properties.isJavaAtLeast("9"))
 
     // The test fails if the same jar file gets reused. This might be a caching problem in our classpath implementation
 
@@ -70,6 +73,7 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
 
   @Test
   def ctSymTest(): Unit = {
+    assumeTrue("ct.sym cross-compilation requires JDK 9+", Properties.isJavaAtLeast("9"))
 
     def classExists(className: String, release: String): Boolean = {
       given ctx: Context = initCtx.fresh

compiler/test/dotty/tools/io/ZipArchiveTest.scala

@@ -44,14 +44,11 @@ class ZipArchiveTest {
     }
   }
 
-  private val bootClassLoader: ClassLoader = {
-    ClassLoader.getPlatformClassLoader
-  }
-
   private def classLoader(location: URI): ClassLoader =
-    new URLClassLoader(Array(location.toURL), bootClassLoader)
+    new URLClassLoader(Array(location.toURL), /*parent*/ null)
 
-  private def manifestAt(location: URI): URL = classLoader(location).getResource("META-INF/MANIFEST.MF")
+  private def manifestAt(location: URI): URL =
+    classLoader(location).getResource("META-INF/MANIFEST.MF")
 
 
   // ZipArchive.fromManifestURL(URL)

tests/neg/i24711-java-nested-types.check

@@ -5,11 +5,11 @@
   |                    Required: Int
   |
   | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg/i24711-java-nested-types.scala:4:38 -------------------------------------------
-4 |  val test2: Int = java.util.Map.entry("key", 1)  // error
-  |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  |                   Found:    java.util.Map.Entry[String, Int]
-  |                   Required: Int
+-- [E007] Type Mismatch Error: tests/neg/i24711-java-nested-types.scala:4:20 -------------------------------------------
+4 |  val test2: Int = (??? : java.util.Map.Entry[String, Int])  // error
+  |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |                    Found:    java.util.Map.Entry[String, Int]
+  |                    Required: Int
   |
   | longer explanation available when compiling with `-explain`
 -- [E007] Type Mismatch Error: tests/neg/i24711-java-nested-types.scala:7:20 -------------------------------------------

tests/neg/i24711-java-nested-types.scala

@@ -1,7 +1,7 @@
 class Test {
   val test1: Int = (??? : java.util.Map.Entry[String, Int])  // error
 
-  val test2: Int = java.util.Map.entry("key", 1)  // error
+  val test2: Int = (??? : java.util.Map.Entry[String, Int])  // error
 
   trait Outer { type Inner }
   val test4: Int = (??? : Outer#Inner)  // error

tests/pos/i24894b/Foo_2.scala

@@ -1 +1 @@
-@Deprecated(since = Bar.bar()) class Foo
+@SuppressWarnings(Array(Bar.bar())) class Foo

tests/run/i23245a/api.scala

@@ -7,11 +7,11 @@ package logadapter:
   trait AbstractApi[T <: AbstractLogAdapter]:
     def logAdapterFor(loggerName: String): T
     trait SelfLogging:
-      given adapter: T = logAdapterFor(this.getClass.getName)
+      given adapter: T = logAdapterFor("TestLogger")
       // workaround:
-      //given () => T = logAdapterFor(this.getClass.getName)
+      //given () => T = logAdapterFor("TestLogger")
       // or
-      //private val adapter = logAdapterFor(this.getClass.getName)
+      //private val adapter = logAdapterFor("TestLogger")
       //given T = adapter
       // or just pollute the interface so it's never taken as pure
       //private val z = 42

tests/run/i24553.check

@@ -1,11 +1,11 @@
 public boolean java.lang.Object.equals(java.lang.Object)
 public final native java.lang.Class<?> java.lang.Object.getClass()
-public native int java.lang.Object.hashCode()
-public int Foo.hello()
 public final native void java.lang.Object.notify()
 public final native void java.lang.Object.notifyAll()
-public java.lang.String java.lang.Object.toString()
-public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException
-public final void java.lang.Object.wait() throws java.lang.InterruptedException
 public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException
+public final void java.lang.Object.wait() throws java.lang.InterruptedException
+public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException
+public int Foo.hello()
 public int Foo.x()
+public java.lang.String java.lang.Object.toString()
+public native int java.lang.Object.hashCode()

tests/run/i24553.scala

@@ -4,5 +4,5 @@ class Foo:
     val x: hello.type = ???
 
 @main def Test =
-    val mtds = classOf[Foo].getMethods().sortBy(_.getName())
+    val mtds = classOf[Foo].getMethods().sortBy(_.toGenericString())
     for mtd <- mtds do println(mtd.toGenericString())