Skip to content

Commit ebd80bd

Browse files
bclozelsnicoll
authored andcommitted
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.
1 parent a4fc68b commit ebd80bd

File tree

4 files changed

+0
-22
lines changed

4 files changed

+0
-22
lines changed

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

-8
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
import freemarker.template.Configuration;
2929
import org.junit.jupiter.api.BeforeEach;
3030
import org.junit.jupiter.api.Test;
31-
import org.junit.jupiter.api.condition.DisabledForJreRange;
32-
import org.junit.jupiter.api.condition.JRE;
3331
import reactor.core.publisher.Mono;
3432
import reactor.test.StepVerifier;
3533

@@ -125,12 +123,6 @@ private void testMacroOutput(String name, String... contents) throws Exception {
125123

126124
}
127125

128-
@Test
129-
@DisabledForJreRange(min = JRE.JAVA_21)
130-
public void age() throws Exception {
131-
testMacroOutput("AGE", "99");
132-
}
133-
134126
@Test
135127
void message() throws Exception {
136128
testMacroOutput("MESSAGE", "Howdy Mundo");

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

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ test template for FreeMarker macro support
66
NAME
77
${command.name}
88

9-
AGE
10-
${command.age}
11-
129
MESSAGE
1310
<@spring.message "hello"/> <@spring.message "world"/>
1411

Diff for: spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java

-8
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
import jakarta.servlet.http.HttpServletResponse;
3232
import org.junit.jupiter.api.BeforeEach;
3333
import org.junit.jupiter.api.Test;
34-
import org.junit.jupiter.api.condition.DisabledForJreRange;
35-
import org.junit.jupiter.api.condition.JRE;
3634

3735
import org.springframework.beans.testfixture.beans.TestBean;
3836
import org.springframework.core.io.ClassPathResource;
@@ -146,12 +144,6 @@ void testName() throws Exception {
146144
assertThat(getMacroOutput("NAME")).isEqualTo("Darren");
147145
}
148146

149-
@Test
150-
@DisabledForJreRange(min = JRE.JAVA_21)
151-
public void testAge() throws Exception {
152-
assertThat(getMacroOutput("AGE")).isEqualTo("99");
153-
}
154-
155147
@Test
156148
void testMessage() throws Exception {
157149
assertThat(getMacroOutput("MESSAGE")).isEqualTo("Howdy Mundo");

Diff for: spring-webmvc/src/test/resources/org/springframework/web/servlet/view/freemarker/test.ftl

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ test template for FreeMarker macro test class
66
NAME
77
${command.name}
88

9-
AGE
10-
${command.age}
11-
129
MESSAGE
1310
<@spring.message "hello"/> <@spring.message "world"/>
1411

0 commit comments

Comments
 (0)