svn commit: r770774 - in /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test: java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java resources/site/xdoc/entityTest.xml

[ltheussl]

Author: ltheussl
Date: Fri May  1 17:55:19 2009
New Revision: 770774

URL: http://svn.apache.org/viewvc?rev=770774&view=rev
Log:
More tests to fix for DOXIA-309, DOXIA-310, DOXIA-311.

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=770774&r1=770773&r2=770774&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
 Fri May  1 17:55:19 2009
@@ -64,11 +64,13 @@
 
         HtmlHeader2 h2 = (HtmlHeader2) elementIterator.next();
         assertNotNull( h2 );
-        assertEquals( h2.asText().trim(), "section name" );
+        // DOXIA-311: FIXME!
+        //assertEquals( h2.asText().trim(), "section name with entities: '&' 
'Α' ' '" );
 
         HtmlAnchor a = (HtmlAnchor) elementIterator.next();
         assertNotNull( a );
-        assertEquals( a.getAttributeValue( "name" ), "section_name" );
+        // DOXIA-311: FIXME!
+        //assertEquals( a.getAttributeValue( "name" ), 
"section_name_with_entities:____" );
 
         div = (HtmlDivision) elementIterator.next();
         assertNotNull( div );
@@ -86,7 +88,7 @@
 
         HtmlHeader3 h3 = (HtmlHeader3) elementIterator.next();
         assertNotNull( h3 );
-        assertEquals( h3.asText().trim(), "Generic Entities" );
+        assertEquals( h3.asText().trim(), "Generic Entities: '&' '<' '>' '\"' 
'''" );
 
         a = (HtmlAnchor) elementIterator.next();
 
@@ -98,19 +100,22 @@
 
         h3 = (HtmlHeader3) elementIterator.next();
         assertNotNull( h3 );
-        assertEquals( h3.asText().trim(), "Local Entities" );
+        // DOXIA-311: FIXME!
+        //assertEquals( h3.asText().trim(), "Local Entities: 'Α' 'Β' 'Γ'" );
 
         a = (HtmlAnchor) elementIterator.next();
 
         p = (HtmlParagraph) elementIterator.next();
         assertNotNull( p );
-        assertEquals( p.asText().trim(), "'Α' 'Β' 'Γ'" );
+        // DOXIA-310: FIXME!
+        //assertEquals( p.asText().trim(), "'Α' 'Β' 'Γ'" );
 
         div = (HtmlDivision) elementIterator.next();
 
         h3 = (HtmlHeader3) elementIterator.next();
         assertNotNull( h3 );
-        assertEquals( h3.asText().trim(), "DTD Entities" );
+        // DOXIA-311: FIXME!
+        //assertEquals( h3.asText().trim(), "DTD 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=770774&r1=770773&r2=770774&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
 Fri May  1 17:55:19 2009
@@ -25,28 +25,30 @@
 <!-- Some entities from http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent -->
 <!ENTITY Alpha    "&#913;"> <!-- greek capital letter alpha, U+0391 -->
 <!ENTITY Beta     "&#914;"> <!-- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma    "&#915;"> <!-- greek capital letter gamma,
-U+0393 ISOgrk3 -->
+<!ENTITY Gamma    "&#915;"> <!-- greek capital letter gamma, U+0393 ISOgrk3 -->
+<!ENTITY tritPos  "&#x1d7ed;"> <!-- MATHEMATICAL SANS-SERIF BOLD DIGIT ONE -->
 ]>
 <document xmlns="http://maven.apache.org/XDOC/2.0";
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
   xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
file:../../../../../../../doxia/doxia-modules/doxia-module-xdoc/src/main/resources/xdoc-2.0.xsd">
   <properties>
     <title>Test entities, cdatas and comments</title>
+    <!-- FIXME: DOXIA-309 -->
+    <author email="t...@email.com">Ligature &AElig;</author>
   </properties>
 
   <body>
 
-    <section name="section name">
+    <section name="section name with entities: '&amp;' '&Alpha;' '&nbsp;'">
 
       <h4>Entities</h4>
-      <h3>Generic Entities</h3>
+      <h3>Generic Entities: '&amp;' '&lt;' '&gt;' '&quot;' '&apos;'</h3>
       <p>'&amp;' '&lt;' '&gt;' '&quot;' '&apos;'</p>
 
-      <h3>Local Entities</h3>
-      <p>'&Alpha;' '&Beta;' '&Gamma;'</p>
+      <h3>Local Entities: '&Alpha;' '&Beta;' '&Gamma;' '&tritPos;'</h3>
+      <p>'&Alpha;' '&Beta;' '&Gamma;' '&tritPos;'</p>
 
-      <h3>DTD Entities</h3>
+      <h3>DTD Entities: '&nbsp;' '&iexcl;' '&cent;'</h3>
       <p>'&nbsp;' '&iexcl;' '&cent;'</p>
 
       <h4>CDATA</h4>