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

HtmlUtils properly escapes single quotes as well

Browse Source
This commit is contained in:
Juergen Hoeller
2011-07-27 20:35:41 +00:00
parent 9347ac358c
commit 38837eddfd
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
org.springframework.web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2007 the original author or authors.
* Copyright 2002-2011 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.
@@ -16,31 +16,36 @@
package org.springframework.web.util;
import junit.framework.TestCase;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Alef Arendsen
* @author Martin Kersten
* @author Rick Evans
*/
public class HtmlUtilsTests extends TestCase {
public class HtmlUtilsTests {
@Test
public void testHtmlEscape() {
String unescaped = "\"This is a quote";
String unescaped = "\"This is a quote'";
String escaped = HtmlUtils.htmlEscape(unescaped);
assertEquals(""This is a quote", escaped);
assertEquals(""This is a quote'", escaped);
escaped = HtmlUtils.htmlEscapeDecimal(unescaped);
assertEquals(""This is a quote", escaped);
assertEquals(""This is a quote'", escaped);
escaped = HtmlUtils.htmlEscapeHex(unescaped);
assertEquals(""This is a quote", escaped);
assertEquals(""This is a quote'", escaped);
}
@Test
public void testHtmlUnescape() {
String escaped = ""This is a quote";
String escaped = ""This is a quote'";
String unescaped = HtmlUtils.htmlUnescape(escaped);
assertEquals(unescaped, "\"This is a quote");
assertEquals(unescaped, "\"This is a quote'");
}
@Test
public void testEncodeIntoHtmlCharacterSet() {
assertNull("A null string should be converted to a null string",
HtmlUtils.htmlEscape(null));
@@ -66,6 +71,7 @@ public class HtmlUtilsTests extends TestCase {
"ϑ", HtmlUtils.htmlEscapeDecimal("" + (char) 977));
}
@Test
public void testDecodeFromHtmlCharacterSet() {
assertNull("A null string should be converted to a null string",
HtmlUtils.htmlUnescape(null));