Browse Source

Delete failing Freemarker test

This test was already ignored as of Java 21 because of a Java behavior
change, and now it started failing as of 17.0.14.
This commit removes the test entirely.
6.1.x
Brian Clozel 11 months ago committed by Stéphane Nicoll
parent
commit
ebd80bdd6c
  1. 8
      spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerMacroTests.java
  2. 3
      spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/freemarker/test-macro.ftl
  3. 8
      spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
  4. 3
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/freemarker/test.ftl

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

@ -28,8 +28,6 @@ import java.util.Map; @@ -28,8 +28,6 @@ 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 reactor.test.StepVerifier;
@ -125,12 +123,6 @@ class FreeMarkerMacroTests { @@ -125,12 +123,6 @@ class FreeMarkerMacroTests {
}
@Test
@DisabledForJreRange(min = JRE.JAVA_21)
public void age() throws Exception {
testMacroOutput("AGE", "99");
}
@Test
void message() throws Exception {
testMacroOutput("MESSAGE", "Howdy Mundo");

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

@ -6,9 +6,6 @@ test template for FreeMarker macro support @@ -6,9 +6,6 @@ test template for FreeMarker macro support
NAME
${command.name}
AGE
${command.age}
MESSAGE
<@spring.message "hello"/> <@spring.message "world"/>

8
spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java

@ -31,8 +31,6 @@ import jakarta.servlet.ServletException; @@ -31,8 +31,6 @@ 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;
@ -146,12 +144,6 @@ public class FreeMarkerMacroTests { @@ -146,12 +144,6 @@ public class FreeMarkerMacroTests {
assertThat(getMacroOutput("NAME")).isEqualTo("Darren");
}
@Test
@DisabledForJreRange(min = JRE.JAVA_21)
public void testAge() throws Exception {
assertThat(getMacroOutput("AGE")).isEqualTo("99");
}
@Test
void testMessage() throws Exception {
assertThat(getMacroOutput("MESSAGE")).isEqualTo("Howdy Mundo");

3
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/freemarker/test.ftl

@ -6,9 +6,6 @@ test template for FreeMarker macro test class @@ -6,9 +6,6 @@ test template for FreeMarker macro test class
NAME
${command.name}
AGE
${command.age}
MESSAGE
<@spring.message "hello"/> <@spring.message "world"/>

Loading…
Cancel
Save