Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x

Browse Source
This commit is contained in:
Phillip Webb
2022-01-18 18:48:53 -08:00
parent 8aacf4cb36 f6cdc27b2a
commit e95c514fd5
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
View File

@@ -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() {