Menu
▾
▴
[HtmlUnit] SVN: [14357] trunk/htmlunit/src
|
From: <asa...@us...> - 2017-05-04 15:36:44
|
Revision: 14357
http://sourceforge.net/p/htmlunit/code/14357
Author: asashour
Date: 2017-05-04 15:36:39 +0000 (Thu, 04 May 2017)
Log Message:
-----------
document.childElementcount
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManager4Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WaitingRefreshHandlerTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebWindowListenerTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParserTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFormTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrameTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTableRowTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngineTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ExternalTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclarationTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterDataTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseFontElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDataElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCellElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableRowElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTitleElementTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -720,15 +720,11 @@
/**
* Returns the current number of element nodes that are children of this element.
- * 0 if this element has no child nodes that are of nodeType 1.
* @return the current number of element nodes that are children of this element.
- * 0 if this element has no child nodes that are of nodeType 1
*/
public int getChildElementCount() {
int counter = 0;
- final Iterator<DomElement> i = getChildElements().iterator();
- while (i.hasNext()) {
- i.next();
+ for (final Iterator<DomElement> i = getChildElements().iterator(); i.hasNext(); i.next()) {
counter++;
}
return counter;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -1313,4 +1313,18 @@
public void setDesignMode(final String mode) {
super.setDesignMode(mode);
}
+
+ /**
+ * Returns the current number of child elements.
+ * @return the child element count
+ */
+ @JsxGetter
+ public int getChildElementCount() {
+ int counter = 0;
+ if (getPage().getDocumentElement() != null) {
+ counter++;
+ }
+ return counter;
+ }
+
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManager4Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManager4Test.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManager4Test.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -266,19 +266,18 @@
+ "<body>\n"
+ "<p>Cookie Domain Test</p>\n"
+ "<script>\n"
- + " document.cookie='c1=1; Domain=." + DOMAIN + "; Path=/';\n"
- + " document.cookie='c2=2; Domain=" + DOMAIN + "; Path=/';\n"
- + " document.cookie='c3=3; Domain=.host1." + DOMAIN + "; Path=/';\n"
- + " document.cookie='c4=4; Domain=host1." + DOMAIN + "; Path=/';\n"
- + " document.cookie='c5=5; Domain=." + DOMAIN + ":" + PORT + "; Path=/';\n"
- + " document.cookie='c6=6; Domain=" + DOMAIN + ":" + PORT + "; Path=/';\n"
- + " document.cookie='c7=7; Domain=.host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
- + " document.cookie='c8=8; Domain=host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
-
- + " document.cookie='c9=9; Domain=.org; Path=/';\n"
- + " document.cookie='c10=10; Domain=org; Path=/';\n"
- + " document.cookie='c11=11; Domain=.htmlunit; Path=/';\n"
- + " document.cookie='c12=12; Domain=htmlunit; Path=/';\n"
+ + " document.cookie = 'c1=1; Domain=." + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c2=2; Domain=" + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c3=3; Domain=.host1." + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c4=4; Domain=host1." + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c5=5; Domain=." + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c6=6; Domain=" + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c7=7; Domain=.host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c8=8; Domain=host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c9=9; Domain=.org; Path=/';\n"
+ + " document.cookie = 'c10=10; Domain=org; Path=/';\n"
+ + " document.cookie = 'c11=11; Domain=.htmlunit; Path=/';\n"
+ + " document.cookie = 'c12=12; Domain=htmlunit; Path=/';\n"
+ "</script>\n"
+ "</body>\n"
+ "</html>";
@@ -303,19 +302,18 @@
+ "<body>\n"
+ "<p>Cookie Domain Test</p>\n"
+ "<script>\n"
- + " document.cookie='c1=1; Domain=." + DOMAIN + "; Path=/';\n"
- + " document.cookie='c2=2; Domain=" + DOMAIN + "; Path=/';\n"
- + " document.cookie='c3=3; Domain=.host1." + DOMAIN + "; Path=/';\n"
- + " document.cookie='c4=4; Domain=host1." + DOMAIN + "; Path=/';\n"
- + " document.cookie='c5=5; Domain=." + DOMAIN + ":" + PORT + "; Path=/';\n"
- + " document.cookie='c6=6; Domain=" + DOMAIN + ":" + PORT + "; Path=/';\n"
- + " document.cookie='c7=7; Domain=.host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
- + " document.cookie='c8=8; Domain=host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
-
- + " document.cookie='c9=9; Domain=.org; Path=/';\n"
- + " document.cookie='c10=10; Domain=org; Path=/';\n"
- + " document.cookie='c11=11; Domain=.htmlunit; Path=/';\n"
- + " document.cookie='c12=12; Domain=htmlunit; Path=/';\n"
+ + " document.cookie = 'c1=1; Domain=." + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c2=2; Domain=" + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c3=3; Domain=.host1." + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c4=4; Domain=host1." + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c5=5; Domain=." + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c6=6; Domain=" + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c7=7; Domain=.host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c8=8; Domain=host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c9=9; Domain=.org; Path=/';\n"
+ + " document.cookie = 'c10=10; Domain=org; Path=/';\n"
+ + " document.cookie = 'c11=11; Domain=.htmlunit; Path=/';\n"
+ + " document.cookie = 'c12=12; Domain=htmlunit; Path=/';\n"
+ "</script>\n"
+ "</body>\n"
+ "</html>";
@@ -338,19 +336,18 @@
+ "<body>\n"
+ "<p>Cookie Domain Test</p>\n"
+ "<script>\n"
- + " document.cookie='c1=1; Domain=." + DOMAIN + "; Path=/';\n"
- + " document.cookie='c2=2; Domain=" + DOMAIN + "; Path=/';\n"
- + " document.cookie='c3=3; Domain=.host1." + DOMAIN + "; Path=/';\n"
- + " document.cookie='c4=4; Domain=host1." + DOMAIN + "; Path=/';\n"
- + " document.cookie='c5=5; Domain=." + DOMAIN + ":" + PORT + "; Path=/';\n"
- + " document.cookie='c6=6; Domain=" + DOMAIN + ":" + PORT + "; Path=/';\n"
- + " document.cookie='c7=7; Domain=.host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
- + " document.cookie='c8=8; Domain=host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
-
- + " document.cookie='c9=9; Domain=.org; Path=/';\n"
- + " document.cookie='c10=10; Domain=org; Path=/';\n"
- + " document.cookie='c11=11; Domain=.htmlunit; Path=/';\n"
- + " document.cookie='c12=12; Domain=htmlunit; Path=/';\n"
+ + " document.cookie = 'c1=1; Domain=." + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c2=2; Domain=" + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c3=3; Domain=.host1." + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c4=4; Domain=host1." + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c5=5; Domain=." + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c6=6; Domain=" + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c7=7; Domain=.host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c8=8; Domain=host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c9=9; Domain=.org; Path=/';\n"
+ + " document.cookie = 'c10=10; Domain=org; Path=/';\n"
+ + " document.cookie = 'c11=11; Domain=.htmlunit; Path=/';\n"
+ + " document.cookie = 'c12=12; Domain=htmlunit; Path=/';\n"
+ "</script>\n"
+ "</body>\n"
+ "</html>";
@@ -375,19 +372,18 @@
+ "<body>\n"
+ "<p>Cookie Domain Test</p>\n"
+ "<script>\n"
- + " document.cookie='c1=1; Domain=." + DOMAIN + "; Path=/';\n"
- + " document.cookie='c2=2; Domain=" + DOMAIN + "; Path=/';\n"
- + " document.cookie='c3=3; Domain=.host1." + DOMAIN + "; Path=/';\n"
- + " document.cookie='c4=4; Domain=host1." + DOMAIN + "; Path=/';\n"
- + " document.cookie='c5=5; Domain=." + DOMAIN + ":" + PORT + "; Path=/';\n"
- + " document.cookie='c6=6; Domain=" + DOMAIN + ":" + PORT + "; Path=/';\n"
- + " document.cookie='c7=7; Domain=.host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
- + " document.cookie='c8=8; Domain=host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
-
- + " document.cookie='c9=9; Domain=.org; Path=/';\n"
- + " document.cookie='c10=10; Domain=org; Path=/';\n"
- + " document.cookie='c11=11; Domain=.htmlunit; Path=/';\n"
- + " document.cookie='c12=12; Domain=htmlunit; Path=/';\n"
+ + " document.cookie = 'c1=1; Domain=." + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c2=2; Domain=" + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c3=3; Domain=.host1." + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c4=4; Domain=host1." + DOMAIN + "; Path=/';\n"
+ + " document.cookie = 'c5=5; Domain=." + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c6=6; Domain=" + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c7=7; Domain=.host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c8=8; Domain=host1." + DOMAIN + ":" + PORT + "; Path=/';\n"
+ + " document.cookie = 'c9=9; Domain=.org; Path=/';\n"
+ + " document.cookie = 'c10=10; Domain=org; Path=/';\n"
+ + " document.cookie = 'c11=11; Domain=.htmlunit; Path=/';\n"
+ + " document.cookie = 'c12=12; Domain=htmlunit; Path=/';\n"
+ "</script>\n"
+ "</body>\n"
+ "</html>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WaitingRefreshHandlerTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WaitingRefreshHandlerTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WaitingRefreshHandlerTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -37,7 +37,7 @@
+ "<head><title>First Page</title>\n"
+ "<script>\n"
+ "function doRedirect() {\n"
- + " window.location.href='" + URL_SECOND + "';\n"
+ + " window.location.href = '" + URL_SECOND + "';\n"
+ "}\n"
+ "</script>\n"
+ "</head>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebWindowListenerTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebWindowListenerTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebWindowListenerTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -41,7 +41,7 @@
+ "<head><title>Test 1</title></head>\n"
+ "<body>\n"
+ "<script type='text/javascript'>\n"
- + " document.location.href='" + URL_SECOND + "';\n"
+ + " document.location.href = '" + URL_SECOND + "';\n"
+ "</script>\n"
+ "<p>Second Page<p>\n"
+ "</body></html>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParserTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParserTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParserTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -93,7 +93,7 @@
public void emptyStack() throws Exception {
final String html =
"<html>\n"
- + " <body onload='document.getElementById(\"s\").innerHTML="
+ + " <body onload='document.getElementById(\"s\").innerHTML = "
+ " \"<h1><span><span></span></span><span><span></span></span></h1>\";'>\n"
+ " <div>\n"
+ " <div>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElement2Test.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElement2Test.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -119,13 +119,13 @@
public void clonedNodeAttributes() throws Exception {
final String html = "<html><body id='a' title='b'><script>\n"
+ "var x = document.body.cloneNode(true);\n"
- + "alert(document.body==x);\n"
- + "alert(document.getElementById('a')==document.body);\n"
+ + "alert(document.body == x);\n"
+ + "alert(document.getElementById('a') == document.body);\n"
+ "alert(document.body.id);\n"
+ "alert(x.id);\n"
+ "alert(document.body.title);\n"
+ "alert(x.title);\n"
- + "x.title='c';\n"
+ + "x.title = 'c';\n"
+ "alert(document.body.title);\n"
+ "alert(x.title);\n"
+ "</script></body></html>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElementTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElementTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -865,8 +865,8 @@
+ " textarea.value += e.type + '-' + e.which + '-';\n"
+ " }\n"
+ " function loadFunction(e) {\n"
- + " document.getElementById('myDiv').onmousedown=divMouseEvent;\n"
- + " document.getElementById('myDiv').onmouseup =divMouseEvent;\n"
+ + " document.getElementById('myDiv').onmousedown = divMouseEvent;\n"
+ + " document.getElementById('myDiv').onmouseup = divMouseEvent;\n"
+ " }\n"
+ "</script>\n"
+ "</head>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFormTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFormTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFormTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -716,9 +716,9 @@
+ "<script language='javascript'>\n"
+ "function setFormat() {\n"
+ " if (document.form1.Format.checked) {\n"
- + " document.form1.Format.value='html';\n"
+ + " document.form1.Format.value = 'html';\n"
+ " } else {\n"
- + " document.form1.Format.value='plain';\n"
+ + " document.form1.Format.value = 'plain';\n"
+ " }\n"
+ "}\n"
+ "</script>\n"
@@ -1327,7 +1327,7 @@
+ "var i = 0;\n"
+ "while (document.cb_form.Quantity[i]) {\n"
+ "document.cb_form.Quantity[i].value = document.cb_form.Quantity[i].value.replace(/[^0-9]/g, '');\n"
- + "if ((document.cb_form.Quantity[i].value.length == 0)) {document.cb_form.Quantity[i].value='1';}\n"
+ + "if ((document.cb_form.Quantity[i].value.length == 0)) {document.cb_form.Quantity[i].value = '1';}\n"
+ "i++;\n"
+ "}\n"
+ "</script>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -211,7 +211,7 @@
+ "<script type='text/javascript'>\n"
+ "function writeForm(frame) {\n"
+ " var div=frame.document.getElementById('div');\n"
- + " div.innerHTML=\"<form id='myForm'><input type='text' id='myInput' name='myInputName'/></form>\";\n"
+ + " div.innerHTML = \"<form id='myForm'><input type='text' id='myInput' name='myInputName'/></form>\";\n"
+ "}\n"
+ "function writeFrame(frame) {\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrameTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrameTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrameTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -248,7 +248,7 @@
+ "<span id='A'></span>\n"
+ "<script>\n"
+ " var frame='<iframe id=\"f\" src=\"" + URL_SECOND + "\"></iframe>';\n"
- + " document.getElementById('A').innerHTML=frame;\n"
+ + " document.getElementById('A').innerHTML = frame;\n"
+ "</script>\n"
+ "</body></html>";
final String html2 = "<html><body>iframe content</body></html>";
@@ -291,7 +291,7 @@
+ "<script>\n"
+ " function createIframe() {\n"
+ " var frame='<iframe id=\"f\" src=\"" + URL_SECOND + "\"></iframe>';\n"
- + " document.getElementById('A').innerHTML=frame;\n"
+ + " document.getElementById('A').innerHTML = frame;\n"
+ " }\n"
+ " setTimeout('createIframe()', 100);\n"
+ "</script>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -491,7 +491,7 @@
public void onLoadHandler_BodyName() throws Exception {
final String htmlContent = "<html><head><title>foo</title>\n"
+ "<script type='text/javascript'>\n"
- + "window.onload=function() {alert('foo')}</script>\n"
+ + " window.onload = function() {alert('foo')}</script>\n"
+ "</head><body></body></html>";
final List<String> collectedAlerts = new ArrayList<>();
final HtmlPage page = loadPage(htmlContent, collectedAlerts);
@@ -1283,7 +1283,7 @@
+ "<div id='myId'>Hello there!</div>\n"
+ "<script>\n"
+ " var x = document.all;\n"
- + " window.onload=function() {alert('foo')};\n"
+ + " window.onload = function() {alert('foo')};\n"
// this tests 3103703
// we don't store the jobs are pending at the moment of serialization
@@ -1593,7 +1593,7 @@
+ " function test() {\n"
+ " var table = document.createElement('table');\n"
+ " var tr = document.createElement('tr');\n"
- + " tr.id='myTR';\n"
+ + " tr.id = 'myTR';\n"
+ " table.appendChild(tr);\n"
+ " document.body.appendChild(table);\n"
+ " document.body.removeChild(table);\n"
@@ -1616,7 +1616,7 @@
+ " function test() {\n"
+ " var table = document.createElement('table');\n"
+ " var tr = document.createElement('tr');\n"
- + " tr.id='myTR';\n"
+ + " tr.id = 'myTR';\n"
+ " table.appendChild(tr);\n"
+ " alert(document.getElementById('myTR'));\n"
+ " }\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTableRowTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTableRowTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTableRowTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -220,7 +220,7 @@
*/
@Test
public void scriptCanSetJsPropertyOnCell() {
- final String cmd = "document.getElementById('cell').a='original';document.getElementById('cell')";
+ final String cmd = "document.getElementById('cell').a = 'original'; document.getElementById('cell')";
final Object object = page_.executeJavaScript(cmd).getJavaScriptResult();
final HTMLElement jselement = (HTMLElement) object;
@@ -235,7 +235,7 @@
@Test
@NotYetImplemented({CHROME, FF})
public void cloneScriptCanSetDisabledOnCell() {
- final String cmd = "document.getElementById('cell').disabled='true'";
+ final String cmd = "document.getElementById('cell').disabled = 'true'";
page_.executeJavaScript(cmd);
assertEquals("disabled", cell_.getAttribute("disabled"));
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngineTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngineTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngineTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -84,7 +84,7 @@
public void setJavascriptEnabled_false() throws Exception {
final String html
= "<html><head><title>foo</title><script>\n"
- + "document.form1.textfield1='blue'"
+ + " document.form1.textfield1 = 'blue'"
+ "</script></head><body>\n"
+ "<p>hello world</p>\n"
+ "<form name='form1'>\n"
@@ -110,7 +110,7 @@
final String content
= "<html><head><title>foo</title><script>\n"
+ "function doTest() {\n"
- + " document.form1.textfield1.value='blue'"
+ + " document.form1.textfield1.value = 'blue'"
+ "}\n"
+ "</script></head><body onload='doTest()'>\n"
+ "<p>hello world</p>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ExternalTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ExternalTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ExternalTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -49,8 +49,8 @@
+ " if ('AutoCompleteSaveForm' in window.external) {\n"
+ " alert('AutoCompleteSaveForm defined');\n"
+ " window.external.AutoCompleteSaveForm(oForm);\n"
- + " oForm.AutoCompleteTest.value='';\n"
- + " oForm.AutoCompleteIgnore.value='';\n"
+ + " oForm.AutoCompleteTest.value = '';\n"
+ + " oForm.AutoCompleteIgnore.value = '';\n"
+ " } else {\n"
+ " alert('no AutoCompleteSaveForm');\n"
+ " }\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -542,7 +542,7 @@
"<html><head><script>\n"
+ "function test() {\n"
+ " document.title += ' 1';\n"
- + " self.frames['frame1'].document.location.href='" + URL_SECOND + "';\n"
+ + " self.frames['frame1'].document.location.href = '" + URL_SECOND + "';\n"
+ " document.title += ' 2';\n"
+ "}\n"
+ "</script></head>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclarationTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclarationTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclarationTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -598,7 +598,7 @@
+ "<script>\n"
+ " d = document.getElementById('my');\n"
+ " alert(d.style.htmlunit);\n"
- + " d.style.htmlunit='foo';\n"
+ + " d.style.htmlunit = 'foo';\n"
+ " alert(d.style.htmlunit);\n"
+ "</script>\n"
+ "</body></html>";
@@ -890,10 +890,10 @@
final String html = "<html><head><title>foo</title><script>\n"
+ " function test() {\n"
+ " var myDiv = document.getElementById('myDiv');\n"
- + " myDiv.style.display='none';\n"
- + " alert(myDiv.style.display=='none');\n"
- + " myDiv.style.display='';\n"
- + " alert(myDiv.style.display=='none');\n"
+ + " myDiv.style.display = 'none';\n"
+ + " alert(myDiv.style.display == 'none');\n"
+ + " myDiv.style.display = '';\n"
+ + " alert(myDiv.style.display == 'none');\n"
+ " }\n"
+ "</script></head><body onload='test()'>\n"
+ " <div id='myDiv'/>\n"
@@ -968,9 +968,9 @@
final String html = "<html><head><title>foo</title><script>\n"
+ " function test() {\n"
+ " var myDiv = document.getElementById('myDiv');\n"
- + " myDiv.style.marginTop='1px';\n"
+ + " myDiv.style.marginTop = '1px';\n"
+ " alert(myDiv.style.marginTop);\n"
- + " myDiv.style.marginTop='2px';\n"
+ + " myDiv.style.marginTop = '2px';\n"
+ " alert(myDiv.style.marginTop);\n"
+ " }\n"
+ "</script></head><body onload='test()'>\n"
@@ -989,10 +989,10 @@
final String html = "<html><head><title>foo</title><script>\n"
+ " function test() {\n"
+ " var myDiv = document.getElementById('myDiv');\n"
- + " myDiv.style.marginTop='2px';\n"
+ + " myDiv.style.marginTop = '2px';\n"
+ " alert(myDiv.style.marginTop);\n"
- + " myDiv.style.left='-1px';\n"
- + " myDiv.style.marginTop='30px';\n"
+ + " myDiv.style.left = '-1px';\n"
+ + " myDiv.style.marginTop = '30px';\n"
+ " alert(myDiv.style.marginTop);\n"
+ " }\n"
+ "</script></head><body onload='test()'>\n"
@@ -2644,7 +2644,7 @@
+ "<script>\n"
+ " function test() {\n"
+ " var a = document.createElement('div');\n"
- + " a.style.cssText='width: 100%';\n"
+ + " a.style.cssText = 'width: 100%';\n"
+ " alert(a.style.length);\n"
+ " alert(a.style[0]);\n"
+ " alert(a.style[1]);\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -1282,13 +1282,13 @@
+ " tester(document.getElementById('div'));\n"
+ " }\n"
+ " function tester(el) {\n"
- + " alert(el.style.width=='auto');\n"
+ + " alert(el.style.width == 'auto');\n"
+ " alert(el.clientWidth > 100);\n"
+ " alert(el.offsetWidth > 100);\n"
+ " var style = window.getComputedStyle(el, null);\n"
+ " alert(/\\d+px/.test(style.width));\n"
- + " alert(style.width=='auto');\n"
+ + " alert(style.width == 'auto');\n"
+ " }\n"
+ " </script>\n"
+ "</head>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterDataTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterDataTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterDataTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -67,7 +67,7 @@
+ "function doTest() {\n"
+ " var div1=document.getElementById('div1');\n"
+ " var text1=div1.firstChild;\n"
- + " text1.data='Some New Text';\n"
+ + " text1.data = 'Some New Text';\n"
+ " alert(text1.data);\n"
+ " alert(text1.nodeValue);\n"
+ "}\n"
@@ -90,7 +90,7 @@
+ "function doTest() {\n"
+ " var div1=document.getElementById('div1');\n"
+ " var text1=div1.firstChild;\n"
- + " text1.nodeValue='Some New Text';\n"
+ + " text1.nodeValue = 'Some New Text';\n"
+ " alert(text1.data);\n"
+ " alert(text1.nodeValue);\n"
+ "}\n"
@@ -363,7 +363,7 @@
+ " var text2=text1.splitText(5);\n"
+ " alert(text1.data);\n"
+ " alert(text2.data);\n"
- + " alert(text1.nextSibling==text2);\n"
+ + " alert(text1.nextSibling == text2);\n"
+ "}\n"
+ "</script></head><body onload='doTest()'>\n"
+ "<div id='div1'>Some Text</div></body></html>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document2Test.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document2Test.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -210,7 +210,7 @@
+ " xmlhttp.open(\"GET\",\"content.xhtml\",true);\n"
+ " xmlhttp.send();\n"
+ " xmlhttp.onreadystatechange = function() {\n"
- + " if (xmlhttp.readyState==4 && xmlhttp.status==200) {\n"
+ + " if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {\n"
+ " var child = document.importNode(xmlhttp.responseXML.getElementById(\"child\"), true);\n"
+ " document.getElementById(\"parent\").appendChild(child);\n"
+ " var found = document.evaluate(\"//div[@id='parent']\", document, null,"
@@ -252,7 +252,7 @@
+ " xmlhttp.open(\"GET\",\"content.xhtml\",true);\n"
+ " xmlhttp.send();\n"
+ " xmlhttp.onreadystatechange = function() {\n"
- + " if (xmlhttp.readyState==4 && xmlhttp.status==200) {\n"
+ + " if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {\n"
+ " var child = document.importNode(xmlhttp.responseXML.getElementById(\"child\"), true);\n"
+ " document.getElementById(\"parent\").appendChild(child);\n"
+ " var found = document.evaluate(\"//div[@id='parent']\", document, null,"
@@ -421,7 +421,7 @@
+ " var d = window.frames['f'].document;\n"
+ " try { alert(d.queryCommandEnabled('SelectAll')); } catch(e) { alert('error'); }\n"
+ " try { alert(d.queryCommandEnabled('sElectaLL')); } catch(e) { alert('error'); }\n"
- + " d.designMode='on';\n"
+ + " d.designMode = 'on';\n"
+ " alert(d.queryCommandEnabled('SelectAll'));\n"
+ " alert(d.queryCommandEnabled('selectall'));\n"
+ " alert(d.queryCommandEnabled('SeLeCtALL'));\n"
@@ -486,7 +486,7 @@
= "<html><head><title>First</title><script>\n"
+ "function doTest() {\n"
+ " var div1 = document.getElementById('div1');\n"
- + " div1.firstChild.id='newId';\n"
+ + " div1.firstChild.id = 'newId';\n"
+ " alert(document.getElementById('newId').value);\n"
+ "}\n"
+ "</script></head><body onload='doTest()'>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -479,11 +479,11 @@
+ " function doTest() {\n"
+ " var form = document.forms['form1'];\n"
+ " var cloneShallow = form.cloneNode(false);\n"
- + " alert(cloneShallow!=null);\n"
- + " alert(cloneShallow.firstChild==null);\n"
+ + " alert(cloneShallow != null);\n"
+ + " alert(cloneShallow.firstChild == null);\n"
+ " var cloneDeep = form.cloneNode(true);\n"
- + " alert(cloneDeep!=null);\n"
- + " alert(cloneDeep.firstChild!=null);\n"
+ + " alert(cloneDeep != null);\n"
+ + " alert(cloneDeep.firstChild != null);\n"
+ " }\n"
+ "</script></head><body onload='doTest()'>\n"
+ "<form name='form1'>\n"
@@ -508,7 +508,7 @@
+ " var oldChild = document.getElementById('oldChild');\n"
+ " var div = document.createElement('DIV');\n"
+ " form.insertBefore(div, oldChild);\n"
- + " alert(form.firstChild==div);\n"
+ + " alert(form.firstChild == div);\n"
+ " }\n"
+ "</script></head><body onload='doTest()'>\n"
+ "<form name='form1'><div id='oldChild'/></form>\n"
@@ -588,7 +588,7 @@
final String html
= "<html><head><title>First</title><script>\n"
+ " function doTest() {\n"
- + " alert(document.parentNode==null);\n"
+ + " alert(document.parentNode == null);\n"
+ " }\n"
+ "</script></head><body onload='doTest()'>\n"
+ "</body></html>";
@@ -607,7 +607,7 @@
= "<html><head><title>First</title><script>\n"
+ " function doTest() {\n"
+ " var div1=document.createElement('div');\n"
- + " alert(div1.parentNode==null);\n"
+ + " alert(div1.parentNode == null);\n"
+ " }\n"
+ "</script></head><body onload='doTest()'>\n"
+ "</body></html>";
@@ -647,9 +647,9 @@
final String html
= "<html><head><title>First</title><script>\n"
+ " function doTest() {\n"
- + " alert(document.documentElement!=null);\n"
+ + " alert(document.documentElement != null);\n"
+ " alert(document.documentElement.tagName);\n"
- + " alert(document.documentElement.parentNode==document);\n"
+ + " alert(document.documentElement.parentNode == document);\n"
+ " }\n"
+ "</script></head><body onload='doTest()'>\n"
+ "</body></html>";
@@ -1917,21 +1917,21 @@
final String html = "<html><body><iframe name='f' id='f'></iframe><script>\n"
+ "var d = " + doc + ";\n"
+ "alert(d.designMode);\n"
- + "try{d.designMode='abc';}catch(e){alert('!');}\n"
+ + "try{d.designMode = 'abc';}catch(e){alert('!');}\n"
+ "alert(d.designMode);\n"
- + "try{d.designMode='on';}catch(e){alert('!');}\n"
+ + "try{d.designMode = 'on';}catch(e){alert('!');}\n"
+ "alert(d.designMode);\n"
- + "try{d.designMode='On';}catch(e){alert('!');}\n"
+ + "try{d.designMode = 'On';}catch(e){alert('!');}\n"
+ "alert(d.designMode);\n"
- + "try{d.designMode='abc';}catch(e){alert('!');}\n"
+ + "try{d.designMode = 'abc';}catch(e){alert('!');}\n"
+ "alert(d.designMode);\n"
- + "try{d.designMode='Off';}catch(e){alert('!');}\n"
+ + "try{d.designMode = 'Off';}catch(e){alert('!');}\n"
+ "alert(d.designMode);\n"
- + "try{d.designMode='off';}catch(e){alert('!');}\n"
+ + "try{d.designMode = 'off';}catch(e){alert('!');}\n"
+ "alert(d.designMode);\n"
- + "try{d.designMode='Inherit';}catch(e){alert('!');}\n"
+ + "try{d.designMode = 'Inherit';}catch(e){alert('!');}\n"
+ "alert(d.designMode);\n"
- + "try{d.designMode='inherit';}catch(e){alert('!');}\n"
+ + "try{d.designMode = 'inherit';}catch(e){alert('!');}\n"
+ "alert(d.designMode);\n"
+ "</script></body></html>";
@@ -1954,9 +1954,9 @@
+ " if(!selection) selection = window.getSelection();\n"
+ " function test() {\n"
+ " alert(selection.rangeCount);\n"
- + " document.designMode='on';\n"
+ + " document.designMode = 'on';\n"
+ " alert(selection.rangeCount);\n"
- + " document.designMode='off';\n"
+ + " document.designMode = 'off';\n"
+ " alert(selection.rangeCount);\n"
+ " }\n"
+ "</script>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -143,7 +143,7 @@
+ " var div = form.firstChild;\n"
+ " var removedDiv = form.removeChild(div);\n"
+ " alert(div==removedDiv);\n"
- + " alert(form.firstChild==null);\n"
+ + " alert(form.firstChild == null);\n"
+ "}\n"
+ "</script></head><body onload='doTest()'>\n"
+ "<form name='form1'><div id='formChild'/></form>\n"
@@ -190,11 +190,11 @@
+ " var div1 = form.firstChild;\n"
+ " var div2 = document.getElementById('newChild');\n"
+ " var removedDiv = form.replaceChild(div2,div1);\n"
- + " alert(div1==removedDiv);\n"
- + " alert(form.firstChild==div2);\n"
+ + " alert(div1 == removedDiv);\n"
+ + " alert(form.firstChild == div2);\n"
+ " var newDiv = document.createElement('div');\n"
+ " form.replaceChild(newDiv, div2);\n"
- + " alert(form.firstChild==newDiv);\n"
+ + " alert(form.firstChild == newDiv);\n"
+ "}\n"
+ "</script></head><body onload='doTest()'>\n"
+ "<form name='form1'><div id='formChild'/></form>\n"
@@ -745,7 +745,7 @@
+ "function doTest() {\n"
+ " try {\n"
+ " var e = document.createElement('div');\n"
- + " e.innerHTML='new element';\n"
+ + " e.innerHTML = 'new element';\n"
+ " document.body.insertBefore(e, undefined);\n"
+ " } catch(e) {alert('exception');}\n"
+ "}\n"
@@ -926,7 +926,7 @@
+ "function doTest() {\n"
+ " try {\n"
+ " var e = document.createElement('div');\n"
- + " e.innerHTML='new element';\n"
+ + " e.innerHTML = 'new element';\n"
+ " document.body.insertBefore(e);\n"
+ " } catch(e) {alert('exception');}\n"
+ "}\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -215,7 +215,7 @@
+ " function doTest(anchorElement) {\n"
+ " alert(anchorElement.href);\n"
+ " alert(anchorElement.getAttribute('href'));\n"
- + " anchorElement.href='testsite2.html';\n"
+ + " anchorElement.href = 'testsite2.html';\n"
+ " alert(anchorElement.href);\n"
+ " alert(anchorElement.getAttribute('href'));\n"
+ " alert(anchorElement.getAttribute('id'));\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseFontElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseFontElementTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseFontElementTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -72,7 +72,7 @@
+ " var base = document.getElementById('base');\n"
+ " alert(base.size);\n"
+ " try {\n"
- + " base.size=42;\n"
+ + " base.size = 42;\n"
+ " alert(base.size);\n"
+ " } catch(e) {\n"
+ " alert('exception');\n"
@@ -101,7 +101,7 @@
+ " var base = document.getElementById('base');\n"
+ " alert(base.face);\n"
+ " try {\n"
- + " base.face='helvetica';\n"
+ + " base.face = 'helvetica';\n"
+ " alert(base.face);\n"
+ " } catch(e) {\n"
+ " alert('exception');\n"
@@ -130,7 +130,7 @@
+ " var base = document.getElementById('base');\n"
+ " alert(base.color);\n"
+ " try {\n"
- + " base.color='blue';\n"
+ + " base.color = 'blue';\n"
+ " alert(base.color);\n"
+ " } catch(e) {\n"
+ " alert('exception');\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDataElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDataElementTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDataElementTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -56,12 +56,12 @@
+ "<script>\n"
+ " var dat = document.getElementById('d1');\n"
+ " alert(dat.value);\n"
- + " dat.value='#12o';\n"
+ + " dat.value = '#12o';\n"
+ " alert(dat.value);\n"
+ " dat = document.getElementById('d2');\n"
+ " alert(dat.value);\n"
- + " dat.value='#12o';\n"
+ + " dat.value = '#12o';\n"
+ " alert(dat.value);\n"
+ "</script></body></html>";
loadPageWithAlerts2(html);
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -1582,13 +1582,13 @@
+ " <head>\n"
+ " <script>\n"
+ " alert(document.cookie);\n"
- + " document.cookie='a';\n"
+ + " document.cookie = 'a';\n"
+ " alert(document.cookie);\n"
- + " document.cookie='';\n"
+ + " document.cookie = '';\n"
+ " alert(document.cookie);\n"
- + " document.cookie='b';\n"
+ + " document.cookie = 'b';\n"
+ " alert(document.cookie);\n"
- + " document.cookie='';\n"
+ + " document.cookie = '';\n"
+ " alert(document.cookie);\n"
+ " </script>\n"
+ " </head>\n"
@@ -1609,9 +1609,9 @@
+ " <head>\n"
+ " <script>\n"
+ " alert(document.cookie);\n"
- + " document.cookie='a';\n"
+ + " document.cookie = 'a';\n"
+ " alert(document.cookie);\n"
- + " document.cookie='=b';\n"
+ + " document.cookie = '=b';\n"
+ " alert(document.cookie);\n"
+ " </script>\n"
+ " </head>\n"
@@ -2537,4 +2537,24 @@
assertEquals(getExpectedAlerts(), actual);
}
+ /**
+ * @throws Exception if the test fails
+ */
+ @Test
+ @Alerts("1")
+ public void childElementCount() throws Exception {
+ final String html = ""
+ + "<html><head>\n"
+ + "<script>\n"
+ + " function test() {\n"
+ + " alert(document.childElementCount);\n"
+ + " }\n"
+ + "</script>\n"
+ + "</head>\n"
+ + "<body onload='test()'><div/>"
+ + "</body></html>";
+
+ loadPageWithAlerts2(html);
+ }
+
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java 2017-05-04 12:25:10 UTC (rev 14356)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java 2017-05-04 15:36:39 UTC (rev 14357)
@@ -290,7 +290,7 @@
"nodeName=custom_attribute",
"nodeType=2",
"nodeValue=bleh",
- "(ownerDocument==document)=true",
+ "(ownerDocument == document) = true",
"parentNode=null",
"previousSibling=null",
"specified=true",
@@ -306,7 +306,7 @@
"nodeName=custom_attribute",
"nodeType=2",
"nodeValue=bleh",
- "(ownerDocument==document)=true",
+ "(ownerDocument == document) = true",
"parentNode=null",
"previousSibling=null",
"specified=true",
@@ -333,7 +333,7 @@
+ " alert('nodeName=' + att.nodeName);\n"
+ " alert('nodeType=' + att.nodeType);\n"
+ " alert('nodeValue=' + att.nodeValue);\n"
- + " alert('(ownerDocument==document)=' + (att.ownerDocument==document));\n"
+ + " alert('(ownerDocument == document) = ' + (att.ownerDocument == document));\n"
+ " alert('parentNode=' + att.parentNode);\n"
+ " alert('previousSibling=' + att.previousSibling);\n"
+ " alert('specified=' + att.specified);\n"
@@ -1446,9 +1446,11 @@
+ " var myNode = document.getElementById('myNode');\n"
+ " document.body.removeChild(myNode);\n"
+ " alert('Old = ' + myNode.innerHTML);\n"
- + " myNode.outerHTML = null;\n"
- + " alert('New = ' + myNode.innerHTML);\n"
- + " alert('Children: ' + myNode.childNodes.length);\n"
+ + " try {\n"
+ + " myNode.outerHTML = null;\n"
+ + " alert('New = ' + myNode.innerHTML);\n"
+ + " alert('Children: ' + myNode.childNodes.length);\n"
+ + " } catch(e) {alert('exception'); }\n"
+ " }\n"
+ " </script>\n"
+ "</head>\n"
@@ -1477,9 +1479,11 @@
+ " var myNode = document.getElementById('myNode');\n"
+ " document.body.removeChild(myNode);\n"
+ " alert('Old = ' + myNode.innerHTML);\n"
- + " myNode.outerHTML = undefined;\n"
- + " alert('New = ' + myNode.innerHTML);\n"
- + " alert('Children: ' + myNode.childNodes.length);\n"
+ + " try {\n"
+ + " myNode.outerHTML = undefined;\n"
+ + " alert('New = ' + myNode.innerHTML);\n"
+ + " alert('Children: ' + myNode.childNodes.length);\n"
+ + " } catch(e) {alert('exception'); }\n"
+ " }\n"
+ " </script>\n"
+ "</head>\n"
@@ -1508,9 +1512,11 @@
+ " var myNode = document.getElementById('myNode');\n"
+ " document.body.removeChild(myNode);\n"
+ " alert('Old = ' + myNode.innerHTML);\n"
- + " myNode.outerHTML = '';\n"
- + " alert('New = ' + myNode.innerHTML);\n"
- + " alert('Children: ' + myNode.childNodes.length);\n"
+ + " try {\n"
+ + " myNode.outerHTML = '';\n"
+ + " alert('New = ' + myNode.innerHTML);\n"
+ + " alert('Children: ' + myNode.childNodes.length);\n"
+ + " } catch(e) {alert('exception'); }\n"
+ " }\n"
+ " </script>\n"
+ "</head>\n"
@@ -1539,9 +1545,11 @@
+ " var myNode = document.getElementById('myNode');\n"
+ " document.body.removeChild(myNode);\n"
+ " alert('Old = ' + myNode.innerHTML);\n"
- + " myNode.outerHTML = '';\n"
- + " alert('New = ' + myNode.innerHTML);\n"
- + " alert('Children: ' + myNode.childNodes.length);\n"
+ + " try {\n"
+ + " myNode.outerHTML = '';\n"
+ + " alert('New = ' + myNode.innerHTML);\n"
+ + " alert('Children: ' + myNode.childNodes.length);\n"
+ + " } catch(e) {alert('exception'); }\n"
+ " }\n"
+ " </script>\n"
+ "</head>\n"
@@ -1570,9 +1578,11 @@
+ " var myNode = document.getElementById('myNode');\n"
+ " document.body.removeChild(myNode);\n"
+ " alert('Old = ' + myNode.innerHTML);\n"
- + " myNode.outerHTML = '<p>test</p>';\n"
- + " alert('New = ' + myNode.innerHTML);\n"
- + " alert('Children: ' + myNode.childNodes.length);\n"
+ + " try {\n"
+ + " myNode.outerHTML = '<p>test</p>';\n"
+ + " alert('New = ' + myNode.innerHTML);\n"
+ + " alert('Children: ' + myNode.childNodes.length);\n"
+ + " } catch(e) {alert('exception'); }\n"
+ " }\n"
+ " </script>\n"
+ "</head>\n"
@@ -2424,16 +2434,16 @@
public void getBoundingClientRect_Scroll() throws Exception {
final String html = "<html><head><title>foo</title><script>\n"
+ " function test() {\n"
- + " var d1 = document.getElementById('outer');\n"
- + " d1.scrollTop=150;\n"
- + " var pos = d1.getBoundingClientRect();\n"
- + " alert(pos.left);\n"
- + " alert(pos.top);\n"
+ + " var d1 = document.getElementById('outer');\n"
+ + " d1.scrollTop = 150;\n"
+ + " var pos = d1.getBoundingClientRect();\n"
+ + " alert(pos.left);\n"
+ + " alert(pos.top);\n"
- + " d1 = document.getElementById('div1');\n"
- + " pos = d1.getBoundingClientRect();\n"
- + " alert(pos.left);\n"
- + " alert(pos.top);\n"
+ + " d1 = document.getElementById('div1');\n"
+ + " pos = d1.getBoundingClientRect();\n"
+ + " alert(pos.left);\n"
+ + " alert(pos.top);\n"
+ " }\n"
+ "</script></head>\n"
+ "<body onload='test()'>\n"
@@ -2556,7 +2566,7 @@
+ " function test() {\n"
+ " var div1 = document.createElement('div');\n"
+ " alert(div1.parentNode);\n"
- + " div1.innerHTML='<p>hello</p>';\n"
+ + " div1.innerHTML = '<p>hello</p>';\n"
+ " if(div1.parentNode)\n"
+ " alert(div1.parentNode.nodeName);\n"
+ " else\n"
@@ -2577,7 +2587,7 @@
+ " function test() {\n"
+ " var div1 = document.createElement('div');\n"
+ " alert(div1.parentNode);\n"
- ...
[truncated message content] |
