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

Remove tests for Kotlin Script Templates

Browse Source 
Closes gh-34030
This commit is contained in:
Sébastien Deleuze
2024-12-05 10:59:02 +01:00
parent 3eb5b8263b
commit edce3029a2
27 changed files with 28 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/FragmentRenderingStreamTests.java
View File

@@ -26,7 +26,6 @@ import reactor.core.publisher.Flux;
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 @@ import static org.springframework.web.testfixture.method.ResolvableMethod.on;
/**
* Tests for streaming of {@link ModelAndView} fragments.
*
* @author Rossen Stoyanchev
* @author Sebastien Deleuze
*/
public class FragmentRenderingStreamTests {
@@ -72,8 +73,8 @@ public class FragmentRenderingStreamTests {
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 @@ public class FragmentRenderingStreamTests {
@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;
}
}
}

19
spring-webmvc/src/test/java/org/springframework/web/servlet/view/DefaultFragmentsRenderingTests.java
View File

@@ -21,26 +21,23 @@ import java.util.Locale;
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 @@ public class DefaultFragmentsRenderingTests {
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 @@ public class DefaultFragmentsRenderingTests {
@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;
}
}
}

142
spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/KotlinScriptTemplateTests.java
View File

@@ -1,142 +0,0 @@
/*
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.servlet.view.script;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import jakarta.servlet.ServletContext;
import org.junit.jupiter.api.BeforeEach;
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.context.WebApplicationContext;
import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
import org.springframework.web.testfixture.servlet.MockServletContext;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.condition.JRE.JAVA_21;
import static org.mockito.Mockito.mock;
/**
* Tests for Kotlin script templates running on Kotlin JSR-223 support.
*
* @author Sebastien Deleuze
* @author Sam Brannen
*/
@DisabledForJreRange(min = JAVA_21, disabledReason = "Kotlin doesn't support Java 21+ yet")
class KotlinScriptTemplateTests {
private WebApplicationContext webAppContext = mock();
private ServletContext servletContext = new MockServletContext();
@BeforeEach
void setup() {
this.servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this.webAppContext);
}
@Test
void renderTemplateWithFrenchLocale() throws Exception {
Map<String, Object> model = new HashMap<>();
model.put("foo", "Foo");
String url = "org/springframework/web/servlet/view/script/kotlin/template.kts";
MockHttpServletResponse response = render(url, model, Locale.FRENCH, ScriptTemplatingConfiguration.class);
assertThat(response.getContentAsString()).isEqualTo("<html><body>\n<p>Bonjour Foo</p>\n</body></html>");
}
@Test
void renderTemplateWithEnglishLocale() throws Exception {
Map<String, Object> model = new HashMap<>();
model.put("foo", "Foo");
String url = "org/springframework/web/servlet/view/script/kotlin/template.kts";
MockHttpServletResponse response = render(url, model, Locale.ENGLISH, ScriptTemplatingConfiguration.class);
assertThat(response.getContentAsString()).isEqualTo("<html><body>\n<p>Hello Foo</p>\n</body></html>");
}
@Test
void renderTemplateWithoutRenderFunction() throws Exception {
Map<String, Object> model = new HashMap<>();
model.put("header", "<html><body>");
model.put("hello", "Hello");
model.put("foo", "Foo");
model.put("footer", "</body></html>");
MockHttpServletResponse response = render("org/springframework/web/servlet/view/script/kotlin/eval.kts",
model, Locale.ENGLISH, ScriptTemplatingConfigurationWithoutRenderFunction.class);
assertThat(response.getContentAsString()).isEqualTo("<html><body>\n<p>Hello Foo</p>\n</body></html>");
}
private static MockHttpServletResponse render(String viewUrl, Map<String, Object> model,
Locale locale, Class<?> configuration) throws Exception {
ScriptTemplateView view = createViewWithUrl(viewUrl, configuration);
MockHttpServletResponse response = new MockHttpServletResponse();
MockHttpServletRequest request = new MockHttpServletRequest();
request.addPreferredLocale(locale);
view.renderMergedOutputModel(model, request, response);
return response;
}
private static ScriptTemplateView createViewWithUrl(String viewUrl, Class<?> configuration) throws Exception {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(configuration);
ScriptTemplateView view = new ScriptTemplateView();
view.setApplicationContext(ctx);
view.setUrl(viewUrl);
view.afterPropertiesSet();
return view;
}
@Configuration
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.setRenderFunction("render");
return configurer;
}
@Bean
ResourceBundleMessageSource messageSource() {
ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
messageSource.setBasename("org/springframework/web/servlet/view/script/messages");
return messageSource;
}
}
@Configuration
static class ScriptTemplatingConfigurationWithoutRenderFunction {
@Bean
ScriptTemplateConfigurer kotlinScriptConfigurer() {
return new ScriptTemplateConfigurer("kotlin");
}
}
}

16
spring-webmvc/src/test/kotlin/org/springframework/web/servlet/view/script/ScriptTemplateWithBindingsExtensions.kt
View File

@@ -1,16 +0,0 @@
@file:Suppress("UNCHECKED_CAST")
package org.springframework.web.servlet.view.script
import kotlin.script.templates.standard.ScriptTemplateWithBindings
fun ScriptTemplateWithBindings.include(path: String) =
(bindings["include"] as (String) -> String).invoke(path)
fun ScriptTemplateWithBindings.i18n(code: String) =
(bindings["i18n"] as (String) -> String).invoke(code)
var ScriptTemplateWithBindings.foo: String
get() = bindings["foo"] as String
set(@Suppress("UNUSED_PARAMETER") value) { throw UnsupportedOperationException()}

3
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jython/fragment1.html Normal file
View File

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

3
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jython/fragment2.html Normal file
View File

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

4
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/eval.kts
View File

@@ -1,4 +0,0 @@
// TODO Improve syntax when KT-15125 will be fixed
"""${bindings["header"]}
<p>${bindings["hello"]} ${bindings["foo"]}</p>
${bindings["footer"]}"""

1
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/footer.html
View File

@@ -1 +0,0 @@
</body></html>

6
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/fragment1.kts
View File

@@ -1,6 +0,0 @@
import org.springframework.web.servlet.view.script.*
"""
|<p>
| ${i18n("hello")} $foo
|</p>""".trimMargin()

6
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/fragment2.kts
View File

@@ -1,6 +0,0 @@
import org.springframework.web.servlet.view.script.*
"""
|<p>
| ${i18n("hello")} $bar
|</p>""".trimMargin()

1
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/header.html
View File

@@ -1 +0,0 @@
<html><body>

15
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/render.kts
View File

@@ -1,15 +0,0 @@
import javax.script.*
import org.springframework.web.servlet.view.script.RenderingContext
import org.springframework.context.support.ResourceBundleMessageSource
import org.springframework.beans.factory.getBean
fun render(template: String, model: Map<String, Any>, renderingContext: RenderingContext): String {
val engine = ScriptEngineManager().getEngineByName("kotlin")
val bindings = SimpleBindings()
bindings.putAll(model)
var messageSource = renderingContext.applicationContext.getBean<ResourceBundleMessageSource>()
bindings.put("i18n", { code: String -> messageSource.getMessage(code, null, renderingContext.locale) })
bindings.put("include", { path: String -> renderingContext.templateLoader.apply("org/springframework/web/servlet/view/script/kotlin/$path.html") })
return engine.eval(template, bindings) as String
}

5
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/template.kts
View File

@@ -1,5 +0,0 @@
import org.springframework.web.servlet.view.script.*
"""${include("header") }
<p>${i18n("hello")} $foo</p>
${include("footer")}"""