Apache/commons-lang
1
0
Fork 0
mirror of https://github.com/apache/commons-lang.git synced 2025-02-13 21:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

PR: 25227

Browse Source 
Obtained from: Discussion around http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25227


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk@137746 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2004-01-10 02:58:36 +00:00
parent 417f6b5b19
commit 4e0b6de05a
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/org/apache/commons/lang/Entities.java
View File

@ -69,7 +69,7 @@
* @author <a href="mailto:alex@purpletech.com">Alexander Day Chaffee</a> * @author <a href="mailto:alex@purpletech.com">Alexander Day Chaffee</a>
* @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a> * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
* @since 2.0 * @since 2.0
* @version $Id: Entities.java,v 1.15 2003/09/13 03:11:29 psteitz Exp $ * @version $Id: Entities.java,v 1.16 2004/01/10 02:58:36 ggregory Exp $
*/ */
class Entities { class Entities {
@ -687,7 +687,12 @@ public String unescape(String str) {
String entityName = str.substring(i + 1, semi); String entityName = str.substring(i + 1, semi);
int entityValue; int entityValue;
if (entityName.charAt(0) == '#') { if (entityName.charAt(0) == '#') {
entityValue = Integer.parseInt(entityName.substring(1)); char charAt1 = entityName.charAt(1);
if (charAt1 == 'x' || charAt1=='X') {
entityValue = Integer.valueOf(entityName.substring(2), 16).intValue();
} else {
entityValue = Integer.parseInt(entityName.substring(1));
}
} else { } else {
entityValue = this.entityValue(entityName); entityValue = this.entityValue(entityName);
} }

19
src/test/org/apache/commons/lang/StringEscapeUtilsTest.java
View File

@ -67,7 +67,7 @@
* *
* @author of original StringUtilsTest.testEscape = ? * @author of original StringUtilsTest.testEscape = ?
* @author <a href="mailto:alex@purpletech.com">Alexander Day Chaffee</a> * @author <a href="mailto:alex@purpletech.com">Alexander Day Chaffee</a>
* @version $Id: StringEscapeUtilsTest.java,v 1.12 2003/08/18 02:22:25 bayard Exp $ * @version $Id: StringEscapeUtilsTest.java,v 1.13 2004/01/10 02:58:36 ggregory Exp $
*/ */
public class StringEscapeUtilsTest extends TestCase { public class StringEscapeUtilsTest extends TestCase {
private final static String FOO = "foo"; private final static String FOO = "foo";
@ -262,10 +262,25 @@ public void testUnescapeHtml() {
} }
// \u00E7 is a cedilla (c with wiggle under) // \u00E7 is a cedilla (c with wiggle under)
// note that the test string must be 7-bit-clean (unicode escaped) or else it will compile incorrectly // note that the test string must be 7-bit-clean (unicode escaped) or else it will compile incorrectly
// on some locales // on some locales
assertEquals("funny chars pass through OK", "Fran\u00E7ais", StringEscapeUtils.unescapeHtml("Fran\u00E7ais")); assertEquals("funny chars pass through OK", "Fran\u00E7ais", StringEscapeUtils.unescapeHtml("Fran\u00E7ais"));
} }
public void testUnescapeHexCharsHtml() {
// Simple easy to grok test
assertEquals("hex number unescape", "\u0080\u009F", StringEscapeUtils.unescapeHtml("&#x80;&#x9F;"));
assertEquals("hex number unescape", "\u0080\u009F", StringEscapeUtils.unescapeHtml("&#X80;&#X9F;"));
// Test all Character values:
for (char i = Character.MIN_VALUE; i < Character.MAX_VALUE; i++) {
Character c1 = new Character(i);
Character c2 = new Character((char)(i+1));
String expected = c1.toString() + c2.toString();
String escapedC1 = "&#x" + Integer.toHexString((int)(c1.charValue())) + ";";
String escapedC2 = "&#x" + Integer.toHexString((int)(c2.charValue())) + ";";
assertEquals("hex number unescape index " + (int)i, expected, StringEscapeUtils.unescapeHtml(escapedC1 + escapedC2));
}
}
public void testUnescapeUnknownEntity() throws Exception public void testUnescapeUnknownEntity() throws Exception
{ {
assertEquals("&zzzz;", StringEscapeUtils.unescapeHtml("&zzzz;")); assertEquals("&zzzz;", StringEscapeUtils.unescapeHtml("&zzzz;"));