spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-01 06:49:42 +00:00
Code Issues Projects Releases Wiki Activity

Fix tests regarding Native Image baseline on JDKs < 25

Browse Source 
See gh-47433
This commit is contained in:
Moritz Halbritter
2025-10-15 12:17:37 +02:00
parent 2890bd8382
commit 57532c62be
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
+2 -2
View File
@@ -1661,13 +1661,13 @@ public class SpringApplication {
/**
* Exception which is thrown if GraalVM's native-image requirements aren't met.
*/
private static final class NativeImageRequirementsNotMetException extends RuntimeException {
static final class NativeImageRequirementsNotMetException extends RuntimeException {
/**
* Creates a new {@link NativeImageRequirementsNotMetException} instance.
* @param message the message
*/
private NativeImageRequirementsNotMetException(String message) {
NativeImageRequirementsNotMetException(String message) {
super(message);
}
core/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
+21
View File
@@ -37,6 +37,8 @@ import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentMatcher;
import org.mockito.ArgumentMatchers;
@@ -57,6 +59,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanNameGenerator;
import org.springframework.beans.factory.support.DefaultBeanNameGenerator;
import org.springframework.boot.Banner.Mode;
import org.springframework.boot.SpringApplication.NativeImageRequirementsNotMetException;
import org.springframework.boot.availability.AvailabilityChangeEvent;
import org.springframework.boot.availability.AvailabilityState;
import org.springframework.boot.availability.LivenessState;
@@ -744,6 +747,24 @@ class SpringApplicationTests {
@Test
@ForkedClassPath
@EnabledForJreRange(max = JRE.JAVA_24)
void nativeImageShouldCheckForJava25() {
System.setProperty("org.graalvm.nativeimage.imagecode", "true");
try {
SpringApplication application = new SpringApplication();
application.setWebApplicationType(WebApplicationType.NONE);
assertThatExceptionOfType(NativeImageRequirementsNotMetException.class).isThrownBy(application::run)
.withMessage(
"Native Image requirements not met, please upgrade it. Native Image must support at least Java 25");
}
finally {
System.clearProperty("org.graalvm.nativeimage.imagecode");
}
}
@Test
@ForkedClassPath
@EnabledForJreRange(min = JRE.JAVA_25)
void failureInANativeImageWritesFailureToSystemOut(CapturedOutput output) {
System.setProperty("org.graalvm.nativeimage.imagecode", "true");
try {