Cleanup compiler test. remove unnecessary isJavaAtLeast conditions

Author: xuwei-k

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -30,7 +30,7 @@ class CompilationTests {
 
   @Test def pos: Unit = {
     implicit val testGroup: TestGroup = TestGroup("compilePos")
-    var tests = List(
+    val tests = List(
       compileFilesInDir("tests/pos", defaultOptions.and("-Wsafe-init", "-Wunused:all", "-Wshadow:private-shadow", "-Wshadow:type-parameter-shadow"), FileFilter.include(TestSources.posLintingAllowlist)),
       compileFilesInDir("tests/pos", defaultOptions.and("-Wsafe-init"), FileFilter.exclude(TestSources.posLintingAllowlist)),
       compileFilesInDir("tests/pos-deep-subtype", allowDeepSubtypes),
@@ -45,14 +45,14 @@ class CompilationTests {
       // Run tests for legacy lazy vals
       compileFilesInDir("tests/pos", defaultOptions.and("-Wsafe-init", "-Ylegacy-lazy-vals", "-Ycheck-constraint-deps"), FileFilter.include(TestSources.posLazyValsAllowlist)),
       compileDir("tests/pos-special/java-param-names", defaultOptions.withJavacOnlyOptions("-parameters")),
+      compileFilesInDir("tests/pos/java-records", defaultOptions.and("-Wsafe-init")),
+      compileFilesInDir("tests/pos/i19386", defaultOptions.and("-Wsafe-init"))
     ) ::: (
       // TODO create a folder for capture checking tests with the stdlib, or use tests/pos-custom-args/captures under this mode?
       if Properties.usingScalaLibraryCCTasty then List(compileDir("tests/pos-special/stdlib", allowDeepSubtypes))
       else Nil
     )
 
-    if scala.util.Properties.isJavaAtLeast("16") then
-      tests ::= compileFilesInDir("tests/pos-java16+", defaultOptions.and("-Wsafe-init"))
 
     aggregateTests(tests*).checkCompile()
   }

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

@@ -19,7 +19,6 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
 
   @Test
   def mrJar(): Unit = {
-    if (!Properties.isJavaAtLeast("9")) { println("skipping mrJar() on old JDK"); return }
 
     // The test fails if the same jar file gets reused. This might be a caching problem in our classpath implementation
 
@@ -61,8 +60,7 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
       assertEquals(Set("foo1", "bar1"), apiMethods(jar1, "8"))
       assertEquals(Set("foo1", "foo2", "bar1"), apiMethods(jar2, "9"))
 
-      if Properties.isJavaAtLeast("10") then
-        assertEquals(Set("foo1", "foo2", "bar1", "bar2"), apiMethods(jar3, "10"))
+      assertEquals(Set("foo1", "foo2", "bar1", "bar2"), apiMethods(jar3, "10"))
     } finally
       List(jar1, jar2, jar3).forall(path =>
         try Files.deleteIfExists(path)
@@ -72,7 +70,6 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
 
   @Test
   def ctSymTest(): Unit = {
-    if (!Properties.isJavaAtLeast("9")) { println("skipping mrJar() on old JDK"); return }
 
     def classExists(className: String, release: String): Boolean = {
       given ctx: Context = initCtx.fresh

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

@@ -6,7 +6,6 @@ import java.io.IOException
 import java.net.{URI, URL, URLClassLoader}
 import java.nio.file.{Files, Path, Paths}
 import java.util.jar.{Attributes, Manifest, JarEntry, JarOutputStream}
-import java.lang.invoke.{MethodHandles, MethodType}
 
 import org.junit.Assert._
 import org.junit.Test
@@ -46,22 +45,11 @@ class ZipArchiveTest {
   }
 
   private val bootClassLoader: ClassLoader = {
-    if (!util.Properties.isJavaAtLeast("9")) null
-    else {
-      try {
-        MethodHandles
-          .lookup()
-          .findStatic(
-            classOf[ClassLoader],
-            "getPlatformClassLoader",
-            MethodType.methodType(classOf[ClassLoader])
-          )
-          .invoke()
-          .asInstanceOf[ClassLoader]
-      } catch {
-        case _: Throwable =>
-          null
-      }
+    try {
+      ClassLoader.getPlatformClassLoader
+    } catch {
+      case _: Throwable =>
+        null
     }
   }