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

SWF-1370 Extract test into a separate test fixture

Browse Source
This commit is contained in:
Rossen Stoyanchev
2010-08-31 15:22:48 +00:00
parent 6bb0f1ffec
commit 78879cebb5
2 changed files with 90 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
spring-webflow/src/test/java/org/springframework/webflow/mvc/view/BindingModelSwf1370Tests.java Normal file
View File

@@ -0,0 +1,90 @@
package org.springframework.webflow.mvc.view;
import java.util.HashMap;
import java.util.Map;
import junit.framework.TestCase;
import org.springframework.binding.convert.ConversionService;
import org.springframework.binding.convert.service.DefaultConversionService;
import org.springframework.binding.message.DefaultMessageContext;
import org.springframework.core.convert.converter.ConverterRegistry;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.webflow.expression.spel.WebFlowSpringELExpressionParser;
/**
* Test harness based on: https://jira.springframework.org/browse/SWF-1370
*
*/
public class BindingModelSwf1370Tests extends TestCase {
private ConversionService conversionService;
private ConverterRegistry converterRegistry;
private WebFlowSpringELExpressionParser expressionParser;
public void setUp() {
conversionService = new DefaultConversionService();
expressionParser = new WebFlowSpringELExpressionParser(new SpelExpressionParser(), conversionService);
converterRegistry = (ConverterRegistry) conversionService.getDelegateConversionService();
}
public void testGetFieldValueWithInvalidBeanWrapperExpression() throws Exception {
Question question = new Question();
converterRegistry.addConverter(new QuestionConverter(question));
BindingModel model = new BindingModel("theTestBean", new TestBeanWithQuestionResponseMap(question),
expressionParser, conversionService, new DefaultMessageContext());
assertEquals("111", model.getFieldValue("responses[1].value"));
}
private class Question {
};
private class Response {
private int value;
public Response(int value) {
this.value = value;
}
public int getValue() {
return value;
}
public void setValue(int value) {
this.value = value;
}
}
private class TestBeanWithQuestionResponseMap {
private Map<Question, Response> responses = new HashMap<Question, Response>();
public TestBeanWithQuestionResponseMap(Question question) {
responses.put(question, new Response(111));
}
public Map<Question, Response> getResponses() {
return responses;
}
public void setResponses(Map<Question, Response> responses) {
this.responses = responses;
}
}
private class QuestionConverter implements org.springframework.core.convert.converter.Converter<Integer, Question> {
private Map<Integer, Question> map = new HashMap<Integer, Question>();
public QuestionConverter(Question... questions) {
for (int i = 0; i < questions.length; i++) {
map.put(i + 1, questions[i]);
}
}
public Question convert(Integer source) {
return map.get(source);
}
}
}

70
spring-webflow/src/test/java/org/springframework/webflow/mvc/view/DefaultBindingModelTests.java
View File

@@ -1,12 +1,6 @@
package org.springframework.webflow.mvc.view;
import java.util.HashMap;
import java.util.Map;
import org.springframework.binding.convert.ConversionService;
import org.springframework.binding.convert.service.DefaultConversionService;
import org.springframework.binding.expression.ExpressionParser;
import org.springframework.core.convert.converter.ConverterRegistry;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.webflow.expression.spel.WebFlowSpringELExpressionParser;
@@ -16,68 +10,4 @@ public class DefaultBindingModelTests extends AbstractBindingModelTests {
return new WebFlowSpringELExpressionParser(new SpelExpressionParser());
}
public void testGetFieldValueWithInvalidBeanWrapperExpression() throws Exception {
// See SWF-1370
Question question = new Question();
Map<Integer, Question> map = new HashMap<Integer, Question>();
map.put(1, question);
ConversionService theConversionService = new DefaultConversionService();
((ConverterRegistry) theConversionService.getDelegateConversionService()).addConverter(new QuestionConverter(
map));
WebFlowSpringELExpressionParser theParser = new WebFlowSpringELExpressionParser(new SpelExpressionParser(),
theConversionService);
model = new BindingModel("theTestBean", new TestBeanWithQuestionResponseMap(question), theParser,
theConversionService, messages);
assertEquals("foo", model.getFieldValue("responses[1].value"));
}
private class Question {
};
private class Response {
private String value;
public Response(String value) {
this.value = value;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
}
private class TestBeanWithQuestionResponseMap {
private Map<Question, Response> responses = new HashMap<Question, Response>();
public TestBeanWithQuestionResponseMap(Question question) {
responses.put(question, new Response("foo"));
}
public Map<Question, Response> getResponses() {
return responses;
}
public void setResponses(Map<Question, Response> responses) {
this.responses = responses;
}
}
private class QuestionConverter implements org.springframework.core.convert.converter.Converter<Integer, Question> {
private Map<Integer, Question> map;
public QuestionConverter(Map<Integer, Question> map) {
this.map = map;
}
public Question convert(Integer source) {
return map.get(source);
}
}
}