From: <rb...@us...> - 2017-05-28 15:42:05
|
Revision: 14477 http://sourceforge.net/p/htmlunit/code/14477 Author: rbri Date: 2017-05-28 15:42:01 +0000 (Sun, 28 May 2017) Log Message: ----------- outerHtml fixes Modified Paths: -------------- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLUnknownElement.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementOuterHtmlTest.java Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2017-05-26 18:17:57 UTC (rev 14476) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2017-05-28 15:42:01 UTC (rev 14477) @@ -440,6 +440,10 @@ @BrowserFeature(CHROME) HTMLLINK_CHECK_TYPE_FOR_STYLESHEET, + /** No end tag for menu item. */ + @BrowserFeature(CHROME) + HTMLMENUITEM_END_TAG_FORBIDDEN, + /** */ @BrowserFeature({FF, IE}) HTMLOPTION_EMPTY_TEXT_IS_NO_CHILDREN, Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLUnknownElement.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLUnknownElement.java 2017-05-26 18:17:57 UTC (rev 14476) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLUnknownElement.java 2017-05-28 15:42:01 UTC (rev 14477) @@ -14,6 +14,7 @@ */ package com.gargoylesoftware.htmlunit.javascript.host.html; +import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLMENUITEM_END_TAG_FORBIDDEN; import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_HTML_HYPHEN_ELEMENT_CLASS_NAME; import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_HTML_RUBY_ELEMENT_CLASS_NAME; import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME; @@ -100,7 +101,9 @@ */ @Override protected boolean isEndTagForbidden() { - if ("IMAGE".equals(getNodeName())) { + if ("BGSOUND".equals(getNodeName()) + || (getBrowserVersion().hasFeature(HTMLMENUITEM_END_TAG_FORBIDDEN) + && "MENUITEM".equals(getNodeName()))) { return true; } return super.isEndTagForbidden(); Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementOuterHtmlTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementOuterHtmlTest.java 2017-05-26 18:17:57 UTC (rev 14476) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementOuterHtmlTest.java 2017-05-28 15:42:01 UTC (rev 14477) @@ -14,14 +14,11 @@ */ package com.gargoylesoftware.htmlunit.general; -import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME; - import org.junit.Test; import org.junit.runner.RunWith; import com.gargoylesoftware.htmlunit.BrowserRunner; import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts; -import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented; import com.gargoylesoftware.htmlunit.WebDriverTestCase; /** @@ -135,7 +132,6 @@ */ @Test @Alerts("<bgsound>") - @NotYetImplemented(CHROME) public void bgsound() throws Exception { loadPageWithAlerts2(test("bgsound")); } @@ -633,7 +629,6 @@ @Test @Alerts(DEFAULT = "<image></image>", IE = "<img>") - @NotYetImplemented(CHROME) public void image() throws Exception { loadPageWithAlerts2(test("image")); } @@ -798,7 +793,6 @@ @Test @Alerts(DEFAULT = "<menuitem></menuitem>", CHROME = "<menuitem>") - @NotYetImplemented(CHROME) public void menuitem() throws Exception { loadPageWithAlerts2(test("menuitem")); } |