GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Polish script based view tests 

Issue: SPR-12266
pull/786/head
Sebastien Deleuze 11 years ago
parent
e306098155
commit
7919364db6
21 changed files with 18 additions and 286 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      build.gradle
  2. 3
      spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
  3. 99
      spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/HandlebarsNashornScriptTemplateTests.java
  4. 8
      spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JrubyScriptTemplateTests.java
  5. 6
      spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JythonScriptTemplateTests.java
  6. 11
      spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/NashornScriptTemplateTests.java
  7. 131
      spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ReactNashornScriptTemplateTests.java
  8. 4
      spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml
  9. 1
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/polyfill.js
  10. 5
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/render.js
  11. 0
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jruby/render.rb
  12. 0
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jruby/template.erb
  13. 0
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jython/render.py
  14. 0
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jython/template.html
  15. 1
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/mustache/template.html
  16. 3
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/nashorn/render.js
  17. 0
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/nashorn/template.html
  18. 5
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/polyfill.js
  19. 13
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/render.js
  20. 5
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/template.js
  21. 5
      spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/template.jsx

4
build.gradle
Unescape View File

@ -901,10 +901,6 @@ project("spring-webmvc") { @@ -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")
}

3
spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
Unescape View File

@ -800,11 +800,10 @@ public class MvcNamespaceTests { @@ -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"));
}

99
spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/HandlebarsNashornScriptTemplateTests.java
Unescape View File

@ -1,99 +0,0 @@ @@ -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<String, Object> 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("<html><head><title>Layout example</title></head><body><p>This is the body</p></body></html>",
response.getContentAsString());
}
private MockHttpServletResponse renderViewWithModel(String viewUrl, Map<String, Object> 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;
}
}
}

8
spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ErbJrubyScriptTemplateTests.java → spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JrubyScriptTemplateTests.java
Unescape View File

@ -38,7 +38,7 @@ import org.springframework.web.context.WebApplicationContext; @@ -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 { @@ -56,7 +56,7 @@ public class ErbJrubyScriptTemplateTests {
Map<String, Object> 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("<html><head><title>Layout example</title></head><body><p>This is the body</p></body></html>",
response.getContentAsString());
}
@ -85,9 +85,9 @@ public class ErbJrubyScriptTemplateTests { @@ -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;

6
spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/StringJythonScriptTemplateTests.java → spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JythonScriptTemplateTests.java
Unescape View File

@ -38,7 +38,7 @@ import org.springframework.web.context.WebApplicationContext; @@ -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 { @@ -56,7 +56,7 @@ public class StringJythonScriptTemplateTests {
Map<String, Object> 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("<html><head><title>Layout example</title></head><body><p>This is the body</p></body></html>",
response.getContentAsString());
}
@ -87,7 +87,7 @@ public class StringJythonScriptTemplateTests { @@ -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;

11
spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/MustacheNashornScriptTemplateTests.java → spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/NashornScriptTemplateTests.java
Unescape View File

@ -34,11 +34,11 @@ import org.springframework.mock.web.test.MockServletContext; @@ -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 { @@ -56,7 +56,7 @@ public class MustacheNashornScriptTemplateTests {
Map<String, Object> 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("<html><head><title>Layout example</title></head><body><p>This is the body</p></body></html>",
response.getContentAsString());
}
@ -85,11 +85,10 @@ public class MustacheNashornScriptTemplateTests { @@ -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;
}

131
spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ReactNashornScriptTemplateTests.java
Unescape View File

@ -1,131 +0,0 @@ @@ -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<String, Object> 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("<html><head><title>Layout example</title></head><body><p>This is the body</p></body></html>",
response.getContentAsString());
}
@Test
public void renderJsxTemplate() throws Exception {
Map<String, Object> 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("<html><head><title>Layout example</title></head><body><p>This is the body</p></body></html>",
response.getContentAsString());
}
private MockHttpServletResponse renderViewWithModel(String viewUrl, Map<String, Object> 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;
}
}
}

4
spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml
Unescape View File

@ -34,8 +34,8 @@ @@ -34,8 +34,8 @@
<mvc:groovy-configurer resource-loader-path="/test" cache-templates="false" auto-indent="true" />
<mvc:script-template-configurer engine-name="nashorn" render-object="Mustache" render-function="render" charset="ISO-8859-1" resource-loader-path="classpath:">
<mvc:script location="/META-INF/resources/webjars/mustachejs/0.8.2/mustache.js" />
<mvc:script-template-configurer engine-name="nashorn" render-function="render" charset="ISO-8859-1" resource-loader-path="classpath:">
<mvc:script location="org/springframework/web/servlet/view/script/nashorn/render.js" />
</mvc:script-template-configurer>
</beans>

1
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/polyfill.js
Unescape View File

@ -1 +0,0 @@ @@ -1 +0,0 @@
var window = {};

5
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/render.js
Unescape View File

@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
// TODO Manage compiled template cache
function render(template, model) {
var compiledTemplate = Handlebars.compile(template);
return compiledTemplate(model);
}

0
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/erb/render.rb → spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jruby/render.rb
Unescape View File

0
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/erb/template.erb → spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jruby/template.erb
Unescape View File

0
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/python/render.py → spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jython/render.py
Unescape View File

0
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/python/template.html → spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jython/template.html
Unescape View File

1
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/mustache/template.html
Unescape View File

@ -1 +0,0 @@ @@ -1 +0,0 @@
<html><head><title>{{title}}</title></head><body><p>{{body}}</p></body></html>

3
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/nashorn/render.js
Unescape View File

@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
function render(template, model) {
return template.replace("{{title}}", model.title).replace("{{body}}", model.body);
}

0
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/handlebars/template.html → spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/nashorn/template.html
Unescape View File

5
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/polyfill.js
Unescape View File

@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
var global = this;
var console = {};
console.debug = print;
console.warn = print;
console.log = print;

13
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/render.js
Unescape View File

@ -1,13 +0,0 @@ @@ -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);
}

5
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/template.js
Unescape View File

@ -1,5 +0,0 @@ @@ -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)));
}
});

5
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/react/template.jsx
Unescape View File

@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
React.createClass({
render: function() {
return <html><head><title>{this.props.title}</title></head><body><p>{this.props.body}</p></body></html>
}
});
Write Preview
Loading…
Cancel
Save