[GitHub] [maven-doxia-sitetools] minfrin commented on issue #5: Switch from XhtmlSink to Xhtml5Sink as the default site renderer.

[GitBox]

minfrin commented on issue #5: Switch from XhtmlSink to Xhtml5Sink as the 
default site renderer.
URL: 
https://github.com/apache/maven-doxia-sitetools/pull/5#issuecomment-499646660
 
 
   Here is a patch to your branch that has the rest of the changes needed. I 
don't want to delete-and-refork just yet, so can't submit a PR yet.
   
   Index: 
doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
   ===================================================================
   --- 
doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
   (revision 870)
   +++ 
doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
   (working copy)
   @@ -109,8 +109,7 @@
    
            h2 = (HtmlHeading2) elementIterator.next();
            assertNotNull( h2 );
   -        // Note: htmlunit strips the white space, actual result is ok
   -        assertEquals( "Section formatting: italicboldmono", 
h2.asText().trim() );
   +        assertEquals( "Section formatting: italic bold mono", 
h2.asText().trim() );
    
            a = (HtmlAnchor) elementIterator.next();
            assertEquals( "Section_formatting:_italic_bold_mono", 
a.getAttribute( "name" ) );
   @@ -132,8 +131,7 @@
    
            HtmlHeading3 h3 = (HtmlHeading3) elementIterator.next();
            assertNotNull( h3 );
   -        // Note: htmlunit strips the white space, actual result is ok
   -        assertEquals( "SubSection formatting: italicboldmono", 
h3.asText().trim() );
   +        assertEquals( "SubSection formatting: italic bold mono", 
h3.asText().trim() );
    
            a = (HtmlAnchor) elementIterator.next();
            assertEquals( "SubSection_formatting:_italic_bold_mono", 
a.getAttribute( "name" ) );
   Index: 
doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
   ===================================================================
   --- 
doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
   (revision 870)
   +++ 
doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
   (working copy)
   @@ -77,7 +77,7 @@
            assertEquals( "Contributing", element.asText().trim() );
    
            HtmlOrderedList ol = (HtmlOrderedList) elementIterator.next();
   -        assertEquals( "One stupid question & a silly answer?", 
ol.getFirstChild().asText().trim() );
   +        assertEquals( "One stupid question & a silly answer?", 
ol.getFirstChild().getNextSibling().asText().trim() );
    
            HtmlListItem li = (HtmlListItem) elementIterator.next();
            assertEquals( "One stupid question & a silly answer?", 
li.getFirstChild().asText().trim() );
   @@ -95,7 +95,7 @@
            assertEquals( "Using Maven", element.asText().trim() );
    
            ol = (HtmlOrderedList) elementIterator.next();
   -        assertEquals( "How do I disable a report on my site?", 
ol.getFirstChild().asText().trim() );
   +        assertEquals( "How do I disable a report on my site?", 
ol.getFirstChild().getNextSibling().asText().trim() );
    
            li = (HtmlListItem) elementIterator.next();
            assertNotNull( li );
   Index: 
doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java
   ===================================================================
   --- 
doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java
  (revision 870)
   +++ 
doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java
  (working copy)
   @@ -19,11 +19,11 @@
     * under the License.
     */
    
   -import com.gargoylesoftware.htmlunit.html.HtmlApplet;
    import com.gargoylesoftware.htmlunit.html.HtmlDivision;
    import com.gargoylesoftware.htmlunit.html.HtmlElement;
    import com.gargoylesoftware.htmlunit.html.HtmlPage;
    import com.gargoylesoftware.htmlunit.html.HtmlParameter;
   +import com.gargoylesoftware.htmlunit.html.HtmlUnknownElement;
    
    import java.util.Iterator;
    
   @@ -53,7 +53,7 @@
            //
            // 
----------------------------------------------------------------------
    
   -        HtmlApplet applet = (HtmlApplet) elementIterator.next();
   +        HtmlUnknownElement applet = (HtmlUnknownElement) 
elementIterator.next();
            assertEquals( "org.micro.applet.Main", applet.getAttribute( "code" 
) );
            assertEquals( "micro-applet.jar", applet.getAttribute( "archive" ) 
);
    
   

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services