svn commit: r771614 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
Author: ltheussl Date: Tue May 5 08:07:22 2009 New Revision: 771614 URL: http://svn.apache.org/viewvc?rev=771614&view=rev Log: Update tests after r771612 (DOXIA-311). Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java?rev=771614&r1=771613&r2=771614&view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java Tue May 5 08:07:22 2009 @@ -97,13 +97,11 @@ HtmlHeader2 h2 = (HtmlHeader2) elementIterator.next(); assertNotNull( h2 ); -// DOXIA-311: FIXME! -//assertEquals( h2.asText().trim(), "section name with entities: '&' 'Î' ' '" ); +assertEquals( h2.asText().trim(), "section name with entities: '&' 'Î' ' '" ); HtmlAnchor a = (HtmlAnchor) elementIterator.next(); assertNotNull( a ); -// DOXIA-311: FIXME! -//assertEquals( a.getAttributeValue( "name" ), "section_name_with_entities:" ); +assertEquals( a.getAttributeValue( "name" ), "section_name_with_entities:___" ); div = (HtmlDivision) elementIterator.next(); assertNotNull( div ); @@ -134,21 +132,19 @@ h3 = (HtmlHeader3) elementIterator.next(); assertNotNull( h3 ); // DOXIA-311: FIXME! -//assertEquals( h3.asText().trim(), "Local Entities: 'Î' 'Î' 'Î'" ); +//assertEquals( h3.asText().trim(), "Local Entities: 'Î' 'Î' 'Î' 'í'" ); a = (HtmlAnchor) elementIterator.next(); p = (HtmlParagraph) elementIterator.next(); assertNotNull( p ); -// DOXIA-310: FIXME! -//assertEquals( p.asText().trim(), "'Î' 'Î' 'Î'" ); +assertEquals( p.asText().trim(), "'Î' 'Î' 'Î' 'í'" ); div = (HtmlDivision) elementIterator.next(); h3 = (HtmlHeader3) elementIterator.next(); assertNotNull( h3 ); -// DOXIA-311: FIXME! -//assertEquals( h3.asText().trim(), "DTD Entities: ' ' '¡' '¢'" ); +assertEquals( h3.asText().trim(), "DTD Entities: ' ' '¡' '¢'" ); a = (HtmlAnchor) elementIterator.next();
svn commit: r771612 - in /maven/doxia/doxia/trunk: doxia-core/ doxia-core/src/main/java/org/apache/maven/doxia/markup/ doxia-core/src/main/java/org/apache/maven/doxia/parser/ doxia-core/src/main/java/
Author: ltheussl
Date: Tue May 5 08:06:19 2009
New Revision: 771612
URL: http://svn.apache.org/viewvc?rev=771612&view=rev
Log:
[DOXIA-311] Character references do not work in xdoc section titles.
Partial fix: all html entities should be properly handled now, custom entities
are still un-escaped in section titles.
Entities are now emitted as text (not rawText) by the XhtmlBaseParser,
unrecognized entities are emitted as an unknown event.
Modified:
maven/doxia/doxia/trunk/doxia-core/pom.xml
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
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/parser/XhtmlBaseParserTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.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/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.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/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/pom.xml?rev=771612&r1=771611&r2=771612&view=diff
==
--- maven/doxia/doxia/trunk/doxia-core/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-core/pom.xml Tue May 5 08:06:19 2009
@@ -55,6 +55,11 @@
xercesImpl
2.8.1
+
+ commons-lang
+ commons-lang
+ 2.4
+
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java?rev=771612&r1=771611&r2=771612&view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
Tue May 5 08:06:19 2009
@@ -48,6 +48,13 @@
/** An end HTML tag. Eg . */
int TAG_TYPE_END = 3;
+/**
+ * An HTML entity. Eg <.
+ *
+ * @since 1.1.1.
+ */
+int ENTITY_TYPE = 4;
+
// --
// All XHTML 1.0 tags
// --
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java?rev=771612&r1=771611&r2=771612&view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
Tue May 5 08:06:19 2009
@@ -23,10 +23,12 @@
import javax.swing.text.html.HTML.Tag;
import org.apache.maven.doxia.macro.MacroExecutionException;
+import org.apache.maven.doxia.markup.HtmlMarkup;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.util.DoxiaUtils;
+import org.apache.maven.doxia.util.HtmlTools;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
@@ -467,13 +469,20 @@
}
else
{
-if ( getLocalEntities().containsKey( textChars ) )
+String unescaped = HtmlTools.unescapeHtml( text );
+
+// TODO: StringEscapeUtils.unescapeHtml returns unknown entities
as is,
+// they should be handled as one character as well
+if ( text.equals( unescaped ) && text.length() > 1 )
{
-sink.rawText( text );
+// this means the entity is unrecognized: emit as unknown
+Object[] required = new Object[] { new Integer(
HtmlMarkup.ENTITY_TYPE ) };
+
+sink.unknown( text, required, null );
}
else
{
-sink.text( text );
+
svn commit: r771628 - in /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test: java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java resources/site/xdoc/entityTest.xml
Author: ltheussl Date: Tue May 5 08:54:22 2009 New Revision: 771628 URL: http://svn.apache.org/viewvc?rev=771628&view=rev Log: Test for DOXIA-312 Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java?rev=771628&r1=771627&r2=771628&view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java Tue May 5 08:54:22 2009 @@ -51,34 +51,43 @@ HtmlMeta author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 0 ); assertNotNull( author ); assertTrue( author.toString().indexOf( "Ligature Æ" ) > 0 ); +// DOXIA-312: FIXME! +//assertEquals( "Ligature Ã", author.getContentAttribute() ); author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 1 ); assertNotNull( author ); assertTrue( author.toString().indexOf( "Ampersand &" ) > 0 ); +assertEquals( "Ampersand &", author.getContentAttribute() ); author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 2 ); assertNotNull( author ); assertTrue( author.toString().indexOf( "Less than <" ) > 0 ); +assertEquals( "Less than <", author.getContentAttribute() ); author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 3 ); assertNotNull( author ); assertTrue( author.toString().indexOf( "Greater than >" ) > 0 ); +assertEquals( "Greater than >", author.getContentAttribute() ); author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 4 ); assertNotNull( author ); assertTrue( author.getContentAttribute().equals( "Apostrophe '" ) ); +assertEquals( "Apostrophe '", author.getContentAttribute() ); author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 5 ); assertNotNull( author ); assertTrue( author.toString().indexOf( "Quote "" ) > 0 ); +assertEquals( "Quote \"", author.getContentAttribute() ); author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 6 ); assertNotNull( author ); assertTrue( author.toString().indexOf( "t...@email.com" ) > 0 ); +assertEquals( "t...@email.com", author.getContentAttribute() ); author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 7 ); assertNotNull( author ); assertTrue( author.toString().indexOf( "test©email.com" ) > 0 ); +assertEquals( "test©email.com", author.getContentAttribute() ); HtmlElement element = page.getHtmlElementById( "contentBox" ); assertNotNull( element ); @@ -131,7 +140,7 @@ h3 = (HtmlHeader3) elementIterator.next(); assertNotNull( h3 ); -// DOXIA-311: FIXME! +// DOXIA-314: FIXME! //assertEquals( h3.asText().trim(), "Local Entities: 'Î' 'Î' 'Î' 'í'" ); a = (HtmlAnchor) elementIterator.next(); Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml?rev=771628&r1=771627&r2=771628&view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml Tue May 5 08:54:22 2009 @@ -33,6 +33,7 @@ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 file:../../../../../../../doxia/doxia-modules/doxia-module-xdoc/src/main/resources/xdoc-2.0.xsd"> Test entities, cdatas and comments + Ligature Æ Ampersand & Less than <
svn commit: r771654 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/sink/ doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/ doxia-modules
Author: ltheussl
Date: Tue May 5 10:20:36 2009
New Revision: 771654
URL: http://svn.apache.org/viewvc?rev=771654&view=rev
Log:
[DOXIA-312] comments in meta properties end up in author content
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java?rev=771654&r1=771653&r2=771654&view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
Tue May 5 10:20:36 2009
@@ -1786,7 +1786,7 @@
buf.append( "" + SPACE + MINUS + MINUS + GREATER_THAN );
-rawText( buf.toString() );
+write( buf.toString() );
}
/**
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=771654&r1=771653&r2=771654&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 5 10:20:36 2009
@@ -152,7 +152,9 @@
throws Exception
{
String text = ""
-+ "titleJohn Doe"
++ "title"
++ ""
++ "John Doe"
+ "";
SinkEventTestingSink sink = new SinkEventTestingSink();
@@ -165,6 +167,7 @@
assertEquals( "title", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "title_", ( (SinkEventElement) it.next() ).getName() );
+assertEquals( "comment", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "author", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "author_", ( (SinkEventElement) it.next() ).getName() );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java?rev=771654&r1=771653&r2=771654&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
Tue May 5 10:20:36 2009
@@ -302,4 +302,33 @@
assertEquals( "&&", writer.toString() );
}
+/**
+ * Test head events.
+ */
+public void testHead()
+{
+XhtmlSink sink = null;
+Writer writer = new StringWriter();
+
+try
+{
+sink = new XhtmlSink( writer );
+sink.head();
+sink.title();
+sink.text( "Title" );
+sink.title_();
+sink.comment( "A comment" );
+sink.author();
+sink.text( "Author" );
+sink.author_();
+sink.head_();
+}
+finally
+{
+sink.close();
+}
+
+String exp = "Title";
+assertTrue( writer.toString().indexOf( exp ) != -1 );
+}
}
svn commit: r771655 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
Author: ltheussl Date: Tue May 5 10:21:15 2009 New Revision: 771655 URL: http://svn.apache.org/viewvc?rev=771655&view=rev Log: Activate test for DOXIA-312. Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java?rev=771655&r1=771654&r2=771655&view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java Tue May 5 10:21:15 2009 @@ -51,8 +51,7 @@ HtmlMeta author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 0 ); assertNotNull( author ); assertTrue( author.toString().indexOf( "Ligature Æ" ) > 0 ); -// DOXIA-312: FIXME! -//assertEquals( "Ligature Ã", author.getContentAttribute() ); +assertEquals( "Ligature Ã", author.getContentAttribute() ); author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 1 ); assertNotNull( author );
svn commit: r771706 - in /maven/doxia/doxia/trunk/doxia-modules: doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/ doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtm
Author: ltheussl
Date: Tue May 5 13:11:16 2009
New Revision: 771706
URL: http://svn.apache.org/viewvc?rev=771706&view=rev
Log:
Add notes about entity replacement hacks
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java?rev=771706&r1=771705&r2=771706&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
Tue May 5 13:11:16 2009
@@ -30,6 +30,7 @@
import org.apache.maven.doxia.sink.SinkUtils;
import org.apache.maven.doxia.sink.XhtmlBaseSink;
import org.apache.maven.doxia.util.HtmlTools;
+
import org.codehaus.plexus.util.StringUtils;
/**
@@ -197,6 +198,8 @@
{
writeStartTag( AUTHOR_TAG );
String text = HtmlTools.escapeHTML( getTextBuffer().toString() );
+// hack: un-escape numerical entities that have been escaped above
+// note that numerical entities should really be written as one
unicode character in the first place
text = StringUtils.replace( text, "&#", "&#" );
write( text );
writeEndTag( AUTHOR_TAG );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java?rev=771706&r1=771705&r2=771706&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
Tue May 5 13:11:16 2009
@@ -28,6 +28,7 @@
import org.apache.maven.doxia.sink.XhtmlBaseSink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.doxia.util.HtmlTools;
+
import org.codehaus.plexus.util.StringUtils;
/**
@@ -186,6 +187,8 @@
MutableAttributeSet att = new SinkEventAttributeSet();
att.addAttribute( Attribute.NAME, "author" );
String text = HtmlTools.escapeHTML( getTextBuffer().toString() );
+// hack: un-escape numerical entities that have been escaped above
+// note that numerical entities should really be added as one
unicode character in the first place
text = StringUtils.replace( text, "&#", "&#" );
att.addAttribute( Attribute.CONTENT, text );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java?rev=771706&r1=771705&r2=771706&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
Tue May 5 13:11:16 2009
@@ -319,7 +319,8 @@
sink.title_();
sink.comment( "A comment" );
sink.author();
-sink.text( "Author" );
+// note: this is really illegal, there should be no un-resolved
entities emitted into text()
+sink.text( "ģ&" );
sink.author_();
sink.head_();
}
@@ -328,7 +329,8 @@
sink.close();
}
-String exp = "Title";
+String exp =
+"Title";
assertTrue( writer.toString().indexOf( exp ) != -1 );
}
}
svn commit: r771705 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
Author: vsiveton Date: Tue May 5 13:11:02 2009 New Revision: 771705 URL: http://svn.apache.org/viewvc?rev=771705&view=rev Log: o switch to unicode char Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java?rev=771705&r1=771704&r2=771705&view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java Tue May 5 13:11:02 2009 @@ -105,7 +105,7 @@ HtmlHeader2 h2 = (HtmlHeader2) elementIterator.next(); assertNotNull( h2 ); -assertEquals( h2.asText().trim(), "section name with entities: '&' 'Î' ' '" ); +assertEquals( h2.asText().trim(), "section name with entities: '&' '\u0391' ' '" ); HtmlAnchor a = (HtmlAnchor) elementIterator.next(); assertNotNull( a ); @@ -140,25 +140,25 @@ h3 = (HtmlHeader3) elementIterator.next(); assertNotNull( h3 ); // DOXIA-314: FIXME! -//assertEquals( h3.asText().trim(), "Local Entities: 'Î' 'Î' 'Î' 'í'" ); +//assertEquals( h3.asText().trim(), "Local Entities: '\u0391' '\u0392' '\u0393' '\uD7ED'" ); a = (HtmlAnchor) elementIterator.next(); p = (HtmlParagraph) elementIterator.next(); assertNotNull( p ); -assertEquals( p.asText().trim(), "'Î' 'Î' 'Î' 'í'" ); +assertEquals( p.asText().trim(), "'\u0391' '\u0392' '\u0393' '\uD7ED'" ); div = (HtmlDivision) elementIterator.next(); h3 = (HtmlHeader3) elementIterator.next(); assertNotNull( h3 ); -assertEquals( h3.asText().trim(), "DTD Entities: ' ' '¡' '¢'" ); +assertEquals( h3.asText().trim(), "DTD Entities: ' ' '\u00A1' '\u00A2'" ); a = (HtmlAnchor) elementIterator.next(); p = (HtmlParagraph) elementIterator.next(); assertNotNull( p ); -assertEquals( p.asText().trim(), "' ' '¡' '¢'" ); +assertEquals( p.asText().trim(), "' ' '\u00A1' '\u00A2'" ); div = (HtmlDivision) elementIterator.next(); assertNotNull( div );
svn commit: r771730 - in /maven/doxia: doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/ doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xd
Author: ltheussl
Date: Tue May 5 13:55:53 2009
New Revision: 771730
URL: http://svn.apache.org/viewvc?rev=771730&view=rev
Log:
Update tests for DOXIA-314
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java?rev=771730&r1=771729&r2=771730&view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
Tue May 5 13:55:53 2009
@@ -105,11 +105,11 @@
HtmlHeader2 h2 = (HtmlHeader2) elementIterator.next();
assertNotNull( h2 );
-assertEquals( h2.asText().trim(), "section name with entities: '&'
'\u0391' ' '" );
+assertEquals( h2.asText().trim(), "section name with entities: '&'
'\u0391' ' ' '\uD7ED'" );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
-assertEquals( a.getAttributeValue( "name" ),
"section_name_with_entities:___" );
+assertEquals( a.getAttributeValue( "name" ),
"section_name_with_entities:x1d7ed" );
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml?rev=771730&r1=771729&r2=771730&view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml
Tue May 5 13:55:53 2009
@@ -46,7 +46,7 @@
-
+
Entities
Generic Entities: '&' '<' '>' '"' '''
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=771730&r1=771729&r2=771730&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 5 13:55:53 2009
@@ -442,8 +442,8 @@
public void testEntities()
throws Exception
{
-final String text = "]>"
-+ "&&foo;";
+final String text = "]>"
++ "&&foo;&tritPos;";
SinkEventTestingSink sink = new SinkEventTestingSink();
@@ -457,7 +457,7 @@
SinkEventElement textEvt = (SinkEventElement) it.next();
assertEquals( "text", textEvt.getName() );
-assertEquals( "&\u0159", textEvt.getArgs()[0] );
+assertEquals( "&\u0159𝟭", textEvt.getArgs()[0] );
assertEquals( "sectionTitle1_", ( (SinkEventElement) it.next()
).getName() );
assertEquals( "paragraph", ( (SinkEventElement) it.next() ).getName()
);
@@ -470,6 +470,10 @@
assertEquals( "text", textEvt.getName() );
assertEquals( "\u0159", textEvt.getArgs()[0] );
+textEvt = (SinkEventElement) it.next();
+assertEquals( "unknown", textEvt.getName() );
+assertEquals( "𝟭", textEvt.getArgs()[0] );
+
assertEquals( "paragraph_", ( (SinkEventElement) it.next() ).getName()
);
assertEquals( "section1_", ( (SinkEventElement) it.next() ).getName()
);
assertFalse( it.hasNext() );
