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

Ignore some FreeMarker tests for JDK21

Browse Source 
This reverts commit 07a5d8c91 and instead disables the relevant
FreeMarker tests for JDK21+ runs.
This commit is contained in:
Brian Clozel
2023-05-11 17:36:22 +02:00
parent 07a5d8c91c
commit a91effcd86
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerMacroTests.java
View File

@@ -28,6 +28,8 @@ import java.util.Map;
import freemarker.template.Configuration; import freemarker.template.Configuration;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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 reactor.core.publisher.Mono;
import org.springframework.beans.testfixture.beans.TestBean; import org.springframework.beans.testfixture.beans.TestBean;
@@ -116,6 +118,7 @@ public class FreeMarkerMacroTests {
} }
@Test @Test
@DisabledForJreRange(min = JRE.JAVA_21)
public void age() throws Exception { public void age() throws Exception {
assertThat(getMacroOutput("AGE")).containsExactly("99"); assertThat(getMacroOutput("AGE")).containsExactly("99");
} }

2
spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/freemarker/test-macro.ftl
View File

@@ -7,7 +7,7 @@ NAME
${command.name} ${command.name}
AGE AGE
${command.age()} ${command.age}
MESSAGE MESSAGE
<@spring.message "hello"/> <@spring.message "world"/> <@spring.message "hello"/> <@spring.message "world"/>

3
spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
View File

@@ -31,6 +31,8 @@ import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; 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.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
@@ -145,6 +147,7 @@ public class FreeMarkerMacroTests {
} }
@Test @Test
@DisabledForJreRange(min = JRE.JAVA_21)
public void testAge() throws Exception { public void testAge() throws Exception {
assertThat(getMacroOutput("AGE")).isEqualTo("99"); assertThat(getMacroOutput("AGE")).isEqualTo("99");
} }

2
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/freemarker/test.ftl
View File

@@ -7,7 +7,7 @@ NAME
${command.name} ${command.name}
AGE AGE
${command.age()} ${command.age}
MESSAGE MESSAGE
<@spring.message "hello"/> <@spring.message "world"/> <@spring.message "hello"/> <@spring.message "world"/>