Skip to content

Commit a02ffa4

Browse files
committed
Cleanup compiler test. remove unnecessary isJavaAtLeast conditions
1 parent 7eab684 commit a02ffa4

File tree

3 files changed

+15
-22
lines changed

3 files changed

+15
-22
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ class CompilationTests {
5151
else Nil
5252
)
5353

54-
if scala.util.Properties.isJavaAtLeast("16") then
55-
tests ::= compileFilesInDir("tests/pos-java16+", defaultOptions.and("-Wsafe-init"))
54+
tests ::= compileFilesInDir("tests/pos-java16+", defaultOptions.and("-Wsafe-init"))
5655

5756
aggregateTests(tests*).checkCompile()
5857
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
1919

2020
@Test
2121
def mrJar(): Unit = {
22-
if (!Properties.isJavaAtLeast("9")) { println("skipping mrJar() on old JDK"); return }
2322

2423
// The test fails if the same jar file gets reused. This might be a caching problem in our classpath implementation
2524

@@ -61,8 +60,7 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
6160
assertEquals(Set("foo1", "bar1"), apiMethods(jar1, "8"))
6261
assertEquals(Set("foo1", "foo2", "bar1"), apiMethods(jar2, "9"))
6362

64-
if Properties.isJavaAtLeast("10") then
65-
assertEquals(Set("foo1", "foo2", "bar1", "bar2"), apiMethods(jar3, "10"))
63+
assertEquals(Set("foo1", "foo2", "bar1", "bar2"), apiMethods(jar3, "10"))
6664
} finally
6765
List(jar1, jar2, jar3).forall(path =>
6866
try Files.deleteIfExists(path)
@@ -72,7 +70,6 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
7270

7371
@Test
7472
def ctSymTest(): Unit = {
75-
if (!Properties.isJavaAtLeast("9")) { println("skipping mrJar() on old JDK"); return }
7673

7774
def classExists(className: String, release: String): Boolean = {
7875
given ctx: Context = initCtx.fresh

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

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,19 @@ class ZipArchiveTest {
4646
}
4747

4848
private val bootClassLoader: ClassLoader = {
49-
if (!util.Properties.isJavaAtLeast("9")) null
50-
else {
51-
try {
52-
MethodHandles
53-
.lookup()
54-
.findStatic(
55-
classOf[ClassLoader],
56-
"getPlatformClassLoader",
57-
MethodType.methodType(classOf[ClassLoader])
58-
)
59-
.invoke()
60-
.asInstanceOf[ClassLoader]
61-
} catch {
62-
case _: Throwable =>
63-
null
64-
}
49+
try {
50+
MethodHandles
51+
.lookup()
52+
.findStatic(
53+
classOf[ClassLoader],
54+
"getPlatformClassLoader",
55+
MethodType.methodType(classOf[ClassLoader])
56+
)
57+
.invoke()
58+
.asInstanceOf[ClassLoader]
59+
} catch {
60+
case _: Throwable =>
61+
null
6562
}
6663
}
6764

0 commit comments

Comments
 (0)