From ebd80bdd6c184fd29eeb36bdd227bed208e76bcc Mon Sep 17 00:00:00 2001
From: Brian Clozel <brian.clozel@broadcom.com>
Date: Wed, 29 Jan 2025 15:23:54 +0100
Subject: [PATCH] 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.
---
 .../result/view/freemarker/FreeMarkerMacroTests.java      | 8 --------
 .../web/reactive/result/view/freemarker/test-macro.ftl    | 3 ---
 .../web/servlet/view/freemarker/FreeMarkerMacroTests.java | 8 --------
 .../springframework/web/servlet/view/freemarker/test.ftl  | 3 ---
 4 files changed, 22 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 8a647bdb1e1..10084f9a100 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,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 {
 
 	}
 
-	@Test
-	@DisabledForJreRange(min = JRE.JAVA_21)
-	public void age() throws Exception {
-		testMacroOutput("AGE", "99");
-	}
-
 	@Test
 	void message() throws Exception {
 		testMacroOutput("MESSAGE", "Howdy Mundo");
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 168c4c6aab3..4ce3dfdfec4 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
@@ -6,9 +6,6 @@ test template for FreeMarker macro support
 NAME
 ${command.name}
 
-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 79bac00e11b..5d61c927b3c 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,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 {
 		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");
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 b6fb4caf4ea..ffce5d5d480 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
@@ -6,9 +6,6 @@ test template for FreeMarker macro test class
 NAME
 ${command.name}
 
-AGE
-${command.age}
-
 MESSAGE
 <@spring.message "hello"/> <@spring.message "world"/>