Skip to content

Commit 9a03f9c

Browse files
rbrirbri
committed
time to remove IE (issue #735)
1 parent e35396c commit 9a03f9c

4 files changed

Lines changed: 114 additions & 63 deletions

File tree

‎src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java‎

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,69 +1296,6 @@ public void setTimeout(final int timeout) {
12961296
timeout_ = timeout;
12971297
}
12981298

1299-
/**
1300-
* {@inheritDoc}
1301-
*/
1302-
@JsxSetter
1303-
@Override
1304-
public void setOntimeout(final Function timeoutHandler) {
1305-
super.setOntimeout(timeoutHandler);
1306-
}
1307-
1308-
/**
1309-
* {@inheritDoc}
1310-
*/
1311-
@JsxSetter
1312-
@Override
1313-
public void setOnprogress(final Function progressHandler) {
1314-
super.setOnprogress(progressHandler);
1315-
}
1316-
1317-
/**
1318-
* {@inheritDoc}
1319-
*/
1320-
@JsxSetter
1321-
@Override
1322-
public void setOnload(final Function loadHandler) {
1323-
super.setOnload(loadHandler);
1324-
}
1325-
1326-
/**
1327-
* {@inheritDoc}
1328-
*/
1329-
@JsxSetter
1330-
@Override
1331-
public void setOnloadstart(final Function loadstartHandler) {
1332-
super.setOnloadstart(loadstartHandler);
1333-
}
1334-
1335-
/**
1336-
* {@inheritDoc}
1337-
*/
1338-
@JsxSetter
1339-
@Override
1340-
public void setOnloadend(final Function loadendHandler) {
1341-
super.setOnloadend(loadendHandler);
1342-
}
1343-
1344-
/**
1345-
* {@inheritDoc}
1346-
*/
1347-
@JsxSetter
1348-
@Override
1349-
public void setOnabort(final Function abortHandler) {
1350-
super.setOnabort(abortHandler);
1351-
}
1352-
1353-
/**
1354-
* {@inheritDoc}
1355-
*/
1356-
@JsxSetter
1357-
@Override
1358-
public void setOnerror(final Function errorHandler) {
1359-
super.setOnerror(errorHandler);
1360-
}
1361-
13621299
private static final class NetworkErrorWebResponse extends WebResponse {
13631300
private final WebRequest request_;
13641301
private final IOException error_;

‎src/test/java/org/htmlunit/general/ElementOwnPropertiesTest.java‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17287,4 +17287,54 @@ public void cssStyleRule() throws Exception {
1728717287
public void geolocation() throws Exception {
1728817288
testString("", " navigator.geolocation");
1728917289
}
17290+
17291+
/**
17292+
* Test {@link org.htmlunit.javascript.host.geo.Geolocation}.
17293+
*
17294+
* @throws Exception if the test fails
17295+
*/
17296+
@Test
17297+
@Alerts(CHROME = "abort(),constructor(),DONE[E],getAllResponseHeaders(),getResponseHeader(),HEADERS_RECEIVED[E],"
17298+
+ "LOADING[E],onreadystatechange[GSCE],open(),OPENED[E],overrideMimeType(),readyState[GCE],"
17299+
+ "response[GCE],responseText[GCE],responseType[GSCE],responseURL[GCE],responseXML[GCE],send(),"
17300+
+ "setPrivateToken(),setRequestHeader(),status[GCE],statusText[GCE],timeout[GSCE],UNSENT[E],"
17301+
+ "upload[GCE],withCredentials[GSCE]",
17302+
EDGE = "abort(),constructor(),DONE[E],getAllResponseHeaders(),getResponseHeader(),HEADERS_RECEIVED[E],"
17303+
+ "LOADING[E],onreadystatechange[GSCE],open(),OPENED[E],overrideMimeType(),readyState[GCE],"
17304+
+ "response[GCE],responseText[GCE],responseType[GSCE],responseURL[GCE],responseXML[GCE],send(),"
17305+
+ "setPrivateToken(),setRequestHeader(),status[GCE],statusText[GCE],timeout[GSCE],UNSENT[E],"
17306+
+ "upload[GCE],withCredentials[GSCE]",
17307+
FF = "abort(),constructor(),DONE[E],getAllResponseHeaders(),getResponseHeader(),HEADERS_RECEIVED[E],"
17308+
+ "LOADING[E],mozAnon[GCE],mozSystem[GCE],onreadystatechange[GSCE],open(),OPENED[E],"
17309+
+ "overrideMimeType(),readyState[GCE],response[GCE],responseText[GCE],responseType[GSCE],"
17310+
+ "responseURL[GCE],responseXML[GCE],send(),setRequestHeader(),status[GCE],statusText[GCE],"
17311+
+ "timeout[GSCE],UNSENT[E],upload[GCE],withCredentials[GSCE]",
17312+
FF_ESR = "abort(),constructor(),DONE[E],getAllResponseHeaders(),getResponseHeader(),HEADERS_RECEIVED[E],"
17313+
+ "LOADING[E],mozAnon[GCE],mozSystem[GCE],onreadystatechange[GSCE],open(),OPENED[E],"
17314+
+ "overrideMimeType(),readyState[GCE],response[GCE],responseText[GCE],responseType[GSCE],"
17315+
+ "responseURL[GCE],responseXML[GCE],send(),setRequestHeader(),status[GCE],statusText[GCE],"
17316+
+ "timeout[GSCE],UNSENT[E],upload[GCE],withCredentials[GSCE]")
17317+
@HtmlUnitNYI(CHROME = "abort(),constructor(),DONE[E],getAllResponseHeaders(),getResponseHeader(),"
17318+
+ "HEADERS_RECEIVED[E],LOADING[E],onreadystatechange[GSCE],open(),OPENED[E],overrideMimeType(),"
17319+
+ "readyState[GCE],response[GCE],responseText[GCE],responseType[GSCE],responseXML[GCE],send(),"
17320+
+ "setRequestHeader(),status[GCE],statusText[GCE],timeout[GSCE],UNSENT[E],"
17321+
+ "upload[GCE],withCredentials[GSCE]",
17322+
EDGE = "abort(),constructor(),DONE[E],getAllResponseHeaders(),getResponseHeader(),"
17323+
+ "HEADERS_RECEIVED[E],LOADING[E],onreadystatechange[GSCE],open(),OPENED[E],overrideMimeType(),"
17324+
+ "readyState[GCE],response[GCE],responseText[GCE],responseType[GSCE],responseXML[GCE],send(),"
17325+
+ "setRequestHeader(),status[GCE],statusText[GCE],timeout[GSCE],UNSENT[E],"
17326+
+ "upload[GCE],withCredentials[GSCE]",
17327+
FF = "abort(),constructor(),DONE[E],getAllResponseHeaders(),getResponseHeader(),"
17328+
+ "HEADERS_RECEIVED[E],LOADING[E],onreadystatechange[GSCE],open(),OPENED[E],overrideMimeType(),"
17329+
+ "readyState[GCE],response[GCE],responseText[GCE],responseType[GSCE],responseXML[GCE],send(),"
17330+
+ "setRequestHeader(),status[GCE],statusText[GCE],timeout[GSCE],UNSENT[E],"
17331+
+ "upload[GCE],withCredentials[GSCE]",
17332+
FF_ESR = "abort(),constructor(),DONE[E],getAllResponseHeaders(),getResponseHeader(),"
17333+
+ "HEADERS_RECEIVED[E],LOADING[E],onreadystatechange[GSCE],open(),OPENED[E],overrideMimeType(),"
17334+
+ "readyState[GCE],response[GCE],responseText[GCE],responseType[GSCE],responseXML[GCE],send(),"
17335+
+ "setRequestHeader(),status[GCE],statusText[GCE],timeout[GSCE],UNSENT[E],"
17336+
+ "upload[GCE],withCredentials[GSCE]")
17337+
public void xmlHttpRequest() throws Exception {
17338+
testString("", "new XMLHttpRequest()");
17339+
}
1729017340
}

‎src/test/java/org/htmlunit/general/ElementOwnPropertySymbolsTest.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3024,4 +3024,18 @@ public void cssStyleRule() throws Exception {
30243024
public void geolocation() throws Exception {
30253025
testString("", " navigator.geolocation");
30263026
}
3027+
3028+
/**
3029+
* Test {@link org.htmlunit.javascript.host.geo.Geolocation}.
3030+
*
3031+
* @throws Exception if the test fails
3032+
*/
3033+
@Test
3034+
@Alerts(CHROME = "Symbol(Symbol.toStringTag) [C] [XMLHttpRequest]",
3035+
EDGE = "Symbol(Symbol.toStringTag) [C] [XMLHttpRequest]",
3036+
FF = "Symbol(Symbol.toStringTag) [C] [XMLHttpRequest]",
3037+
FF_ESR = "Symbol(Symbol.toStringTag) [C] [XMLHttpRequest]")
3038+
public void xmlHttpRequest() throws Exception {
3039+
testString("", "new XMLHttpRequest()");
3040+
}
30273041
}

‎src/test/java/org/htmlunit/general/ElementPropertiesTest.java‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8704,4 +8704,54 @@ public void cssStyleRule() throws Exception {
87048704
public void geolocation() throws Exception {
87058705
testString("", " navigator.geolocation");
87068706
}
8707+
8708+
/**
8709+
* Test {@link org.htmlunit.javascript.host.geo.Geolocation}.
8710+
*
8711+
* @throws Exception if the test fails
8712+
*/
8713+
@Test
8714+
@Alerts(CHROME = "abort(),addEventListener(),dispatchEvent(),DONE,getAllResponseHeaders(),getResponseHeader(),"
8715+
+ "HEADERS_RECEIVED,LOADING,onabort,onerror,onload,onloadend,onloadstart,onprogress,"
8716+
+ "onreadystatechange,ontimeout,open(),OPENED,overrideMimeType(),readyState,removeEventListener(),"
8717+
+ "response,responseText,responseType,responseURL,responseXML,send(),setPrivateToken(),"
8718+
+ "setRequestHeader(),status,statusText,timeout,UNSENT,upload,withCredentials",
8719+
EDGE = "abort(),addEventListener(),dispatchEvent(),DONE,getAllResponseHeaders(),getResponseHeader(),"
8720+
+ "HEADERS_RECEIVED,LOADING,onabort,onerror,onload,onloadend,onloadstart,onprogress,"
8721+
+ "onreadystatechange,ontimeout,open(),OPENED,overrideMimeType(),readyState,removeEventListener(),"
8722+
+ "response,responseText,responseType,responseURL,responseXML,send(),setPrivateToken(),"
8723+
+ "setRequestHeader(),status,statusText,timeout,UNSENT,upload,withCredentials",
8724+
FF = "abort(),addEventListener(),dispatchEvent(),DONE,getAllResponseHeaders(),getResponseHeader(),"
8725+
+ "HEADERS_RECEIVED,LOADING,mozAnon,mozSystem,onabort,onerror,onload,onloadend,onloadstart,"
8726+
+ "onprogress,onreadystatechange,ontimeout,open(),OPENED,overrideMimeType(),readyState,"
8727+
+ "removeEventListener(),response,responseText,responseType,responseURL,responseXML,send(),"
8728+
+ "setRequestHeader(),status,statusText,timeout,UNSENT,upload,withCredentials",
8729+
FF_ESR = "abort(),addEventListener(),dispatchEvent(),DONE,getAllResponseHeaders(),getResponseHeader(),"
8730+
+ "HEADERS_RECEIVED,LOADING,mozAnon,mozSystem,onabort,onerror,onload,onloadend,onloadstart,"
8731+
+ "onprogress,onreadystatechange,ontimeout,open(),OPENED,overrideMimeType(),readyState,"
8732+
+ "removeEventListener(),response,responseText,responseType,responseURL,responseXML,send(),"
8733+
+ "setRequestHeader(),status,statusText,timeout,UNSENT,upload,withCredentials")
8734+
@HtmlUnitNYI(CHROME = "abort(),addEventListener(),dispatchEvent(),DONE,getAllResponseHeaders(),getResponseHeader(),"
8735+
+ "HEADERS_RECEIVED,LOADING,onabort,onerror,onload,onloadend,onloadstart,onprogress,onreadystatechange,"
8736+
+ "ontimeout,open(),OPENED,overrideMimeType(),readyState,removeEventListener(),response,responseText,"
8737+
+ "responseType,responseXML,send(),setRequestHeader(),status,statusText,timeout,UNSENT,"
8738+
+ "upload,withCredentials",
8739+
EDGE = "abort(),addEventListener(),dispatchEvent(),DONE,getAllResponseHeaders(),getResponseHeader(),"
8740+
+ "HEADERS_RECEIVED,LOADING,onabort,onerror,onload,onloadend,onloadstart,onprogress,onreadystatechange,"
8741+
+ "ontimeout,open(),OPENED,overrideMimeType(),readyState,removeEventListener(),response,responseText,"
8742+
+ "responseType,responseXML,send(),setRequestHeader(),status,statusText,timeout,UNSENT,"
8743+
+ "upload,withCredentials",
8744+
FF = "abort(),addEventListener(),dispatchEvent(),DONE,getAllResponseHeaders(),getResponseHeader(),"
8745+
+ "HEADERS_RECEIVED,LOADING,onabort,onerror,onload,onloadend,onloadstart,onprogress,onreadystatechange,"
8746+
+ "ontimeout,open(),OPENED,overrideMimeType(),readyState,removeEventListener(),response,responseText,"
8747+
+ "responseType,responseXML,send(),setRequestHeader(),status,statusText,timeout,UNSENT,"
8748+
+ "upload,withCredentials",
8749+
FF_ESR = "abort(),addEventListener(),dispatchEvent(),DONE,getAllResponseHeaders(),getResponseHeader(),"
8750+
+ "HEADERS_RECEIVED,LOADING,onabort,onerror,onload,onloadend,onloadstart,onprogress,onreadystatechange,"
8751+
+ "ontimeout,open(),OPENED,overrideMimeType(),readyState,removeEventListener(),response,responseText,"
8752+
+ "responseType,responseXML,send(),setRequestHeader(),status,statusText,timeout,UNSENT,"
8753+
+ "upload,withCredentials")
8754+
public void xmlHttpRequest() throws Exception {
8755+
testString("", "new XMLHttpRequest()");
8756+
}
87078757
}

0 commit comments

Comments
 (0)