From e3db31dcd7d193e2b6576198d947392d55aba5f0 Mon Sep 17 00:00:00 2001 From: Caesar Ralf Date: Fri, 6 Oct 2023 17:14:35 +0200 Subject: [PATCH] Switch test only in java >= 12 --- src/test/java/com/spotify/fmt/FMTTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/spotify/fmt/FMTTest.java b/src/test/java/com/spotify/fmt/FMTTest.java index d8dd4e0..adfa3df 100644 --- a/src/test/java/com/spotify/fmt/FMTTest.java +++ b/src/test/java/com/spotify/fmt/FMTTest.java @@ -177,7 +177,7 @@ public void forkAlways() throws Exception { @Test public void forkNeverBeforeJDK16() throws Exception { - assumeFalse(javaRuntimeStronglyEncapsulatesByDefault()); // Skip if forking is needed. + assumeFalse(isJavaVersionEqualOrHigherThan("16")); // Skip if forking is needed. FMT fmt = loadMojo("fork_never_beforejdk16", FORMAT); assertThat(fmt.shouldFork()).isFalse(); fmt.execute(); @@ -189,7 +189,7 @@ public void forkNeverBeforeJDK16() throws Exception { expected = IllegalAccessError.class) // Could stop throwing this if google-java-format is fixed. public void forkNeverAfterJDK16() throws Exception { - assumeTrue(javaRuntimeStronglyEncapsulatesByDefault()); // Skip if forking is not needed. + assumeTrue(isJavaVersionEqualOrHigherThan("16")); FMT fmt = loadMojo("fork_never_afterjdk16", FORMAT); assertThat(fmt.shouldFork()).isFalse(); fmt.execute(); @@ -207,6 +207,7 @@ public void unsupportedForkMode() throws Exception { @Test public void switchWithArrows() throws Exception { + assumeTrue(isJavaVersionEqualOrHigherThan("12")); FMT fmt = loadMojo("switchwitharrows", FORMAT); fmt.execute(); @@ -331,7 +332,7 @@ private Log setupLogSpy(Mojo mojo) { return spy; } - private static boolean javaRuntimeStronglyEncapsulatesByDefault() { - return Runtime.version().compareTo(Runtime.Version.parse("16")) >= 0; + private static boolean isJavaVersionEqualOrHigherThan(final String javaVersion) { + return Runtime.version().compareTo(Runtime.Version.parse(javaVersion)) >= 0; } }