Remove tests for Kotlin Script Templates

Closes spring-projectsgh-34030

Author: sdeleuze

spring-webflux/spring-webflux.gradle

@@ -53,14 +53,12 @@ dependencies {
 	testImplementation("org.eclipse.jetty:jetty-reactive-httpclient")
 	testImplementation("org.eclipse.jetty:jetty-server")
 	testImplementation("org.hibernate:hibernate-validator")
-	testImplementation("org.jetbrains.kotlin:kotlin-script-runtime")
 	testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
 	testRuntimeOnly("com.sun.activation:jakarta.activation")
 	testRuntimeOnly("io.netty:netty5-buffer")
 	testRuntimeOnly("org.glassfish:jakarta.el")
-	testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jsr223")
 	testRuntimeOnly("org.jruby:jruby")
 	testRuntimeOnly("org.python:jython-standalone")
 	testRuntimeOnly("org.webjars:underscorejs")

spring-webflux/src/test/java/org/springframework/web/reactive/result/view/FragmentViewResolutionResultHandlerTests.java

@@ -33,7 +33,6 @@
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.BindingContext;
@@ -53,6 +52,7 @@
  * Tests for {@link Fragment} rendering through {@link ViewResolutionResultHandler}.
  *
  * @author Rossen Stoyanchev
+ * @author Sebastien Deleuze
  */
 public class FragmentViewResolutionResultHandlerTests {
 
@@ -138,8 +138,8 @@ private ViewResolutionResultHandler initHandler() {
 		AnnotationConfigApplicationContext context =
 				new AnnotationConfigApplicationContext(ScriptTemplatingConfiguration.class);
 
-		String prefix = "org/springframework/web/reactive/result/view/script/kotlin/";
-		ScriptTemplateViewResolver viewResolver = new ScriptTemplateViewResolver(prefix, ".kts");
+		String prefix = "org/springframework/web/reactive/result/view/script/jython/";
+		ScriptTemplateViewResolver viewResolver = new ScriptTemplateViewResolver(prefix, ".html");
 		viewResolver.setApplicationContext(context);
 		viewResolver.setSupportedMediaTypes(List.of(MediaType.TEXT_HTML, MediaType.TEXT_EVENT_STREAM));
 
@@ -166,18 +166,11 @@ static class ScriptTemplatingConfiguration {
 		@Bean
 		public ScriptTemplateConfigurer kotlinScriptConfigurer() {
 			ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer();
-			configurer.setEngineName("kotlin");
-			configurer.setScripts("org/springframework/web/reactive/result/view/script/kotlin/render.kts");
+			configurer.setEngineName("jython");
+			configurer.setScripts("org/springframework/web/reactive/result/view/script/jython/render.py");
 			configurer.setRenderFunction("render");
 			return configurer;
 		}
-
-		@Bean
-		public ResourceBundleMessageSource messageSource() {
-			ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
-			messageSource.setBasename("org/springframework/web/reactive/result/view/script/messages");
-			return messageSource;
-		}
 	}
 
 }

spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/KotlinScriptTemplateTests.java

@@ -0,0 +1,3 @@
+<p>
+	Hello $foo
+</p>

spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/view/script/ScriptTemplateWithBindingsExtensions.kt

@@ -0,0 +1,3 @@
+<p>
+	Hello $bar
+</p>

spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/jython/fragment1.html

@@ -60,7 +60,6 @@ dependencies {
 		exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
 	}
 	testImplementation("org.hibernate:hibernate-validator")
-	testImplementation("org.jetbrains.kotlin:kotlin-script-runtime")
 	testImplementation("org.mozilla:rhino")
 	testImplementation("org.skyscreamer:jsonassert")
 	testImplementation("org.xmlunit:xmlunit-assertj")
@@ -70,7 +69,6 @@ dependencies {
 	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
 	testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")
 	testRuntimeOnly("org.glassfish:jakarta.el")
-	testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jsr223")
 	testRuntimeOnly("org.jruby:jruby")
 	testRuntimeOnly("org.python:jython-standalone")
 	testRuntimeOnly("org.webjars:underscorejs")

spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/jython/fragment2.html

@@ -26,7 +26,6 @@
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ReactiveAdapterRegistry;
 import org.springframework.core.task.SyncTaskExecutor;
@@ -50,7 +49,9 @@
 
 /**
  * Tests for streaming of {@link ModelAndView} fragments.
+ *
  * @author Rossen Stoyanchev
+ * @author Sebastien Deleuze
  */
 public class FragmentRenderingStreamTests {
 
@@ -72,8 +73,8 @@ void setUp() {
 		AnnotationConfigApplicationContext context =
 				new AnnotationConfigApplicationContext(ScriptTemplatingConfiguration.class);
 
-		String prefix = "org/springframework/web/servlet/view/script/kotlin/";
-		ScriptTemplateViewResolver viewResolver = new ScriptTemplateViewResolver(prefix, ".kts");
+		String prefix = "org/springframework/web/servlet/view/script/jython/";
+		ScriptTemplateViewResolver viewResolver = new ScriptTemplateViewResolver(prefix, ".html");
 		viewResolver.setApplicationContext(context);
 
 		this.handler = new ResponseBodyEmitterReturnValueHandler(
@@ -165,18 +166,12 @@ static class ScriptTemplatingConfiguration {
 		@Bean
 		ScriptTemplateConfigurer kotlinScriptConfigurer() {
 			ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer();
-			configurer.setEngineName("kotlin");
-			configurer.setScripts("org/springframework/web/servlet/view/script/kotlin/render.kts");
+			configurer.setEngineName("jython");
+			configurer.setScripts("org/springframework/web/servlet/view/script/jython/render.py");
 			configurer.setRenderFunction("render");
 			return configurer;
 		}
 
-		@Bean
-		ResourceBundleMessageSource messageSource() {
-			ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
-			messageSource.setBasename("org/springframework/web/servlet/view/script/messages");
-			return messageSource;
-		}
 	}
 
 }

spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/eval.kts

@@ -21,26 +21,23 @@
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledForJreRange;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.web.servlet.view.script.ScriptTemplateConfigurer;
 import org.springframework.web.servlet.view.script.ScriptTemplateViewResolver;
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.condition.JRE.JAVA_21;
 
 /**
  * Tests for rendering through {@link DefaultFragmentsRendering}.
  *
  * @author Rossen Stoyanchev
+ * @author Sebastien Deleuze
  */
-@DisabledForJreRange(min = JAVA_21, disabledReason = "Kotlin doesn't support Java 21+ yet")
 public class DefaultFragmentsRenderingTests {
 
 	@Test
@@ -49,8 +46,8 @@ void render() throws Exception {
 		AnnotationConfigApplicationContext context =
 				new AnnotationConfigApplicationContext(ScriptTemplatingConfiguration.class);
 
-		String prefix = "org/springframework/web/servlet/view/script/kotlin/";
-		ScriptTemplateViewResolver viewResolver = new ScriptTemplateViewResolver(prefix, ".kts");
+		String prefix = "org/springframework/web/servlet/view/script/jython/";
+		ScriptTemplateViewResolver viewResolver = new ScriptTemplateViewResolver(prefix, ".html");
 		viewResolver.setApplicationContext(context);
 
 		MockHttpServletRequest request = new MockHttpServletRequest();
@@ -82,18 +79,12 @@ static class ScriptTemplatingConfiguration {
 		@Bean
 		ScriptTemplateConfigurer kotlinScriptConfigurer() {
 			ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer();
-			configurer.setEngineName("kotlin");
-			configurer.setScripts("org/springframework/web/servlet/view/script/kotlin/render.kts");
+			configurer.setEngineName("jython");
+			configurer.setScripts("org/springframework/web/servlet/view/script/jython/render.py");
 			configurer.setRenderFunction("render");
 			return configurer;
 		}
 
-		@Bean
-		ResourceBundleMessageSource messageSource() {
-			ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
-			messageSource.setBasename("org/springframework/web/servlet/view/script/messages");
-			return messageSource;
-		}
 	}
 
 }