Menu
▾
▴
[HtmlUnit] SVN: [8835] trunk/htmlunit/src
|
From: <rb...@us...> - 2013-12-12 18:41:10
|
Revision: 8835
http://sourceforge.net/p/htmlunit/code/8835
Author: rbri
Date: 2013-12-12 18:41:07 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
first huge implementation step forward to support IE11 [Frank Danek]
this introduces a completely separate implementation of the MSXMLActiveXObject (IE11 supports this AND a build in one)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomCharacterData.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/xml/XmlPage.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/xml/XmlUtil.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/BrowserVersionClassRunner.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/CookieManagerTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NoHttpResponseTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient3Test.java
Added Paths:
-----------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -19,6 +19,7 @@
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.PROTOCOL_DATA;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.URL_MINIMAL_QUERY_ENCODING;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.WINDOW_ACTIVE_ELEMENT_FOCUSED;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_XML_SUPPORT_VIA_ACTIVEXOBJECT;
import java.io.BufferedInputStream;
import java.io.File;
@@ -54,6 +55,7 @@
import org.apache.http.client.CredentialsProvider;
import org.w3c.css.sac.ErrorHandler;
+import com.gargoylesoftware.htmlunit.activex.javascript.msxml.MSXMLActiveXObjectFactory;
import com.gargoylesoftware.htmlunit.attachment.Attachment;
import com.gargoylesoftware.htmlunit.attachment.AttachmentHandler;
import com.gargoylesoftware.htmlunit.gae.GAEUtils;
@@ -117,6 +119,7 @@
* @author Amit Manjhi
* @author Nicolas Belisle
* @author Ronald Brill
+ * @author Frank Danek
*/
public class WebClient implements Serializable {
@@ -167,6 +170,7 @@
private ScriptPreProcessor scriptPreProcessor_;
private Map<String, String> activeXObjectMap_ = Collections.emptyMap();
+ private transient MSXMLActiveXObjectFactory msxmlActiveXObjectFactory_;
private RefreshHandler refreshHandler_ = new NiceRefreshHandler(2);
private JavaScriptErrorListener javaScriptErrorListener_;
@@ -220,8 +224,24 @@
addWebWindowListener(new CurrentWindowTracker(this));
currentWindow_ = new TopLevelWindow("", this);
fireWindowOpened(new WebWindowEvent(currentWindow_, WebWindowEvent.OPEN, null, null));
+
+ if (getBrowserVersion().hasFeature(JS_XML_SUPPORT_VIA_ACTIVEXOBJECT)) {
+ initMSXMLActiveX();
+ }
}
+ private void initMSXMLActiveX() {
+ msxmlActiveXObjectFactory_ = new MSXMLActiveXObjectFactory();
+ // TODO [IE11] initialize in #init or in #initialize?
+ try {
+ msxmlActiveXObjectFactory_.init(getBrowserVersion());
+ }
+ catch (final Exception e) {
+ LOG.error("Exception while initializing MSXML ActiveX for the page", e);
+ throw new ScriptException(null, e); // BUG: null is not useful.
+ }
+ }
+
/**
* Returns the object that will resolve all URL requests.
*
@@ -1453,6 +1473,14 @@
}
/**
+ * Returns the MSXML ActiveX object factory (if supported).
+ * @return the msxmlActiveXObjectFactory
+ */
+ public MSXMLActiveXObjectFactory getMSXMLActiveXObjectFactory() {
+ return msxmlActiveXObjectFactory_;
+ }
+
+ /**
* Sets the listener for messages generated by the HTML parser.
* @param listener the new listener, <code>null</code> if messages should be totally ignored
*/
@@ -1852,6 +1880,10 @@
webConnection_ = createWebConnection();
scriptEngine_ = new JavaScriptEngine(this);
jobManagers_ = Collections.synchronizedList(new ArrayList<WeakReference<JavaScriptJobManager>>());
+
+ if (getBrowserVersion().hasFeature(JS_XML_SUPPORT_VIA_ACTIVEXOBJECT)) {
+ initMSXMLActiveX();
+ }
}
private WebConnection createWebConnection() {
Index: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex 2013-12-12 18:41:07 UTC (rev 8835)
Property changes on: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+SF issue number (optional):
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+http://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+Issue %BUGID%
\ No newline at end of property
Index: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript 2013-12-12 18:41:07 UTC (rev 8835)
Property changes on: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+SF issue number (optional):
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+http://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+Issue %BUGID%
\ No newline at end of property
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomCharacterData.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomCharacterData.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomCharacterData.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -103,7 +103,7 @@
*/
public void deleteData(final int offset, final int count) {
if (offset < 0) {
- throw new IllegalArgumentException("Provided offset: " + offset + "is less than zero.");
+ throw new IllegalArgumentException("Provided offset: " + offset + " is less than zero.");
}
final String data = data_.substring(0, offset);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -14,6 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_ATTRIBUTES_BY_NAME_CASE_SENSITIVE;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_ATTRIBUTES_CONTAINS_EMPTY_ATTR_FOR_PROPERTIES;
import net.sourceforge.htmlunit.corejs.javascript.Context;
import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
@@ -38,6 +39,7 @@
* @author Ahmed Ashour
* @author Marc Guillemot
* @author Ronald Brill
+ * @author Frank Danek
* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-1780488922">DOM Level 2 Core Spec</a>
* @see <a href="http://msdn2.microsoft.com/en-us/library/ms763824.aspx">IXMLDOMNamedNodeMap</a>
*/
@@ -89,7 +91,15 @@
public Object getWithFallback(final String name) {
final Object response = getNamedItem(name);
if (response != null) {
- return response;
+ if (response instanceof Attr && getBrowserVersion().hasFeature(JS_ATTRIBUTES_BY_NAME_CASE_SENSITIVE)) {
+ final Attr attr = (Attr) response;
+ if (attr.getName().equals(name)) {
+ return response;
+ }
+ }
+ else {
+ return response;
+ }
}
if (useRecursiveAttributeForIE() && isRecursiveAttribute(name)) {
return getUnspecifiedAttributeNode(name);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/xml/XmlPage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/xml/XmlPage.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/xml/XmlPage.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -50,6 +50,7 @@
* @author Marc Guillemot
* @author David K. Taylor
* @author Ahmed Ashour
+ * @author Frank Danek
*/
public class XmlPage extends SgmlPage {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/xml/XmlUtil.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/xml/XmlUtil.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/xml/XmlUtil.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -66,6 +66,7 @@
* @author Sudhan Moghe
* @author Ronald Brill
* @author Chuck Dumont
+ * @author Frank Danek
*/
public final class XmlUtil {
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -82,8 +82,8 @@
if (/*browsers.contains("hu") ||*/ browsers.contains("hu-ie9")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_9, false));
}
- if (/*browsers.contains("hu") ||*/ browsers.contains("hu-ie10")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_10, false));
+ if (/*browsers.contains("hu") ||*/ browsers.contains("hu-ie11")) {
+ runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_11, false));
}
if (/*browsers.contains("hu") || */browsers.contains("hu-chrome")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.CHROME, false));
@@ -102,8 +102,8 @@
if (browsers.contains("ie9")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_9, true));
}
- if (browsers.contains("ie10")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_10, true));
+ if (browsers.contains("ie11")) {
+ runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_11, true));
}
if (browsers.contains("chrome")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.CHROME, true));
@@ -169,8 +169,8 @@
/** Internet Explorer 9. */
IE9,
- /** Internet Explorer 10. */
- IE10,
+ /** Internet Explorer 11. */
+ IE11,
/** All versions of Firefox. */
FF,
@@ -230,8 +230,8 @@
/** Alerts for Internet Explorer 9. If not defined, {@link #IE()} is used. */
String[] IE9() default { EMPTY_DEFAULT };
- /** Alerts for Internet Explorer 10. If not defined, {@link #IE()} is used. */
- String[] IE10() default { EMPTY_DEFAULT };
+ /** Alerts for Internet Explorer 11. If not defined, {@link #IE()} is used. */
+ String[] IE11() default { EMPTY_DEFAULT };
/** Alerts for any Firefox, it can be overridden by specific FF version. */
String[] FF() default { EMPTY_DEFAULT };
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -43,7 +43,7 @@
@Test
@Alerts(DEFAULT = "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
IE = "Accept: image/gif, image/jpeg, image/pjpeg, image/pjpeg, */*",
- IE10 = "Accept: text/html, application/xhtml+xml, */*")
+ IE11 = "Accept: text/html, application/xhtml+xml, */*")
public void acceptHeaderGetUrl() throws Exception {
final String html = "<html><body>Response</body></html>";
loadPage2(html, getDefaultUrl());
@@ -57,7 +57,7 @@
@Test
@Alerts(DEFAULT = { "2", "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" },
IE = { "2", "Accept: image/gif, image/jpeg, image/pjpeg, image/pjpeg, */*" },
- IE10 = { "2", "Accept: text/html, application/xhtml+xml, */*" })
+ IE11 = { "2", "Accept: text/html, application/xhtml+xml, */*" })
public void acceptHeaderWindowOpen() throws Exception {
String html = "<html><body>Response</body></html>";
getMockWebConnection().setDefaultResponse(html);
@@ -79,7 +79,7 @@
@Test
@Alerts(DEFAULT = {"2", "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" },
IE = {"2", "Accept: image/gif, image/jpeg, image/pjpeg, image/pjpeg, */*" },
- IE10 = {"2", "Accept: text/html, application/xhtml+xml, */*" })
+ IE11 = {"2", "Accept: text/html, application/xhtml+xml, */*" })
public void acceptHeaderAnchorClick() throws Exception {
String html = "<html><body>Response</body></html>";
getMockWebConnection().setDefaultResponse(html);
@@ -101,7 +101,7 @@
@Test
@Alerts(DEFAULT = "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
IE = "Accept: image/gif, image/jpeg, image/pjpeg, image/pjpeg, */*",
- IE10 = "Accept: text/html, application/xhtml+xml, */*")
+ IE11 = "Accept: text/html, application/xhtml+xml, */*")
public void acceptHeaderAnchorClickWithType() throws Exception {
String html = "<html><body>Response</body></html>";
getMockWebConnection().setDefaultResponse(html);
@@ -124,7 +124,7 @@
@Alerts(DEFAULT = "Accept: image/png,image/*;q=0.8,*/*;q=0.5",
CHROME = "Accept: image/webp,*/*;q=0.8",
IE = "Accept: */*",
- IE10 = "Accept: image/png, image/svg+xml, image/*;q=0.8, */*;q=0.5")
+ IE11 = "Accept: image/png, image/svg+xml, image/*;q=0.8, */*;q=0.5")
public void acceptHeaderImage() throws Exception {
final String html
= "<html><head>\n"
@@ -149,7 +149,7 @@
@Test
@Alerts(DEFAULT = "Accept: text/css,*/*;q=0.1",
IE = "Accept: */*",
- IE10 = "Accept: text/css")
+ IE11 = "Accept: text/css, */*")
public void acceptHeaderCss() throws Exception {
final String html
= "<html><head>\n"
@@ -174,7 +174,7 @@
*/
@Test
@Alerts(DEFAULT = "Accept: */*",
- IE10 = "Accept: application/javascript, */*;q=0.8")
+ IE11 = "Accept: application/javascript, */*;q=0.8")
public void acceptHeaderJavascript() throws Exception {
final String html
= "<html><head>\n"
@@ -193,7 +193,7 @@
*/
@Test
@Alerts(DEFAULT = "Accept: */*",
- IE10 = "Accept: application/javascript, */*;q=0.8")
+ IE11 = "Accept: application/javascript, */*;q=0.8")
public void acceptHeaderJavascriptWithoutType() throws Exception {
final String html
= "<html><head>\n"
@@ -213,7 +213,7 @@
@Test
@Alerts(DEFAULT = "Accept: text/css,*/*;q=0.1",
IE = "Accept: */*",
- IE10 = "Accept: text/css")
+ IE11 = "Accept: text/css, */*")
public void acceptHeaderCssWithoutType() throws Exception {
final String html
= "<html><head>\n"
@@ -239,7 +239,7 @@
@Test
@Alerts(DEFAULT = "Accept: text/css,*/*;q=0.1",
IE = "Accept: */*",
- IE10 = "Accept: text/css")
+ IE11 = "Accept: text/css, */*")
public void acceptHeaderCssDifferentType() throws Exception {
final String html
= "<html><head>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionClassRunner.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionClassRunner.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionClassRunner.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -77,8 +77,8 @@
else if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_9) {
expectedAlerts = firstDefined(alerts.IE9(), alerts.IE(), alerts.DEFAULT());
}
- else if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_10) {
- expectedAlerts = firstDefined(alerts.IE10(), alerts.IE(), alerts.DEFAULT());
+ else if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_11) {
+ expectedAlerts = firstDefined(alerts.IE11(), alerts.IE(), alerts.DEFAULT());
}
else if (browserVersion_ == BrowserVersion.FIREFOX_17) {
expectedAlerts = firstDefined(alerts.FF17(), alerts.FF(), alerts.DEFAULT());
@@ -239,8 +239,8 @@
}
break;
- case IE10:
- if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_10) {
+ case IE11:
+ if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_11) {
return true;
}
break;
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionFeaturesTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionFeaturesTest.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionFeaturesTest.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -34,6 +34,7 @@
* @version $Revision$
* @author Ahmed Ashour
* @author Ronald Brill
+ * @author Frank Danek
*/
@RunWith(BrowserRunner.class)
public class BrowserVersionFeaturesTest extends SimpleWebTestCase {
@@ -67,7 +68,7 @@
browsers.add(BrowserVersion.FIREFOX_24);
browsers.add(BrowserVersion.INTERNET_EXPLORER_8);
browsers.add(BrowserVersion.INTERNET_EXPLORER_9);
- browsers.add(BrowserVersion.INTERNET_EXPLORER_10);
+ browsers.add(BrowserVersion.INTERNET_EXPLORER_11);
browsers.add(BrowserVersion.CHROME);
for (final BrowserVersionFeatures feature : BrowserVersionFeatures.values()) {
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -34,7 +34,7 @@
assertEquals(17.0f, BrowserVersion.FIREFOX_17.getBrowserVersionNumeric());
assertEquals(8.0f, BrowserVersion.INTERNET_EXPLORER_8.getBrowserVersionNumeric());
assertEquals(9.0f, BrowserVersion.INTERNET_EXPLORER_9.getBrowserVersionNumeric());
- assertEquals(10.0f, BrowserVersion.INTERNET_EXPLORER_10.getBrowserVersionNumeric());
+ assertEquals(11.0f, BrowserVersion.INTERNET_EXPLORER_11.getBrowserVersionNumeric());
assertEquals(29.0f, BrowserVersion.CHROME.getBrowserVersionNumeric());
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManagerTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManagerTest.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CookieManagerTest.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -135,7 +135,7 @@
* @throws Exception if the test fails
*/
@Test
- // TODO [IE10]SINGLE-VS-BULK test runs when executed as single but breaks as bulk
+ // TODO [IE11]SINGLE-VS-BULK test runs when executed as single but breaks as bulk
public void orderCookiesByPath_fromJs() throws Exception {
final String html = "<html><body><script>\n"
+ "document.cookie = 'exampleCookie=rootPath;path=/';\n"
@@ -161,8 +161,7 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts(DEFAULT = "key1=; key2=",
- IE10 = "key1; key2")
+ @Alerts("key1=; key2=")
public void emptyCookie() throws Exception {
final List<NameValuePair> responseHeader = new ArrayList<NameValuePair>();
responseHeader.add(new NameValuePair("Set-Cookie", "key1="));
@@ -283,7 +282,7 @@
@Test
@Alerts(DEFAULT = "first=1; second=2; third=3",
CHROME = "third=3",
- IE10 = "first=1; second=2; third=3; fourth=4")
+ IE11 = "first=1; second=2; third=3; fourth=4")
public void setCookieExpired_badDateFormat() throws Exception {
final List<NameValuePair> responseHeader1 = new ArrayList<NameValuePair>();
responseHeader1.add(new NameValuePair("Set-Cookie", "first=1;expires=Dec-1-94 16:00:00"));
@@ -301,7 +300,7 @@
*/
@Test
@Alerts(DEFAULT = "cookie1=1; cookie2=2; cookie3=3",
- IE10 = "cookie1=1; cookie2=2; cookie3=3; cookie4=4; cookie5=5; cookie6=6")
+ IE11 = "cookie1=1; cookie2=2; cookie3=3; cookie4=4; cookie5=5; cookie6=6")
public void setCookieExpires_twoDigits() throws Exception {
final List<NameValuePair> responseHeader1 = new ArrayList<NameValuePair>();
responseHeader1.add(new NameValuePair("Set-Cookie", "cookie1=1;expires=Sun 01-Dec-68 16:00:00 GMT"));
@@ -321,7 +320,7 @@
*/
@Test
@Alerts(DEFAULT = "cookie1=1; cookie2=2; cookie3=3",
- IE10 = "cookie1=1; cookie2=2; cookie3=3; cookie4=4; cookie5=5; cookie6=6")
+ IE11 = "cookie1=1; cookie2=2; cookie3=3; cookie4=4; cookie5=5; cookie6=6")
public void setCookieExpires_twoDigits2() throws Exception {
final List<NameValuePair> responseHeader1 = new ArrayList<NameValuePair>();
responseHeader1.add(new NameValuePair("Set-Cookie", "cookie1=1;expires=Sun,01 Dec 68 16:00:00 GMT"));
@@ -342,7 +341,7 @@
*/
@Test
@Alerts(DEFAULT = "cookie1=1",
- IE10 = "cookie1=1; cookie6=6")
+ IE11 = "cookie1=1; cookie6=6")
public void setCookieExpires_badDateFormat() throws Exception {
final List<NameValuePair> responseHeader1 = new ArrayList<NameValuePair>();
responseHeader1.add(new NameValuePair("Set-Cookie", "cookie1=1;expires=Sun-01 Dec 68 16:00:00 GMT"));
@@ -437,7 +436,7 @@
*/
@Test
@Alerts(DEFAULT = "first=1",
- IE10 = "")
+ IE11 = "")
public void setCookieSubPath() throws Exception {
final List<NameValuePair> responseHeader1 = new ArrayList<NameValuePair>();
responseHeader1.add(new NameValuePair("Set-Cookie", "first=1; path=/foo/blah"));
@@ -455,7 +454,7 @@
*/
@Test
@Alerts(DEFAULT = "first=1",
- IE10 = "")
+ IE11 = "")
public void setCookieDifferentPath() throws Exception {
final List<NameValuePair> responseHeader1 = new ArrayList<NameValuePair>();
responseHeader1.add(new NameValuePair("Set-Cookie", "first=1; path=/foo/blah"));
@@ -532,7 +531,7 @@
*/
@Test
@Alerts(DEFAULT = "first=1",
- IE10 = "")
+ IE11 = "")
public void cookieSetFromJSWithoutPathUsesCurrentLocation2() throws Exception {
final List<NameValuePair> responseHeader1 = new ArrayList<NameValuePair>();
responseHeader1.add(new NameValuePair("Set-Cookie", "first=1; path=/c"));
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection2Test.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -34,6 +34,7 @@
* @version $Revision$
* @author Marc Guillemot
* @author Ahmed Ashour
+ * @author Frank Danek
*/
@RunWith(BrowserRunner.class)
public class HttpWebConnection2Test extends WebDriverTestCase {
@@ -63,13 +64,13 @@
assertEquals(null, lastRequest.getRequestBody());
assertEquals(getDefaultUrl() + "foo", lastRequest.getUrl());
String expectedHeaders = "";
- if (getBrowserVersion() == BrowserVersion.INTERNET_EXPLORER_10) {
+ if (getBrowserVersion() == BrowserVersion.INTERNET_EXPLORER_11) {
expectedHeaders += "Cache-Control: no-cache\n";
}
expectedHeaders += "Connection: keep-alive\n"
+ "Content-Length: 48\n"
+ "Content-Type: application/x-www-form-urlencoded\n";
- if (getBrowserVersion() == BrowserVersion.INTERNET_EXPLORER_10) {
+ if (getBrowserVersion() == BrowserVersion.INTERNET_EXPLORER_11) {
expectedHeaders += "DNT: 1\n";
}
expectedHeaders += "Host: localhost:" + PORT + "\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NoHttpResponseTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NoHttpResponseTest.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NoHttpResponseTest.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -71,7 +71,7 @@
* @throws Exception if the test fails
*/
@Test
- // TODO [IE10] does not run in real IE10 (browser waits for a looooooong time)
+ // TODO [IE11] does not run in real IE11 (browser waits for a looooooong time)
public void callSubmitInButtonAndReturnTrue() throws Exception {
final MockWebConnection mockWebConnection = getMockWebConnection();
mockWebConnection.setResponse(getDefaultUrl(), html);
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient3Test.java 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient3Test.java 2013-12-12 18:41:07 UTC (rev 8835)
@@ -50,7 +50,7 @@
* Regression test for bug 2822048: a 302 redirect without Location header.
* @throws Exception if an error occurs
*/
- // TODO [IE10]ERRORPAGE real IE10 displays his own error page (res://ieframe.dll/dnserror.htm#<url>)
+ // TODO [IE11]ERRORPAGE real IE11 displays his own error page (res://ieframe.dll/dnserror.htm#<url>)
@Test
public void redirect302WithoutLocation() throws Exception {
final String html = "<html><body><a href='page2'>to redirect</a></body></html>";
@@ -235,7 +235,7 @@
*/
@Test
@Alerts ({ "open", "first", "second" })
- // TODO [IE10]MODALPANEL real IE10 opens a modal panel 'really close window?' which webdriver cannot handle
+ // TODO [IE11]MODALPANEL real IE11 opens a modal panel 'really close window?' which webdriver cannot handle
public void windowOpenedByAnchorTargetIsAttachedToJavascriptEventLoop() throws Exception {
final String firstContent = "<html>"
+ "<head>"
@@ -280,7 +280,7 @@
*/
@Test
@Alerts ({ "open", "first", "second" })
- // TODO [IE10]MODALPANEL real IE10 opens a modal panel 'really close window?' which webdriver cannot handle
+ // TODO [IE11]MODALPANEL real IE11 opens a modal panel 'really close window?' which webdriver cannot handle
public void windowOpenedByFormTargetIsAttachedToJavascriptEventLoop() throws Exception {
final String firstContent = "<html>"
+ "<head>"
@@ -419,7 +419,7 @@
*/
@Test
@Alerts ({ "Executed", "later" })
- // TODO [IE10]ERRORPAGE real IE10 displays own error page if response is to small
+ // TODO [IE11]ERRORPAGE real IE11 displays own error page if response is to small
public void execJavascriptOnErrorPages() throws Exception {
final String errorHtml = "<html>\n"
+ "<head>\n"
@@ -462,7 +462,7 @@
*/
@Test
@Alerts("modified")
- // TODO [IE10]SINGLE-VS-BULK test runs when executed as single but breaks as bulk
+ // TODO [IE11]SINGLE-VS-BULK test runs when executed as single but breaks as bulk
public void deflateCompressionGZipCompatible() throws Exception {
doTestDeflateCompression(true);
}
@@ -473,7 +473,7 @@
*/
@Test
@Alerts(DEFAULT = "modified",
- IE10 = "Hello world")
+ IE11 = "Hello world")
public void deflateCompressionNonGZipCompatible() throws Exception {
doTestDeflateCompression(false);
}
Index: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex 2013-12-12 18:30:31 UTC (rev 8834)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex 2013-12-12 18:41:07 UTC (rev 8835)
Property changes on: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+SF issue number (optional):
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+http://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+Issue %BUGID%
\ No newline at end of property
|
