From a91effcd86eae8ff5e9e47b88c7ef82fd40b341c Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 11 May 2023 17:36:22 +0200 Subject: [PATCH] Ignore some FreeMarker tests for JDK21 This reverts commit 07a5d8c91 and instead disables the relevant FreeMarker tests for JDK21+ runs. --- .../reactive/result/view/freemarker/FreeMarkerMacroTests.java | 3 +++ .../web/reactive/result/view/freemarker/test-macro.ftl | 2 +- .../web/servlet/view/freemarker/FreeMarkerMacroTests.java | 3 +++ .../org/springframework/web/servlet/view/freemarker/test.ftl | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerMacroTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerMacroTests.java index 7bf09e1c4e..6cb164d6c6 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerMacroTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerMacroTests.java @@ -28,6 +28,8 @@ import java.util.Map; import freemarker.template.Configuration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledForJreRange; +import org.junit.jupiter.api.condition.JRE; import reactor.core.publisher.Mono; import org.springframework.beans.testfixture.beans.TestBean; @@ -116,6 +118,7 @@ public class FreeMarkerMacroTests { } @Test + @DisabledForJreRange(min = JRE.JAVA_21) public void age() throws Exception { assertThat(getMacroOutput("AGE")).containsExactly("99"); } diff --git a/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/freemarker/test-macro.ftl b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/freemarker/test-macro.ftl index dd2ff4aaaf..168c4c6aab 100644 --- a/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/freemarker/test-macro.ftl +++ b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/freemarker/test-macro.ftl @@ -7,7 +7,7 @@ NAME ${command.name} AGE -${command.age()} +${command.age} MESSAGE <@spring.message "hello"/> <@spring.message "world"/> diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java index afbb145927..8e7c54946a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java @@ -31,6 +31,8 @@ import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledForJreRange; +import org.junit.jupiter.api.condition.JRE; import org.springframework.beans.testfixture.beans.TestBean; import org.springframework.core.io.ClassPathResource; @@ -145,6 +147,7 @@ public class FreeMarkerMacroTests { } @Test + @DisabledForJreRange(min = JRE.JAVA_21) public void testAge() throws Exception { assertThat(getMacroOutput("AGE")).isEqualTo("99"); } diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/freemarker/test.ftl b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/freemarker/test.ftl index e65774ed96..b6fb4caf4e 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/freemarker/test.ftl +++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/freemarker/test.ftl @@ -7,7 +7,7 @@ NAME ${command.name} AGE -${command.age()} +${command.age} MESSAGE <@spring.message "hello"/> <@spring.message "world"/>