svn commit: r1641345 - in /wookie/branches/wookie-1.0.x: ivy.xml src/test/java/org/apache/wookie/tests/HtmlSerializerTest.java

[scottbw]

Author: scottbw
Date: Mon Nov 24 10:04:48 2014
New Revision: 1641345

URL: http://svn.apache.org/r1641345
Log:
Updated HtmlCleaner to 2.10 (see WOOKIE-431). Thanks to Jawwad Farooq for the 
bug report and testing this out.

Modified:
    wookie/branches/wookie-1.0.x/ivy.xml
    
wookie/branches/wookie-1.0.x/src/test/java/org/apache/wookie/tests/HtmlSerializerTest.java

Modified: wookie/branches/wookie-1.0.x/ivy.xml
URL: 
http://svn.apache.org/viewvc/wookie/branches/wookie-1.0.x/ivy.xml?rev=1641345&r1=1641344&r2=1641345&view=diff
==============================================================================
--- wookie/branches/wookie-1.0.x/ivy.xml (original)
+++ wookie/branches/wookie-1.0.x/ivy.xml Mon Nov 24 10:04:48 2014
@@ -74,7 +74,7 @@
         </dependency>
         <dependency org="dom4j" name="dom4j" rev="1.6.1" 
conf="deploy->default">
         </dependency>
-        <dependency org="net.sourceforge.htmlcleaner" name="htmlcleaner" 
rev="2.2.1" conf="deploy->default">
+        <dependency org="net.sourceforge.htmlcleaner" name="htmlcleaner" 
rev="2.10" conf="deploy->default">
         </dependency>
         <dependency org="org.directwebremoting" name="dwr" rev="2.0.10" 
conf="deploy->default">
                </dependency>

Modified: 
wookie/branches/wookie-1.0.x/src/test/java/org/apache/wookie/tests/HtmlSerializerTest.java
URL: 
http://svn.apache.org/viewvc/wookie/branches/wookie-1.0.x/src/test/java/org/apache/wookie/tests/HtmlSerializerTest.java?rev=1641345&r1=1641344&r2=1641345&view=diff
==============================================================================
--- 
wookie/branches/wookie-1.0.x/src/test/java/org/apache/wookie/tests/HtmlSerializerTest.java
 (original)
+++ 
wookie/branches/wookie-1.0.x/src/test/java/org/apache/wookie/tests/HtmlSerializerTest.java
 Mon Nov 24 10:04:48 2014
@@ -21,6 +21,7 @@ import java.io.StringWriter;
 import org.apache.wookie.util.html.HtmlSerializer;
 import org.htmlcleaner.CleanerProperties;
 import org.htmlcleaner.HtmlCleaner;
+import org.htmlcleaner.SimpleHtmlSerializer;
 import org.htmlcleaner.TagNode;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -39,14 +40,15 @@ public class HtmlSerializerTest {
                properties.setOmitXmlDeclaration(true);
                properties.setUseCdataForScriptAndStyle(true);
                properties.setUseEmptyElementTags(false);       
+               properties.setAddNewlineToHeadAndBody(false);
        }
        
        private String parse(String content){
                StringWriter writer = new StringWriter();
-               HtmlSerializer ser = new HtmlSerializer(properties);
+               SimpleHtmlSerializer ser = new SimpleHtmlSerializer(properties);
                try {
                        TagNode html = cleaner.clean(content);
-                       ser.writeXml(html, writer, "UTF-8");
+                       ser.write(html, writer, "UTF-8");
                        return writer.getBuffer().toString();
                } catch (IOException e) {
                        return null;