root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix EvalTagTests with locales other than english 

Fix testPrintFormattedScopedAttributeResult test in org.springframework.web.servlet.tags.EvalTagTests class by making an assertion which is not locale dependent.

Issue: SPR-11392
This commit is contained in:
Sebastien Deleuze 2014-02-05 17:22:36 +01:00
parent 3a89bc4b26
commit 261a863e8f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
View File

@ -18,6 +18,7 @@ package org.springframework.web.servlet.tags;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import javax.servlet.jsp.tagext.Tag; import javax.servlet.jsp.tagext.Tag;
@ -26,6 +27,7 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.MapPropertySource;
import org.springframework.format.annotation.NumberFormat; import org.springframework.format.annotation.NumberFormat;
import org.springframework.format.annotation.NumberFormat.Style; import org.springframework.format.annotation.NumberFormat.Style;
import org.springframework.format.number.PercentFormatter;
import org.springframework.format.support.FormattingConversionServiceFactoryBean; import org.springframework.format.support.FormattingConversionServiceFactoryBean;
import org.springframework.mock.web.test.MockHttpServletResponse; import org.springframework.mock.web.test.MockHttpServletResponse;
import org.springframework.mock.web.test.MockPageContext; import org.springframework.mock.web.test.MockPageContext;
@ -70,12 +72,14 @@ public class EvalTagTests extends AbstractTagTests {
} }
public void testPrintFormattedScopedAttributeResult() throws Exception { public void testPrintFormattedScopedAttributeResult() throws Exception {
PercentFormatter formatter = new PercentFormatter();
tag.setExpression("bean.formattable"); tag.setExpression("bean.formattable");
int action = tag.doStartTag(); int action = tag.doStartTag();
assertEquals(Tag.EVAL_BODY_INCLUDE, action); assertEquals(Tag.EVAL_BODY_INCLUDE, action);
action = tag.doEndTag(); action = tag.doEndTag();
assertEquals(Tag.EVAL_PAGE, action); assertEquals(Tag.EVAL_PAGE, action);
assertEquals("25%", ((MockHttpServletResponse) context.getResponse()).getContentAsString()); assertEquals(formatter.print(new BigDecimal(".25"), Locale.getDefault()),
((MockHttpServletResponse) context.getResponse()).getContentAsString());
} }
public void testPrintHtmlEscapedAttributeResult() throws Exception { public void testPrintHtmlEscapedAttributeResult() throws Exception {