You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by vs...@apache.org on 2009/05/26 11:58:50 UTC
svn commit: r778640 - in /maven/doxia/doxia/trunk:
doxia-core/src/main/java/org/apache/maven/doxia/util/
doxia-core/src/test/java/org/apache/maven/doxia/util/
doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/
Author: vsiveton
Date: Tue May 26 09:58:50 2009
New Revision: 778640
URL: http://svn.apache.org/viewvc?rev=778640&view=rev
Log:
o fix test in xdocparser about entities
o fix unescapeHTML to unescape all entities and add more test cases
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java?rev=778640&r1=778639&r2=778640&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java Tue May 26 09:58:50 2009
@@ -252,12 +252,7 @@
unescaped = StringEscapeUtils.unescapeHtml( text );
}
- if ( !text.equals( unescaped ) )
- {
- return unescaped;
- }
-
- String tmp = text;
+ String tmp = unescaped;
List entities = new ArrayList();
while ( true )
{
@@ -288,10 +283,10 @@
String entity = (String) entities.get( i );
int codePoint = Integer.parseInt( entity, 16 );
- text = StringUtils.replace( text, "&#x" + entity + ";", new String( toChars( codePoint ) ) );
+ unescaped = StringUtils.replace( unescaped, "&#x" + entity + ";", new String( toChars( codePoint ) ) );
}
- return text;
+ return unescaped;
}
/**
Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java?rev=778640&r1=778639&r2=778640&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java Tue May 26 09:58:50 2009
@@ -83,6 +83,9 @@
assertEquals( "𝟭 𝟭", HtmlTools.unescapeHTML( "𝟭 𝟭" ) );
assertEquals( "𝟭 \uD835\uDFED", HtmlTools.unescapeHTML( "𝟭 𝟭" ) );
assertEquals( "&#xQWER;", HtmlTools.unescapeHTML( "&#xQWER;" ) );
+ assertEquals( "\u00E5", HtmlTools.unescapeHTML( "å" ) );
+ assertEquals( "<>&\"\u00E5\u0159\uD835\uDFED",
+ HtmlTools.unescapeHTML( "<>&"åř𝟭" ) );
}
/**
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java?rev=778640&r1=778639&r2=778640&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java Tue May 26 09:58:50 2009
@@ -457,7 +457,7 @@
SinkEventElement textEvt = (SinkEventElement) it.next();
assertEquals( "text", textEvt.getName() );
- assertEquals( "&\u0159𝟭", textEvt.getArgs()[0] );
+ assertEquals( "&\u0159\uD835\uDFED", textEvt.getArgs()[0] );
assertEquals( "sectionTitle1_", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "paragraph", ( (SinkEventElement) it.next() ).getName() );