From 7919364db60ffd5b8e70fd1f900ce5f265fe3353 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Tue, 5 May 2015 11:38:47 +0200 Subject: [PATCH] Polish script based view tests Issue: SPR-12266 --- build.gradle | 4 - .../web/servlet/config/MvcNamespaceTests.java | 3 +- .../HandlebarsNashornScriptTemplateTests.java | 99 ------------- ...sts.java => JrubyScriptTemplateTests.java} | 8 +- ...ts.java => JythonScriptTemplateTests.java} | 6 +- ...s.java => NashornScriptTemplateTests.java} | 11 +- .../ReactNashornScriptTemplateTests.java | 131 ------------------ .../config/mvc-config-view-resolution.xml | 4 +- .../view/script/handlebars/polyfill.js | 1 - .../servlet/view/script/handlebars/render.js | 5 - .../view/script/{erb => jruby}/render.rb | 0 .../view/script/{erb => jruby}/template.erb | 0 .../view/script/{python => jython}/render.py | 0 .../script/{python => jython}/template.html | 0 .../view/script/mustache/template.html | 1 - .../web/servlet/view/script/nashorn/render.js | 3 + .../{handlebars => nashorn}/template.html | 0 .../web/servlet/view/script/react/polyfill.js | 5 - .../web/servlet/view/script/react/render.js | 13 -- .../web/servlet/view/script/react/template.js | 5 - .../servlet/view/script/react/template.jsx | 5 - 21 files changed, 18 insertions(+), 286 deletions(-) delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/HandlebarsNashornScriptTemplateTests.java rename spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/{ErbJrubyScriptTemplateTests.java => JrubyScriptTemplateTests.java} (94%) rename spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/{StringJythonScriptTemplateTests.java => JythonScriptTemplateTests.java} (96%) rename spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/{MustacheNashornScriptTemplateTests.java => NashornScriptTemplateTests.java} (89%) delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ReactNashornScriptTemplateTests.java delete mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/polyfill.js delete mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/render.js rename spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/{erb => jruby}/render.rb (100%) rename spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/{erb => jruby}/template.erb (100%) rename spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/{python => jython}/render.py (100%) rename spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/{python => jython}/template.html (100%) delete mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/mustache/template.html create mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/nashorn/render.js rename spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/{handlebars => nashorn}/template.html (100%) delete mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/polyfill.js delete mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/render.js delete mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/template.js delete mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/template.jsx diff --git a/build.gradle b/build.gradle index dcca5700206..f1c8797abd9 100644 --- a/build.gradle +++ b/build.gradle @@ -901,10 +901,6 @@ project("spring-webmvc") { testCompile("commons-io:commons-io:1.3") testCompile("joda-time:joda-time:${jodaVersion}") testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") - testCompile("org.webjars:mustachejs:0.8.2") - testCompile("org.webjars:handlebars:3.0.0-1") - testCompile("org.webjars:react:0.12.2") - testCompile("org.webjars:underscorejs:1.8.2") testCompile("org.jruby:jruby:${jrubyVersion}") testCompile("org.python:jython-standalone:2.5.3") } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java index 5a302e19ba2..fa3bc94ddfc 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java @@ -800,11 +800,10 @@ public class MvcNamespaceTests { ScriptTemplateConfigurer scriptTemplateConfigurer = appContext.getBean(ScriptTemplateConfigurer.class); assertNotNull(scriptTemplateConfigurer); - assertEquals("Mustache", scriptTemplateConfigurer.getRenderObject()); assertEquals("render", scriptTemplateConfigurer.getRenderFunction()); assertEquals(StandardCharsets.ISO_8859_1, scriptTemplateConfigurer.getCharset()); assertEquals("classpath:", scriptTemplateConfigurer.getResourceLoaderPath()); - String[] scripts = { "/META-INF/resources/webjars/mustachejs/0.8.2/mustache.js" }; + String[] scripts = { "org/springframework/web/servlet/view/script/nashorn/render.js" }; accessor = new DirectFieldAccessor(scriptTemplateConfigurer); assertArrayEquals(scripts, (String[]) accessor.getPropertyValue("scripts")); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/HandlebarsNashornScriptTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/HandlebarsNashornScriptTemplateTests.java deleted file mode 100644 index 813eaf1f7a9..00000000000 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/HandlebarsNashornScriptTemplateTests.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2002-2015 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 - * - * http://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.Map; -import javax.servlet.ServletContext; - -import static org.junit.Assert.assertEquals; -import org.junit.Before; -import org.junit.Test; -import static org.mockito.Mockito.mock; - -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.mock.web.test.MockHttpServletRequest; -import org.springframework.mock.web.test.MockHttpServletResponse; -import org.springframework.mock.web.test.MockServletContext; -import org.springframework.web.context.WebApplicationContext; - -/** - * Unit tests for Handlebars templates running on Nashorn Javascript engine. - * - * @author Sebastien Deleuze - */ -public class HandlebarsNashornScriptTemplateTests { - - private WebApplicationContext webAppContext; - - private ServletContext servletContext; - - @Before - public void setup() { - this.webAppContext = mock(WebApplicationContext.class); - this.servletContext = new MockServletContext(); - this.servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this.webAppContext); - } - - @Test - public void renderTemplate() throws Exception { - Map model = new HashMap<>(); - model.put("title", "Layout example"); - model.put("body", "This is the body"); - MockHttpServletResponse response = renderViewWithModel("org/springframework/web/servlet/view/script/handlebars/template.html", model); - assertEquals("Layout example

This is the body

", - response.getContentAsString()); - } - - private MockHttpServletResponse renderViewWithModel(String viewUrl, Map model) throws Exception { - ScriptTemplateView view = createViewWithUrl(viewUrl); - MockHttpServletResponse response = new MockHttpServletResponse(); - MockHttpServletRequest request = new MockHttpServletRequest(); - view.renderMergedOutputModel(model, request, response); - return response; - } - - private ScriptTemplateView createViewWithUrl(String viewUrl) throws Exception { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - ctx.register(ScriptTemplatingConfiguration.class); - ctx.refresh(); - - ScriptTemplateView view = new ScriptTemplateView(); - view.setApplicationContext(ctx); - view.setUrl(viewUrl); - view.afterPropertiesSet(); - return view; - } - - @Configuration - static class ScriptTemplatingConfiguration { - - @Bean - public ScriptTemplateConfigurer handlebarsConfigurer() { - ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer(); - configurer.setEngineName("nashorn"); - configurer.setScripts( "org/springframework/web/servlet/view/script/handlebars/polyfill.js", - "/META-INF/resources/webjars/handlebars/3.0.0-1/handlebars.js", - "org/springframework/web/servlet/view/script/handlebars/render.js"); - configurer.setRenderFunction("render"); - return configurer; - } - } - -} diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ErbJrubyScriptTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JrubyScriptTemplateTests.java similarity index 94% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ErbJrubyScriptTemplateTests.java rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JrubyScriptTemplateTests.java index ca1b5dc49fc..12d2b811152 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ErbJrubyScriptTemplateTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JrubyScriptTemplateTests.java @@ -38,7 +38,7 @@ import org.springframework.web.context.WebApplicationContext; * * @author Sebastien Deleuze */ -public class ErbJrubyScriptTemplateTests { +public class JRubyScriptTemplateTests { private WebApplicationContext webAppContext; @@ -56,7 +56,7 @@ public class ErbJrubyScriptTemplateTests { Map model = new HashMap<>(); model.put("title", "Layout example"); model.put("body", "This is the body"); - MockHttpServletResponse response = renderViewWithModel("org/springframework/web/servlet/view/script/erb/template.erb", model); + MockHttpServletResponse response = renderViewWithModel("org/springframework/web/servlet/view/script/jruby/template.erb", model); assertEquals("Layout example

This is the body

", response.getContentAsString()); } @@ -85,9 +85,9 @@ public class ErbJrubyScriptTemplateTests { static class ScriptTemplatingConfiguration { @Bean - public ScriptTemplateConfigurer jrubyConfigurer() { + public ScriptTemplateConfigurer jRubyConfigurer() { ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer(); - configurer.setScripts("org/springframework/web/servlet/view/script/erb/render.rb"); + configurer.setScripts("org/springframework/web/servlet/view/script/jruby/render.rb"); configurer.setEngineName("jruby"); configurer.setRenderFunction("render"); return configurer; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/StringJythonScriptTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JythonScriptTemplateTests.java similarity index 96% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/StringJythonScriptTemplateTests.java rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JythonScriptTemplateTests.java index 1a710f8413b..16cc9559930 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/StringJythonScriptTemplateTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JythonScriptTemplateTests.java @@ -38,7 +38,7 @@ import org.springframework.web.context.WebApplicationContext; * * @author Sebastien Deleuze */ -public class StringJythonScriptTemplateTests { +public class JythonScriptTemplateTests { private WebApplicationContext webAppContext; @@ -56,7 +56,7 @@ public class StringJythonScriptTemplateTests { Map model = new HashMap<>(); model.put("title", "Layout example"); model.put("body", "This is the body"); - MockHttpServletResponse response = renderViewWithModel("org/springframework/web/servlet/view/script/python/template.html", model); + MockHttpServletResponse response = renderViewWithModel("org/springframework/web/servlet/view/script/jython/template.html", model); assertEquals("Layout example

This is the body

", response.getContentAsString()); } @@ -87,7 +87,7 @@ public class StringJythonScriptTemplateTests { @Bean public ScriptTemplateConfigurer jythonConfigurer() { ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer(); - configurer.setScripts("org/springframework/web/servlet/view/script/python/render.py"); + configurer.setScripts("org/springframework/web/servlet/view/script/jython/render.py"); configurer.setEngineName("jython"); configurer.setRenderFunction("render"); return configurer; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/MustacheNashornScriptTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/NashornScriptTemplateTests.java similarity index 89% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/MustacheNashornScriptTemplateTests.java rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/NashornScriptTemplateTests.java index b1110b54353..a777584dbf2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/MustacheNashornScriptTemplateTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/NashornScriptTemplateTests.java @@ -34,11 +34,11 @@ import org.springframework.mock.web.test.MockServletContext; import org.springframework.web.context.WebApplicationContext; /** - * Unit tests for Mustache templates running on Nashorn Javascript engine. + * Unit tests for pure Javascript templates running on Nashorn engine. * * @author Sebastien Deleuze */ -public class MustacheNashornScriptTemplateTests { +public class NashornScriptTemplateTests { private WebApplicationContext webAppContext; @@ -56,7 +56,7 @@ public class MustacheNashornScriptTemplateTests { Map model = new HashMap<>(); model.put("title", "Layout example"); model.put("body", "This is the body"); - MockHttpServletResponse response = renderViewWithModel("org/springframework/web/servlet/view/script/mustache/template.html", model); + MockHttpServletResponse response = renderViewWithModel("org/springframework/web/servlet/view/script/nashorn/template.html", model); assertEquals("Layout example

This is the body

", response.getContentAsString()); } @@ -85,11 +85,10 @@ public class MustacheNashornScriptTemplateTests { static class ScriptTemplatingConfiguration { @Bean - public ScriptTemplateConfigurer mustacheConfigurer() { + public ScriptTemplateConfigurer nashornConfigurer() { ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer(); configurer.setEngineName("nashorn"); - configurer.setScripts("/META-INF/resources/webjars/mustachejs/0.8.2/mustache.js"); - configurer.setRenderObject("Mustache"); + configurer.setScripts("org/springframework/web/servlet/view/script/nashorn/render.js"); configurer.setRenderFunction("render"); return configurer; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ReactNashornScriptTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ReactNashornScriptTemplateTests.java deleted file mode 100644 index d42a8f62214..00000000000 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ReactNashornScriptTemplateTests.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright 2002-2015 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 - * - * http://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.Map; -import javax.servlet.ServletContext; - -import static org.junit.Assert.assertEquals; -import org.junit.Before; -import org.junit.Test; -import static org.mockito.Mockito.mock; - -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.mock.web.test.MockHttpServletRequest; -import org.springframework.mock.web.test.MockHttpServletResponse; -import org.springframework.mock.web.test.MockServletContext; -import org.springframework.web.context.WebApplicationContext; - -/** - * Unit tests for React templates running on Nashorn Javascript engine. - * - * @author Sebastien Deleuze - */ -public class ReactNashornScriptTemplateTests { - - private WebApplicationContext webAppContext; - - private ServletContext servletContext; - - @Before - public void setup() { - this.webAppContext = mock(WebApplicationContext.class); - this.servletContext = new MockServletContext(); - this.servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this.webAppContext); - } - - @Test - public void renderJavascriptTemplate() throws Exception { - Map model = new HashMap<>(); - model.put("title", "Layout example"); - model.put("body", "This is the body"); - MockHttpServletResponse response = renderViewWithModel("org/springframework/web/servlet/view/script/react/template.js", model); - assertEquals("Layout example

This is the body

", - response.getContentAsString()); - } - - @Test - public void renderJsxTemplate() throws Exception { - Map model = new HashMap<>(); - model.put("title", "Layout example"); - model.put("body", "This is the body"); - MockHttpServletResponse response = renderViewWithModel("org/springframework/web/servlet/view/script/react/template.jsx", model); - assertEquals("Layout example

This is the body

", - response.getContentAsString()); - } - - private MockHttpServletResponse renderViewWithModel(String viewUrl, Map model) throws Exception { - ScriptTemplateView view = createViewWithUrl(viewUrl); - MockHttpServletResponse response = new MockHttpServletResponse(); - MockHttpServletRequest request = new MockHttpServletRequest(); - view.renderMergedOutputModel(model, request, response); - return response; - } - - private ScriptTemplateView createViewWithUrl(String viewUrl) throws Exception { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - if (viewUrl.endsWith(".jsx")) { - ctx.register(JsxTemplatingConfiguration.class); - } - else { - ctx.register(JavascriptTemplatingConfiguration.class); - } - ctx.refresh(); - - ScriptTemplateView view = new ScriptTemplateView(); - view.setApplicationContext(ctx); - view.setUrl(viewUrl); - view.afterPropertiesSet(); - return view; - } - - @Configuration - static class JavascriptTemplatingConfiguration { - - @Bean - public ScriptTemplateConfigurer reactConfigurer() { - ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer(); - configurer.setEngineName("nashorn"); - configurer.setScripts( "org/springframework/web/servlet/view/script/react/polyfill.js", - "/META-INF/resources/webjars/react/0.12.2/react.js", - "/META-INF/resources/webjars/react/0.12.2/JSXTransformer.js", - "org/springframework/web/servlet/view/script/react/render.js"); - configurer.setRenderFunction("render"); - return configurer; - } - } - - @Configuration - static class JsxTemplatingConfiguration { - - @Bean - public ScriptTemplateConfigurer reactConfigurer() { - ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer(); - configurer.setEngineName("nashorn"); - configurer.setScripts( "org/springframework/web/servlet/view/script/react/polyfill.js", - "/META-INF/resources/webjars/react/0.12.2/react.js", - "/META-INF/resources/webjars/react/0.12.2/JSXTransformer.js", - "org/springframework/web/servlet/view/script/react/render.js"); - configurer.setRenderFunction("renderJsx"); - return configurer; - } - } - -} diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml index 31528511001..8037b0cfed9 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml +++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml @@ -34,8 +34,8 @@ - - + + diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/polyfill.js b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/polyfill.js deleted file mode 100644 index 14aaa260635..00000000000 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/polyfill.js +++ /dev/null @@ -1 +0,0 @@ -var window = {}; \ No newline at end of file diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/render.js b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/render.js deleted file mode 100644 index 03d0166bf10..00000000000 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/render.js +++ /dev/null @@ -1,5 +0,0 @@ -// TODO Manage compiled template cache -function render(template, model) { - var compiledTemplate = Handlebars.compile(template); - return compiledTemplate(model); -} \ No newline at end of file diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/erb/render.rb b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jruby/render.rb similarity index 100% rename from spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/erb/render.rb rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jruby/render.rb diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/erb/template.erb b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jruby/template.erb similarity index 100% rename from spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/erb/template.erb rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jruby/template.erb diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/python/render.py b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jython/render.py similarity index 100% rename from spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/python/render.py rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jython/render.py diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/python/template.html b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jython/template.html similarity index 100% rename from spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/python/template.html rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jython/template.html diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/mustache/template.html b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/mustache/template.html deleted file mode 100644 index 9110e3181b0..00000000000 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/mustache/template.html +++ /dev/null @@ -1 +0,0 @@ -{{title}}

{{body}}

\ No newline at end of file diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/nashorn/render.js b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/nashorn/render.js new file mode 100644 index 00000000000..bc4db9adcea --- /dev/null +++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/nashorn/render.js @@ -0,0 +1,3 @@ +function render(template, model) { + return template.replace("{{title}}", model.title).replace("{{body}}", model.body); +} \ No newline at end of file diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/template.html b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/nashorn/template.html similarity index 100% rename from spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/template.html rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/nashorn/template.html diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/polyfill.js b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/polyfill.js deleted file mode 100644 index 52454f31c72..00000000000 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/polyfill.js +++ /dev/null @@ -1,5 +0,0 @@ -var global = this; -var console = {}; -console.debug = print; -console.warn = print; -console.log = print; \ No newline at end of file diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/render.js b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/render.js deleted file mode 100644 index fdf22ff1b1b..00000000000 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/render.js +++ /dev/null @@ -1,13 +0,0 @@ -function render(template, model) { - // Create a real Javascript Object from the model Map - var data = {}; - for(var k in model) data[k]=model[k]; - var element = React.createElement(eval(template), data); - // Should use React.renderToString in production - return React.renderToStaticMarkup(element); -} - -function renderJsx(template, model) { - var jsTemplate = JSXTransformer.transform(template).code; - return render(jsTemplate, model); -} \ No newline at end of file diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/template.js b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/template.js deleted file mode 100644 index 73412bde437..00000000000 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/template.js +++ /dev/null @@ -1,5 +0,0 @@ -React.createClass({ - render: function() { - return React.createElement("html", null, React.createElement("head", null, React.createElement("title", null, this.props.title)), React.createElement("body", null, React.createElement("p", null, this.props.body))); - } -}); \ No newline at end of file diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/template.jsx b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/template.jsx deleted file mode 100644 index 89eec8aac9c..00000000000 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/template.jsx +++ /dev/null @@ -1,5 +0,0 @@ -React.createClass({ - render: function() { - return {this.props.title}

{this.props.body}

- } -}); \ No newline at end of file