Menu
▾
▴
[HtmlUnit] SVN: [8849] trunk/htmlunit/src
|
From: <rb...@us...> - 2013-12-15 11:58:54
|
Revision: 8849
http://sourceforge.net/p/htmlunit/code/8849
Author: rbri
Date: 2013-12-15 11:58:50 +0000 (Sun, 15 Dec 2013)
Log Message:
-----------
next try in the fight with or line break handling
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomText.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlScript.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlOrderedListTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlScriptTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlUnorderedListTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java 2013-12-14 16:05:37 UTC (rev 8848)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java 2013-12-15 11:58:50 UTC (rev 8849)
@@ -163,12 +163,15 @@
printOpeningTagContentAsXml(printWriter);
if (!hasChildren && !isEmptyXmlTagExpanded()) {
- printWriter.println("/>");
+ printWriter.print("/>");
+ printWriter.print("\r\n");
}
else {
- printWriter.println(">");
+ printWriter.print(">");
+ printWriter.print("\r\n");
printChildrenAsXml(indent, printWriter);
- printWriter.println(indent + "</" + getTagName() + ">");
+ printWriter.print(indent + "</" + getTagName() + ">");
+ printWriter.print("\r\n");
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java 2013-12-14 16:05:37 UTC (rev 8848)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java 2013-12-15 11:58:50 UTC (rev 8849)
@@ -784,7 +784,8 @@
final StringWriter stringWriter = new StringWriter();
final PrintWriter printWriter = new PrintWriter(stringWriter);
if (charsetName != null && this instanceof HtmlHtml) {
- printWriter.println("<?xml version=\"1.0\" encoding=\"" + charsetName + "\"?>");
+ printWriter.print("<?xml version=\"1.0\" encoding=\"" + charsetName + "\"?>");
+ printWriter.print("\r\n");
}
printXml("", printWriter);
printWriter.close();
@@ -798,7 +799,9 @@
* @param printWriter writer where child nodes are written
*/
protected void printXml(final String indent, final PrintWriter printWriter) {
- printWriter.println(indent + this);
+ printWriter.print(indent);
+ printWriter.print(this);
+ printWriter.print("\r\n");
printChildrenAsXml(indent, printWriter);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomText.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomText.java 2013-12-14 16:05:37 UTC (rev 8848)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomText.java 2013-12-15 11:58:50 UTC (rev 8849)
@@ -133,7 +133,8 @@
if (!(getParentNode() instanceof HtmlStyle) || !data.startsWith("<!--") || !data.endsWith("-->")) {
data = StringUtils.escapeXmlChars(data);
}
- printWriter.println(data);
+ printWriter.print(data);
+ printWriter.print("\r\n");
}
printChildrenAsXml(indent, printWriter);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlScript.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlScript.java 2013-12-14 16:05:37 UTC (rev 8848)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlScript.java 2013-12-15 11:58:50 UTC (rev 8849)
@@ -560,12 +560,16 @@
final String data = textNode.getData();
if (data.contains("//<![CDATA[")) {
- printWriter.println(data);
+ printWriter.print(data);
+ printWriter.print("\r\n");
}
else {
- printWriter.println("//<![CDATA[");
- printWriter.println(data);
- printWriter.println("//]]>");
+ printWriter.print("//<![CDATA[");
+ printWriter.print("\r\n");
+ printWriter.print(data);
+ printWriter.print("\r\n");
+ printWriter.print("//]]>");
+ printWriter.print("\r\n");
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElementTest.java 2013-12-14 16:05:37 UTC (rev 8848)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElementTest.java 2013-12-15 11:58:50 UTC (rev 8849)
@@ -1239,14 +1239,12 @@
final HtmlPage page = loadPage(html);
- final String htmlDiv1XML = "<div id=\"div1\" onclick=\"alert('hello')\">" + LINE_SEPARATOR
- + " click me" + LINE_SEPARATOR
- + "</div>" + LINE_SEPARATOR;
+ final String htmlDiv1XML = "<div id=\"div1\" onclick=\"alert('hello')\">\r\n click me"
+ + "\r\n</div>\r\n";
assertEquals(htmlDiv1XML, page.getElementById("div1").asXml());
- final String htmlDiv2XML = "<div id=\"div2\" onclick=\"alert("hello again")\">" + LINE_SEPARATOR
- + " click me again" + LINE_SEPARATOR
- + "</div>" + LINE_SEPARATOR;
+ final String htmlDiv2XML = "<div id=\"div2\" onclick=\"alert("hello again")\">\r\n click me again"
+ + "\r\n</div>\r\n";
assertEquals(htmlDiv2XML, page.getElementById("div2").asXml());
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlOrderedListTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlOrderedListTest.java 2013-12-14 16:05:37 UTC (rev 8848)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlOrderedListTest.java 2013-12-15 11:58:50 UTC (rev 8849)
@@ -87,7 +87,7 @@
final HtmlPage page = loadPage(content);
final HtmlElement element = page.getHtmlElementById("myNode");
- assertEquals("<ol id=\"myNode\">" + LINE_SEPARATOR + "</ol>" + LINE_SEPARATOR, element.asXml());
+ assertEquals("<ol id=\"myNode\">\r\n</ol>\r\n", element.asXml());
assertTrue(page.asXml().contains("</ol>"));
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlScriptTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlScriptTest.java 2013-12-14 16:05:37 UTC (rev 8848)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlScriptTest.java 2013-12-15 11:58:50 UTC (rev 8849)
@@ -141,7 +141,7 @@
final String html = "<html><body><script id='s'>" + script + "</script></body></html>";
final HtmlPage page = loadPage(html);
final HtmlScript scriptElement = page.getHtmlElementById("s");
- assertEquals("<script id=\"s\">" + LINE_SEPARATOR + script + LINE_SEPARATOR + "</script>" + LINE_SEPARATOR,
+ assertEquals("<script id=\"s\">\r\n" + script + "\r\n</script>\r\n",
scriptElement.asXml());
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlUnorderedListTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlUnorderedListTest.java 2013-12-14 16:05:37 UTC (rev 8848)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlUnorderedListTest.java 2013-12-15 11:58:50 UTC (rev 8849)
@@ -70,7 +70,7 @@
final HtmlPage page = loadPage(content);
final HtmlElement element = page.getHtmlElementById("myNode");
- assertEquals("<ul id=\"myNode\">" + LINE_SEPARATOR + "</ul>" + LINE_SEPARATOR, element.asXml());
+ assertEquals("<ul id=\"myNode\">\r\n</ul>\r\n", element.asXml());
assertTrue(page.asXml().contains("</ul>"));
}
}
|
