Menu
▾
▴
htmlunit-develop
|
From: <rb...@us...> - 2018-04-21 15:31:25
|
Revision: 15241
http://sourceforge.net/p/htmlunit/code/15241
Author: rbri
Date: 2018-04-21 15:31:12 +0000 (Sat, 21 Apr 2018)
Log Message:
-----------
latest chrome (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclarationTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-04-15 12:52:47 UTC (rev 15240)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-04-21 15:31:12 UTC (rev 15241)
@@ -94,10 +94,6 @@
@BrowserFeature({CHROME, FF})
CSS_LENGTH_INITIAL,
- /** undefined is processed as empty length value. */
- @BrowserFeature(CHROME)
- CSS_LENGTH_UNDEFINED_AS_EMPTY,
-
/** Is display style of HtmlNoEmbed is 'inline'. */
@BrowserFeature(CHROME)
CSS_NOEMBED_INLINE,
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java 2018-04-15 12:52:47 UTC (rev 15240)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java 2018-04-21 15:31:12 UTC (rev 15241)
@@ -16,7 +16,6 @@
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_BACKGROUND_INITIAL;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_LENGTH_INITIAL;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_LENGTH_UNDEFINED_AS_EMPTY;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_OUTLINE_WIDTH_UNIT_NOT_REQUIRED;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_SET_NULL_THROWS;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_SUPPORTS_BEHAVIOR_PROPERTY;
@@ -889,7 +888,7 @@
@JsxSetter
public void setBorderBottomWidth(final Object borderBottomWidth) {
setStyleLengthAttribute(BORDER_BOTTOM_WIDTH.getAttributeName(), borderBottomWidth, "",
- false, false, false, false, false);
+ false, false, false, false);
}
/**
@@ -1006,7 +1005,7 @@
@JsxSetter
public void setBorderLeftWidth(final Object borderLeftWidth) {
setStyleLengthAttribute(BORDER_LEFT_WIDTH.getAttributeName(), borderLeftWidth, "",
- false, false, false, false, false);
+ false, false, false, false);
}
/**
@@ -1081,7 +1080,7 @@
@JsxSetter
public void setBorderRightWidth(final Object borderRightWidth) {
setStyleLengthAttribute(BORDER_RIGHT_WIDTH.getAttributeName(), borderRightWidth, "",
- false, false, false, false, false);
+ false, false, false, false);
}
/**
@@ -1165,7 +1164,7 @@
@JsxSetter
public void setBorderTopWidth(final Object borderTopWidth) {
setStyleLengthAttribute(BORDER_TOP_WIDTH.getAttributeName(), borderTopWidth, "",
- false, false, false, false, false);
+ false, false, false, false);
}
/**
@@ -1183,7 +1182,7 @@
*/
@JsxSetter
public void setBottom(final Object bottom) {
- setStyleLengthAttribute(BOTTOM.getAttributeName(), bottom, "", true, true, false, false, false);
+ setStyleLengthAttribute(BOTTOM.getAttributeName(), bottom, "", true, true, false, false);
}
/**
@@ -1284,7 +1283,7 @@
*/
@JsxSetter
public void setFontSize(final Object fontSize) {
- setStyleLengthAttribute(FONT_SIZE.getAttributeName(), fontSize, "", false, true, false, false, false);
+ setStyleLengthAttribute(FONT_SIZE.getAttributeName(), fontSize, "", false, true, false, false);
updateFont(getFont(), false);
}
@@ -1395,7 +1394,7 @@
*/
@JsxSetter
public void setHeight(final Object height) {
- setStyleLengthAttribute(HEIGHT.getAttributeName(), height, "", true, true, false, false, false);
+ setStyleLengthAttribute(HEIGHT.getAttributeName(), height, "", true, true, false, false);
}
/**
@@ -1413,7 +1412,7 @@
*/
@JsxSetter
public void setLeft(final Object left) {
- setStyleLengthAttribute(LEFT.getAttributeName(), left, "", true, true, false, false, false);
+ setStyleLengthAttribute(LEFT.getAttributeName(), left, "", true, true, false, false);
}
/**
@@ -1442,7 +1441,7 @@
@JsxSetter
public void setLetterSpacing(final Object letterSpacing) {
setStyleLengthAttribute(LETTER_SPACING.getAttributeName(), letterSpacing, "",
- false, false, false, false, false);
+ false, false, false, false);
}
/**
@@ -1478,7 +1477,7 @@
*/
@JsxSetter
public void setMarginBottom(final Object marginBottom) {
- setStyleLengthAttribute(MARGIN_BOTTOM.getAttributeName(), marginBottom, "", true, true, false, false, false);
+ setStyleLengthAttribute(MARGIN_BOTTOM.getAttributeName(), marginBottom, "", true, true, false, false);
}
/**
@@ -1496,7 +1495,7 @@
*/
@JsxSetter
public void setMarginLeft(final Object marginLeft) {
- setStyleLengthAttribute(MARGIN_LEFT.getAttributeName(), marginLeft, "", true, true, false, false, false);
+ setStyleLengthAttribute(MARGIN_LEFT.getAttributeName(), marginLeft, "", true, true, false, false);
}
/**
@@ -1514,7 +1513,7 @@
*/
@JsxSetter
public void setMarginRight(final Object marginRight) {
- setStyleLengthAttribute(MARGIN_RIGHT.getAttributeName(), marginRight, "", true, true, false, false, false);
+ setStyleLengthAttribute(MARGIN_RIGHT.getAttributeName(), marginRight, "", true, true, false, false);
}
/**
@@ -1532,7 +1531,7 @@
*/
@JsxSetter
public void setMarginTop(final Object marginTop) {
- setStyleLengthAttribute(MARGIN_TOP.getAttributeName(), marginTop, "", true, true, false, false, false);
+ setStyleLengthAttribute(MARGIN_TOP.getAttributeName(), marginTop, "", true, true, false, false);
}
/**
@@ -1550,7 +1549,7 @@
*/
@JsxSetter
public void setMaxHeight(final Object maxHeight) {
- setStyleLengthAttribute(MAX_HEIGHT.getAttributeName(), maxHeight, "", false, true, false, false, false);
+ setStyleLengthAttribute(MAX_HEIGHT.getAttributeName(), maxHeight, "", false, true, false, false);
}
/**
@@ -1568,7 +1567,7 @@
*/
@JsxSetter
public void setMaxWidth(final Object maxWidth) {
- setStyleLengthAttribute(MAX_WIDTH.getAttributeName(), maxWidth, "", false, true, false, false, false);
+ setStyleLengthAttribute(MAX_WIDTH.getAttributeName(), maxWidth, "", false, true, false, false);
}
/**
@@ -1586,7 +1585,7 @@
*/
@JsxSetter
public void setMinHeight(final Object minHeight) {
- setStyleLengthAttribute(MIN_HEIGHT.getAttributeName(), minHeight, "", true, true, false, false, false);
+ setStyleLengthAttribute(MIN_HEIGHT.getAttributeName(), minHeight, "", true, true, false, false);
}
/**
@@ -1604,7 +1603,7 @@
*/
@JsxSetter
public void setMinWidth(final Object minWidth) {
- setStyleLengthAttribute(MIN_WIDTH.getAttributeName(), minWidth, "", true, true, false, false, false);
+ setStyleLengthAttribute(MIN_WIDTH.getAttributeName(), minWidth, "", true, true, false, false);
}
/**
@@ -1846,7 +1845,7 @@
public void setOutlineWidth(final Object outlineWidth) {
final boolean requiresUnit = !getBrowserVersion().hasFeature(CSS_OUTLINE_WIDTH_UNIT_NOT_REQUIRED);
setStyleLengthAttribute(OUTLINE_WIDTH.getAttributeName(), outlineWidth, "",
- false, false, true, requiresUnit, false);
+ false, false, true, requiresUnit);
}
/**
@@ -1882,7 +1881,7 @@
*/
@JsxSetter
public void setPaddingBottom(final Object paddingBottom) {
- setStyleLengthAttribute(PADDING_BOTTOM.getAttributeName(), paddingBottom, "", false, true, false, false, false);
+ setStyleLengthAttribute(PADDING_BOTTOM.getAttributeName(), paddingBottom, "", false, true, false, false);
}
/**
@@ -1900,7 +1899,7 @@
*/
@JsxSetter
public void setPaddingLeft(final Object paddingLeft) {
- setStyleLengthAttribute(PADDING_LEFT.getAttributeName(), paddingLeft, "", false, true, false, false, false);
+ setStyleLengthAttribute(PADDING_LEFT.getAttributeName(), paddingLeft, "", false, true, false, false);
}
/**
@@ -1918,7 +1917,7 @@
*/
@JsxSetter
public void setPaddingRight(final Object paddingRight) {
- setStyleLengthAttribute(PADDING_RIGHT.getAttributeName(), paddingRight, "", false, true, false, false, false);
+ setStyleLengthAttribute(PADDING_RIGHT.getAttributeName(), paddingRight, "", false, true, false, false);
}
/**
@@ -1936,7 +1935,7 @@
*/
@JsxSetter
public void setPaddingTop(final Object paddingTop) {
- setStyleLengthAttribute(PADDING_TOP.getAttributeName(), paddingTop, "", false, true, false, false, false);
+ setStyleLengthAttribute(PADDING_TOP.getAttributeName(), paddingTop, "", false, true, false, false);
}
/**
@@ -2188,7 +2187,7 @@
*/
@JsxSetter
public void setRight(final Object right) {
- setStyleLengthAttribute(RIGHT.getAttributeName(), right, "", true, true, false, false, false);
+ setStyleLengthAttribute(RIGHT.getAttributeName(), right, "", true, true, false, false);
}
/**
@@ -2332,7 +2331,7 @@
*/
@JsxSetter
public void setTextIndent(final Object textIndent) {
- setStyleLengthAttribute(TEXT_INDENT.getAttributeName(), textIndent, "", false, true, false, false, false);
+ setStyleLengthAttribute(TEXT_INDENT.getAttributeName(), textIndent, "", false, true, false, false);
}
/**
@@ -2350,7 +2349,7 @@
*/
@JsxSetter
public void setTop(final Object top) {
- setStyleLengthAttribute(TOP.getAttributeName(), top, "", true, true, false, false, false);
+ setStyleLengthAttribute(TOP.getAttributeName(), top, "", true, true, false, false);
}
/**
@@ -2369,7 +2368,7 @@
@JsxSetter
public void setVerticalAlign(final Object verticalAlign) {
final boolean auto = getBrowserVersion().hasFeature(CSS_VERTICAL_ALIGN_SUPPORTS_AUTO);
- setStyleLengthAttribute(VERTICAL_ALIGN.getAttributeName(), verticalAlign, "", auto, true, false, false, false);
+ setStyleLengthAttribute(VERTICAL_ALIGN.getAttributeName(), verticalAlign, "", auto, true, false, false);
}
/**
@@ -2387,7 +2386,7 @@
*/
@JsxSetter
public void setWidth(final Object width) {
- setStyleLengthAttribute(WIDTH.getAttributeName(), width, "", true, true, false, false, false);
+ setStyleLengthAttribute(WIDTH.getAttributeName(), width, "", true, true, false, false);
}
/**
@@ -2484,7 +2483,7 @@
@JsxSetter
public void setWordSpacing(final Object wordSpacing) {
setStyleLengthAttribute(WORD_SPACING.getAttributeName(), wordSpacing, "",
- false, getBrowserVersion().hasFeature(JS_STYLE_WORD_SPACING_ACCEPTS_PERCENT), false, false, false);
+ false, getBrowserVersion().hasFeature(JS_STYLE_WORD_SPACING_ACCEPTS_PERCENT), false, false);
}
/**
@@ -2640,31 +2639,25 @@
}
if (LENGTH_PROPERTIES_FFFF.contains(name)) {
- setStyleLengthAttribute(name, value, imp, false, false, false, false,
- getBrowserVersion().hasFeature(CSS_LENGTH_UNDEFINED_AS_EMPTY));
+ setStyleLengthAttribute(name, value, imp, false, false, false, false);
}
else if (LENGTH_PROPERTIES_TTFF.contains(name)) {
- setStyleLengthAttribute(name, value, imp, true, true, false, false,
- getBrowserVersion().hasFeature(CSS_LENGTH_UNDEFINED_AS_EMPTY));
+ setStyleLengthAttribute(name, value, imp, true, true, false, false);
}
else if (LENGTH_PROPERTIES_FTFF.contains(name)) {
- setStyleLengthAttribute(name, value, imp, false, true, false, false,
- getBrowserVersion().hasFeature(CSS_LENGTH_UNDEFINED_AS_EMPTY));
+ setStyleLengthAttribute(name, value, imp, false, true, false, false);
}
else if (OUTLINE_WIDTH.getAttributeName().equals(name)) {
final boolean requiresUnit = !getBrowserVersion().hasFeature(CSS_OUTLINE_WIDTH_UNIT_NOT_REQUIRED);
- setStyleLengthAttribute(OUTLINE_WIDTH.getAttributeName(), value, imp, false, false, true, requiresUnit,
- getBrowserVersion().hasFeature(CSS_LENGTH_UNDEFINED_AS_EMPTY));
+ setStyleLengthAttribute(OUTLINE_WIDTH.getAttributeName(), value, imp, false, false, true, requiresUnit);
}
else if (WORD_SPACING.getAttributeName().equals(name)) {
setStyleLengthAttribute(WORD_SPACING.getAttributeName(), value, imp,
- false, getBrowserVersion().hasFeature(JS_STYLE_WORD_SPACING_ACCEPTS_PERCENT), false, false,
- getBrowserVersion().hasFeature(CSS_LENGTH_UNDEFINED_AS_EMPTY));
+ false, getBrowserVersion().hasFeature(JS_STYLE_WORD_SPACING_ACCEPTS_PERCENT), false, false);
}
else if (VERTICAL_ALIGN.getAttributeName().equals(name)) {
final boolean auto = getBrowserVersion().hasFeature(CSS_VERTICAL_ALIGN_SUPPORTS_AUTO);
- setStyleLengthAttribute(VERTICAL_ALIGN.getAttributeName(), value, imp, auto, true, false, false,
- getBrowserVersion().hasFeature(CSS_LENGTH_UNDEFINED_AS_EMPTY));
+ setStyleLengthAttribute(VERTICAL_ALIGN.getAttributeName(), value, imp, auto, true, false, false);
}
else {
setStyleAttribute(name, Context.toString(value), imp);
@@ -3094,11 +3087,9 @@
* @param thinMedThick thin, medium, thick are supported
* @param unitRequired unit is required
* @param perecent true if percent is supported
- * @param undefinedAsEmpty true if undefined should be handled like an empty string
*/
private void setStyleLengthAttribute(final String name, final Object value, final String important,
- final boolean auto, final boolean percent, final boolean thinMedThick, final boolean unitRequired,
- final boolean undefinedAsEmpty) {
+ final boolean auto, final boolean percent, final boolean thinMedThick, final boolean unitRequired) {
if (ScriptRuntime.NaNobj == value) {
return;
@@ -3114,7 +3105,7 @@
}
else {
String valueString = Context.toString(value);
- if (null == value || (undefinedAsEmpty && Undefined.instance == value)) {
+ if (null == value) {
valueString = "";
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java 2018-04-15 12:52:47 UTC (rev 15240)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java 2018-04-21 15:31:12 UTC (rev 15241)
@@ -48,7 +48,7 @@
public class ExternalTest {
/** Chrome driver. */
- static String CHROME_DRIVER_ = "2.37";
+ static String CHROME_DRIVER_ = "2.38";
/**
* Tests that POM dependencies are the latest.
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 2018-04-15 12:52:47 UTC (rev 15240)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclarationTest.java 2018-04-21 15:31:12 UTC (rev 15241)
@@ -1561,8 +1561,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "auto", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setWidthProperty() throws Exception {
@@ -1587,8 +1585,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "auto", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setHeightProperty() throws Exception {
@@ -1613,8 +1609,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "auto", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setTopProperty() throws Exception {
@@ -1639,8 +1633,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "auto", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setLeftProperty() throws Exception {
@@ -1665,8 +1657,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "auto", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setBottomProperty() throws Exception {
@@ -1691,8 +1681,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "auto", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setRightProperty() throws Exception {
@@ -1717,8 +1705,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "auto", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setMarginTopProperty() throws Exception {
@@ -1743,8 +1729,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "auto", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setMarginLeftProperty() throws Exception {
@@ -1769,8 +1753,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "auto", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setMarginBottomProperty() throws Exception {
@@ -1795,8 +1777,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "auto", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setMarginRightProperty() throws Exception {
@@ -1821,8 +1801,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setPaddingTopProperty() throws Exception {
@@ -1847,8 +1825,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setPaddingLeftProperty() throws Exception {
@@ -1873,8 +1849,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setPaddingBottomProperty() throws Exception {
@@ -1899,8 +1873,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setPaddingRightProperty() throws Exception {
@@ -1925,8 +1897,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "17px", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "17px", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "17px", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setBorderTopWidthProperty() throws Exception {
@@ -1951,8 +1921,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "17px", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "17px", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "17px", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setBorderLeftWidthProperty() throws Exception {
@@ -1977,8 +1945,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "17px", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "17px", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "17px", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setBorderBottomWidthProperty() throws Exception {
@@ -2003,8 +1969,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "17px", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "17px", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "17px", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setBorderRightWidthProperty() throws Exception {
@@ -2029,8 +1993,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setMaxWidthProperty() throws Exception {
@@ -2055,8 +2017,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "auto", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setMinWidthProperty() throws Exception {
@@ -2081,8 +2041,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setMaxHeightProperty() throws Exception {
@@ -2107,8 +2065,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "auto", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "auto", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setMinHeightProperty() throws Exception {
@@ -2133,8 +2089,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setTextIndentProperty() throws Exception {
@@ -2159,8 +2113,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setFontSizeProperty() throws Exception {
@@ -2185,8 +2137,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "17px", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "17px", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
FF = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "17px", "17px", "inherit",
@@ -2215,8 +2165,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "17px", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "17px", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "17px", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setLetterSpacingProperty() throws Exception {
@@ -2241,8 +2189,6 @@
@Test
@Alerts(DEFAULT = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"4px", "5px", "6em", "17px", "7%", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "auto", "7%", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setVerticalAlignProperty() throws Exception {
@@ -2267,8 +2213,6 @@
@Test
@Alerts(DEFAULT = {"17px", "5px", "6em", "17px", "17px", "initial", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"},
- CHROME = {"17px", "5px", "6em", "17px", "17px", "initial", "inherit",
- "17px", "", "17px", "", "17px", "", "17px", "17px", "17px"},
IE = {"4px", "5px", "6em", "17px", "17px", "17px", "inherit",
"17px", "17px", "17px", "", "17px", "", "17px", "17px", "17px"})
public void setOutlineWidthProperty() throws Exception {
|
|
From: <rb...@us...> - 2018-04-21 15:47:13
|
Revision: 15242
http://sourceforge.net/p/htmlunit/code/15242
Author: rbri
Date: 2018-04-21 15:46:39 +0000 (Sat, 21 Apr 2018)
Log Message:
-----------
latest chrome (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSImportRuleTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-04-21 15:31:12 UTC (rev 15241)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-04-21 15:46:39 UTC (rev 15242)
@@ -1061,7 +1061,7 @@
JS_MEDIA_LIST_ALL,
/** Indicates that an empty media list is represented by the string 'all'. */
- @BrowserFeature(FF)
+ @BrowserFeature({CHROME, FF})
JS_MEDIA_LIST_EMPTY_STRING,
/** Type property of menu has always '' as value. */
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSImportRuleTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSImportRuleTest.java 2018-04-21 15:31:12 UTC (rev 15241)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSImportRuleTest.java 2018-04-21 15:46:39 UTC (rev 15242)
@@ -40,9 +40,7 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(DEFAULT = {"[object CSSImportRule]", "§§URL§§second/",
- "[object MediaList]", "0", "[object CSSStyleSheet]"},
- FF = {"[object CSSImportRule]", "§§URL§§second/", "", "0", "[object CSSStyleSheet]"},
+ @Alerts(DEFAULT = {"[object CSSImportRule]", "§§URL§§second/", "", "0", "[object CSSStyleSheet]"},
IE = {"[object CSSImportRule]", "§§URL§§second/",
"all", "0", "[object CSSStyleSheet]"})
public void getImportFromCssRulesCollection_absolute() throws Exception {
@@ -54,9 +52,7 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(DEFAULT = {"[object CSSImportRule]", "foo.css",
- "[object MediaList]", "0", "[object CSSStyleSheet]"},
- FF = {"[object CSSImportRule]", "foo.css", "", "0", "[object CSSStyleSheet]"},
+ @Alerts(DEFAULT = {"[object CSSImportRule]", "foo.css", "", "0", "[object CSSStyleSheet]"},
IE = {"[object CSSImportRule]", "foo.css", "all", "0", "[object CSSStyleSheet]"})
public void getImportFromCssRulesCollection_relative() throws Exception {
final URL urlPage = new URL(URL_FIRST, "/dir1/dir2/foo.html");
@@ -86,7 +82,7 @@
final String css = "#d { color: green }";
getMockWebConnection().setResponse(cssUrl, css, "text/css");
- loadPageWithAlerts2(html, pageUrl);
+ loadPageWithAlerts2(html, pageUrl, 1000000);
}
/**
|
|
From: <rb...@us...> - 2018-04-22 07:11:25
|
Revision: 15246
http://sourceforge.net/p/htmlunit/code/15246
Author: rbri
Date: 2018-04-22 07:11:19 +0000 (Sun, 22 Apr 2018)
Log Message:
-----------
latest chrome (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSlot.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/AbstractList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAllCollection.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAllCollectionTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-04-21 16:25:05 UTC (rev 15245)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-04-22 07:11:19 UTC (rev 15246)
@@ -305,10 +305,6 @@
@BrowserFeature(IE)
HTMLALLCOLLECTION_NO_COLLECTION_FOR_MANY_HITS,
- /** HtmlAllCollection.item returns null instead of undefined if an element was not found. */
- @BrowserFeature({IE, FF})
- HTMLALLCOLLECTION_NULL_IF_ITEM_NOT_FOUND,
-
/** HtmlAllCollection.namedItem returns null instead of undefined if an element was not found. */
@BrowserFeature({CHROME, FF})
HTMLALLCOLLECTION_NULL_IF_NAMED_ITEM_NOT_FOUND,
@@ -338,7 +334,7 @@
HTMLCOLLECTION_NAMED_ITEM_ID_FIRST,
/** HtmlCollection.item returns null instead of undefined if an element was not found. */
- @BrowserFeature(IE)
+ @BrowserFeature({CHROME, IE})
HTMLCOLLECTION_NULL_IF_ITEM_NOT_FOUND,
/** HtmlCollection returns null instead of undefined if an element was not found. */
@@ -1492,6 +1488,10 @@
@BrowserFeature({CHROME, FF52, IE})
SELECT_DESELECT_ALL_IF_SWITCHING_UNKNOWN,
+ /** The default display style of slot is 'content'. */
+ @BrowserFeature(CHROME)
+ SLOT_CONTENTS,
+
/** Indicates that string.contains() is supported. */
@BrowserFeature(FF45)
STRING_CONTAINS,
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java 2018-04-21 16:25:05 UTC (rev 15245)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java 2018-04-22 07:11:19 UTC (rev 15246)
@@ -81,6 +81,8 @@
NONE("none"),
/** block. */
BLOCK("block"),
+ /** contents. */
+ CONTENTS("contents"),
/** inline. */
INLINE("inline"),
/** inline-block. */
@@ -222,7 +224,7 @@
protected static void notifyAttributeChangeListeners(final HtmlAttributeChangeEvent event,
final HtmlElement element, final String oldAttributeValue, final boolean notifyMutationObservers) {
final Collection<HtmlAttributeChangeListener> listeners = element.attributeListeners_;
- if (oldAttributeValue == ATTRIBUTE_NOT_DEFINED) {
+ if (ATTRIBUTE_NOT_DEFINED == oldAttributeValue) {
synchronized (listeners) {
for (final HtmlAttributeChangeListener listener : listeners) {
if (notifyMutationObservers || !(listener instanceof MutationObserver)) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSlot.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSlot.java 2018-04-21 16:25:05 UTC (rev 15245)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSlot.java 2018-04-22 07:11:19 UTC (rev 15246)
@@ -14,6 +14,8 @@
*/
package com.gargoylesoftware.htmlunit.html;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.SLOT_CONTENTS;
+
import java.util.Map;
import com.gargoylesoftware.htmlunit.SgmlPage;
@@ -22,6 +24,7 @@
* Wrapper for the HTML element "slot".
*
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlSlot extends HtmlElement {
@@ -45,6 +48,9 @@
*/
@Override
public DisplayStyle getDefaultStyleDisplay() {
+ if (getPage().getWebClient().getBrowserVersion().hasFeature(SLOT_CONTENTS)) {
+ return DisplayStyle.CONTENTS;
+ }
return DisplayStyle.INLINE;
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/AbstractList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/AbstractList.java 2018-04-21 16:25:05 UTC (rev 15245)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/AbstractList.java 2018-04-22 07:11:19 UTC (rev 15246)
@@ -14,7 +14,6 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.dom;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLCOLLECTION_NULL_IF_ITEM_NOT_FOUND;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLCOLLECTION_NULL_IF_NOT_FOUND;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_NODE_LIST_ENUMERATE_CHILDREN;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_NODE_LIST_ENUMERATE_FUNCTIONS;
@@ -400,10 +399,7 @@
public Object item(final Object index) {
final Object object = getIt(index);
if (object == NOT_FOUND) {
- if (getBrowserVersion().hasFeature(HTMLCOLLECTION_NULL_IF_ITEM_NOT_FOUND)) {
- return null;
- }
- return Undefined.instance;
+ return null;
}
return object;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAllCollection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAllCollection.java 2018-04-21 16:25:05 UTC (rev 15245)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAllCollection.java 2018-04-22 07:11:19 UTC (rev 15246)
@@ -18,10 +18,8 @@
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLALLCOLLECTION_DO_NOT_SUPPORT_PARANTHESES;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLALLCOLLECTION_INTEGER_INDEX;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLALLCOLLECTION_NO_COLLECTION_FOR_MANY_HITS;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLALLCOLLECTION_NULL_IF_ITEM_NOT_FOUND;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLALLCOLLECTION_NULL_IF_NAMED_ITEM_NOT_FOUND;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLCOLLECTION_ITEM_FUNCT_SUPPORTS_DOUBLE_INDEX_ALSO;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLCOLLECTION_NAMED_ITEM_ID_FIRST;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
@@ -88,7 +86,7 @@
numb = ScriptRuntime.toNumber(index);
}
if (numb.isNaN()) {
- return itemNotFound(browser);
+ return null;
}
}
else {
@@ -97,12 +95,12 @@
}
if (numb < 0) {
- return itemNotFound(browser);
+ return null;
}
if (!browser.hasFeature(HTMLCOLLECTION_ITEM_FUNCT_SUPPORTS_DOUBLE_INDEX_ALSO)
&& (Double.isInfinite(numb) || numb != Math.floor(numb))) {
- return itemNotFound(browser);
+ return null;
}
final Object object = get(numb.intValue(), this);
@@ -112,13 +110,6 @@
return object;
}
- private static Object itemNotFound(final BrowserVersion browser) {
- if (browser.hasFeature(HTMLALLCOLLECTION_NULL_IF_ITEM_NOT_FOUND)) {
- return null;
- }
- return Undefined.instance;
- }
-
/**
* {@inheritDoc}
*/
@@ -130,24 +121,11 @@
final List<DomElement> matching = new ArrayList<>();
final BrowserVersion browser = getBrowserVersion();
-
- final boolean idFirst = browser.hasFeature(HTMLCOLLECTION_NAMED_ITEM_ID_FIRST);
- if (idFirst) {
- for (final Object next : elements) {
- if (next instanceof DomElement) {
- final DomElement elem = (DomElement) next;
- if (name.equals(elem.getId())) {
- matching.add(elem);
- }
- }
- }
- }
-
for (final DomNode next : elements) {
if (next instanceof DomElement) {
final DomElement elem = (DomElement) next;
if (name.equals(elem.getAttributeDirect("name"))
- || (!idFirst && name.equals(elem.getId()))) {
+ || name.equals(elem.getId())) {
matching.add(elem);
}
}
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 2018-04-21 16:25:05 UTC (rev 15245)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java 2018-04-22 07:11:19 UTC (rev 15246)
@@ -1356,7 +1356,6 @@
*/
@Test
@Alerts(DEFAULT = {"coll 2", "f6<->form6", "form6<->form6_2"},
- CHROME = {"coll 2", "form6<->form6_2", "f6<->form6"},
IE = "f6<->form6")
public void all_NamedItem_DuplicateIdName() throws Exception {
namedItem("form6");
@@ -1471,8 +1470,7 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(DEFAULT = {"undefined", "undefined", "null"},
- FF = {"null", "null", "null"},
+ @Alerts(DEFAULT = {"null", "null", "null"},
IE = {"undefined", "null", "undefined"})
public void all_NotExisting() throws Exception {
final String html = "<html><head><title>First</title><script>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAllCollectionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAllCollectionTest.java 2018-04-21 16:25:05 UTC (rev 15245)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAllCollectionTest.java 2018-04-22 07:11:19 UTC (rev 15246)
@@ -96,7 +96,6 @@
*/
@Test
@Alerts(DEFAULT = {"coll 2", "b6-button6", "button6-button6_2"},
- CHROME = {"coll 2", "button6-button6_2", "b6-button6"},
IE = "b6-button6")
public void namedItem_DuplicateIdName() throws Exception {
namedItem("'button6'");
@@ -207,8 +206,7 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(DEFAULT = "null",
- CHROME = "undefined")
+ @Alerts("null")
public void item_Unknown() throws Exception {
item("'foo'");
}
@@ -235,8 +233,7 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(DEFAULT = "null",
- CHROME = "undefined")
+ @Alerts("null")
public void item_NegativIndex() throws Exception {
item("-1");
}
@@ -264,7 +261,7 @@
*/
@Test
@Alerts(DEFAULT = "myHead-undefined",
- CHROME = "undefined")
+ CHROME = "null")
public void item_DoubleIndex() throws Exception {
item("1.1");
}
@@ -292,8 +289,7 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(DEFAULT = "null",
- CHROME = "undefined")
+ @Alerts("null")
public void item_IndexDoubleAsString() throws Exception {
item("'1.1'");
}
@@ -452,8 +448,8 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(DEFAULT = "undefined",
- FF = "null")
+ @Alerts(DEFAULT = "null",
+ IE = "undefined")
public void functionIndex_Unknown() throws Exception {
functionIndex("'foo'");
}
@@ -480,8 +476,8 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(DEFAULT = "undefined",
- FF = "null")
+ @Alerts(DEFAULT = "null",
+ IE = "undefined")
public void functionIndex_NegativIndex() throws Exception {
functionIndex("-1");
}
@@ -511,7 +507,6 @@
*/
@Test
@Alerts(DEFAULT = "null",
- CHROME = "undefined",
IE = "myHead-undefined")
public void functionIndex_DoubleIndex() throws Exception {
functionIndex("1.1");
|
|
From: <rb...@us...> - 2018-04-22 09:05:30
|
Revision: 15248
http://sourceforge.net/p/htmlunit/code/15248
Author: rbri
Date: 2018-04-22 09:03:42 +0000 (Sun, 22 Apr 2018)
Log Message:
-----------
latest chrome (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-04-22 08:56:10 UTC (rev 15247)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-04-22 09:03:42 UTC (rev 15248)
@@ -213,8 +213,8 @@
EDGE.scriptAcceptHeader_ = "application/javascript, */*;q=0.8";
// CHROME
- CHROME.applicationVersion_ = "5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36";
- CHROME.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36";
+ CHROME.applicationVersion_ = "5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.117 Safari/537.36";
+ CHROME.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.117 Safari/537.36";
CHROME.applicationCodeName_ = "Mozilla";
CHROME.vendor_ = "Google Inc.";
@@ -356,19 +356,19 @@
// flush plugin (windows version)
PluginConfiguration flash = new PluginConfiguration("Shockwave Flash",
- "Shockwave Flash 29.0 r0", "29.0.0.113", "NPSWF32_29_0_0_113.dll");
+ "Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF32_29_0_0_140.dll");
flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
"Shockwave Flash", "swf"));
FIREFOX_45.plugins_.add(flash);
flash = new PluginConfiguration("Shockwave Flash",
- "Shockwave Flash 29.0 r0", "29.0.0.113", "NPSWF64_29_0_0_113.dll");
+ "Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF64_29_0_0_140.dll");
flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
"Shockwave Flash", "swf"));
FIREFOX_52.plugins_.add(flash);
flash = new PluginConfiguration("Shockwave Flash",
- "Shockwave Flash 29.0 r0", "29.0.0.113", "Flash32_29_0_0_113.ocx");
+ "Shockwave Flash 29.0 r0", "29.0.0.140", "Flash32_29_0_0_140.ocx");
flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
"Shockwave Flash", "swf"));
INTERNET_EXPLORER.plugins_.add(flash);
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java 2018-04-22 08:56:10 UTC (rev 15247)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java 2018-04-22 09:03:42 UTC (rev 15248)
@@ -216,10 +216,10 @@
* @throws Exception on test failure
*/
@Test
- @Alerts(FF45 = {"Shockwave Flash", "Shockwave Flash 29.0 r0", "29.0.0.113", "NPSWF32_29_0_0_113.dll"},
- FF52 = {"Shockwave Flash", "Shockwave Flash 29.0 r0", "29.0.0.113", "NPSWF64_29_0_0_113.dll"},
+ @Alerts(FF45 = {"Shockwave Flash", "Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF32_29_0_0_140.dll"},
+ FF52 = {"Shockwave Flash", "Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF64_29_0_0_140.dll"},
CHROME = "Shockwave Flash not available",
- IE = {"Shockwave Flash", "Shockwave Flash 29.0 r0", "29.0.0.113", "Flash32_29_0_0_113.ocx"},
+ IE = {"Shockwave Flash", "Shockwave Flash 29.0 r0", "29.0.0.140", "Flash32_29_0_0_140.ocx"},
EDGE = {"Shockwave Flash", "Shockwave Flash 18.0 r0", "18.0.0.232", "Flash.ocx"})
public void pluginsShockwaveFlash() throws Exception {
final String html = "<html>\n"
|
|
From: <rb...@us...> - 2018-04-22 09:26:16
|
Revision: 15249
http://sourceforge.net/p/htmlunit/code/15249
Author: rbri
Date: 2018-04-22 09:24:21 +0000 (Sun, 22 Apr 2018)
Log Message:
-----------
latest chrome (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java
trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties.Chrome.txt
trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties2.Chrome.txt
trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.Chrome.txt
trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.notAttached.Chrome.txt
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java 2018-04-22 09:03:42 UTC (rev 15248)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java 2018-04-22 09:24:21 UTC (rev 15249)
@@ -983,6 +983,9 @@
GLYPH_ORIENTATION_VERTICAL("glyphOrientationVertical", "glyph-orientation-vertical",
ie("auto")),
+ /** The style property {@code gap}. */
+ GAP("gap", "gap", chrome("normal normal")),
+
/** The style property {@code grid}. */
GRID("grid", "grid", chrome("none / none / none / row / auto / auto"),
ff52up("")),
@@ -1024,7 +1027,7 @@
GRID_COLUMN_END_("grid-column-end", "grid-column-end", ff52up("auto")),
/** The style property {@code gridColumnGap}. */
- GRID_COLUMN_GAP("gridColumnGap", "grid-column-gap", chrome("0px"), ff52up("0px")),
+ GRID_COLUMN_GAP("gridColumnGap", "grid-column-gap", chrome("normal"), ff52up("0px")),
/** The style property {@code grid-column-gap}. */
GRID_COLUMN_GAP_("grid-column-gap", "grid-column-gap", ff52up("0px")),
@@ -1036,7 +1039,7 @@
GRID_COLUMN_START_("grid-column-start", "grid-column-start", ff52up("auto")),
/** The style property {@code gridGap}. */
- GRID_GAP("gridGap", "grid-gap", chrome("0px 0px"), ff52up("")),
+ GRID_GAP("gridGap", "grid-gap", chrome("normal normal"), ff52up("")),
/** The style property {@code grid-gap}. */
GRID_GAP_("grid-gap", "grid-gap", ff52up("")),
@@ -1054,7 +1057,7 @@
GRID_ROW_END_("grid-row-end", "grid-row-end", ff52up("auto")),
/** The style property {@code gridRowGap}. */
- GRID_ROW_GAP("gridRowGap", "grid-row-gap", chrome("0px"), ff52up("0px")),
+ GRID_ROW_GAP("gridRowGap", "grid-row-gap", chrome("normal"), ff52up("0px")),
/** The style property {@code grid-row-gap}. */
GRID_ROW_GAP_("grid-row-gap", "grid-row-gap", ff52up("0px")),
@@ -2467,6 +2470,9 @@
/** The style property {@code right}. */
RIGHT("right", "right", chrome("auto"), ff(""), ie("")),
+ /** The style property {@code rowGap}. */
+ ROW_GAP("rowGap", "rowGap", chrome("normal")),
+
/** The style property {@code rubyAlign}. */
RUBY_ALIGN("rubyAlign", "ruby-align", ff("space-around"), ie("")),
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 2018-04-22 09:03:42 UTC (rev 15248)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java 2018-04-22 09:24:21 UTC (rev 15249)
@@ -1914,6 +1914,7 @@
*/
@Test
@Alerts(DEFAULT = {"0", "24"},
+ CHROME = {"0", "23"},
FF = {"0", "26"})
@NotYetImplemented
public void offsetHeightTable() throws Exception {
Modified: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties.Chrome.txt
===================================================================
--- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties.Chrome.txt 2018-04-22 09:03:42 UTC (rev 15248)
+++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties.Chrome.txt 2018-04-22 09:24:21 UTC (rev 15249)
@@ -132,6 +132,7 @@
fontVariantNumeric
fontVariationSettings
fontWeight
+gap
grid
gridArea
gridAutoColumns
@@ -234,6 +235,7 @@
r
resize
right
+rowGap
rx
ry
scrollBehavior
Modified: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties2.Chrome.txt
===================================================================
--- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties2.Chrome.txt 2018-04-22 09:03:42 UTC (rev 15248)
+++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties2.Chrome.txt 2018-04-22 09:24:21 UTC (rev 15249)
@@ -132,6 +132,7 @@
fontVariantNumeric
fontVariationSettings
fontWeight
+gap
grid
gridArea
gridAutoColumns
@@ -233,6 +234,7 @@
r
resize
right
+rowGap
rx
ry
scrollBehavior
Modified: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.Chrome.txt
===================================================================
--- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.Chrome.txt 2018-04-22 09:03:42 UTC (rev 15248)
+++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.Chrome.txt 2018-04-22 09:24:21 UTC (rev 15249)
@@ -132,6 +132,7 @@
fontVariantNumeric=:normal
fontVariationSettings=:normal
fontWeight=:400
+gap=:normal normal
grid=:none / none / none / row / auto / auto
gridArea=:auto / auto / auto / auto
gridAutoColumns=:auto
@@ -139,12 +140,12 @@
gridAutoRows=:auto
gridColumn=:auto / auto
gridColumnEnd=:auto
-gridColumnGap=:0px
+gridColumnGap=:normal
gridColumnStart=:auto
-gridGap=:0px 0px
+gridGap=:normal normal
gridRow=:auto / auto
gridRowEnd=:auto
-gridRowGap=:0px
+gridRowGap=:normal
gridRowStart=:auto
gridTemplate=:none / none / none
gridTemplateAreas=:none
@@ -233,6 +234,7 @@
r=:0px
resize=:none
right=:auto
+rowGap=:normal
rx=:auto
ry=:auto
scrollBehavior=:auto
Modified: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.notAttached.Chrome.txt
===================================================================
--- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.notAttached.Chrome.txt 2018-04-22 09:03:42 UTC (rev 15248)
+++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.notAttached.Chrome.txt 2018-04-22 09:24:21 UTC (rev 15249)
@@ -132,6 +132,7 @@
fontVariantNumeric=:
fontVariationSettings=:
fontWeight=:
+gap=:
grid=:
gridArea=:
gridAutoColumns=:
@@ -233,6 +234,7 @@
r=:
resize=:
right=:
+rowGap=:
rx=:
ry=:
scrollBehavior=:
|
|
From: <rb...@us...> - 2018-04-22 11:58:42
|
Revision: 15250
http://sourceforge.net/p/htmlunit/code/15250
Author: rbri
Date: 2018-04-22 11:56:47 +0000 (Sun, 22 Apr 2018)
Log Message:
-----------
latest chrome (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParser2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImageInputTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java 2018-04-22 09:24:21 UTC (rev 15249)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java 2018-04-22 11:56:47 UTC (rev 15250)
@@ -975,6 +975,9 @@
/** The style property {@code font-weight}. */
FONT_WEIGHT_("font-weight", "font-weight", ff("400")),
+ /** The style property {@code gap}. */
+ GAP("gap", "gap", chrome("normal normal")),
+
/** The style property {@code glyphOrientationHorizontal}. */
GLYPH_ORIENTATION_HORIZONTAL("glyphOrientationHorizontal", "glyph-orientation-horizontal",
ie("0deg")),
@@ -983,9 +986,6 @@
GLYPH_ORIENTATION_VERTICAL("glyphOrientationVertical", "glyph-orientation-vertical",
ie("auto")),
- /** The style property {@code gap}. */
- GAP("gap", "gap", chrome("normal normal")),
-
/** The style property {@code grid}. */
GRID("grid", "grid", chrome("none / none / none / row / auto / auto"),
ff52up("")),
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java 2018-04-22 09:24:21 UTC (rev 15249)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java 2018-04-22 11:56:47 UTC (rev 15250)
@@ -418,8 +418,9 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(CHROME = "accessKey,blur(),click(),contentEditable,dataset,dir,draggable,focus(),hidden,"
- + "innerText,isContentEditable,lang,nonce,"
+ @Alerts(CHROME = "accessKey,autocapitalize,"
+ + "blur(),click(),contentEditable,dataset,dir,draggable,focus(),hidden,"
+ + "innerText,inputMode,isContentEditable,lang,nonce,"
+ "offsetHeight,offsetLeft,offsetParent,offsetTop,offsetWidth,onabort,"
+ "onauxclick,onblur,oncancel,oncanplay,oncanplaythrough,onchange,onclick,"
+ "onclose,oncontextmenu,oncuechange,ondblclick,ondrag,ondragend,ondragenter,ondragleave,ondragover,"
@@ -505,10 +506,11 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(DEFAULT = "animate(),append(),attachShadow(),attributes,childElementCount,children,classList,className,"
- + "clientHeight,clientLeft,clientTop,clientWidth,closest(),createShadowRoot(),firstElementChild,"
- + "getAttribute(),getAttributeNames(),getAttributeNode(),getAttributeNodeNS(),getAttributeNS(),"
- + "getBoundingClientRect(),"
+ @Alerts(DEFAULT = "animate(),append(),attachShadow(),attributes,attributeStyleMap,"
+ + "childElementCount,children,classList,className,"
+ + "clientHeight,clientLeft,clientTop,clientWidth,closest(),computedStyleMap(),createShadowRoot(),"
+ + "firstElementChild,getAttribute(),getAttributeNames(),getAttributeNode(),"
+ + "getAttributeNodeNS(),getAttributeNS(),getBoundingClientRect(),"
+ "getClientRects(),getElementsByClassName(),getElementsByTagName(),getElementsByTagNameNS(),"
+ "hasAttribute(),hasAttributeNS(),hasAttributes(),hasPointerCapture(),id,innerHTML,"
+ "insertAdjacentElement(),insertAdjacentHTML(),insertAdjacentText(),lastElementChild,localName,"
@@ -565,8 +567,10 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(CHROME = "after(),animate(),assignedSlot,attachShadow(),attributes,before(),classList,className,"
- + "clientHeight,clientLeft,clientTop,clientWidth,closest(),createShadowRoot(),getAttribute(),"
+ @Alerts(CHROME = "after(),animate(),assignedSlot,attachShadow(),attributes,attributeStyleMap,"
+ + "before(),classList,className,"
+ + "clientHeight,clientLeft,clientTop,clientWidth,closest(),computedStyleMap(),createShadowRoot(),"
+ + "getAttribute(),"
+ "getAttributeNames(),getAttributeNode(),getAttributeNodeNS(),getAttributeNS(),"
+ "getBoundingClientRect(),getClientRects(),"
+ "getDestinationInsertionPoints(),getElementsByClassName(),getElementsByTagName(),"
@@ -580,7 +584,7 @@
+ "scrollIntoViewIfNeeded(),scrollLeft,scrollTo(),scrollTop,scrollWidth,setAttribute(),"
+ "setAttributeNode(),"
+ "setAttributeNodeNS(),setAttributeNS(),setPointerCapture(),shadowRoot,slot,tagName,"
- + "webkitMatchesSelector(),webkitRequestFullscreen(),webkitRequestFullScreen()",
+ + "webkitMatchesSelector(),webkitRequestFullScreen(),webkitRequestFullscreen()",
FF45 = "attributes,classList,className,clientHeight,clientLeft,clientTop,"
+ "clientWidth,closest(),getAttribute(),getAttributeNames(),getAttributeNode(),getAttributeNodeNS(),"
+ "getAttributeNS(),getBoundingClientRect(),getClientRects(),getElementsByClassName(),"
@@ -2327,7 +2331,8 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(CHROME = "add(),autofocus,checkValidity(),disabled,form,item(),labels,length,multiple,name,namedItem(),"
+ @Alerts(CHROME = "add(),autocomplete,autofocus,checkValidity(),"
+ + "disabled,form,item(),labels,length,multiple,name,namedItem(),"
+ "options,reportValidity(),required,selectedIndex,selectedOptions,setCustomValidity(),size,type,"
+ "validationMessage,validity,value,"
+ "willValidate",
@@ -2585,7 +2590,7 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(CHROME = "autocapitalize,autofocus,checkValidity(),cols,defaultValue,dirName,disabled,form,labels,"
+ @Alerts(CHROME = "autocomplete,autofocus,checkValidity(),cols,defaultValue,dirName,disabled,form,labels,"
+ "maxLength,minLength,name,placeholder,readOnly,reportValidity(),required,rows,select(),"
+ "selectionDirection,selectionEnd,selectionStart,setCustomValidity(),setRangeText(),"
+ "setSelectionRange(),textLength,type,validationMessage,validity,value,willValidate,"
@@ -2836,7 +2841,7 @@
+ "min,multiple,name,pattern,placeholder,readOnly,required,select(),selectionEnd,selectionStart,"
+ "setCustomValidity(),setSelectionRange(),size,src,start,status,step,stepDown(),stepUp(),type,"
+ "useMap,validationMessage,validity,value,valueAsNumber,vrml,vspace,width,willValidate",
- CHROME = "accept,align,alt,autocapitalize,autocomplete,autofocus,checked,checkValidity(),"
+ CHROME = "accept,align,alt,autocomplete,autofocus,checked,checkValidity(),"
+ "defaultChecked,defaultValue,"
+ "dirName,disabled,files,form,formAction,formEnctype,formMethod,formNoValidate,formTarget,height,"
+ "incremental,indeterminate,labels,list,max,maxLength,min,minLength,multiple,name,pattern,"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParser2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParser2Test.java 2018-04-22 09:24:21 UTC (rev 15249)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParser2Test.java 2018-04-22 11:56:47 UTC (rev 15250)
@@ -14,6 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.html;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
import org.junit.Test;
@@ -414,13 +415,13 @@
* @throws Exception on test failure
*/
@Test
- @Alerts(DEFAULT = {"<iframe></div></body></html></iframe>", "1",
- "1", "IFRAME", "null", "1",
- "3", "#text", "</div></body></html>"},
- FF = {"<iframe></div></body></html></iframe>", "1",
- "1", "IFRAME", "null", "1",
- "3", "#text", "</div></body></html>"})
- @NotYetImplemented(FF)
+ @Alerts(DEFAULT = {"<iframe></div></body></html></iframe>", "1",
+ "1", "IFRAME", "null", "1",
+ "3", "#text", "</div></body></html>"},
+ IE = {"<iframe></div></body></html></iframe>", "1",
+ "1", "IFRAME", "null", "1",
+ "3", "#text", "</div></body></html>"})
+ @NotYetImplemented({CHROME, FF})
public void selfClosingIframe() throws Exception {
final String html = "<html><head>\n"
+ "<script>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImageInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImageInputTest.java 2018-04-22 09:24:21 UTC (rev 15249)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImageInputTest.java 2018-04-22 11:56:47 UTC (rev 15250)
@@ -50,7 +50,7 @@
*/
@Test
@Alerts(DEFAULT = "§§URL§§?button.x=0&button.y=0",
- CHROME = "§§URL§§?button.x=16&button.y=7&button=foo",
+ CHROME = "§§URL§§?button.x=16&button.y=8&button=foo",
IE = "§§URL§§?button.x=14&button.y=15")
@NotYetImplemented({CHROME, IE})
public void click_NoPosition() throws Exception {
|
|
From: <rb...@us...> - 2018-05-14 14:27:47
|
Revision: 15261
http://sourceforge.net/p/htmlunit/code/15261
Author: rbri
Date: 2018-05-14 14:27:42 +0000 (Mon, 14 May 2018)
Log Message:
-----------
document.fonts added
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSet.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java
Added Paths:
-----------
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSetTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceTest.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2018-05-14 13:40:24 UTC (rev 15260)
+++ trunk/htmlunit/src/changes/changes.xml 2018-05-14 14:27:42 UTC (rev 15261)
@@ -8,6 +8,9 @@
<body>
<release version="2.31" date="xx, 2018" description="Bugfixes, FIREFOX_45 is deprecated, special GAE handlings removed">
+ <action type="add" dev="rbri">
+ document.fonts added.
+ </action>
<action type="update" dev="rbri">
BrowserVersion: deprecate FIREFOX_45.
</action>
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSet.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSet.java 2018-05-14 13:40:24 UTC (rev 15260)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSet.java 2018-05-14 14:27:42 UTC (rev 15261)
@@ -14,6 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -24,7 +25,9 @@
* A JavaScript object for {@code FontFaceSet}.
*
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
+@JsxClass(isJSObject = false, value = CHROME)
@JsxClass(FF)
public class FontFaceSet extends EventTarget {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java 2018-05-14 13:40:24 UTC (rev 15260)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java 2018-05-14 14:27:42 UTC (rev 15261)
@@ -104,6 +104,7 @@
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxGetter;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter;
import com.gargoylesoftware.htmlunit.javascript.host.Element;
+import com.gargoylesoftware.htmlunit.javascript.host.FontFaceSet;
import com.gargoylesoftware.htmlunit.javascript.host.Location;
import com.gargoylesoftware.htmlunit.javascript.host.NativeFunctionPrefixResolver;
import com.gargoylesoftware.htmlunit.javascript.host.Window;
@@ -230,6 +231,7 @@
private String domain_;
private String lastModified_;
private ScriptableObject currentScript_;
+ private transient FontFaceSet fonts_;
private transient StyleSheetList styleSheetList_;
static {
@@ -4291,4 +4293,18 @@
public void setCurrentScript(final ScriptableObject script) {
currentScript_ = script;
}
+
+ /**
+ * @return the {@code FontFaceSet}
+ */
+ @JsxGetter({CHROME, FF})
+ public ScriptableObject getFonts() {
+ if (fonts_ == null) {
+ final FontFaceSet fonts = new FontFaceSet();
+ fonts.setParentScope(getWindow());
+ fonts.setPrototype(getPrototype(fonts.getClass()));
+ fonts_ = fonts;
+ }
+ return fonts_;
+ }
}
Added: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSetTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSetTest.java (rev 0)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSetTest.java 2018-05-14 14:27:42 UTC (rev 15261)
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2002-2018 Gargoyle Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gargoylesoftware.htmlunit.javascript.host;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.gargoylesoftware.htmlunit.BrowserRunner;
+import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
+import com.gargoylesoftware.htmlunit.WebDriverTestCase;
+
+/**
+ * Tests for {@link FontFaceSet}.
+ *
+ * @author Ronald Brill
+ */
+@RunWith(BrowserRunner.class)
+public class FontFaceSetTest extends WebDriverTestCase {
+
+ /**
+ * @throws Exception if the test fails
+ */
+ @Test
+ @Alerts(DEFAULT = "undefined",
+ FF = "function FontFaceSet() {\n [native code]\n}")
+ public void window() throws Exception {
+ final String html
+ = "<html>\n"
+ + "<body>\n"
+ + "<script>\n"
+ + " alert(window.FontFaceSet);\n"
+ + "</script>\n"
+ + "</body></html>";
+
+ loadPageWithAlerts2(html);
+ }
+
+ /**
+ * @throws Exception if the test fails
+ */
+ @Test
+ @Alerts(DEFAULT = "[object FontFaceSet]",
+ IE = "undefined")
+ public void documentFonts() throws Exception {
+ final String html
+ = "<html>\n"
+ + "<body>\n"
+ + "<script>\n"
+ + " alert(document.fonts);\n"
+ + "</script>\n"
+ + "</body></html>";
+
+ loadPageWithAlerts2(html);
+ }
+}
Property changes on: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSetTest.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceTest.java (rev 0)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceTest.java 2018-05-14 14:27:42 UTC (rev 15261)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2002-2018 Gargoyle Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gargoylesoftware.htmlunit.javascript.host;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.gargoylesoftware.htmlunit.BrowserRunner;
+import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
+import com.gargoylesoftware.htmlunit.WebDriverTestCase;
+
+/**
+ * Tests for {@link FontFace}.
+ *
+ * @author Ronald Brill
+ */
+@RunWith(BrowserRunner.class)
+public class FontFaceTest extends WebDriverTestCase {
+
+ /**
+ * @throws Exception if the test fails
+ */
+ @Test
+ @Alerts(DEFAULT = "function FontFace() {\n [native code]\n}",
+ CHROME = "function FontFace() { [native code] }",
+ IE = "undefined")
+ public void window() throws Exception {
+ final String html
+ = "<html>\n"
+ + "<body>\n"
+ + "<script>\n"
+ + " alert(window.FontFace);\n"
+ + "</script>\n"
+ + "</body></html>";
+
+ loadPageWithAlerts2(html);
+ }
+}
Property changes on: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceTest.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
|
|
From: <rb...@us...> - 2018-05-15 09:27:49
|
Revision: 15262
http://sourceforge.net/p/htmlunit/code/15262
Author: rbri
Date: 2018-05-15 09:27:45 +0000 (Tue, 15 May 2018)
Log Message:
-----------
implement FontFaceSet.load
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSet.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSetTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSet.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSet.java 2018-05-14 14:27:42 UTC (rev 15261)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSet.java 2018-05-15 09:27:45 UTC (rev 15262)
@@ -19,6 +19,7 @@
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
+import com.gargoylesoftware.htmlunit.javascript.configuration.JsxFunction;
import com.gargoylesoftware.htmlunit.javascript.host.event.EventTarget;
/**
@@ -37,4 +38,17 @@
@JsxConstructor
public FontFaceSet() {
}
+
+ /**
+ * @param font a font specification using the CSS value syntax, e.g. "italic bold 16px Roboto"
+ * @param text limit the font faces to those whose Unicode range contains at least one
+ * of the characters in text. This does not check for individual glyph coverage.
+ * @return a Promise of an Array of FontFace loaded. The promise is fulfilled
+ * when all the fonts are loaded; it is rejected if one of the fonts failed to load.
+ */
+ @JsxFunction
+ public Promise load(final String font, final String text) {
+ final Promise promise = Promise.resolve(null, this, new Object[] {""}, null);
+ return promise;
+ }
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSetTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSetTest.java 2018-05-14 14:27:42 UTC (rev 15261)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/FontFaceSetTest.java 2018-05-15 09:27:45 UTC (rev 15262)
@@ -64,4 +64,28 @@
loadPageWithAlerts2(html);
}
+
+ /**
+ * @throws Exception if the test fails
+ */
+ @Test
+ @Alerts(DEFAULT = "then: ",
+ IE = "document.fonts is undefined")
+ public void load() throws Exception {
+ final String html
+ = "<html>\n"
+ + "<body>\n"
+ + "<script>\n"
+ + " if (document.fonts) {\n"
+ + " document.fonts.load('12px Arial', 'HtmlUnit').then(function(value) {\n"
+ + " alert('then: ' + value);"
+ + " });\n"
+ + " } else {\n"
+ + " alert('document.fonts is undefined');\n"
+ + " }"
+ + "</script>\n"
+ + "</body></html>";
+
+ loadPageWithAlerts2(html);
+ }
}
|
|
From: <rb...@us...> - 2018-05-17 10:39:58
|
Revision: 15268
http://sourceforge.net/p/htmlunit/code/15268
Author: rbri
Date: 2018-05-17 10:39:38 +0000 (Thu, 17 May 2018)
Log Message:
-----------
more typed array fixes
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferViewBase.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float32Array.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float64Array.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int16Array.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int32Array.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int8Array.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint16Array.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint32Array.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8Array.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ClampedArray.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferViewTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float32ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float64ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int16ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int32ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int8ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint16ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint32ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ClampedArrayTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferViewBase.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferViewBase.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferViewBase.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -26,6 +26,7 @@
import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
import net.sourceforge.htmlunit.corejs.javascript.ScriptableObject;
import net.sourceforge.htmlunit.corejs.javascript.Undefined;
+import net.sourceforge.htmlunit.corejs.javascript.Wrapper;
/**
* The parent class of all typed arrays, {@link DataView} is not included.
@@ -125,7 +126,19 @@
if (lengthProperty instanceof Number) {
final int length = ((Number) lengthProperty).intValue();
for (int i = 0; i < length; i++) {
- put(i + offset, this, sourceArray.get(i));
+ final Object value = sourceArray.get(i, sourceArray);
+ if (value == Scriptable.NOT_FOUND || value == Undefined.instance) {
+ put(i + offset, this, Double.NaN);
+ }
+ else if (value == null) {
+ put(i + offset, this, 0);
+ }
+ else if (value instanceof Wrapper) {
+ put(i + offset, this, ((Wrapper) value).unwrap());
+ }
+ else {
+ put(i + offset, this, value);
+ }
}
}
}
@@ -149,7 +162,7 @@
@Override
public void put(final int index, final Scriptable start, final Object value) {
getBuffer().setBytes(index * getBytesPerElement() + getByteOffset(),
- value == null ? toArray(null) : toArray(Context.toNumber(value)));
+ value == null ? toByteArray(null) : toByteArray(Context.toNumber(value)));
}
/**
@@ -157,7 +170,7 @@
* @param number the number
* @return the byte array
*/
- protected byte[] toArray(final Number number) {
+ protected byte[] toByteArray(final Number number) {
return null;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float32Array.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float32Array.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float32Array.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -51,7 +51,7 @@
* {@inheritDoc}
*/
@Override
- protected byte[] toArray(final Number number) {
+ protected byte[] toByteArray(final Number number) {
final ByteBuffer buff = ByteBuffer.allocate(BYTES_PER_ELEMENT);
buff.order(ByteOrder.LITTLE_ENDIAN);
buff.putFloat(number != null ? number.floatValue() : Float.NaN);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float64Array.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float64Array.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float64Array.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -51,7 +51,7 @@
* {@inheritDoc}
*/
@Override
- protected byte[] toArray(final Number number) {
+ protected byte[] toByteArray(final Number number) {
final ByteBuffer buff = ByteBuffer.allocate(BYTES_PER_ELEMENT);
buff.order(ByteOrder.LITTLE_ENDIAN);
buff.putDouble(number != null ? number.doubleValue() : Double.NaN);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int16Array.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int16Array.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int16Array.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -51,10 +51,14 @@
* {@inheritDoc}
*/
@Override
- protected byte[] toArray(final Number number) {
+ protected byte[] toByteArray(final Number number) {
final ByteBuffer buff = ByteBuffer.allocate(BYTES_PER_ELEMENT);
buff.order(ByteOrder.LITTLE_ENDIAN);
- buff.putShort(number != null ? number.shortValue() : 0);
+ if (number == null || Double.isInfinite(number.doubleValue())) {
+ buff.putShort((short) 0);
+ return buff.array();
+ }
+ buff.putShort(number.shortValue());
return buff.array();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int32Array.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int32Array.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int32Array.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -51,10 +51,14 @@
* {@inheritDoc}
*/
@Override
- protected byte[] toArray(final Number number) {
+ protected byte[] toByteArray(final Number number) {
final ByteBuffer buff = ByteBuffer.allocate(BYTES_PER_ELEMENT);
buff.order(ByteOrder.LITTLE_ENDIAN);
- buff.putInt(number != null ? number.intValue() : 0);
+ if (number == null || Double.isInfinite(number.doubleValue())) {
+ buff.putInt(0);
+ return buff.array();
+ }
+ buff.putInt(number.intValue());
return buff.array();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int8Array.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int8Array.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int8Array.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -48,8 +48,11 @@
* {@inheritDoc}
*/
@Override
- protected byte[] toArray(final Number number) {
- return new byte[] {number != null ? number.byteValue() : 0};
+ protected byte[] toByteArray(final Number number) {
+ if (number == null || Double.isInfinite(number.doubleValue())) {
+ return new byte[] {0};
+ }
+ return new byte[] {number.byteValue()};
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint16Array.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint16Array.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint16Array.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -51,10 +51,14 @@
* {@inheritDoc}
*/
@Override
- protected byte[] toArray(final Number number) {
+ protected byte[] toByteArray(final Number number) {
final ByteBuffer buff = ByteBuffer.allocate(BYTES_PER_ELEMENT);
buff.order(ByteOrder.LITTLE_ENDIAN);
- buff.putShort((number != null) ? number.shortValue() : 0);
+ if (number == null || Double.isInfinite(number.doubleValue())) {
+ buff.putShort((short) 0);
+ return buff.array();
+ }
+ buff.putShort(number.shortValue());
return buff.array();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint32Array.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint32Array.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint32Array.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -51,10 +51,14 @@
* {@inheritDoc}
*/
@Override
- protected byte[] toArray(final Number number) {
+ protected byte[] toByteArray(final Number number) {
final ByteBuffer buff = ByteBuffer.allocate(BYTES_PER_ELEMENT);
buff.order(ByteOrder.LITTLE_ENDIAN);
- buff.putInt(number != null ? number.intValue() : 0);
+ if (number == null || Double.isInfinite(number.doubleValue())) {
+ buff.putInt(0);
+ return buff.array();
+ }
+ buff.putInt(number.intValue());
return buff.array();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8Array.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8Array.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8Array.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -75,8 +75,11 @@
* {@inheritDoc}
*/
@Override
- protected byte[] toArray(final Number number) {
- return new byte[] {number != null ? number.byteValue() : 0};
+ protected byte[] toByteArray(final Number number) {
+ if (number == null || Double.isInfinite(number.doubleValue())) {
+ return new byte[] {0};
+ }
+ return new byte[] {number.byteValue()};
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ClampedArray.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ClampedArray.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ClampedArray.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -47,7 +47,7 @@
* {@inheritDoc}
*/
@Override
- protected byte[] toArray(Number number) {
+ protected byte[] toByteArray(Number number) {
if (number == null || number.intValue() < 0) {
number = 0;
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferViewTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferViewTest.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferViewTest.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -19,7 +19,6 @@
import com.gargoylesoftware.htmlunit.BrowserRunner;
import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
-import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
import com.gargoylesoftware.htmlunit.WebDriverTestCase;
/**
@@ -120,14 +119,13 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts({"6", /* "0", */ "NaN", "NaN", "10", "1", "2.5", "2.75"})
+ @Alerts({"7", "0", "NaN", "NaN", "10", "1", "2.5", "2.75"})
public void ctorInvalidValuesFloat() throws Exception {
final String html
= "<html><head><title>foo</title><script>\n"
+ "function test() {\n"
+ " try {\n"
- + " var x = new Float32Array(['null', undefined, '10', true, 2.5, '2.75']);\n"
- // + " var x = new Float32Array([null, 'null', undefined, '10', true, 2.5, '2.75']);\n"
+ + " var x = new Float32Array([null, 'null', undefined, '10', true, 2.5, '2.75']);\n"
+ " alert(x.length);\n"
+ " for(var i = 0; i < x.length; i++) {\n"
+ " alert(x[i]);\n"
@@ -141,26 +139,4 @@
loadPageWithAlerts2(html);
}
-
- /**
- * @throws Exception if the test fails
- */
- @Test
- @Alerts({"1", "0"})
- @NotYetImplemented
- public void ctorInvalidValuesFloatNYI() throws Exception {
- final String html
- = "<html><head><title>foo</title><script>\n"
- + "function test() {\n"
- + " var x = new Float32Array([null]);\n"
- + " alert(x.length);\n"
- + " for(var i = 0; i < x.length; i++) {\n"
- + " alert(x[i]);\n"
- + " }\n"
- + "}\n"
- + "</script></head><body onload='test()'>\n"
- + "</body></html>";
-
- loadPageWithAlerts2(html);
- }
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float32ArrayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float32ArrayTest.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float32ArrayTest.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -105,20 +105,28 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts({"undefined", "NaN", "NaN", "4", "undefined"})
+ @Alerts({"undefined", "6", "NaN", "0", "NaN", "Infinity", "-Infinity", "4", "undefined"})
public void undefinedValueInArray() throws Exception {
final String html
= "<html><head><title>foo</title><script>\n"
+ "function test() {\n"
+ " var array = [];\n"
- + " array[2] = 4;\n"
+ + " array[1] = null;\n"
+ + " array[2] = Number.NaN;\n"
+ + " array[3] = Number.POSITIVE_INFINITY;\n"
+ + " array[4] = Number.NEGATIVE_INFINITY;\n"
+ + " array[5] = 4;\n"
+ " alert(array[0]);\n"
+ " var nativeArray = new Float32Array(array);\n"
+ + " alert(nativeArray.length);\n"
+ " alert(nativeArray[0]);\n"
+ " alert(nativeArray[1]);\n"
+ " alert(nativeArray[2]);\n"
+ " alert(nativeArray[3]);\n"
+ + " alert(nativeArray[4]);\n"
+ + " alert(nativeArray[5]);\n"
+ + " alert(nativeArray[6]);\n"
+ "}\n"
+ "</script></head><body onload='test()'>\n"
+ "</body></html>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float64ArrayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float64ArrayTest.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float64ArrayTest.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -105,20 +105,28 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts({"undefined", "NaN", "NaN", "4", "undefined"})
+ @Alerts({"undefined", "6", "NaN", "0", "NaN", "Infinity", "-Infinity", "4", "undefined"})
public void undefinedValueInArray() throws Exception {
final String html
= "<html><head><title>foo</title><script>\n"
+ "function test() {\n"
+ " var array = [];\n"
- + " array[2] = 4;\n"
+ + " array[1] = null;\n"
+ + " array[2] = Number.NaN;\n"
+ + " array[3] = Number.POSITIVE_INFINITY;\n"
+ + " array[4] = Number.NEGATIVE_INFINITY;\n"
+ + " array[5] = 4;\n"
+ " alert(array[0]);\n"
+ " var nativeArray = new Float64Array(array);\n"
+ + " alert(nativeArray.length);\n"
+ " alert(nativeArray[0]);\n"
+ " alert(nativeArray[1]);\n"
+ " alert(nativeArray[2]);\n"
+ " alert(nativeArray[3]);\n"
+ + " alert(nativeArray[4]);\n"
+ + " alert(nativeArray[5]);\n"
+ + " alert(nativeArray[6]);\n"
+ "}\n"
+ "</script></head><body onload='test()'>\n"
+ "</body></html>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int16ArrayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int16ArrayTest.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int16ArrayTest.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -199,20 +199,28 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts({"undefined", "0", "0", "4", "undefined"})
+ @Alerts({"undefined", "6", "0", "0", "0", "0", "0", "4", "undefined"})
public void undefinedValueInArray() throws Exception {
final String html
= "<html><head><title>foo</title><script>\n"
+ "function test() {\n"
+ " var array = [];\n"
- + " array[2] = 4;\n"
+ + " array[1] = null;\n"
+ + " array[2] = Number.NaN;\n"
+ + " array[3] = Number.POSITIVE_INFINITY;\n"
+ + " array[4] = Number.NEGATIVE_INFINITY;\n"
+ + " array[5] = 4;\n"
+ " alert(array[0]);\n"
+ " var nativeArray = new Int16Array(array);\n"
+ + " alert(nativeArray.length);\n"
+ " alert(nativeArray[0]);\n"
+ " alert(nativeArray[1]);\n"
+ " alert(nativeArray[2]);\n"
+ " alert(nativeArray[3]);\n"
+ + " alert(nativeArray[4]);\n"
+ + " alert(nativeArray[5]);\n"
+ + " alert(nativeArray[6]);\n"
+ "}\n"
+ "</script></head><body onload='test()'>\n"
+ "</body></html>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int32ArrayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int32ArrayTest.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int32ArrayTest.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -105,20 +105,28 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts({"undefined", "0", "0", "4", "undefined"})
+ @Alerts({"undefined", "6", "0", "0", "0", "0", "0", "4", "undefined"})
public void undefinedValueInArray() throws Exception {
final String html
= "<html><head><title>foo</title><script>\n"
+ "function test() {\n"
+ " var array = [];\n"
- + " array[2] = 4;\n"
+ + " array[1] = null;\n"
+ + " array[2] = Number.NaN;\n"
+ + " array[3] = Number.POSITIVE_INFINITY;\n"
+ + " array[4] = Number.NEGATIVE_INFINITY;\n"
+ + " array[5] = 4;\n"
+ " alert(array[0]);\n"
+ " var nativeArray = new Int32Array(array);\n"
+ + " alert(nativeArray.length);\n"
+ " alert(nativeArray[0]);\n"
+ " alert(nativeArray[1]);\n"
+ " alert(nativeArray[2]);\n"
+ " alert(nativeArray[3]);\n"
+ + " alert(nativeArray[4]);\n"
+ + " alert(nativeArray[5]);\n"
+ + " alert(nativeArray[6]);\n"
+ "}\n"
+ "</script></head><body onload='test()'>\n"
+ "</body></html>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int8ArrayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int8ArrayTest.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int8ArrayTest.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -173,20 +173,28 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts({"undefined", "0", "0", "4", "undefined"})
+ @Alerts({"undefined", "6", "0", "0", "0", "0", "0", "4", "undefined"})
public void undefinedValueInArray() throws Exception {
final String html
= "<html><head><title>foo</title><script>\n"
+ "function test() {\n"
+ " var array = [];\n"
- + " array[2] = 4;\n"
+ + " array[1] = null;\n"
+ + " array[2] = Number.NaN;\n"
+ + " array[3] = Number.POSITIVE_INFINITY;\n"
+ + " array[4] = Number.NEGATIVE_INFINITY;\n"
+ + " array[5] = 4;\n"
+ " alert(array[0]);\n"
+ " var nativeArray = new Int8Array(array);\n"
+ + " alert(nativeArray.length);\n"
+ " alert(nativeArray[0]);\n"
+ " alert(nativeArray[1]);\n"
+ " alert(nativeArray[2]);\n"
+ " alert(nativeArray[3]);\n"
+ + " alert(nativeArray[4]);\n"
+ + " alert(nativeArray[5]);\n"
+ + " alert(nativeArray[6]);\n"
+ "}\n"
+ "</script></head><body onload='test()'>\n"
+ "</body></html>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint16ArrayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint16ArrayTest.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint16ArrayTest.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -106,20 +106,28 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts({"undefined", "0", "0", "4", "undefined"})
+ @Alerts({"undefined", "6", "0", "0", "0", "0", "0", "4", "undefined"})
public void undefinedValueInArray() throws Exception {
final String html
= "<html><head><title>foo</title><script>\n"
+ "function test() {\n"
+ " var array = [];\n"
- + " array[2] = 4;\n"
+ + " array[1] = null;\n"
+ + " array[2] = Number.NaN;\n"
+ + " array[3] = Number.POSITIVE_INFINITY;\n"
+ + " array[4] = Number.NEGATIVE_INFINITY;\n"
+ + " array[5] = 4;\n"
+ " alert(array[0]);\n"
+ " var nativeArray = new Uint16Array(array);\n"
+ + " alert(nativeArray.length);\n"
+ " alert(nativeArray[0]);\n"
+ " alert(nativeArray[1]);\n"
+ " alert(nativeArray[2]);\n"
+ " alert(nativeArray[3]);\n"
+ + " alert(nativeArray[4]);\n"
+ + " alert(nativeArray[5]);\n"
+ + " alert(nativeArray[6]);\n"
+ "}\n"
+ "</script></head><body onload='test()'>\n"
+ "</body></html>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint32ArrayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint32ArrayTest.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint32ArrayTest.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -127,20 +127,28 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts({"undefined", "0", "0", "4", "undefined"})
+ @Alerts({"undefined", "6", "0", "0", "0", "0", "0", "4", "undefined"})
public void undefinedValueInArray() throws Exception {
final String html
= "<html><head><title>foo</title><script>\n"
+ "function test() {\n"
+ " var array = [];\n"
- + " array[2] = 4;\n"
+ + " array[1] = null;\n"
+ + " array[2] = Number.NaN;\n"
+ + " array[3] = Number.POSITIVE_INFINITY;\n"
+ + " array[4] = Number.NEGATIVE_INFINITY;\n"
+ + " array[5] = 4;\n"
+ " alert(array[0]);\n"
+ " var nativeArray = new Uint32Array(array);\n"
+ + " alert(nativeArray.length);\n"
+ " alert(nativeArray[0]);\n"
+ " alert(nativeArray[1]);\n"
+ " alert(nativeArray[2]);\n"
+ " alert(nativeArray[3]);\n"
+ + " alert(nativeArray[4]);\n"
+ + " alert(nativeArray[5]);\n"
+ + " alert(nativeArray[6]);\n"
+ "}\n"
+ "</script></head><body onload='test()'>\n"
+ "</body></html>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ArrayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ArrayTest.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ArrayTest.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -106,20 +106,28 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts({"undefined", "0", "0", "4", "undefined"})
+ @Alerts({"undefined", "6", "0", "0", "0", "0", "0", "4", "undefined"})
public void undefinedValueInArray() throws Exception {
final String html
= "<html><head><title>foo</title><script>\n"
+ "function test() {\n"
+ " var array = [];\n"
- + " array[2] = 4;\n"
+ + " array[1] = null;\n"
+ + " array[2] = Number.NaN;\n"
+ + " array[3] = Number.POSITIVE_INFINITY;\n"
+ + " array[4] = Number.NEGATIVE_INFINITY;\n"
+ + " array[5] = 4;\n"
+ " alert(array[0]);\n"
+ " var nativeArray = new Uint8Array(array);\n"
+ + " alert(nativeArray.length);\n"
+ " alert(nativeArray[0]);\n"
+ " alert(nativeArray[1]);\n"
+ " alert(nativeArray[2]);\n"
+ " alert(nativeArray[3]);\n"
+ + " alert(nativeArray[4]);\n"
+ + " alert(nativeArray[5]);\n"
+ + " alert(nativeArray[6]);\n"
+ "}\n"
+ "</script></head><body onload='test()'>\n"
+ "</body></html>";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ClampedArrayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ClampedArrayTest.java 2018-05-17 09:09:09 UTC (rev 15267)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ClampedArrayTest.java 2018-05-17 10:39:38 UTC (rev 15268)
@@ -107,20 +107,28 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts({"undefined", "0", "0", "4", "undefined"})
+ @Alerts({"undefined", "6", "0", "0", "0", "255", "0", "4", "undefined"})
public void undefinedValueInArray() throws Exception {
final String html
= "<html><head><title>foo</title><script>\n"
+ "function test() {\n"
+ " var array = [];\n"
- + " array[2] = 4;\n"
+ + " array[1] = null;\n"
+ + " array[2] = Number.NaN;\n"
+ + " array[3] = Number.POSITIVE_INFINITY;\n"
+ + " array[4] = Number.NEGATIVE_INFINITY;\n"
+ + " array[5] = 4;\n"
+ " alert(array[0]);\n"
+ " var nativeArray = new Uint8ClampedArray(array);\n"
+ + " alert(nativeArray.length);\n"
+ " alert(nativeArray[0]);\n"
+ " alert(nativeArray[1]);\n"
+ " alert(nativeArray[2]);\n"
+ " alert(nativeArray[3]);\n"
+ + " alert(nativeArray[4]);\n"
+ + " alert(nativeArray[5]);\n"
+ + " alert(nativeArray[6]);\n"
+ "}\n"
+ "</script></head><body onload='test()'>\n"
+ "</body></html>";
|
|
From: <rb...@us...> - 2018-05-18 12:04:09
|
Revision: 15273
http://sourceforge.net/p/htmlunit/code/15273
Author: rbri
Date: 2018-05-18 12:04:03 +0000 (Fri, 18 May 2018)
Log Message:
-----------
Set constructor now supports parameters of type iterator also
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Iterator.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SetTest.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2018-05-18 12:02:37 UTC (rev 15272)
+++ trunk/htmlunit/src/changes/changes.xml 2018-05-18 12:04:03 UTC (rev 15273)
@@ -8,6 +8,9 @@
<body>
<release version="2.31" date="xx, 2018" description="Bugfixes, FIREFOX_45 is deprecated, special GAE handlings removed">
+ <action type="fix" dev="rbri">
+ Set constructor now supports parameters of type iterator also.
+ </action>
<action type="add" dev="rbri">
document.fonts added.
</action>
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Iterator.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Iterator.java 2018-05-18 12:02:37 UTC (rev 15272)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Iterator.java 2018-05-18 12:04:03 UTC (rev 15273)
@@ -34,6 +34,7 @@
* A JavaScript object for {@code Iterator}.
*
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class Iterator extends SimpleScriptable {
@@ -115,6 +116,22 @@
final Scriptable thisObj,
final Scriptable scriptable,
final Consumer<Object> processor) {
+
+ if (scriptable instanceof ES6Iterator) {
+ ScriptableObject next = (ScriptableObject) ScriptableObject.callMethod(scriptable, "next", null);
+ boolean done = (boolean) next.get(ES6Iterator.DONE_PROPERTY);
+ Object value = next.get(ES6Iterator.VALUE_PROPERTY);
+
+ while (!done) {
+ processor.accept(value);
+
+ next = (ScriptableObject) ScriptableObject.callMethod(scriptable, "next", null);
+ done = (boolean) next.get(ES6Iterator.DONE_PROPERTY);
+ value = next.get(ES6Iterator.VALUE_PROPERTY);
+ }
+ return true;
+ }
+
if (!(scriptable instanceof SymbolScriptable)) {
return false;
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SetTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SetTest.java 2018-05-18 12:02:37 UTC (rev 15272)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SetTest.java 2018-05-18 12:04:03 UTC (rev 15273)
@@ -198,6 +198,28 @@
* @throws Exception if the test fails
*/
@Test
+ @Alerts(DEFAULT = {"7", "true", "false"},
+ IE = {"0", "false", "false"})
+ public void constructorStringIteratorParam() throws Exception {
+ final String html
+ = "<html><head><title>foo</title><script>\n"
+ + "function test() {\n"
+ + " var strIter = 'HtmlUnit'[Symbol.iterator]();"
+ + " var mySet = new Set(strIter);\n"
+ + " alert(mySet.size);\n"
+ + " alert(mySet.has('t'));\n"
+ + " alert(mySet.has('x'));\n"
+ + "}\n"
+ + "</script></head><body onload='test()'>\n"
+ + "</body></html>";
+
+ loadPageWithAlerts2(html);
+ }
+
+ /**
+ * @throws Exception if the test fails
+ */
+ @Test
@Alerts(DEFAULT = {"3", "true", "false"},
IE = {"0", "false", "false"})
public void constructorSetParam() throws Exception {
|
|
From: <rb...@us...> - 2018-05-27 11:29:32
|
Revision: 15292
http://sourceforge.net/p/htmlunit/code/15292
Author: rbri
Date: 2018-05-27 11:29:11 +0000 (Sun, 27 May 2018)
Log Message:
-----------
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/MozCSSKeyframesRule.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMSettableTokenList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLContentElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLShadowElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozPowerManager.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGAltGlyphElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGDocument.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionFeaturesTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CodeStyleTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NotYetImplementedTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementDefaultStyleDisplayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostTypeOfTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/DebugFrameImplTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfigurationTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/History2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MapTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NamedNodeMapTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SetTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SymbolTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/URLSearchParamsTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowConcurrencyTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float32ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float64ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int16ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int32ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int8ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint16ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint32ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ClampedArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSKeyframesRuleTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleListTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributesIterableTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementClientWidthTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetWidthTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMParserTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMTokenListTest.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/DocumentTypeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeListTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/PopStateEventTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/WebGLContextEventTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCanvasElementTest.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/HTMLImageElementTest.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/HTMLTextAreaElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxy3Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/runners/BrowserStatement.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/runners/BrowserVersionClassRunner.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/runners/TestCaseCorrector.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgAltGlyphTest.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/changes/changes.xml 2018-05-27 11:29:11 UTC (rev 15292)
@@ -7,7 +7,7 @@
</properties>
<body>
- <release version="2.32" date="xx 2018" description="Bugfixes">
+ <release version="2.32" date="xx 2018" description="Bugfixes, FIREFOX_45 removed, FIREFOX_60 added">
<action type="fix" dev="rbri" issue="1962">
Various fixes for the selector specificity calculation (CssParser).
</action>
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -93,12 +93,10 @@
private static final String PLATFORM_WIN64 = "Win64";
/**
- * Firefox 45 ESR.
- * @since 2.21
- * @deprecated As of 2.31
+ * Firefox 60 ESR.
+ * @since 2,.32
*/
- @Deprecated
- public static final BrowserVersion FIREFOX_45 = new BrowserVersion(45, "FF45");
+ public static final BrowserVersion FIREFOX_60 = new BrowserVersion(45, "FF60");
/**
* Firefox 52 ESR.
@@ -125,13 +123,13 @@
/** Register plugins for the browser versions. */
static {
- // FF45
- FIREFOX_45.applicationVersion_ = "5.0 (Windows)";
- FIREFOX_45.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0";
- FIREFOX_45.platform_ = PLATFORM_WIN32;
- FIREFOX_45.buildId_ = "20170411115307";
- FIREFOX_45.productSub_ = "20100101";
- FIREFOX_45.headerNamesOrdered_ = new String[] {
+ // FF60
+ FIREFOX_60.applicationVersion_ = "5.0 (Windows)";
+ FIREFOX_60.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0";
+ FIREFOX_60.platform_ = PLATFORM_WIN32;
+ FIREFOX_60.buildId_ = "20170411115307";
+ FIREFOX_60.productSub_ = "20100101";
+ FIREFOX_60.headerNamesOrdered_ = new String[] {
HttpHeader.HOST,
HttpHeader.USER_AGENT,
HttpHeader.ACCEPT,
@@ -140,11 +138,11 @@
HttpHeader.REFERER,
HttpHeader.COOKIE,
HttpHeader.CONNECTION};
- FIREFOX_45.htmlAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
- FIREFOX_45.xmlHttpRequestAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
- FIREFOX_45.imgAcceptHeader_ = "image/png,image/*;q=0.8,*/*;q=0.5";
- FIREFOX_45.cssAcceptHeader_ = "text/css,*/*;q=0.1";
- FIREFOX_45.fontHeights_ = new int[] {
+ FIREFOX_60.htmlAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
+ FIREFOX_60.xmlHttpRequestAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
+ FIREFOX_60.imgAcceptHeader_ = "image/png,image/*;q=0.8,*/*;q=0.5";
+ FIREFOX_60.cssAcceptHeader_ = "text/css,*/*;q=0.1";
+ FIREFOX_60.fontHeights_ = new int[] {
0, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
30, 31, 32, 33, 34, 35, 36, 37, 38, 40, 41, 42, 43, 44, 45, 46, 47, 48, 50, 51, 52, 53, 53, 55, 57, 58,
59, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 72, 73, 74, 75, 76, 77, 78, 79, 80, 82, 84, 85, 86, 87, 88,
@@ -271,29 +269,29 @@
CHROME.registerUploadMimeType("txt", "text/plain");
CHROME.registerUploadMimeType("text", "text/plain");
- FIREFOX_45.registerUploadMimeType("html", "text/html");
- FIREFOX_45.registerUploadMimeType("htm", "text/html");
- FIREFOX_45.registerUploadMimeType("css", "text/css");
- FIREFOX_45.registerUploadMimeType("xml", "text/xml");
- FIREFOX_45.registerUploadMimeType("gif", "image/gif");
- FIREFOX_45.registerUploadMimeType("jpeg", "image/jpeg");
- FIREFOX_45.registerUploadMimeType("jpg", "image/jpeg");
- FIREFOX_45.registerUploadMimeType("mp4", "video/mp4");
- FIREFOX_45.registerUploadMimeType("m4v", "video/mp4");
- FIREFOX_45.registerUploadMimeType("m4a", "audio/mp4");
- FIREFOX_45.registerUploadMimeType("mp3", "audio/mpeg");
- FIREFOX_45.registerUploadMimeType("ogv", "video/ogg");
- FIREFOX_45.registerUploadMimeType("ogm", "video/x-ogm");
- FIREFOX_45.registerUploadMimeType("ogg", "video/ogg");
- FIREFOX_45.registerUploadMimeType("oga", "audio/ogg");
- FIREFOX_45.registerUploadMimeType("opus", "audio/ogg");
- FIREFOX_45.registerUploadMimeType("webm", "video/webm");
- FIREFOX_45.registerUploadMimeType("wav", "audio/wav");
- FIREFOX_45.registerUploadMimeType("flac", "audio/x-flac");
- FIREFOX_45.registerUploadMimeType("xhtml", "application/xhtml+xml");
- FIREFOX_45.registerUploadMimeType("xht", "application/xhtml+xml");
- FIREFOX_45.registerUploadMimeType("txt", "text/plain");
- FIREFOX_45.registerUploadMimeType("text", "text/plain");
+ FIREFOX_60.registerUploadMimeType("html", "text/html");
+ FIREFOX_60.registerUploadMimeType("htm", "text/html");
+ FIREFOX_60.registerUploadMimeType("css", "text/css");
+ FIREFOX_60.registerUploadMimeType("xml", "text/xml");
+ FIREFOX_60.registerUploadMimeType("gif", "image/gif");
+ FIREFOX_60.registerUploadMimeType("jpeg", "image/jpeg");
+ FIREFOX_60.registerUploadMimeType("jpg", "image/jpeg");
+ FIREFOX_60.registerUploadMimeType("mp4", "video/mp4");
+ FIREFOX_60.registerUploadMimeType("m4v", "video/mp4");
+ FIREFOX_60.registerUploadMimeType("m4a", "audio/mp4");
+ FIREFOX_60.registerUploadMimeType("mp3", "audio/mpeg");
+ FIREFOX_60.registerUploadMimeType("ogv", "video/ogg");
+ FIREFOX_60.registerUploadMimeType("ogm", "video/x-ogm");
+ FIREFOX_60.registerUploadMimeType("ogg", "video/ogg");
+ FIREFOX_60.registerUploadMimeType("oga", "audio/ogg");
+ FIREFOX_60.registerUploadMimeType("opus", "audio/ogg");
+ FIREFOX_60.registerUploadMimeType("webm", "video/webm");
+ FIREFOX_60.registerUploadMimeType("wav", "audio/wav");
+ FIREFOX_60.registerUploadMimeType("flac", "audio/x-flac");
+ FIREFOX_60.registerUploadMimeType("xhtml", "application/xhtml+xml");
+ FIREFOX_60.registerUploadMimeType("xht", "application/xhtml+xml");
+ FIREFOX_60.registerUploadMimeType("txt", "text/plain");
+ FIREFOX_60.registerUploadMimeType("text", "text/plain");
FIREFOX_52.registerUploadMimeType("html", "text/html");
FIREFOX_52.registerUploadMimeType("htm", "text/html");
@@ -359,7 +357,7 @@
"Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF32_29_0_0_140.dll");
flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
"Shockwave Flash", "swf"));
- FIREFOX_45.plugins_.add(flash);
+ FIREFOX_60.plugins_.add(flash);
flash = new PluginConfiguration("Shockwave Flash",
"Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF64_29_0_0_140.dll");
@@ -442,7 +440,7 @@
expectedBrowser = SupportedBrowser.FF52;
}
else if (isFirefox()) {
- expectedBrowser = SupportedBrowser.FF45;
+ expectedBrowser = SupportedBrowser.FF60;
}
else if (isIE()) {
expectedBrowser = SupportedBrowser.IE;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -17,7 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -51,7 +51,7 @@
ANCHOR_IGNORE_TARGET_FOR_JS_HREF,
/** Is the default display style of Applet is 'inline-block'. */
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
APPLET_INLINE_BLOCK,
/** Background image is 'initial'. */
@@ -433,7 +433,7 @@
HTMLLINK_CHECK_TYPE_FOR_STYLESHEET,
/** If the single select has exact one option, this options gets never deselected. */
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
HTMLOPTION_EXACT_ONE_OPTION_GETS_NERVER_DESELECTED,
/** */
@@ -608,7 +608,7 @@
JS_CANVAS_DATA_URL_IE_PNG,
/** draw for canvas throws an error if no image available. */
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
JS_CANVAS_DRAW_THROWS_FOR_MISSING_IMG,
/** Do not allow invalid clear values. */
@@ -644,7 +644,7 @@
JS_CSSRULELIST_ENUM_ITEM_LENGTH,
/** Uses {@code MozCSSKeyframesRule}. */
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
JS_CSS_MOZ_CSS_KEYFRAMES_RULE,
/** <code>Date.toLocaleDateString()</code> returns a short form (d.M.yyyy). */
@@ -1235,9 +1235,9 @@
@BrowserFeature({CHROME, FF, EDGE})
JS_SYMBOL,
- /** Symbol support is limited in FF45. */
- @BrowserFeature(FF45)
- JS_SYMBOL_FF45,
+ /** Symbol support is limited in FF60. */
+ @BrowserFeature(FF60)
+ JS_SYMBOL_FF60,
/** The width cell height does not return negative values. */
@BrowserFeature(IE)
@@ -1290,7 +1290,7 @@
/** Setting the property cols throws an exception, if the provided value is not convertible into an integer.
* FF ignores the provided value in this case and sets cols to 0.
*/
- @BrowserFeature({IE, FF45})
+ @BrowserFeature({IE, FF60})
JS_TEXT_AREA_SET_COLS_THROWS_EXCEPTION,
/** Setting the property {@code maxLength} throws an exception, if the provided value is less than 0. */
@@ -1304,7 +1304,7 @@
/** Setting the property rows throws an exception, if the provided value is not convertible into an integer.
* FF ignores the provided value in this case and sets rows to 0.
*/
- @BrowserFeature({IE, FF45})
+ @BrowserFeature({IE, FF60})
JS_TEXT_AREA_SET_ROWS_THROWS_EXCEPTION,
/** Setting the value processes null as null value. */
@@ -1489,7 +1489,7 @@
SLOT_CONTENTS,
/** Indicates that string.contains() is supported. */
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
STRING_CONTAINS,
/** Indicates that string.includes() is supported. */
@@ -1541,7 +1541,7 @@
* Indicates, that the pathname for the url {@code about:blank} is empty;
* instead of '/blank'.
*/
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
URL_ABOUT_BLANK_HAS_EMPTY_PATH,
/**
@@ -1581,7 +1581,7 @@
XHR_IGNORE_PORT_FOR_SAME_ORIGIN,
/** ProgressEvent.lengthComputable is true. */
- @BrowserFeature({FF45, IE})
+ @BrowserFeature({FF60, IE})
XHR_LENGTH_COMPUTABLE,
/** A cross origin request to {@code about:blank} is not allowed. */
@@ -1593,7 +1593,7 @@
XHR_OPEN_ALLOW_EMTPY_URL,
/** Indicates that open() throws an exception in sync mode if 'withCredentials' is set to true. */
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
XHR_OPEN_WITHCREDENTIALS_TRUE_IN_SYNC_EXCEPTION,
/** Indicates that method overrideMimeType throws if msg was already sent. */
@@ -1616,7 +1616,7 @@
* Indicates that the property <code>withCredentials</code> is not writable for sync requests.
* Setting the property throws an exception.
*/
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
XHR_WITHCREDENTIALS_NOT_WRITEABLE_IN_SYNC_EXCEPTION,
/** Indicates that the XPath attribute is case sensitive. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -23,7 +23,7 @@
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_OBJECT_GET_OWN_PROPERTY_SYMBOLS;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_REFLECT;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_SYMBOL;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_SYMBOL_FF45;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_SYMBOL_FF60;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_WINDOW_ACTIVEXOBJECT_HIDDEN;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_XML;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.STRING_CONTAINS;
@@ -232,7 +232,7 @@
deleteProperties(window, "Symbol");
}
- if (browserVersion.hasFeature(JS_SYMBOL_FF45)) {
+ if (browserVersion.hasFeature(JS_SYMBOL_FF60)) {
final ScriptableObject sym = (ScriptableObject) ScriptableObject.getProperty(window, "Symbol");
final List<String> toDelete = Arrays.asList("hasInstance", "isConcatSpreadable", "replace",
"search", "split", "string", "toStringTag", "unscopables");
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -17,7 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -115,7 +115,7 @@
expectedBrowser = FF52;
}
else if (browser.isFirefox()) {
- expectedBrowser = FF45;
+ expectedBrowser = FF60;
}
else {
expectedBrowser = CHROME; // our current fallback
@@ -330,8 +330,8 @@
*/
public static boolean isCompatible(final SupportedBrowser browser1, final SupportedBrowser browser2) {
return (browser1 == browser2)
- || (browser1 == FF && (browser2 == FF45 || browser2 == FF52))
- || (browser2 == FF && (browser1 == FF45 || browser1 == FF52));
+ || (browser1 == FF && (browser2 == FF60 || browser2 == FF52))
+ || (browser2 == FF && (browser1 == FF60 || browser1 == FF52));
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -34,7 +34,7 @@
FF,
/** Firefox 45. */
- FF45,
+ FF60,
/** Firefox 52. */
FF52
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -24,7 +24,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -2650,7 +2650,7 @@
* Returns the {@code onmozpointerlockchange} event handler.
* @return the {@code onmozpointerlockchange} event handler
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockchange() {
return getEventHandler("mozpointerlockchange");
}
@@ -2659,7 +2659,7 @@
* Sets the {@code onmozpointerlockchange} event handler.
* @param onmozpointerlockchange the {@code onmozpointerlockchange} event handler
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockchange(final Object onmozpointerlockchange) {
setHandlerForJavaScript("mozpointerlockchange", onmozpointerlockchange);
}
@@ -4054,7 +4054,7 @@
* Returns the {@code onmozpointerlockerror} event handler.
* @return the {@code onmozpointerlockerror} event handler
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockerror() {
return getEventHandler("mozpointerlockerror");
}
@@ -4063,7 +4063,7 @@
* Sets the {@code onmozpointerlockerror} event handler.
* @param onmozpointerlockerror the {@code onmozpointerlockerror} event handler
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockerror(final Object onmozpointerlockerror) {
setHandlerForJavaScript("mozpointerlockerror", onmozpointerlockerror);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.canvas;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -1645,7 +1645,7 @@
public static final long STENCIL_FUNC = 2962L;
/** The constant {@code STENCIL_INDEX}. */
- @JsxConstant({FF52, FF45, IE})
+ @JsxConstant({FF52, FF60, IE})
public static final long STENCIL_INDEX = 6401L;
/** The constant {@code STENCIL_INDEX8}. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -17,7 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -340,7 +340,7 @@
@JsxConstant
public static final int TEXTURE = 0x1702;
/** The constant {@code STENCIL_INDEX}. */
- @JsxConstant({FF52, FF45, IE})
+ @JsxConstant({FF52, FF60, IE})
public static final int STENCIL_INDEX = 0x1901;
/** The constant {@code DEPTH_COMPONENT}. */
@JsxConstant
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -1066,7 +1066,7 @@
if (browserVersion.hasFeature(JS_CLIENTWIDTH_INPUT_TEXT_169)) {
return 169;
}
- width = 141; // FF45
+ width = 141; // FF60
}
else if (node instanceof HtmlRadioButtonInput || node instanceof HtmlCheckBoxInput) {
width = 13;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/MozCSSKeyframesRule.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/MozCSSKeyframesRule.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/MozCSSKeyframesRule.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.css;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -23,6 +23,6 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(FF45)
+@JsxClass(FF60)
public class MozCSSKeyframesRule extends CSSRule {
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMSettableTokenList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMSettableTokenList.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMSettableTokenList.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -16,7 +16,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -27,7 +27,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass({FF45, IE, EDGE})
+@JsxClass({FF60, IE, EDGE})
public class DOMSettableTokenList extends DOMTokenList {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -34,7 +34,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import static com.gargoylesoftware.htmlunit.util.StringUtils.parseHttpDate;
@@ -3563,7 +3563,7 @@
* Returns the {@code onmozpointerlockchange} event handler for this element.
* @return the {@code onmozpointerlockchange} event handler for this element
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockchange() {
return getEventHandler("mozpointerlockchange");
}
@@ -3572,7 +3572,7 @@
* Sets the {@code onmozpointerlockchange} event handler for this element.
* @param onmozpointerlockchange the {@code onmozpointerlockchange} event handler for this element
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockchange(final Object onmozpointerlockchange) {
setEventHandler("mozpointerlockchange", onmozpointerlockchange);
}
@@ -3581,7 +3581,7 @@
* Returns the {@code onmozpointerlockerror} event handler for this element.
* @return the {@code onmozpointerlockerror} event handler for this element
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockerror() {
return getEventHandler("mozpointerlockerror");
}
@@ -3590,7 +3590,7 @@
* Sets the {@code onmozpointerlockerror} event handler for this element.
* @param onmozpointerlockerror the {@code onmozpointerlockerror} event handler for this element
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockerror(final Object onmozpointerlockerror) {
setEventHandler("mozpointerlockerror", onmozpointerlockerror);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -19,7 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import org.apache.commons.lang3.StringUtils;
@@ -141,7 +141,7 @@
* {@inheritDoc}
*/
@Override
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Object getPrefix() {
return super.getPrefix();
}
@@ -150,7 +150,7 @@
* {@inheritDoc}
*/
@Override
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Object getLocalName() {
return super.getLocalName();
}
@@ -159,7 +159,7 @@
* {@inheritDoc}
*/
@Override
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Object getNamespaceURI() {
return super.getNamespaceURI();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -19,7 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -721,7 +721,7 @@
* Returns the namespace prefix.
* @return the namespace prefix
*/
- @JsxGetter({FF45, IE})
+ @JsxGetter({FF60, IE})
public Object getPrefix() {
return getDomNodeOrDie().getPrefix();
}
@@ -730,7 +730,7 @@
* Returns the local name of this attribute.
* @return the local name of this attribute
*/
- @JsxGetter({FF45, IE})
+ @JsxGetter({FF60, IE})
public Object getLocalName() {
return getDomNodeOrDie().getLocalName();
}
@@ -739,7 +739,7 @@
* Returns the URI that identifies an XML namespace.
* @return the URI that identifies an XML namespace
*/
- @JsxGetter({FF45, IE})
+ @JsxGetter({FF60, IE})
public Object getNamespaceURI() {
return getDomNodeOrDie().getNamespaceURI();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.event;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -24,7 +24,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(FF45)
+@JsxClass(FF60)
public class MozContactChangeEvent extends Event {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.event;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -24,7 +24,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(FF45)
+@JsxClass(FF60)
public class MozSettingsEvent extends Event {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -147,7 +147,7 @@
LOG.info("Invoking URL: " + url);
}
- try (WebClient webClient = new WebClient(BrowserVersion.FIREFOX_45)) {
+ try (WebClient webClient = new WebClient(BrowserVersion.FIREFOX_60)) {
final Page page = webClient.getPage(url);
final String content = page.getWebResponse().getContentAsString();
if (LOG.isDebugEnabled()) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLContentElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLContentElement.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLContentElement.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.html;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.html.HtmlContent;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -26,7 +26,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(domClass = HtmlContent.class, value = {CHROME, FF45})
+@JsxClass(domClass = HtmlContent.class, value = {CHROME, FF60})
public class HTMLContentElement extends HTMLElement {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -23,7 +23,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -173,7 +173,7 @@
@JsxClass(domClass = HtmlDefinitionTerm.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlElement.class, value = {FF, IE})
@JsxClass(domClass = HtmlEmphasis.class, value = {CHROME, FF})
-@JsxClass(domClass = HtmlExample.class, value = FF45)
+@JsxClass(domClass = HtmlExample.class, value = FF60)
@JsxClass(domClass = HtmlFigure.class)
@JsxClass(domClass = HtmlFigureCaption.class)
@JsxClass(domClass = HtmlFooter.class)
@@ -181,7 +181,7 @@
@JsxClass(domClass = HtmlItalic.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlKeyboard.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlLayer.class, value = CHROME)
-@JsxClass(domClass = HtmlListing.class, value = FF45)
+@JsxClass(domClass = HtmlListing.class, value = FF60)
@JsxClass(domClass = HtmlMark.class)
@JsxClass(domClass = HtmlNav.class)
@JsxClass(domClass = HtmlNoBreak.class, value = {CHROME, FF})
@@ -343,7 +343,7 @@
COLORS_MAP_IE.put("Olive", "#808000");
COLORS_MAP_IE.put("OliveDrab", "#6B8E23");
COLORS_MAP_IE.put("Orange", "#FFA500");
- COLORS_MAP_IE.put("OrangeRed", "#FF4500");
+ COLORS_MAP_IE.put("OrangeRed", "#FF6000");
COLORS_MAP_IE.put("Orchid", "#DA70D6");
COLORS_MAP_IE.put("PaleGoldenrod", "#EEE8AA");
COLORS_MAP_IE.put("PaleGreen", "#98FB98");
@@ -3578,7 +3578,7 @@
* Returns the {@code onmozpointerlockchange} event handler for this element.
* @return the {@code onmozpointerlockchange} event handler for this element
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockchange() {
return getEventHandler("mozpointerlockchange");
}
@@ -3587,7 +3587,7 @@
* Sets the {@code onmozpointerlockchange} event handler for this element.
* @param onmozpointerlockchange the {@code onmozpointerlockchange} event handler for this element
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockchange(final Object onmozpointerlockchange) {
setEventHandler("mozpointerlockchange", onmozpointerlockchange);
}
@@ -3596,7 +3596,7 @@
* Returns the {@code onmozpointerlockerror} event handler for this element.
* @return the {@code onmozpointerlockerror} event handler for this element
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockerror() {
return getEventHandler("mozpointerlockerror");
}
@@ -3605,7 +3605,7 @@
* Sets the {@code onmozpointerlockerror} event handler for this element.
* @param onmozpointerlockerror the {@code onmozpointerlockerror} event handler for this element
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockerror(final Object onmozpointerlockerror) {
setEventHandler("mozpointerlockerror", onmozpointerlockerror);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLShadowElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLShadowElement.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLShadowElement.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.html;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -25,7 +25,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass({CHROME, FF45})
+@JsxClass({CHROME, FF60})
public class HTMLShadowElement extends HTMLElement {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozPowerManager.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozPowerManager.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozPowerManager.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.moz;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -25,7 +25,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(FF45)
+@JsxClass(FF60)
public class MozPowerManager extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGAltGlyphElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGAltGlyphElement.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGAltGlyphElement.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.svg;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -26,7 +26,7 @@
* @author Ahmed Ashour
* @author Frank Danek
*/
-@JsxClass(domClass = SvgAltGlyph.class, value = FF45)
+@JsxClass(domClass = SvgAltGlyph.class, value = FF60)
public class SVGAltGlyphElement extends SVGTextPositioningElement {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGDocument.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGDocument.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGDocument.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.svg;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -25,7 +25,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(FF45)
+@JsxClass(FF60)
public class SVGDocument extends Document {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -17,7 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -441,7 +441,7 @@
* Returns the {@code onmozpointerlockchange} event handler.
* @return the {@code onmozpointerlockchange} event handler
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockchange() {
return getEventHandler("mozpointerlockchange");
}
@@ -450,7 +450,7 @@
* Sets the {@code onmozpointerlockchange} event handler.
* @param mozpointerlockchange the {@code onmozpointerlockchange} event handler
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockchange(final Object mozpointerlockchange) {
setEventHandler("mozpointerlockchange", mozpointerlockchange);
}
@@ -855,7 +855,7 @@
* Returns the {@code onmozpointerlockerror} event handler.
* @return the {@code onmozpointerlockerror} event handler
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockerror() {
return getEventHandler("mozpointerlockerror");
}
@@ -864,7 +864,7 @@
* Sets the {@code onmozpointerlockerror} event handler.
* @param mozpointerlockerror the {@code onmozpointerlockerror} event handler
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockerror(final Object mozpointerlockerror) {
setEventHandler("mozpointerlockerror", mozpointerlockerror);
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -134,9 +134,9 @@
runners_.add(new BrowserVersionClassRunnerWithParameters(
klass, BrowserVersion.CHROME, true, tests));
}
- if (browsers.contains("ff45")) {
+ if (browsers.contains("ff60")) {
runners_.add(new BrowserVersionClassRunnerWithParameters(
- klass, BrowserVersion.FIREFOX_45, true, tests));
+ klass, BrowserVersion.FIREFOX_60, true, tests));
}
if (browsers.contains("ff52")) {
runners_.add(new BrowserVersionClassRunnerWithParameters(
@@ -156,9 +156,9 @@
runners_.add(new BrowserVersionClassRunnerWithParameters(
klass, BrowserVersion.CHROME, false, tests));
}
- if (browsers.contains("hu-ff45")) {
+ if (browsers.contains("hu_ff60")) {
runners_.add(new BrowserVersionClassRunnerWithParameters(
- klass, BrowserVersion.FIREFOX_45, false, tests));
+ klass, BrowserVersion.FIREFOX_60, false, tests));
}
if (browsers.contains("hu-ff52")) {
runners_.add(new BrowserVersionClassRunnerWithParameters(
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -77,8 +77,8 @@
if (browsers.contains("chrome")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.CHROME, true));
}
- if (browsers.contains("ff45")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_45, true));
+ if (browsers.contains("ff60")) {
+ runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_60, true));
}
if (browsers.contains("ff52")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_52, true));
@@ -94,8 +94,8 @@
if (browsers.contains("hu-chrome")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.CHROME, false));
}
- if (browsers.contains("hu-ff45")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_45, false));
+ if (browsers.contains("hu-ff60")) {
+ runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_60, false));
}
if (browsers.contains("hu-ff52")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_52, false));
@@ -170,7 +170,7 @@
FF,
/** Firefox 45. */
- FF45,
+ FF60,
/** Firefox 52. */
FF52
@@ -217,7 +217,7 @@
* Alerts for Firefox 45. If not defined, {@link #FF()} is used.
* @return the alerts
*/
- String[] FF45() default { EMPTY_DEFAULT };
+ String[] FF60() default { EMPTY_DEFAULT };
/**
* Alerts for Firefox 52. If not defined, {@link #FF()} is used.
@@ -275,7 +275,7 @@
* Alerts for Firefox 45. If not defined, {@link #FF()} is used.
* @return the alerts
*/
- String[] FF45() default { EMPTY_DEFAULT };
+ String[] FF60() default { EMPTY_DEFAULT };
/**
* Alerts for Firefox 52. If not defined, {@link #FF()} is used.
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.j...
[truncated message content] |
|
From: <rb...@us...> - 2018-06-15 17:43:57
|
Revision: 15320
http://sourceforge.net/p/htmlunit/code/15320
Author: rbri
Date: 2018-06-15 17:43:45 +0000 (Fri, 15 Jun 2018)
Log Message:
-----------
ff60 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDetailsElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPreElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElement.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -1323,7 +1323,7 @@
JS_TREEWALKER_FILTER_FUNCTION_ONLY,
/** Types arrays can be constructed with {@code null}. */
- @BrowserFeature(CHROME)
+ @BrowserFeature({CHROME, FF60})
JS_TYPED_ARRAYS_NULL,
/** Setting the property align to arbitrary values is allowed. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -212,7 +212,7 @@
* Returns the value of the rev property.
* @return the referrerPolicy property
*/
- @JsxGetter({CHROME, FF52})
+ @JsxGetter({CHROME, FF})
public String getReferrerPolicy() {
String attrib = ((HtmlAnchor) getDomNodeOrDie()).getAttribute("referrerPolicy");
if (StringUtils.isEmpty(attrib)) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -18,6 +18,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import java.util.Locale;
@@ -511,7 +512,7 @@
* Returns the {@code onmessageerror} event handler for this element.
* @return the {@code onmessageerror} event handler for this element
*/
- @JsxGetter(CHROME)
+ @JsxGetter({CHROME, FF60})
public Function getOnmessageerror() {
return getEventHandler("onmessageerror");
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDetailsElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDetailsElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDetailsElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.html;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
import com.gargoylesoftware.htmlunit.html.HtmlDetails;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -26,8 +26,9 @@
* The JavaScript object {@code HTMLDetailsElement}.
*
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
-@JsxClass(domClass = HtmlDetails.class, value = {CHROME, FF52})
+@JsxClass(domClass = HtmlDetails.class, value = {CHROME, FF})
public class HTMLDetailsElement extends HTMLElement {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -23,8 +23,8 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import java.io.IOException;
@@ -73,7 +73,6 @@
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlEmphasis;
-import com.gargoylesoftware.htmlunit.html.HtmlExample;
import com.gargoylesoftware.htmlunit.html.HtmlFigure;
import com.gargoylesoftware.htmlunit.html.HtmlFigureCaption;
import com.gargoylesoftware.htmlunit.html.HtmlFooter;
@@ -81,7 +80,6 @@
import com.gargoylesoftware.htmlunit.html.HtmlItalic;
import com.gargoylesoftware.htmlunit.html.HtmlKeyboard;
import com.gargoylesoftware.htmlunit.html.HtmlLayer;
-import com.gargoylesoftware.htmlunit.html.HtmlListing;
import com.gargoylesoftware.htmlunit.html.HtmlMain;
import com.gargoylesoftware.htmlunit.html.HtmlMark;
import com.gargoylesoftware.htmlunit.html.HtmlNav;
@@ -173,7 +171,6 @@
@JsxClass(domClass = HtmlDefinitionTerm.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlElement.class, value = {FF, IE})
@JsxClass(domClass = HtmlEmphasis.class, value = {CHROME, FF})
-@JsxClass(domClass = HtmlExample.class, value = FF60)
@JsxClass(domClass = HtmlFigure.class)
@JsxClass(domClass = HtmlFigureCaption.class)
@JsxClass(domClass = HtmlFooter.class)
@@ -181,7 +178,6 @@
@JsxClass(domClass = HtmlItalic.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlKeyboard.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlLayer.class, value = CHROME)
-@JsxClass(domClass = HtmlListing.class, value = FF60)
@JsxClass(domClass = HtmlMark.class)
@JsxClass(domClass = HtmlNav.class)
@JsxClass(domClass = HtmlNoBreak.class, value = {CHROME, FF})
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -17,6 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import com.gargoylesoftware.htmlunit.html.HtmlFrameSet;
@@ -208,7 +209,7 @@
* Returns the {@code onmessageerror} event handler for this element.
* @return the {@code onmessageerror} event handler for this element
*/
- @JsxGetter(CHROME)
+ @JsxGetter({CHROME, FF60})
public Function getOnmessageerror() {
return getEventHandler("onmessageerror");
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -16,6 +16,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.html.HtmlMeter;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -122,7 +123,7 @@
* Returns the labels associated with the element.
* @return the labels associated with the element
*/
- @JsxGetter(CHROME)
+ @JsxGetter({CHROME, FF60})
public AbstractList getLabels() {
if (labels_ == null) {
labels_ = new LabelsHelper(getDomNodeOrDie());
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPreElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPreElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPreElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -18,7 +18,6 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import org.apache.commons.lang3.ArrayUtils;
@@ -39,10 +38,9 @@
* @author Ahmed Ashour
* @author Ronald Brill
*/
-@JsxClass(domClass = HtmlExample.class, value = CHROME)
+@JsxClass(domClass = HtmlExample.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlPreformattedText.class)
-@JsxClass(domClass = HtmlListing.class, value = {CHROME, FF52})
-@JsxClass(domClass = HtmlExample.class, value = FF52)
+@JsxClass(domClass = HtmlListing.class, value = {CHROME, FF})
public class HTMLPreElement extends HTMLElement {
/** Valid values for the {@link #getClear() clear} property. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElement.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElement.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -17,6 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import java.io.StringReader;
@@ -123,7 +124,7 @@
* Returns the scoped of this style.
* @return the scoped
*/
- @JsxGetter(FF)
+ @JsxGetter(FF52)
public boolean isScoped() {
final HtmlStyle style = (HtmlStyle) getDomNodeOrDie();
return style.hasAttribute("scoped");
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java 2018-06-15 15:48:47 UTC (rev 15319)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java 2018-06-15 17:43:45 UTC (rev 15320)
@@ -17,7 +17,6 @@
import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
@@ -2888,7 +2887,7 @@
@Test
@Alerts(DEFAULT = "-",
CHROME = "getDistributedNodes(),select")
- @NotYetImplemented({CHROME, FF60})
+ @NotYetImplemented(CHROME)
public void content() throws Exception {
test("content");
}
|
|
From: <rb...@us...> - 2018-06-15 18:08:10
|
Revision: 15321
http://sourceforge.net/p/htmlunit/code/15321
Author: rbri
Date: 2018-06-15 18:08:05 +0000 (Fri, 15 Jun 2018)
Log Message:
-----------
ff60 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StringCustom.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-15 17:43:45 UTC (rev 15320)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-15 18:08:05 UTC (rev 15321)
@@ -1488,10 +1488,6 @@
@BrowserFeature(CHROME)
SLOT_CONTENTS,
- /** Indicates that string.contains() is supported. */
- @BrowserFeature(FF60)
- STRING_CONTAINS,
-
/** Indicates that string.includes() is supported. */
@BrowserFeature({CHROME, FF})
STRING_INCLUDES,
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2018-06-15 17:43:45 UTC (rev 15320)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2018-06-15 18:08:05 UTC (rev 15321)
@@ -26,7 +26,6 @@
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_SYMBOL_FF60;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_WINDOW_ACTIVEXOBJECT_HIDDEN;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_XML;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.STRING_CONTAINS;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.STRING_INCLUDES;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.STRING_REPEAT;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.STRING_STARTS_ENDS_WITH;
@@ -67,7 +66,6 @@
import com.gargoylesoftware.htmlunit.javascript.host.DateCustom;
import com.gargoylesoftware.htmlunit.javascript.host.NumberCustom;
import com.gargoylesoftware.htmlunit.javascript.host.Reflect;
-import com.gargoylesoftware.htmlunit.javascript.host.StringCustom;
import com.gargoylesoftware.htmlunit.javascript.host.Window;
import com.gargoylesoftware.htmlunit.javascript.host.intl.Intl;
@@ -464,12 +462,6 @@
removePrototypeProperties(window, "String", "trimLeft");
removePrototypeProperties(window, "String", "trimRight");
}
- if (browserVersion.hasFeature(STRING_CONTAINS)) {
- final ScriptableObject stringPrototype =
- (ScriptableObject) ScriptableObject.getClassPrototype(window, "String");
- stringPrototype.defineFunctionProperties(new String[] {"contains"},
- StringCustom.class, ScriptableObject.EMPTY);
- }
// only FF has toSource
if (!browserVersion.hasFeature(JS_FUNCTION_TOSOURCE)) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StringCustom.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StringCustom.java 2018-06-15 17:43:45 UTC (rev 15320)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/StringCustom.java 2018-06-15 18:08:05 UTC (rev 15321)
@@ -14,10 +14,6 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host;
-import net.sourceforge.htmlunit.corejs.javascript.Context;
-import net.sourceforge.htmlunit.corejs.javascript.Function;
-import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
-
/**
* Contains some missing features of Rhino NativeString.
*
@@ -27,29 +23,4 @@
public final class StringCustom {
private StringCustom() { }
-
- /**
- * Determines whether one string may be found within another string,
- * returning true or false as appropriate.
- * @param context the JavaScript context
- * @param thisObj the scriptable
- * @param args the arguments passed into the method
- * @param function the function
- * @return true or false
- */
- public static boolean contains(
- final Context context, final Scriptable thisObj, final Object[] args, final Function function) {
- if (args.length < 1) {
- return false;
- }
- final String string = Context.toString(thisObj);
- final String search = Context.toString(args[0]);
-
- if (args.length < 2) {
- return string.contains(search);
- }
-
- final int start = (int) Math.max(0, Context.toNumber(args[1]));
- return string.indexOf(search, start) > -1;
- }
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java 2018-06-15 17:43:45 UTC (rev 15320)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java 2018-06-15 18:08:05 UTC (rev 15321)
@@ -14,7 +14,6 @@
*/
package com.gargoylesoftware.htmlunit.javascript;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
import org.junit.Test;
@@ -44,7 +43,7 @@
@Test
@Alerts(DEFAULT = {"1<>5", "5<>2", "1<>2", "5<>1", "2<>1", "1<>1", "5<>9"},
IE = {"5<>1", "2<>5", "2<>1", "2<>5", "1<>5", "1<>2", "1<>1", "9<>5"})
- @NotYetImplemented({FF60, IE})
+ @NotYetImplemented(IE)
public void sortSteps() throws Exception {
final String html
= "<html><head><title>foo</title><script>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java 2018-06-15 17:43:45 UTC (rev 15320)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java 2018-06-15 18:08:05 UTC (rev 15321)
@@ -27,6 +27,7 @@
* @author Marc Guillemot
* @author Ahmed Ashour
* @author Frank Danek
+ * @author Ronald Brill
*/
@RunWith(BrowserRunner.class)
public class NativeStringTest extends WebDriverTestCase {
|
|
From: <rb...@us...> - 2018-06-16 12:34:55
|
Revision: 15324
http://sourceforge.net/p/htmlunit/code/15324
Author: rbri
Date: 2018-06-16 12:34:48 +0000 (Sat, 16 Jun 2018)
Log Message:
-----------
ff60 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java 2018-06-16 06:29:17 UTC (rev 15323)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java 2018-06-16 12:34:48 UTC (rev 15324)
@@ -33,7 +33,7 @@
/** All versions of Firefox. */
FF,
- /** Firefox 45. */
+ /** Firefox 60. */
FF60,
/** Firefox 52. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java 2018-06-16 06:29:17 UTC (rev 15323)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java 2018-06-16 12:34:48 UTC (rev 15324)
@@ -115,7 +115,7 @@
commonFormats.put("ja", yyyySlash);
commonFormats.put("ko", yyyyDotBlankDot);
commonFormats.put("lt", yyyyDash);
- commonFormats.put("lv", ddDotDot);
+ commonFormats.put("lv", yyyyDotDot);
commonFormats.put("mk", ddDot);
commonFormats.put("ms", ddSlash);
commonFormats.put("mt", yyyyDash);
@@ -144,21 +144,18 @@
commonFormats.put("en-PH", ddSlash);
commonFormats.put("es-US", ddSlash);
commonFormats.put("ga", ddSlash);
- commonFormats.put("hr", ddDotDot);
+ commonFormats.put("fr-CH", ddDot);
commonFormats.put("ja-JP-u-ca-japanese", "yy/MM/dd");
+ commonFormats.put("mt", ddSlash);
+ commonFormats.put("nl-BE", ddSlash);
commonFormats.put("sk", ddDotBlank);
commonFormats.put("sr", ddDotDot);
commonFormats.put("sq", ddDot);
FF_52_FORMATS_.putAll(commonFormats);
- FF_52_FORMATS_.put("fr", ddSlash);
- FF_52_FORMATS_.put("hr", ddDotBlankDot);
- FF_52_FORMATS_.put("fr-CH", ddDot);
- FF_52_FORMATS_.put("lv", yyyyDotDot);
- FF_52_FORMATS_.put("mt", ddSlash);
- FF_52_FORMATS_.put("nl-BE", ddSlash);
FF_60_FORMATS_.putAll(commonFormats);
+ FF_60_FORMATS_.put("ban", mmSlash);
CHROME_FORMATS_.put("be", yyyyDash);
CHROME_FORMATS_.put("en-CA", yyyyDash);
@@ -166,7 +163,6 @@
CHROME_FORMATS_.put("en-MT", ddSlash);
CHROME_FORMATS_.put("en-PH", ddSlash);
CHROME_FORMATS_.put("es-US", ddSlash);
- CHROME_FORMATS_.put("fr", ddSlash);
CHROME_FORMATS_.put("fr-CH", ddDot);
CHROME_FORMATS_.put("hr", ddDotBlankDot);
CHROME_FORMATS_.put("in", ddDot);
@@ -174,7 +170,6 @@
CHROME_FORMATS_.put("is", yyyyDash);
CHROME_FORMATS_.put("iw", ddDot);
CHROME_FORMATS_.put("ja-JP-u-ca-japanese", "平成yy/MM/dd");
- CHROME_FORMATS_.put("lv", yyyyDotDot);
CHROME_FORMATS_.put("mk", yyyyDash);
CHROME_FORMATS_.put("nl-BE", ddSlash);
CHROME_FORMATS_.put("sk", ddDotBlank);
@@ -218,7 +213,6 @@
IE_FORMATS_.put("ja-JP-u-ca-japanese", "\u200E平成\u200E \u200Eyy\u200E年\u200EMM\u200E月\u200Edd\u200E日");
IE_FORMATS_.put("ko", "\u200EYYYY\u200E\uB144 \u200EMM\u200E\uC6D4 \u200Edd\u200E\uC77C");
IE_FORMATS_.put("lt", yyyyDot);
- IE_FORMATS_.put("lv", yyyyDotDot);
IE_FORMATS_.put("mt", ddSlash);
IE_FORMATS_.put("nl-BE", ddSlash);
IE_FORMATS_.put("no", ddDot);
@@ -250,7 +244,7 @@
else if (browserVersion.isIE()) {
formats = IE_FORMATS_;
}
- else if (!browserVersion.isFirefox52()) {
+ else if (browserVersion.isFirefox52()) {
formats = FF_52_FORMATS_;
}
else {
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java 2018-06-16 06:29:17 UTC (rev 15323)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java 2018-06-16 12:34:48 UTC (rev 15324)
@@ -17,6 +17,8 @@
import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
+import org.apache.commons.lang3.CharUtils;
+import org.junit.ComparisonFailure;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -62,7 +64,23 @@
+ "</head><body onload='test()'>\n"
+ "</body></html>";
- loadPageWithAlerts2(html);
+ try {
+ loadPageWithAlerts2(html);
+ }
+ catch (final ComparisonFailure e) {
+ final String msg = e.getMessage();
+ for (int i = 0; i < msg.length(); i++) {
+ final char c = msg.charAt(i);
+ if (CharUtils.isAscii(c)) {
+ System.out.print(c);
+ }
+ else {
+ System.out.print(CharUtils.unicodeEscaped(c));
+ }
+ }
+ System.out.println();
+ throw e;
+ }
}
/**
@@ -89,8 +107,7 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(DEFAULT = "\u5e73\u621024/12/20",
- FF = "24/12/20",
+ @Alerts(DEFAULT = "24/12/20",
IE = "\u200e\u5e73\u6210\u200e\u0020\u200e24\u200e\u5e74\u200e12\u200e\u6708\u200e20\u200e\u65e5")
public void format_ja_jp_u_ca_japanese() throws Exception {
test("new Intl.DateTimeFormat('ja-JP-u-ca-japanese').format(date)");
@@ -103,6 +120,7 @@
*/
@Test
@Alerts(DEFAULT = "20.12.2012",
+ FF60 = "12/20/2012",
IE = "\u200E12\u200E/\u200E20\u200E/\u200E2012")
public void format_ban() throws Exception {
test("new Intl.DateTimeFormat('ban').format(date)");
@@ -222,7 +240,10 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(DEFAULT = "\u0627\u0644\u062E\u0645\u064A\u0633\u060C \u0662\u0660 \u062F\u064A\u0633\u0645\u0628\u0631"
+ @Alerts(DEFAULT = "\u0627\u0644\u062e\u0645\u064a\u0633\u060c \u0662\u0660 \u062f\u064a\u0633\u0645\u0628\u0631"
+ + " \u0662\u0660\u0661\u0662 \u0645\u064a\u0644\u0627\u062f\u064a"
+ + " \u0664:\u0660\u0660:\u0660\u0660 \u0635",
+ FF52 = "\u0627\u0644\u062E\u0645\u064A\u0633\u060C \u0662\u0660 \u062F\u064A\u0633\u0645\u0628\u0631"
+ "\u060C \u0662\u0660\u0661\u0662 \u0645\u064A\u0644\u0627\u062F\u064A \u0664:\u0660\u0660:\u0660"
+ "\u0660 \u0635",
IE = "\u200F\u0627\u0644\u062E\u0645\u064A\u0633\u200F,"
@@ -242,6 +263,7 @@
@Test
@Alerts(DEFAULT = "Thursday, December 20, 2012, GMT",
CHROME = "Thursday, December 20, 2012, UTC",
+ FF60 = "Thursday, December 20, 2012, UTC",
IE = "\u200EThursday\u200E, \u200EDecember\u200E \u200E20\u200E, \u200E2012")
@NotYetImplemented
public void format_utc_short() throws Exception {
@@ -1367,7 +1389,7 @@
*/
@Test
@Alerts(DEFAULT = "2012-12-20",
- FF52 = "20/12/2012",
+ FF = "20/12/2012",
IE = "\u200E20\u200E/\u200E12\u200E/\u200E2012")
public void format_mt() throws Exception {
test("new Intl.DateTimeFormat('mt').format(date)");
@@ -1378,7 +1400,7 @@
*/
@Test
@Alerts(DEFAULT = "2012-12-20",
- FF52 = "20/12/2012",
+ FF = "20/12/2012",
IE = "\u200E20\u200E/\u200E12\u200E/\u200E2012")
public void format_mt_mt() throws Exception {
test("new Intl.DateTimeFormat('mt-MT').format(date)");
@@ -1399,7 +1421,6 @@
*/
@Test
@Alerts(DEFAULT = "20/12/2012",
- FF60 = "20-12-2012",
IE = "\u200E20\u200E/\u200E12\u200E/\u200E2012")
public void format_nl_be() throws Exception {
test("new Intl.DateTimeFormat('nl-BE').format(date)");
|
|
From: <rb...@us...> - 2018-06-16 12:47:31
|
Revision: 15325
http://sourceforge.net/p/htmlunit/code/15325
Author: rbri
Date: 2018-06-16 12:47:20 +0000 (Sat, 16 Jun 2018)
Log Message:
-----------
ff60 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlApplet.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2D.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSKeyframesRule.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlApplet.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlApplet.java 2018-06-16 12:34:48 UTC (rev 15324)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlApplet.java 2018-06-16 12:47:20 UTC (rev 15325)
@@ -14,8 +14,6 @@
*/
package com.gargoylesoftware.htmlunit.html;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.APPLET_INLINE_BLOCK;
-
import java.applet.Applet;
import java.io.IOException;
import java.net.URL;
@@ -348,9 +346,6 @@
*/
@Override
public DisplayStyle getDefaultStyleDisplay() {
- if (getPage().getWebClient().getBrowserVersion().hasFeature(APPLET_INLINE_BLOCK)) {
- return DisplayStyle.INLINE_BLOCK;
- }
return DisplayStyle.INLINE;
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java 2018-06-16 12:34:48 UTC (rev 15324)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java 2018-06-16 12:47:20 UTC (rev 15325)
@@ -22,7 +22,6 @@
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.EVENT_ONMOUSEOVER_NEVER_FOR_SELECT_OPTION;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.EVENT_ONMOUSEUP_FOR_SELECT_OPTION_TRIGGERS_ADDITIONAL_UP_FOR_SELECT;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.EVENT_ONMOUSEUP_NOT_FOR_SELECT_OPTION;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLOPTION_EXACT_ONE_OPTION_GETS_NERVER_DESELECTED;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLOPTION_PREVENT_DISABLED;
import java.io.IOException;
@@ -110,7 +109,7 @@
* @param shiftKey {@code true} if SHIFT is pressed
* @param ctrlKey {@code true} if CTRL is pressed
*/
- private void setSelected(boolean selected, final boolean invokeOnFocus, final boolean isClick,
+ private void setSelected(final boolean selected, final boolean invokeOnFocus, final boolean isClick,
final boolean shiftKey, final boolean ctrlKey) {
if (selected == isSelected()) {
return;
@@ -117,10 +116,6 @@
}
final HtmlSelect select = getEnclosingSelect();
if (select != null) {
- if (hasFeature(HTMLOPTION_EXACT_ONE_OPTION_GETS_NERVER_DESELECTED)
- && !select.isMultipleSelectEnabled() && select.getOptionSize() == 1) {
- selected = true;
- }
select.setSelectedAttribute(this, selected, invokeOnFocus, shiftKey, ctrlKey, isClick);
return;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2018-06-16 12:34:48 UTC (rev 15324)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2018-06-16 12:47:20 UTC (rev 15325)
@@ -23,7 +23,6 @@
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_OBJECT_GET_OWN_PROPERTY_SYMBOLS;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_REFLECT;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_SYMBOL;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_SYMBOL_FF60;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_WINDOW_ACTIVEXOBJECT_HIDDEN;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_XML;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.STRING_INCLUDES;
@@ -37,7 +36,6 @@
import java.lang.reflect.Method;
import java.util.ArrayDeque;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Deque;
import java.util.HashMap;
import java.util.List;
@@ -230,16 +228,6 @@
deleteProperties(window, "Symbol");
}
- if (browserVersion.hasFeature(JS_SYMBOL_FF60)) {
- final ScriptableObject sym = (ScriptableObject) ScriptableObject.getProperty(window, "Symbol");
- final List<String> toDelete = Arrays.asList("hasInstance", "isConcatSpreadable", "replace",
- "search", "split", "string", "toStringTag", "unscopables");
- for (String propName : toDelete) {
- sym.setAttributes(propName, ScriptableObject.EMPTY);
- sym.delete(propName);
- }
- }
-
final ScriptableObject errorObject = (ScriptableObject) ScriptableObject.getProperty(window, "Error");
if (browserVersion.hasFeature(JS_ERROR_STACK_TRACE_LIMIT)) {
errorObject.defineProperty("stackTraceLimit", 10, ScriptableObject.EMPTY);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java 2018-06-16 12:34:48 UTC (rev 15324)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java 2018-06-16 12:47:20 UTC (rev 15325)
@@ -21,7 +21,6 @@
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_LOCATION_HASH_RETURNS_HASH_FOR_EMPTY_DEFINED;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_LOCATION_HREF_HASH_IS_ENCODED;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.URL_ABOUT_BLANK_HAS_BLANK_PATH;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.URL_ABOUT_BLANK_HAS_EMPTY_PATH;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
@@ -432,9 +431,6 @@
@JsxGetter
public String getPathname() {
if (WebClient.URL_ABOUT_BLANK == getUrl()) {
- if (getBrowserVersion().hasFeature(URL_ABOUT_BLANK_HAS_EMPTY_PATH)) {
- return "";
- }
if (getBrowserVersion().hasFeature(URL_ABOUT_BLANK_HAS_BLANK_PATH)) {
return "blank";
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2D.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2D.java 2018-06-16 12:34:48 UTC (rev 15324)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2D.java 2018-06-16 12:47:20 UTC (rev 15325)
@@ -14,7 +14,6 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.canvas;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_CANVAS_DRAW_THROWS_FOR_MISSING_IMG;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
@@ -333,9 +332,6 @@
}
}
catch (final IOException ioe) {
- if (getBrowserVersion().hasFeature(JS_CANVAS_DRAW_THROWS_FOR_MISSING_IMG)) {
- throw Context.throwAsScriptRuntimeEx(ioe);
- }
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSKeyframesRule.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSKeyframesRule.java 2018-06-16 12:34:48 UTC (rev 15324)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSKeyframesRule.java 2018-06-16 12:47:20 UTC (rev 15325)
@@ -14,7 +14,6 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.css;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_CSS_MOZ_CSS_KEYFRAMES_RULE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
@@ -58,16 +57,4 @@
public short getType() {
return KEYFRAMES_RULE;
}
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Object getDefaultValue(final Class<?> hint) {
- if ((String.class.equals(hint) || hint == null)
- && getBrowserVersion().hasFeature(JS_CSS_MOZ_CSS_KEYFRAMES_RULE)) {
- return "[object MozCSSKeyframesRule]";
- }
- return super.getDefaultValue(hint);
- }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2018-06-16 12:34:48 UTC (rev 15324)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2018-06-16 12:47:20 UTC (rev 15325)
@@ -20,12 +20,10 @@
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_LENGTH_COMPUTABLE;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_NO_CROSS_ORIGIN_TO_ABOUT;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_OPEN_ALLOW_EMTPY_URL;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_OPEN_WITHCREDENTIALS_TRUE_IN_SYNC_EXCEPTION;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_OVERRIDE_MIME_TYPE_BEFORE_SEND;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_USE_CONTENT_CHARSET;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_USE_DEFAULT_CHARSET_FROM_PAGE;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_WITHCREDENTIALS_ALLOW_ORIGIN_ALL;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_WITHCREDENTIALS_NOT_WRITEABLE_IN_SYNC_EXCEPTION;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -515,13 +513,6 @@
async = ScriptRuntime.toBoolean(asyncParam);
}
- if (!async
- && isWithCredentials()
- && getBrowserVersion().hasFeature(XHR_OPEN_WITHCREDENTIALS_TRUE_IN_SYNC_EXCEPTION)) {
- throw Context.reportRuntimeError(
- "open() in sync mode is not possible because 'withCredentials' is set to true");
- }
-
final String url = Context.toString(urlParam);
// (URL + Method + User + Password) become a WebRequest instance.
@@ -960,11 +951,6 @@
*/
@JsxSetter
public void setWithCredentials(final boolean withCredentials) {
- if (!async_ && state_ != UNSENT) {
- if (getBrowserVersion().hasFeature(XHR_WITHCREDENTIALS_NOT_WRITEABLE_IN_SYNC_EXCEPTION)) {
- throw Context.reportRuntimeError("Property 'withCredentials' not writable in sync mode.");
- }
- }
withCredentials_ = withCredentials;
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java 2018-06-16 12:34:48 UTC (rev 15324)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java 2018-06-16 12:47:20 UTC (rev 15325)
@@ -471,10 +471,10 @@
}
private static String getBrowserName(final BrowserVersion browserVersion) {
- if (browserVersion == BrowserVersion.FIREFOX_60) {
+ if (browserVersion == BrowserVersion.FIREFOX_52) {
return BrowserType.FIREFOX + '-' + browserVersion.getBrowserVersionNumeric();
}
- else if (browserVersion == BrowserVersion.FIREFOX_52) {
+ else if (browserVersion == BrowserVersion.FIREFOX_60) {
return BrowserType.FIREFOX;
}
if (browserVersion == BrowserVersion.INTERNET_EXPLORER) {
|
|
From: <rb...@us...> - 2018-06-16 20:04:09
|
Revision: 15338
http://sourceforge.net/p/htmlunit/code/15338
Author: rbri
Date: 2018-06-16 20:04:04 +0000 (Sat, 16 Jun 2018)
Log Message:
-----------
ff60 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeList.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-16 20:00:39 UTC (rev 15337)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-16 20:04:04 UTC (rev 15338)
@@ -194,7 +194,7 @@
EVENT_ONLOAD_INTERNAL_JAVASCRIPT,
/** MessageEvent default data value is null. */
- @BrowserFeature({CHROME, FF52})
+ @BrowserFeature({CHROME, FF})
EVENT_ONMESSAGE_DEFAULT_DATA_NULL,
/** Does not trigger "onmousedown" event handler for the select options. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeList.java 2018-06-16 20:00:39 UTC (rev 15337)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeList.java 2018-06-16 20:04:04 UTC (rev 15338)
@@ -17,7 +17,6 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import java.util.ArrayList;
import java.util.List;
@@ -109,7 +108,7 @@
* Returns an {@link Iterator} allowing to go through all keys contained in this object.
* @return an {@link Iterator}
*/
- @JsxFunction({CHROME, FF52})
+ @JsxFunction({CHROME, FF})
public Iterator keys() {
final int length = getElements().size();
final List<Integer> list = new ArrayList<>();
@@ -126,7 +125,7 @@
* Returns an {@link Iterator} allowing to go through all keys contained in this object.
* @return an {@link Iterator}
*/
- @JsxFunction({CHROME, FF52})
+ @JsxFunction({CHROME, FF})
public Iterator values() {
final List<DomNode> list = getElements();
final Iterator object = new Iterator(ITERATOR_NAME, list.iterator());
@@ -139,7 +138,7 @@
* Returns an {@link Iterator} allowing to go through all key/value pairs contained in this object.
* @return an {@link Iterator}
*/
- @JsxFunction({CHROME, FF52})
+ @JsxFunction({CHROME, FF})
public Iterator entries() {
final List<DomNode> elements = getElements();
final Context context = Context.getCurrentContext();
@@ -167,7 +166,7 @@
* Calls the {@code callback} given in parameter once for each value pair in the list, in insertion order.
* @param callback function to execute for each element
*/
- @JsxFunction({CHROME, FF52})
+ @JsxFunction({CHROME, FF})
public void forEach(final Object callback) {
final List<DomNode> nodes = getElements();
final Context context = Context.enter();
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java 2018-06-16 20:00:39 UTC (rev 15337)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java 2018-06-16 20:04:04 UTC (rev 15338)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.event;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF52;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -132,7 +132,7 @@
FF = "exception",
IE = {"-[object MessageEvent]", "-message", "-true", "-true", "-hello",
"-http://localhost:", "-undefined", "-[object Window]"})
- @NotYetImplemented(FF52)
+ @NotYetImplemented(FF)
public void initMessageEventPortsNull() throws Exception {
final String[] expectedAlerts = getExpectedAlerts();
if (expectedAlerts.length > 4) {
|
|
From: <rb...@us...> - 2018-06-17 07:33:14
|
Revision: 15339
http://sourceforge.net/p/htmlunit/code/15339
Author: rbri
Date: 2018-06-17 07:33:09 +0000 (Sun, 17 Jun 2018)
Log Message:
-----------
ff60 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementDefaultStyleDisplayTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-16 20:04:04 UTC (rev 15338)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-17 07:33:09 UTC (rev 15339)
@@ -55,7 +55,7 @@
CSS_BACKGROUND_INITIAL,
/** Computed {@code display} is {@code block} for non-attached elements. */
- @BrowserFeature(FF)
+ @BrowserFeature(FF52)
CSS_COMPUTED_BLOCK_IF_NOT_ATTACHED,
/** Computed {@code zIndex} is not considered. */
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementDefaultStyleDisplayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementDefaultStyleDisplayTest.java 2018-06-16 20:04:04 UTC (rev 15338)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementDefaultStyleDisplayTest.java 2018-06-17 07:33:09 UTC (rev 15339)
@@ -27,6 +27,7 @@
* Tests the result of the default 'display' style of an element.
*
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
@RunWith(BrowserRunner.class)
@StandardsMode
|
|
From: <rb...@us...> - 2018-06-17 08:15:01
|
Revision: 15340
http://sourceforge.net/p/htmlunit/code/15340
Author: rbri
Date: 2018-06-17 08:14:55 +0000 (Sun, 17 Jun 2018)
Log Message:
-----------
ff60 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementCreationTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-06-17 07:33:09 UTC (rev 15339)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-06-17 08:14:55 UTC (rev 15340)
@@ -108,7 +108,7 @@
public static final BrowserVersion INTERNET_EXPLORER = new BrowserVersion(11, "IE");
/** Latest Chrome. */
- public static final BrowserVersion CHROME = new BrowserVersion(60, "Chrome");
+ public static final BrowserVersion CHROME = new BrowserVersion(67, "Chrome");
/** Microsoft Edge. Work In Progress!!! */
public static final BrowserVersion EDGE = new BrowserVersion(14, "Edge");
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java 2018-06-17 07:33:09 UTC (rev 15339)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java 2018-06-17 08:14:55 UTC (rev 15340)
@@ -31,10 +31,10 @@
*/
@Test
public void getBrowserVersionNumeric() {
- assertEquals(45, BrowserVersion.FIREFOX_60.getBrowserVersionNumeric());
+ assertEquals(60, BrowserVersion.FIREFOX_60.getBrowserVersionNumeric());
assertEquals(52, BrowserVersion.FIREFOX_52.getBrowserVersionNumeric());
assertEquals(11, BrowserVersion.INTERNET_EXPLORER.getBrowserVersionNumeric());
- assertEquals(60, BrowserVersion.CHROME.getBrowserVersionNumeric());
+ assertEquals(67, BrowserVersion.CHROME.getBrowserVersionNumeric());
assertEquals(14, BrowserVersion.EDGE.getBrowserVersionNumeric());
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementCreationTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementCreationTest.java 2018-06-17 07:33:09 UTC (rev 15339)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementCreationTest.java 2018-06-17 08:14:55 UTC (rev 15340)
@@ -98,7 +98,8 @@
*/
@Test
@Alerts(DEFAULT = "[object HTMLAppletElement]",
- CHROME = "[object HTMLUnknownElement]")
+ CHROME = "[object HTMLUnknownElement]",
+ FF60 = "[object HTMLUnknownElement]")
public void applet() throws Exception {
test("applet");
}
@@ -465,9 +466,7 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(DEFAULT = "[object HTMLElement]",
- CHROME = "[object HTMLPreElement]",
- FF52 = "[object HTMLPreElement]",
+ @Alerts(DEFAULT = "[object HTMLPreElement]",
IE = "[object HTMLBlockElement]")
public void xmp() throws Exception {
test("xmp");
@@ -825,9 +824,7 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(DEFAULT = "[object HTMLElement]",
- CHROME = "[object HTMLPreElement]",
- FF52 = "[object HTMLPreElement]",
+ @Alerts(DEFAULT = "[object HTMLPreElement]",
IE = "[object HTMLBlockElement]")
public void listing() throws Exception {
test("listing");
@@ -1307,9 +1304,8 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(DEFAULT = "[object HTMLUnknownElement]",
- CHROME = "[object HTMLElement]",
- FF52 = "[object HTMLElement]")
+ @Alerts(DEFAULT = "[object HTMLElement]",
+ IE = "[object HTMLUnknownElement]")
public void summary() throws Exception {
test("summary");
}
@@ -1657,9 +1653,8 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(DEFAULT = "[object HTMLUnknownElement]",
- CHROME = "[object HTMLDetailsElement]",
- FF52 = "[object HTMLDetailsElement]")
+ @Alerts(DEFAULT = "[object HTMLDetailsElement]",
+ IE = "[object HTMLUnknownElement]")
public void details() throws Exception {
test("details");
}
@@ -2023,9 +2018,8 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(DEFAULT = "[object HTMLContentElement]",
- FF52 = "[object HTMLUnknownElement]",
- IE = "[object HTMLUnknownElement]")
+ @Alerts(DEFAULT = "[object HTMLUnknownElement]",
+ CHROME = "[object HTMLContentElement]")
public void content() throws Exception {
test("content");
}
|
|
From: <rb...@us...> - 2018-06-17 08:31:25
|
Revision: 15343
http://sourceforge.net/p/htmlunit/code/15343
Author: rbri
Date: 2018-06-17 08:31:21 +0000 (Sun, 17 Jun 2018)
Log Message:
-----------
ff60 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSelect.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-17 08:17:44 UTC (rev 15342)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-17 08:31:21 UTC (rev 15343)
@@ -804,7 +804,7 @@
JS_DOMTOKENLIST_LENGTH_IGNORES_DUPLICATES,
/** DOMTokenList removed all whitespace chars during add. */
- @BrowserFeature(CHROME)
+ @BrowserFeature({CHROME, FF60})
JS_DOMTOKENLIST_REMOVE_WHITESPACE_CHARS_ON_ADD,
/** DOMTokenList removed all whitespace chars during edit. */
@@ -1457,13 +1457,6 @@
@BrowserFeature(IE)
RESETINPUT_DEFAULT_VALUE_IF_VALUE_NOT_DEFINED,
- /**
- * Indicates that all options of a select are deselected,
- * if the select state is changed for an unknown option.
- */
- @BrowserFeature({CHROME, FF52, IE})
- SELECT_DESELECT_ALL_IF_SWITCHING_UNKNOWN,
-
/** The default display style of slot is 'content'. */
@BrowserFeature(CHROME)
SLOT_CONTENTS,
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSelect.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSelect.java 2018-06-17 08:17:44 UTC (rev 15342)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSelect.java 2018-06-17 08:31:21 UTC (rev 15343)
@@ -16,7 +16,6 @@
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.EVENT_MOUSE_ON_DISABLED;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_SELECT_SET_VALUES_CHECKS_ONLY_VALUE_ATTRIBUTE;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.SELECT_DESELECT_ALL_IF_SWITCHING_UNKNOWN;
import java.util.ArrayList;
import java.util.Collection;
@@ -311,10 +310,8 @@
return setSelectedAttribute(selected, isSelected, invokeOnFocus, true, false, true);
}
catch (final ElementNotFoundException e) {
- if (hasFeature(SELECT_DESELECT_ALL_IF_SWITCHING_UNKNOWN)) {
- for (final HtmlOption o : getSelectedOptions()) {
- o.setSelected(false);
- }
+ for (final HtmlOption o : getSelectedOptions()) {
+ o.setSelected(false);
}
return (P) getPage();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement.java 2018-06-17 08:17:44 UTC (rev 15342)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement.java 2018-06-17 08:31:21 UTC (rev 15343)
@@ -18,6 +18,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import java.util.List;
@@ -312,7 +313,7 @@
* Returns the labels associated with the element.
* @return the labels associated with the element
*/
- @JsxGetter(CHROME)
+ @JsxGetter({CHROME, FF60})
public AbstractList getLabels() {
if (labels_ == null) {
labels_ = new LabelsHelper(getDomNodeOrDie());
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java 2018-06-17 08:17:44 UTC (rev 15342)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java 2018-06-17 08:31:21 UTC (rev 15343)
@@ -33,7 +33,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlPageTest;
/**
- * Tests for {@link HTMLScriptElement}.
+ * Tests for {@link HTMLSelectElement}.
*
* @author <a href="mailto:mb...@Ga...">Mike Bowler</a>
* @author David K. Taylor
|
|
From: <rb...@us...> - 2018-06-17 12:59:29
|
Revision: 15348
http://sourceforge.net/p/htmlunit/code/15348
Author: rbri
Date: 2018-06-17 12:59:25 +0000 (Sun, 17 Jun 2018)
Log Message:
-----------
more ff60 expectations
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java
trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.FF60.txt
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java 2018-06-17 11:42:28 UTC (rev 15347)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java 2018-06-17 12:59:25 UTC (rev 15348)
@@ -212,11 +212,12 @@
BACKGROUND_CLIP_("background-clip", "background-clip", ff("border-box")),
/** The style property {@code backgroundColor}. */
- BACKGROUND_COLOR("backgroundColor", "background-color", chrome("rgba(0, 0, 0, 0)"), ff("transparent"),
+ BACKGROUND_COLOR("backgroundColor", "background-color", chrome("rgba(0, 0, 0, 0)"),
+ ffBelow60("transparent"), ff60up("rgba(0, 0, 0, 0)"),
ie("transparent")),
/** The style property {@code background-color}. */
- BACKGROUND_COLOR_("background-color", "background-color", ff("transparent")),
+ BACKGROUND_COLOR_("background-color", "background-color", ffBelow60("transparent"), ff60up("rgba(0, 0, 0, 0)")),
/** The style property {@code backgroundImage}. */
BACKGROUND_IMAGE("backgroundImage", "background-image", chrome("none"), ff("none"), ie("none")),
@@ -390,10 +391,11 @@
BORDER_IMAGE_("border-image", "border-image", ff("")),
/** The style property {@code borderImageOutset}. */
- BORDER_IMAGE_OUTSET("borderImageOutset", "border-image-outset", ff("0 0 0 0"), ie("0"), chrome("0px")),
+ BORDER_IMAGE_OUTSET("borderImageOutset", "border-image-outset", ie("0"), chrome("0px"),
+ ffBelow60("0 0 0 0"), ff60up("0")),
/** The style property {@code border-image-outset}. */
- BORDER_IMAGE_OUTSET_("border-image-outset", "border-image-outset", ff("0 0 0 0")),
+ BORDER_IMAGE_OUTSET_("border-image-outset", "border-image-outset", ffBelow60("0 0 0 0"), ff60up("0")),
/** The style property {@code borderImageRepeat}. */
BORDER_IMAGE_REPEAT("borderImageRepeat", "border-image-repeat",
@@ -403,11 +405,12 @@
BORDER_IMAGE_REPEAT_("border-image-repeat", "border-image-repeat", ff("stretch stretch")),
/** The style property {@code borderImageSlice}. */
- BORDER_IMAGE_SLICE("borderImageSlice", "border-image-slice",
- ff("100% 100% 100% 100%"), ie("100%"), chrome("100%")),
+ BORDER_IMAGE_SLICE("borderImageSlice", "border-image-slice", ie("100%"), chrome("100%"),
+ ffBelow60("100% 100% 100% 100%"), ff60up("100%")),
/** The style property {@code border-image-slice}. */
- BORDER_IMAGE_SLICE_("border-image-slice", "border-image-slice", ff("100% 100% 100% 100%")),
+ BORDER_IMAGE_SLICE_("border-image-slice", "border-image-slice",
+ ffBelow60("100% 100% 100% 100%"), ff60up("100%")),
/** The style property {@code borderImageSource}. */
BORDER_IMAGE_SOURCE("borderImageSource", "border-image-source", ff("none"), ie("none"), chrome("none")),
@@ -416,10 +419,11 @@
BORDER_IMAGE_SOURCE_("border-image-source", "border-image-source", ff("none")),
/** The style property {@code borderImageWidth}. */
- BORDER_IMAGE_WIDTH("borderImageWidth", "border-image-width", ff("1 1 1 1"), ie("1"), chrome("1")),
+ BORDER_IMAGE_WIDTH("borderImageWidth", "border-image-width", ie("1"), chrome("1"),
+ ffBelow60("1 1 1 1"), ff60up("1")),
/** The style property {@code border-image-width}. */
- BORDER_IMAGE_WIDTH_("border-image-width", "border-image-width", ff("1 1 1 1")),
+ BORDER_IMAGE_WIDTH_("border-image-width", "border-image-width", ffBelow60("1 1 1 1"), ff60up("1")),
/** The style property {@code borderInlineEnd}. */
BORDER_INLINE_END("borderInlineEnd", "border-inline-end", ff("")),
@@ -620,8 +624,11 @@
CAPTION_SIDE_("caption-side", "caption-side", ff("top")),
/** The style property {@code caretColor}. */
- CARET_COLOR("caretColor", "caret-color", chrome("rgb(0, 0, 0)"), ff60up("")),
+ CARET_COLOR("caretColor", "caret-color", chrome("rgb(0, 0, 0)"), ff60up("rgb(0, 0, 0)")),
+ /** The style property {@code caret-color}. */
+ CARET_COLOR_("caret-color", "caret-color", ff60up("rgb(0, 0, 0)")),
+
/** The style property {@code clear}. */
CLEAR("clear", "clear", chrome("none"), ff("none"), ie("none")),
@@ -678,10 +685,11 @@
COLUMN_FILL_("column-fill", "column-fill", ff("balance")),
/** The style property {@code columnGap}. */
- COLUMN_GAP("columnGap", "column-gap", chrome("normal"), ff("16px"), ie("normal")),
+ COLUMN_GAP("columnGap", "column-gap", chrome("normal"), ie("normal"),
+ ffBelow60("16px"), ff60up("normal")),
/** The style property {@code column-gap}. */
- COLUMN_GAP_("column-gap", "column-gap", ff("16px")),
+ COLUMN_GAP_("column-gap", "column-gap", ffBelow60("16px"), ff60up("normal")),
/** The style property {@code columnRule}. */
COLUMN_RULE("columnRule", "column-rule", chrome("0px none rgb(0, 0, 0)"), ff(""), ie("")),
@@ -724,7 +732,7 @@
CONTAIN("contain", "contain", chrome("none")),
/** The style property {@code content}. */
- CONTENT("content", "content", ie("normal"), chrome(""), ff("none")),
+ CONTENT("content", "content", ie("normal"), chrome("normal"), ff("none")),
/** The style property {@code counterIncrement}. */
COUNTER_INCREMENT("counterIncrement", "counter-increment", chrome("none"), ff("none"), ie("none")),
@@ -1299,6 +1307,66 @@
/** The style property {@code mask}. */
MASK("mask", "mask", ff("none"), ie("none"), chrome("none")),
+ /** The style property {@code maskClip}. */
+ MASK_CLIP("maskClip", "mask-clip", ff60up("border-box")),
+
+ /** The style property {@code mask-clip}. */
+ MASK_CLIP_("mask-clip", "mask-clip", ff60up("border-box")),
+
+ /** The style property {@code maskComposite}. */
+ MASK_COMPOSITE("maskComposite", "mask-composite", ff60up("add")),
+
+ /** The style property {@code mask-composite}. */
+ MASK_COMPOSITE_("mask-composite", "mask-composite", ff60up("add")),
+
+ /** The style property {@code maskImage}. */
+ MASK_IMAGE("maskImage", "mask-image", ff60up("none")),
+
+ /** The style property {@code mask-image}. */
+ MASK_IMAGE_("mask-image", "mask-image", ff60up("none")),
+
+ /** The style property {@code maskMode}. */
+ MASK_MODE("maskMode", "mask-mode", ff60up("match-source")),
+
+ /** The style property {@code mask-mode}. */
+ MASK_MODE_("mask-mode", "mask-mode", ff60up("match-source")),
+
+ /** The style property {@code maskOrigin}. */
+ MASK_ORIGIN("maskOrigin", "mask-origin", ff60up("border-box")),
+
+ /** The style property {@code mask-origin}. */
+ MASK_ORIGIN_("mask-origin", "mask-origin", ff60up("border-box")),
+
+ /** The style property {@code maskPosition}. */
+ MASK_POSITION("maskPosition", "mask-position", ff60up("0% 0%")),
+
+ /** The style property {@code mask-position}. */
+ MASK_POSITION_("mask-position", "mask-position", ff60up("0% 0%")),
+
+ /** The style property {@code maskPositionX}. */
+ MASK_POSITION_X("maskPositionX", "mask-position-x", ff60up("0%")),
+
+ /** The style property {@code mask-position-x}. */
+ MASK_POSITION_X_("mask-position-x", "mask-position-x", ff60up("0%")),
+
+ /** The style property {@code maskPositionY}. */
+ MASK_POSITION_Y("maskPositionY", "mask-position-y", ff60up("0%")),
+
+ /** The style property {@code mask-position-y}. */
+ MASK_POSITION_Y_("mask-position-y", "mask-position-y", ff60up("0%")),
+
+ /** The style property {@code maskRepeat}. */
+ MASK_REPEAT("maskRepeat", "mask-repeat", ff60up("repeat")),
+
+ /** The style property {@code mask-repeat}. */
+ MASK_REPEAT_("mask-repeat", "mask-repeat", ff60up("repeat")),
+
+ /** The style property {@code maskSize}. */
+ MASK_SIZE("maskSize", "mask-size", ff60up("auto auto")),
+
+ /** The style property {@code mask-size}. */
+ MASK_SIZE_("mask-size", "mask-size", ff60up("auto auto")),
+
/** The style property {@code maskType}. */
MASK_TYPE("maskType", "mask-type", ff("luminance"), chrome("luminance")),
@@ -1608,10 +1676,10 @@
MOZ_COLUMN_FILL__("-moz-column-fill", "-moz-column-fill", ff("balance")),
/** The style property {@code MozColumnGap}. */
- MOZ_COLUMN_GAP("MozColumnGap", "-moz-column-gap", ff("16px")),
+ MOZ_COLUMN_GAP("MozColumnGap", "-moz-column-gap", ffBelow60("16px"), ff60up("normal")),
/** The style property {@code -moz-column-gap}. */
- MOZ_COLUMN_GAP__("-moz-column-gap", "-moz-column-gap", ff("16px")),
+ MOZ_COLUMN_GAP__("-moz-column-gap", "-moz-column-gap", ffBelow60("16px"), ff60up("normal")),
/** The style property {@code MozColumnRule}. */
MOZ_COLUMN_RULE("MozColumnRule", "-moz-column-rule", ff("")),
@@ -2291,12 +2359,21 @@
/** The style property {@code overscrollBehavior}. */
OVERSCROLL_BEHAVIOR("overscrollBehavior", "overscroll-behavior", chrome("auto auto"), ff60up("")),
+ /** The style property {@code overscroll-behavior}. */
+ OVERSCROLL_BEHAVIOR_("overscroll-behavior", "overscroll-behavior", ff60up("")),
+
/** The style property {@code overscrollBehaviorX}. */
- OVERSCROLL_BEHAVIOR_X("overscrollBehaviorX", "overscroll-behavior_x", chrome("auto"), ff60up("")),
+ OVERSCROLL_BEHAVIOR_X("overscrollBehaviorX", "overscroll-behavior-x", chrome("auto"), ff60up("auto")),
+ /** The style property {@code overscroll-behavior-x}. */
+ OVERSCROLL_BEHAVIOR_X_("overscroll-behavior-x", "overscroll-behavior-x", ff60up("auto")),
+
/** The style property {@code overscrollBehaviorY}. */
- OVERSCROLL_BEHAVIOR_Y("overscrollBehaviorY", "overscroll-behavior_y", chrome("auto"), ff60up("")),
+ OVERSCROLL_BEHAVIOR_Y("overscrollBehaviorY", "overscroll-behavior-y", chrome("auto"), ff60up("auto")),
+ /** The style property {@code overscroll-behavior-y}. */
+ OVERSCROLL_BEHAVIOR_Y_("overscroll-behavior-y", "overscroll-behavior-y", ff60up("auto")),
+
/** The style property {@code padding}. */
PADDING("padding", "padding", chrome("0px"), ff(""), ie("")),
@@ -2789,6 +2866,9 @@
/** The style property {@code textJustify}. */
TEXT_JUSTIFY("textJustify", "text-justify", ie("auto"), ff60up("auto")),
+ /** The style property {@code text-justify}. */
+ TEXT_JUSTIFY_("text-justify", "text-justify", ff60up("auto")),
+
/** The style property {@code textJustifyTrim}. */
TEXT_JUSTIFY_TRIM("textJustifyTrim", "text-justify-trim", ie("undefined")),
@@ -2847,8 +2927,11 @@
TRANSFORM("transform", "transform", ff("none"), ie("none"), chrome("none")),
/** The style property {@code transformBox}. */
- TRANSFORM_BOX("transformBox", "transform-box", chrome("view-box"), ff60up("")),
+ TRANSFORM_BOX("transformBox", "transform-box", chrome("view-box"), ff60up("border-box")),
+ /** The style property {@code transform-box}. */
+ TRANSFORM_BOX_("transform-box", "transform-box", ff60up("border-box")),
+
/** The style property {@code transformOrigin}. */
TRANSFORM_ORIGIN("transformOrigin", "transform-origin",
ff("625px 172.5px"), ie("620px 163.2px"), chrome("456.5px 161px")),
@@ -3046,7 +3129,7 @@
ff("ease")),
/** The style property {@code webkitAppRegion}. */
- WEBKIT_APP_REGION("webkitAppRegion", "webkit-app-region", chrome("no-drag")),
+ WEBKIT_APP_REGION("webkitAppRegion", "webkit-app-region", chrome("none")),
/** The style property {@code webkitAppearance}. */
WEBKIT_APPEARANCE("webkitAppearance", "webkit-appearance", chrome("none")),
@@ -3438,8 +3521,14 @@
WEBKIT_MARGIN_TOP_COLLAPSE("webkitMarginTopCollapse", "webkit-margin-top-collapse", chrome("collapse")),
/** The style property {@code webkitMask}. */
- WEBKIT_MASK("webkitMask", "webkit-mask", chrome(""), ff60up("")),
+ WEBKIT_MASK("webkitMask", "webkit-mask", chrome(""), ff60up("none")),
+ /** The style property {@code WebkitMask}. */
+ WEBKIT_MASK_("WebkitMask", "webkit-mask", ff60up("none")),
+
+ /** The style property {@code -webkit-mask}. */
+ WEBKIT_MASK__("-webkit-mask", "webkit-mask", ff60up("none")),
+
/** The style property {@code webkitMaskBoxImage}. */
WEBKIT_MASK_BOX_IMAGE("webkitMaskBoxImage", "webkit-mask-box-image", chrome("none")),
@@ -3459,29 +3548,77 @@
WEBKIT_MASK_BOX_IMAGE_WIDTH("webkitMaskBoxImageWidth", "webkit-mask-box-image-width", chrome("auto")),
/** The style property {@code webkitMaskClip}. */
- WEBKIT_MASK_CLIP("webkitMaskClip", "webkit-mask-clip", chrome("border-box"), ff60up("")),
+ WEBKIT_MASK_CLIP("webkitMaskClip", "webkit-mask-clip", chrome("border-box"), ff60up("border-box")),
+ /** The style property {@code WebkitMaskClip}. */
+ WEBKIT_MASK_CLIP_("WebkitMaskClip", "webkit-mask-clip", ff60up("border-box")),
+
+ /** The style property {@code -webkit-mask-clip}. */
+ WEBKIT_MASK_CLIP__("-webkit-mask-clip", "webkit-mask-clip", ff60up("border-box")),
+
/** The style property {@code webkitMaskComposite}. */
- WEBKIT_MASK_COMPOSITE("webkitMaskComposite", "webkit-mask-composite", chrome("source-over"), ff60up("")),
+ WEBKIT_MASK_COMPOSITE("webkitMaskComposite", "webkit-mask-composite", chrome("source-over"), ff60up("add")),
+ /** The style property {@code WebkitMaskComposite}. */
+ WEBKIT_MASK_COMPOSITE_("WebkitMaskComposite", "webkit-mask-composite", ff60up("add")),
+
+ /** The style property {@code -webkit-mask-composite}. */
+ WEBKIT_MASK_COMPOSITE__("-webkit-mask-composite", "webkit-mask-composite", ff60up("add")),
+
/** The style property {@code webkitMaskImage}. */
- WEBKIT_MASK_IMAGE("webkitMaskImage", "webkit-mask-image", chrome("none"), ff60up("")),
+ WEBKIT_MASK_IMAGE("webkitMaskImage", "webkit-mask-image", chrome("none"), ff60up("none")),
+ /** The style property {@code WebkitMaskImage}. */
+ WEBKIT_MASK_IMAGE_("WebkitMaskImage", "webkit-mask-image", ff60up("none")),
+
+ /** The style property {@code -webkit-mask-image}. */
+ WEBKIT_MASK_IMAGE__("-webkit-mask-image", "webkit-mask-image", ff60up("none")),
+
/** The style property {@code webkitMaskOrigin}. */
- WEBKIT_MASK_ORIGIN("webkitMaskOrigin", "webkit-mask-origin", chrome("border-box"), ff60up("")),
+ WEBKIT_MASK_ORIGIN("webkitMaskOrigin", "webkit-mask-origin", chrome("border-box"), ff60up("border-box")),
+ /** The style property {@code WebkitMaskOrigin}. */
+ WEBKIT_MASK_ORIGIN_("WebkitMaskOrigin", "webkit-mask-origin", ff60up("border-box")),
+
+ /** The style property {@code -webkit-mask-origin}. */
+ WEBKIT_MASK_ORIGIN__("-webkit-mask-origin", "webkit-mask-origin", ff60up("border-box")),
+
/** The style property {@code webkitMaskPosition}. */
- WEBKIT_MASK_POSITION("webkitMaskPosition", "webkit-mask-position", chrome("0% 0%"), ff60up("")),
+ WEBKIT_MASK_POSITION("webkitMaskPosition", "webkit-mask-position", chrome("0% 0%"), ff60up("0% 0%")),
+ /** The style property {@code WebkitMaskPosition}. */
+ WEBKIT_MASK_POSITION_("WebkitMaskPosition", "webkit-mask-position", ff60up("0% 0%")),
+
+ /** The style property {@code -webkit-mask-position}. */
+ WEBKIT_MASK_POSITION__("-webkit-mask-position", "webkit-mask-position", ff60up("0% 0%")),
+
/** The style property {@code webkitMaskPositionX}. */
- WEBKIT_MASK_POSITION_X("webkitMaskPositionX", "webkit-mask-position-x", chrome("0%"), ff60up("")),
+ WEBKIT_MASK_POSITION_X("webkitMaskPositionX", "webkit-mask-position-x", chrome("0%"), ff60up("0%")),
+ /** The style property {@code WebkitMaskPositionX}. */
+ WEBKIT_MASK_POSITION_X_("WebkitMaskPositionX", "webkit-mask-position-x", ff60up("0%")),
+
+ /** The style property {@code -webkit-mask-position-x}. */
+ WEBKIT_MASK_POSITION_X__("-webkit-mask-position-x", "webkit-mask-position-x", ff60up("0%")),
+
/** The style property {@code webkitMaskPositionY}. */
- WEBKIT_MASK_POSITION_Y("webkitMaskPositionY", "webkit-mask-position-y", chrome("0%"), ff60up("")),
+ WEBKIT_MASK_POSITION_Y("webkitMaskPositionY", "webkit-mask-position-y", chrome("0%"), ff60up("0%")),
+ /** The style property {@code WebkitMaskPositionY}. */
+ WEBKIT_MASK_POSITION_Y_("WebkitMaskPositionY", "webkit-mask-position-y", ff60up("0%")),
+
+ /** The style property {@code -webkit-mask-position-y}. */
+ WEBKIT_MASK_POSITION_Y__("-webkit-mask-position-y", "webkit-mask-position-y", ff60up("0%")),
+
/** The style property {@code webkitMaskRepeat}. */
- WEBKIT_MASK_REPEAT("webkitMaskRepeat", "webkit-mask-repeat", chrome("repeat"), ff60up("")),
+ WEBKIT_MASK_REPEAT("webkitMaskRepeat", "webkit-mask-repeat", chrome("repeat"), ff60up("repeat")),
+ /** The style property {@code WebkitMaskRepeat}. */
+ WEBKIT_MASK_REPEAT_("WebkitMaskRepeat", "webkit-mask-repeat", ff60up("repeat")),
+
+ /** The style property {@code -webkit-mask-repeat}. */
+ WEBKIT_MASK_REPEAT__("-webkit-mask-repeat", "webkit-mask-repeat", ff60up("repeat")),
+
/** The style property {@code webkitMaskRepeatX}. */
WEBKIT_MASK_REPEAT_X("webkitMaskRepeatX", "webkit-mask-repeat-x", chrome("")),
@@ -3489,8 +3626,14 @@
WEBKIT_MASK_REPEAT_Y("webkitMaskRepeatY", "webkit-mask-repeat-y", chrome("")),
/** The style property {@code webkitMaskSize}. */
- WEBKIT_MASK_SIZE("webkitMaskSize", "webkit-mask-size", chrome("auto"), ff60up("")),
+ WEBKIT_MASK_SIZE("webkitMaskSize", "webkit-mask-size", chrome("auto"), ff60up("auto auto")),
+ /** The style property {@code WebkitMaskSize}. */
+ WEBKIT_MASK_SIZE_("WebkitMaskSize", "webkit-mask-size", ff60up("auto auto")),
+
+ /** The style property {@code -webkit-mask-size}. */
+ WEBKIT_MASK_SIZE__("-webkit-mask-size", "webkit-mask-size", ff60up("auto auto")),
+
/** The style property {@code webkitMaxLogicalHeight}. */
WEBKIT_MAX_LOGICAL_HEIGHT("webkitMaxLogicalHeight", "webkit-max-logical-height", chrome("none")),
Modified: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.FF60.txt
===================================================================
--- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.FF60.txt 2018-06-17 11:42:28 UTC (rev 15347)
+++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.FF60.txt 2018-06-17 12:59:25 UTC (rev 15348)
@@ -51,12 +51,12 @@
-moz-outline-radius=:
-moz-padding-end=:
-moz-padding-start=:
--moz-perspective-origin=:621px 172.5px
+-moz-perspective-origin=:625px 172.5px
-moz-perspective=:none
-moz-stack-sizing=:stretch-to-fit
-moz-tab-size=:8
-moz-text-size-adjust=:auto
--moz-transform-origin=:621px 172.5px
+-moz-transform-origin=:625px 172.5px
-moz-transform-style=:flat
-moz-transform=:none
-moz-transition-delay=:0s
@@ -119,7 +119,7 @@
-webkit-mask-size=:auto auto
-webkit-mask=:none
-webkit-order=:0
--webkit-perspective-origin=:621px 172.5px
+-webkit-perspective-origin=:625px 172.5px
-webkit-perspective=:none
-webkit-text-fill-color=:rgb(0, 0, 0)
-webkit-text-size-adjust=:auto
@@ -126,7 +126,7 @@
-webkit-text-stroke-color=:rgb(0, 0, 0)
-webkit-text-stroke-width=:0px
-webkit-text-stroke=:
--webkit-transform-origin=:621px 172.5px
+-webkit-transform-origin=:625px 172.5px
-webkit-transform-style=:flat
-webkit-transform=:none
-webkit-transition-delay=:0s
@@ -189,12 +189,12 @@
MozPaddingEnd=:
MozPaddingStart=:
MozPerspective=:none
-MozPerspectiveOrigin=:621px 172.5px
+MozPerspectiveOrigin=:625px 172.5px
MozStackSizing=:stretch-to-fit
MozTabSize=:8
MozTextSizeAdjust=:auto
MozTransform=:none
-MozTransformOrigin=:621px 172.5px
+MozTransformOrigin=:625px 172.5px
MozTransformStyle=:flat
MozTransition=:
MozTransitionDelay=:0s
@@ -257,7 +257,7 @@
WebkitMaskSize=:auto auto
WebkitOrder=:0
WebkitPerspective=:none
-WebkitPerspectiveOrigin=:621px 172.5px
+WebkitPerspectiveOrigin=:625px 172.5px
WebkitTextFillColor=:rgb(0, 0, 0)
WebkitTextSizeAdjust=:auto
WebkitTextStroke=:
@@ -264,7 +264,7 @@
WebkitTextStrokeColor=:rgb(0, 0, 0)
WebkitTextStrokeWidth=:0px
WebkitTransform=:none
-WebkitTransformOrigin=:621px 172.5px
+WebkitTransformOrigin=:625px 172.5px
WebkitTransformStyle=:flat
WebkitTransition=:
WebkitTransitionDelay=:0s
@@ -727,9 +727,9 @@
pageBreakInside=:auto
paint-order=:normal
paintOrder=:normal
-perspective-origin=:621px 172.5px
+perspective-origin=:625px 172.5px
perspective=:none
-perspectiveOrigin=:621px 172.5px
+perspectiveOrigin=:625px 172.5px
place-content=:
place-items=:
place-self=:
@@ -827,11 +827,11 @@
touch-action=:auto
touchAction=:auto
transform-box=:border-box
-transform-origin=:621px 172.5px
+transform-origin=:625px 172.5px
transform-style=:flat
transform=:none
transformBox=:border-box
-transformOrigin=:621px 172.5px
+transformOrigin=:625px 172.5px
transformStyle=:flat
transition-delay=:0s
transition-duration=:0s
@@ -900,7 +900,7 @@
webkitMaskSize=:auto auto
webkitOrder=:0
webkitPerspective=:none
-webkitPerspectiveOrigin=:621px 172.5px
+webkitPerspectiveOrigin=:625px 172.5px
webkitTextFillColor=:rgb(0, 0, 0)
webkitTextSizeAdjust=:auto
webkitTextStroke=:
@@ -907,7 +907,7 @@
webkitTextStrokeColor=:rgb(0, 0, 0)
webkitTextStrokeWidth=:0px
webkitTransform=:none
-webkitTransformOrigin=:621px 172.5px
+webkitTransformOrigin=:625px 172.5px
webkitTransformStyle=:flat
webkitTransition=:
webkitTransitionDelay=:0s
|
|
From: <rb...@us...> - 2018-06-18 19:05:26
|
Revision: 15355
http://sourceforge.net/p/htmlunit/code/15355
Author: rbri
Date: 2018-06-18 19:05:16 +0000 (Mon, 18 Jun 2018)
Log Message:
-----------
more ff60 expectations
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRule.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGClipPathElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFilterElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGGradientElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGMaskElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGPatternElement.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostConstantsTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java 2018-06-18 15:53:47 UTC (rev 15354)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java 2018-06-18 19:05:16 UTC (rev 15355)
@@ -16,6 +16,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
@@ -1645,7 +1646,7 @@
public static final long STENCIL_FUNC = 2962L;
/** The constant {@code STENCIL_INDEX}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final long STENCIL_INDEX = 6401L;
/** The constant {@code STENCIL_INDEX8}. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java 2018-06-18 15:53:47 UTC (rev 15354)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java 2018-06-18 19:05:16 UTC (rev 15355)
@@ -17,7 +17,6 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -340,7 +339,7 @@
@JsxConstant
public static final int TEXTURE = 0x1702;
/** The constant {@code STENCIL_INDEX}. */
- @JsxConstant({FF52, FF60, IE})
+ @JsxConstant({FF52, IE})
public static final int STENCIL_INDEX = 0x1901;
/** The constant {@code DEPTH_COMPONENT}. */
@JsxConstant
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRule.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRule.java 2018-06-18 15:53:47 UTC (rev 15354)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRule.java 2018-06-18 19:05:16 UTC (rev 15355)
@@ -17,6 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -45,7 +46,7 @@
/**
* The rule is a {@code CSSUnknownRule}.
*/
- @JsxConstant({FF, IE, EDGE})
+ @JsxConstant({FF52, IE, EDGE})
public static final short UNKNOWN_RULE = org.w3c.dom.css.CSSRule.UNKNOWN_RULE;
/**
@@ -93,7 +94,7 @@
/**
* The rule is a {@code CSSKeyframesRule}.
*/
- @JsxConstant(FF)
+ @JsxConstant(FF52)
public static final short MOZ_KEYFRAMES_RULE = 7;
/**
@@ -105,7 +106,7 @@
/**
* The rule is a {@code CSSKeyframeRule}.
*/
- @JsxConstant(FF)
+ @JsxConstant(FF52)
public static final short MOZ_KEYFRAME_RULE = 8;
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGClipPathElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGClipPathElement.java 2018-06-18 15:53:47 UTC (rev 15354)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGClipPathElement.java 2018-06-18 19:05:16 UTC (rev 15355)
@@ -17,6 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -33,13 +34,13 @@
public class SVGClipPathElement extends SVGElement {
/** Constant for {@code SVG_UNIT_TYPE_UNKNOWN}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_UNKNOWN = 0;
/** Constant for {@code SVG_UNIT_TYPE_USERSPACEONUSE}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_USERSPACEONUSE = 1;
/** Constant for {@code SVG_UNIT_TYPE_OBJECTBOUNDINGBOX}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2;
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFilterElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFilterElement.java 2018-06-18 15:53:47 UTC (rev 15354)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGFilterElement.java 2018-06-18 19:05:16 UTC (rev 15355)
@@ -17,6 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -33,13 +34,13 @@
public class SVGFilterElement extends SVGElement {
/** Constant for {@code SVG_UNIT_TYPE_UNKNOWN}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_UNKNOWN = 0;
/** Constant for {@code SVG_UNIT_TYPE_USERSPACEONUSE}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_USERSPACEONUSE = 1;
/** Constant for {@code SVG_UNIT_TYPE_OBJECTBOUNDINGBOX}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2;
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGGradientElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGGradientElement.java 2018-06-18 15:53:47 UTC (rev 15354)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGGradientElement.java 2018-06-18 19:05:16 UTC (rev 15355)
@@ -17,6 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -44,13 +45,13 @@
@JsxConstant
public static final int SVG_SPREADMETHOD_REPEAT = 3;
/** Constant for {@code SVG_UNIT_TYPE_UNKNOWN}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_UNKNOWN = 0;
/** Constant for {@code SVG_UNIT_TYPE_USERSPACEONUSE}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_USERSPACEONUSE = 1;
/** Constant for {@code SVG_UNIT_TYPE_OBJECTBOUNDINGBOX}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2;
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGMaskElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGMaskElement.java 2018-06-18 15:53:47 UTC (rev 15354)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGMaskElement.java 2018-06-18 19:05:16 UTC (rev 15355)
@@ -17,6 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -39,13 +40,13 @@
@JsxConstant(FF)
public static final int SVG_MASKTYPE_ALPHA = 1;
/** Constant for {@code SVG_UNIT_TYPE_UNKNOWN}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_UNKNOWN = 0;
/** Constant for {@code SVG_UNIT_TYPE_USERSPACEONUSE}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_USERSPACEONUSE = 1;
/** Constant for {@code SVG_UNIT_TYPE_OBJECTBOUNDINGBOX}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2;
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGPatternElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGPatternElement.java 2018-06-18 15:53:47 UTC (rev 15354)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGPatternElement.java 2018-06-18 19:05:16 UTC (rev 15355)
@@ -17,6 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -33,13 +34,13 @@
public class SVGPatternElement extends SVGElement {
/** Constant for {@code SVG_UNIT_TYPE_UNKNOWN}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_UNKNOWN = 0;
/** Constant for {@code SVG_UNIT_TYPE_USERSPACEONUSE}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_USERSPACEONUSE = 1;
/** Constant for {@code SVG_UNIT_TYPE_OBJECTBOUNDINGBOX}. */
- @JsxConstant({FF, IE})
+ @JsxConstant({FF52, IE})
public static final int SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2;
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostConstantsTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostConstantsTest.java 2018-06-18 15:53:47 UTC (rev 15354)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostConstantsTest.java 2018-06-18 19:05:16 UTC (rev 15355)
@@ -26,6 +26,8 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
import com.gargoylesoftware.htmlunit.BrowserParameterizedRunner;
import com.gargoylesoftware.htmlunit.BrowserParameterizedRunner.Default;
@@ -77,8 +79,11 @@
public void test() throws Exception {
setExpectedAlerts(getExpectedString());
- loadPageWithAlerts2("<html><head>\n"
+ final String html = "<html><head>\n"
+ "<script>\n"
+ + "function log(x) {\n"
+ + " document.getElementById('log').value += x + '\\n';\n"
+ + "}\n"
+ "function test() {\n"
+ " try {\n"
+ " var all = [];\n"
@@ -104,12 +109,18 @@
+ " var x = all[i];\n"
+ " string += x + ':' + " + host_ + "[x] + ' ';\n"
+ " }\n"
- + " alert(string);\n"
+ + " log(string);\n"
+ " } catch (e) {}\n"
+ "}\n"
+ "</script>\n"
- + "</head><body onload='test()'>\n"
- + "</body></html>");
+ + "</head>\n"
+ + "<body onload='test()'>\n"
+ + " <textarea id='log' cols='80' rows='40'></textarea>\n"
+ + "</body></html>";
+
+ final WebDriver driver = loadPage2(html);
+ final String text = driver.findElement(By.id("log")).getAttribute("value").trim().replaceAll("\r", "");
+ assertEquals(String.join("\n", getExpectedAlerts()), text);
}
/**
@@ -156,7 +167,7 @@
for (final String key : constants) {
builder.append(key).append(' ');
}
- return builder.toString();
+ return builder.toString().trim();
}
/**
|
|
From: <rb...@us...> - 2018-06-19 06:10:56
|
Revision: 15359
http://sourceforge.net/p/htmlunit/code/15359
Author: rbri
Date: 2018-06-19 06:10:51 +0000 (Tue, 19 Jun 2018)
Log Message:
-----------
ff60 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/File.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLProgressElement.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/File.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/File.java 2018-06-19 05:58:09 UTC (rev 15358)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/File.java 2018-06-19 06:10:51 UTC (rev 15359)
@@ -18,7 +18,6 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import java.util.Date;
@@ -98,7 +97,7 @@
* Returns the {@code webkitRelativePath} property.
* @return the {@code webkitRelativePath} property
*/
- @JsxGetter({CHROME, FF52})
+ @JsxGetter({CHROME, FF})
public String getWebkitRelativePath() {
return "";
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java 2018-06-19 05:58:09 UTC (rev 15358)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java 2018-06-19 06:10:51 UTC (rev 15359)
@@ -17,6 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import java.util.Locale;
@@ -89,7 +90,7 @@
* Returns the labels associated with the element.
* @return the labels associated with the element
*/
- @JsxGetter(CHROME)
+ @JsxGetter({CHROME, FF60})
public AbstractList getLabels() {
if (labels_ == null) {
labels_ = new LabelsHelper(getDomNodeOrDie());
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLProgressElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLProgressElement.java 2018-06-19 05:58:09 UTC (rev 15358)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLProgressElement.java 2018-06-19 06:10:51 UTC (rev 15359)
@@ -17,6 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.html.HtmlProgress;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -76,7 +77,7 @@
* Returns the labels associated with the element.
* @return the labels associated with the element
*/
- @JsxGetter(CHROME)
+ @JsxGetter({CHROME, FF60})
public AbstractList getLabels() {
if (labels_ == null) {
labels_ = new LabelsHelper(getDomNodeOrDie());
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileTest.java 2018-06-19 05:58:09 UTC (rev 15358)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileTest.java 2018-06-19 06:10:51 UTC (rev 15359)
@@ -30,7 +30,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlPageTest;
/**
- * Tests for {@link File}.
+ * Tests for {@link com.gargoylesoftware.htmlunit.javascript.host.file.File}.
*
* @author Ronald Brill
*/
|
|
From: <rb...@us...> - 2018-06-19 06:21:13
|
Revision: 15360
http://sourceforge.net/p/htmlunit/code/15360
Author: rbri
Date: 2018-06-19 06:21:08 +0000 (Tue, 19 Jun 2018)
Log Message:
-----------
ff60 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElement.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextArea2Test.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java 2018-06-19 06:10:51 UTC (rev 15359)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java 2018-06-19 06:21:08 UTC (rev 15360)
@@ -17,6 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import java.util.ArrayList;
import java.util.List;
@@ -147,7 +148,7 @@
* Returns the type of selection (IE only).
* @return the type of selection
*/
- @JsxGetter(CHROME)
+ @JsxGetter({CHROME, FF60})
public String getType() {
return type_;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElement.java 2018-06-19 06:10:51 UTC (rev 15359)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElement.java 2018-06-19 06:21:08 UTC (rev 15360)
@@ -24,6 +24,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import com.gargoylesoftware.htmlunit.html.HtmlTextArea;
@@ -374,7 +375,7 @@
* Returns the labels associated with the element.
* @return the labels associated with the element
*/
- @JsxGetter(CHROME)
+ @JsxGetter({CHROME, FF60})
public AbstractList getLabels() {
if (labels_ == null) {
labels_ = new LabelsHelper(getDomNodeOrDie());
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextArea2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextArea2Test.java 2018-06-19 06:10:51 UTC (rev 15359)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextArea2Test.java 2018-06-19 06:21:08 UTC (rev 15360)
@@ -23,9 +23,10 @@
import com.gargoylesoftware.htmlunit.BrowserRunner;
import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
import com.gargoylesoftware.htmlunit.WebDriverTestCase;
+import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLTextAreaElement;
/**
- * Tests for {@link HtmlTextInput}.
+ * Tests for {@link HTMLTextAreaElement}.
*
* @author Ronald Brill
* @author Ahmed Ashour
|
|
From: <rb...@us...> - 2018-06-20 06:12:19
|
Revision: 15362
http://sourceforge.net/p/htmlunit/code/15362
Author: rbri
Date: 2018-06-20 06:12:12 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
more ff60 expectations
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPasswordInputTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-20 06:02:23 UTC (rev 15361)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-20 06:12:12 UTC (rev 15362)
@@ -963,8 +963,8 @@
@BrowserFeature({CHROME, FF52})
JS_INNER_TEXT_VALUE_NULL,
- /** Chrome ignores negative selection starts. */
- @BrowserFeature(CHROME)
+ /** Ignore negative selection starts. */
+ @BrowserFeature({CHROME, FF60})
JS_INPUT_IGNORE_NEGATIVE_SELECTION_START,
/** Chrome/FF returns null for selectionStart/selectionEnd. */
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPasswordInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPasswordInputTest.java 2018-06-20 06:02:23 UTC (rev 15361)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPasswordInputTest.java 2018-06-20 06:12:12 UTC (rev 15362)
@@ -22,6 +22,7 @@
import org.junit.runner.RunWith;
import org.openqa.selenium.By;
import org.openqa.selenium.InvalidElementStateException;
+import org.openqa.selenium.Keys;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.htmlunit.HtmlUnitDriver;
@@ -67,13 +68,13 @@
final WebElement p = driver.findElement(By.id("p"));
p.sendKeys("abc");
assertEquals("abc", p.getAttribute("value"));
- p.sendKeys("\b");
+ p.sendKeys(Keys.BACK_SPACE);
assertEquals("ab", p.getAttribute("value"));
- p.sendKeys("\b");
+ p.sendKeys(Keys.BACK_SPACE);
assertEquals("a", p.getAttribute("value"));
- p.sendKeys("\b");
+ p.sendKeys(Keys.BACK_SPACE);
assertEquals("", p.getAttribute("value"));
- p.sendKeys("\b");
+ p.sendKeys(Keys.BACK_SPACE);
assertEquals("", p.getAttribute("value"));
}
|
|
From: <rb...@us...> - 2018-06-20 06:48:53
|
Revision: 15364
http://sourceforge.net/p/htmlunit/code/15364
Author: rbri
Date: 2018-06-20 06:48:47 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
ff60 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlApplet2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-06-20 06:19:39 UTC (rev 15363)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-06-20 06:48:47 UTC (rev 15364)
@@ -286,7 +286,6 @@
FIREFOX_60.registerUploadMimeType("opus", "audio/ogg");
FIREFOX_60.registerUploadMimeType("webm", "video/webm");
FIREFOX_60.registerUploadMimeType("wav", "audio/wav");
- FIREFOX_60.registerUploadMimeType("flac", "audio/x-flac");
FIREFOX_60.registerUploadMimeType("xhtml", "application/xhtml+xml");
FIREFOX_60.registerUploadMimeType("xht", "application/xhtml+xml");
FIREFOX_60.registerUploadMimeType("txt", "text/plain");
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-20 06:19:39 UTC (rev 15363)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-20 06:48:47 UTC (rev 15364)
@@ -417,11 +417,11 @@
HTMLINPUT_FILES_UNDEFINED,
/** HTMLInputElement: type {@code file} selectionSart/End are null. */
- @BrowserFeature({CHROME, FF52})
+ @BrowserFeature({CHROME, FF})
HTMLINPUT_FILE_SELECTION_START_END_NULL,
/** HTMLInputElement: type {@code file} value to be {@code fakepath}. */
- @BrowserFeature({CHROME, IE})
+ @BrowserFeature({CHROME, FF60, IE})
HTMLINPUT_FILE_VALUE_FAKEPATH,
/** Should the HTMLElement of {@code keygen} have no end tag. */
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlApplet2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlApplet2Test.java 2018-06-20 06:19:39 UTC (rev 15363)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlApplet2Test.java 2018-06-20 06:48:47 UTC (rev 15364)
@@ -39,7 +39,8 @@
*/
@Test
@Alerts(DEFAULT = {"[object HTMLAppletElement]", "[object HTMLCollection]", "1", "[object HTMLAppletElement]"},
- CHROME = {"[object HTMLUnknownElement]", "[object HTMLCollection]", "0", "undefined"})
+ CHROME = {"[object HTMLUnknownElement]", "[object HTMLCollection]", "0", "undefined"},
+ FF60 = {"[object HTMLUnknownElement]", "[object NodeList]", "0", "undefined"})
public void simpleScriptable() throws Exception {
final String html = "<html><head>\n"
+ "<script>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java 2018-06-20 06:19:39 UTC (rev 15363)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java 2018-06-20 06:48:47 UTC (rev 15364)
@@ -254,10 +254,8 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(DEFAULT = {"CONTENT_TYPE:audio/flac", "charset"},
- FF60 = {"CONTENT_TYPE:audio/x-flac", "charset"},
- FF52 = {"CONTENT_TYPE:application/octet-stream", "charset"},
- IE = {"CONTENT_TYPE:application/octet-stream", "charset"})
+ @Alerts(DEFAULT = {"CONTENT_TYPE:application/octet-stream", "charset"},
+ CHROME = {"CONTENT_TYPE:audio/flac", "charset"})
public void contentTypeFlac() throws Exception {
contentType("flac");
}
@@ -827,9 +825,8 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(DEFAULT = {"ex start", "ex end", "exception"},
- CHROME = {"null", "null", "0"},
- FF52 = {"null", "null", "0"})
+ @Alerts(DEFAULT = {"null", "null", "0"},
+ IE = {"ex start", "ex end", "exception"})
public void selection() throws Exception {
final String html =
"<html><head><script>\n"
@@ -864,9 +861,6 @@
@Alerts(DEFAULT = {"null,null", "exception value", "null,null",
"exception", "null,null",
"exception", "null,null"},
- FF60 = {"exception", "exception value", "exception",
- "exception", "exception",
- "exception", "exception"},
IE = {"exception", "exception",
"exception", "exception",
"exception", "exception"})
@@ -881,9 +875,6 @@
@Alerts(DEFAULT = {"null,null", "exception value", "null,null",
"exception", "null,null",
"exception", "null,null"},
- FF60 = {"exception", "exception value", "exception",
- "exception", "exception",
- "exception", "exception"},
IE = {"exception", "exception",
"exception", "exception",
"exception", "exception"})
@@ -898,9 +889,6 @@
@Alerts(DEFAULT = {"null,null", "exception value", "null,null",
"exception", "null,null",
"exception", "null,null"},
- FF60 = {"exception", "exception value", "exception",
- "exception", "exception",
- "exception", "exception"},
IE = {"exception", "exception",
"exception", "exception",
"exception", "exception"})
@@ -949,9 +937,8 @@
* @throws Exception if test fails
*/
@Test
- @Alerts(DEFAULT = "exception",
- CHROME = {"null,null", "exception"},
- FF52 = {"null,null", "exception"})
+ @Alerts(DEFAULT = {"null,null", "exception"},
+ IE = "exception")
public void selectionOnUpdate() throws Exception {
final String html = "<html>\n"
+ "<body>\n"
@@ -1033,7 +1020,7 @@
*/
@Test
@Alerts(DEFAULT = "C:\\fakepath\\pom.xml--null",
- FF = "pom.xml--null")
+ FF52 = "pom.xml--null")
// since 2.28
// there is an option for IE, for local and trusted sites IE includes the file path
// because we do not support any IE specific setting we do not send the filename as
@@ -1115,7 +1102,7 @@
*/
@Test
@Alerts(DEFAULT = "C:\\fakepath\\pom.xml",
- FF = "pom.xml")
+ FF52 = "pom.xml")
// since 2.28
// there is an option for IE, for local and trusted sites IE includes the file path
// because we do not support any IE specific setting we do not send the filename as
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X