From eca05c42fbef663c4709158ecb4762e0df61d1a3 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 18 Jan 2022 18:47:41 -0800 Subject: [PATCH] Further refine LoaderIntegrationTests for CI Update `LoaderIntegrationTests` to filter compatible JDKs early. See gh-29385 --- .../boot/loader/LoaderIntegrationTests.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java index 708e3835077..27599f773e7 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.function.Supplier; import java.util.stream.Stream; -import org.junit.Assume; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.testcontainers.containers.GenericContainer; @@ -50,7 +49,6 @@ class LoaderIntegrationTests { @ParameterizedTest @MethodSource("javaRuntimes") void readUrlsWithoutWarning(JavaRuntime javaRuntime) { - javaRuntime.assumeCompatible(); try (GenericContainer container = createContainer(javaRuntime)) { container.start(); System.out.println(this.output.toUtf8String()); @@ -79,7 +77,7 @@ class LoaderIntegrationTests { javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.ELEVEN)); javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN)); javaRuntimes.add(JavaRuntime.oracleJdk17()); - return javaRuntimes.stream(); + return javaRuntimes.stream().filter(JavaRuntime::isCompatible); } static final class JavaRuntime { @@ -96,8 +94,8 @@ class LoaderIntegrationTests { this.container = container; } - private void assumeCompatible() { - Assume.assumeTrue(JavaVersion.getJavaVersion().isEqualOrNewerThan(this.version)); + private boolean isCompatible() { + return this.version.isEqualOrNewerThan(JavaVersion.getJavaVersion()); } GenericContainer getContainer() {