Upgrade HtmlUnit 2.18

Signed-off-by: Alexei Barantsev <[email protected]>

java/client/.classpath

@@ -8,7 +8,7 @@
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/testng/testng-6.8.5.jar" sourcepath="/third-party/java/testng/testng-6.8.5-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-18.0.jar" sourcepath="/third-party/java/guava-libraries/guava-18.0-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.17.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.17-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.18.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.18-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.17.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-4.1.0.jar" sourcepath="/third-party/java/jna/jna-4.1.0-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-platform-4.1.0.jar" sourcepath="/third-party/java/jna/jna-platform-4.1.0-src.jar"/>
@@ -17,14 +17,14 @@
 	<classpathentry kind="lib" path="/third-party/java/cglib/cglib-nodep-2.1_3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/servlet-api/servlet-api-2.5-6.1.9.jar" sourcepath="/third-party/java/servlet-api/servlet-api-2.5-6.1.9-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/phantomjs-driver/phantomjsdriver-1.2.1.jar" sourcepath="/third-party/java/phantomjs-driver/phantomjsdriver-1.2.1-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.4.1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-logging/commons-logging-1.1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-io/commons-io-2.4.jar" sourcepath="/third-party/java/commons-io/commons-io-2.4-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-codec/commons-codec-1.10.jar" sourcepath="/third-party/java/commons-codec/commons-codec-1.10-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/css/sac-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons/commons-lang3-3.4.jar" sourcepath="/third-party/java/commons/commons-lang3-3.4-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpmime-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpmime-4.4.1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpmime-4.5.jar" sourcepath="/third-party/java/httpcomponents/httpmime-4.5-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-collections/commons-collections-3.2.1.jar" sourcepath="/third-party/java/commons-collections/commons-collections-3.2.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.16.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/xerces/xercesImpl-2.11.0.jar" sourcepath="/third-party/java/xerces/xercesImpl-2.11.0-sources.jar"/>
@@ -40,10 +40,10 @@
 	<classpathentry kind="lib" path="/third-party/java/slf4j/slf4j-api-1.6.6.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/slf4j/slf4j-jdk14-1.6.6.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/gson/gson-2.3.1.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-api-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-client-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-common-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-io-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-util-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-api-9.2.12.v20150709.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-client-9.2.12.v20150709.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-common-9.2.12.v20150709.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-io-9.2.12.v20150709.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-util-9.2.12.v20150709.jar"/>
 	<classpathentry kind="output" path="build/production"/>
 </classpath>

java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java

@@ -79,6 +79,7 @@
 import com.gargoylesoftware.htmlunit.BrowserVersion;
 import com.gargoylesoftware.htmlunit.CookieManager;
 import com.gargoylesoftware.htmlunit.ElementNotFoundException;
+import com.gargoylesoftware.htmlunit.InteractivePage;
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.ProxyConfig;
 import com.gargoylesoftware.htmlunit.ScriptResult;
@@ -1323,7 +1324,7 @@ public WebDriver defaultContent() {
     public WebElement activeElement() {
       Page page = lastPage();
       if (page instanceof HtmlPage) {
-        DomElement element = ((HtmlPage) page).getFocusedElement();
+        DomElement element = ((InteractivePage) page).getFocusedElement();
         if (element == null || element instanceof HtmlHtml) {
           List<? extends HtmlElement> allBodies =
               ((HtmlPage) page).getDocumentElement().getHtmlElementsByTagName("body");

java/client/test/org/openqa/selenium/TypingTest.java

@@ -354,7 +354,6 @@ public void testNumericNonShiftKeys() {
 
   @JavascriptEnabled
   @Ignore(value = MARIONETTE, reason = "untested user agent")
-  @NotYetImplemented(HTMLUNIT)
   @Test
   public void testNumericShiftKeys() {
     driver.get(pages.javascriptPage);
@@ -385,7 +384,6 @@ public void testLowerCaseAlphaKeys() {
 
   @JavascriptEnabled
   @Ignore(value = MARIONETTE, reason = "untested user agents")
-  @NotYetImplemented(HTMLUNIT)
   @Test
   public void testUppercaseAlphaKeys() {
     driver.get(pages.javascriptPage);
@@ -402,7 +400,6 @@ public void testUppercaseAlphaKeys() {
 
   @JavascriptEnabled
   @Ignore(value = MARIONETTE, reason = "untested user agents")
-  @NotYetImplemented(HTMLUNIT)
   @Test
   public void testAllPrintableKeys() {
     driver.get(pages.javascriptPage);
@@ -745,10 +742,9 @@ public void testShouldBeAbleToTypeOnANumberInputField() {
     assertThat(email.getAttribute("value"), equalTo("33"));
   }
 
-  @Ignore(value = {SAFARI, MARIONETTE}, reason = "Untested browsers;" +
+  @Ignore(value = {SAFARI, MARIONETTE, HTMLUNIT}, reason = "Untested browsers;" +
       " Safari: cannot type on contentEditable with synthetic events",
       issues = {3127})
-  @NotYetImplemented(HTMLUNIT)
   @Test
   public void testShouldBeAbleToTypeIntoEmptyContentEditableElement() {
     driver.get(pages.readOnlyPage);
@@ -772,11 +768,10 @@ public void testShouldBeAbleToTypeIntoContentEditableElementWithExistingValue()
     assertThat(editable.getText(), equalTo(initialText + ", edited"));
   }
 
-  @Ignore(value = {IE, SAFARI, MARIONETTE},
+  @Ignore(value = {IE, SAFARI, MARIONETTE, HTMLUNIT},
           reason = "Untested browsers;" +
                    " Safari: cannot type on contentEditable with synthetic events",
           issues = {3127})
-  @NotYetImplemented(HTMLUNIT)
   @NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
   @Test
   public void testShouldBeAbleToTypeIntoTinyMCE() {
@@ -793,7 +788,6 @@ public void testShouldBeAbleToTypeIntoTinyMCE() {
 
   @JavascriptEnabled
   @Ignore(value = SAFARI, reason = "Untested")
-  @NotYetImplemented(HTMLUNIT)
   @Test
   public void canSafelyTypeOnElementThatIsRemovedFromTheDomOnKeyPress() {
     driver.get(appServer.whereIs("key_tests/remove_on_keypress.html"));

java/client/test/org/openqa/selenium/interactions/BasicKeyboardInterfaceTest.java

@@ -116,7 +116,7 @@ public void testSendingKeyUp() {
   }
 
   @JavascriptEnabled
-  @Ignore(IE)
+  @Ignore({IE, HTMLUNIT})
   @Test
   public void testSendingKeysWithShiftPressed() {
     driver.get(pages.javascriptPage);

java/server/.classpath

@@ -6,7 +6,7 @@
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/client"/>
 	<classpathentry kind="lib" path="/third-party/java/gson/gson-2.3.1.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/servlet-api/servlet-api-2.5-6.1.9.jar" sourcepath="/third-party/java/servlet-api/servlet-api-2.5-6.1.9-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.4.1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>

maven/htmlunit-driver/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.17</version>
+            <version>2.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

maven/pom.xml

@@ -181,7 +181,7 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.4.1</version>
+                <version>4.5</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>

third_party/java/htmlunit/BUCK

@@ -1,6 +1,6 @@
 prebuilt_jar(name = 'htmlunit',
-  binary_jar = 'htmlunit-2.17.jar',
-  source_jar = 'htmlunit-2.17-sources.jar',
+  binary_jar = 'htmlunit-2.18.jar',
+  source_jar = 'htmlunit-2.18-sources.jar',
   deps = [
     ':js-core',
     '//third_party/java/httpcomponents:httpclient',

third_party/java/htmlunit/build.desc

@@ -1,6 +1,6 @@
 java_library(name = "htmlunit",
   deps = [
-    "htmlunit-2.17.jar",
+    "htmlunit-2.18.jar",
     "htmlunit-core-js-2.17.jar",
     "//third_party/java/commons:commons-lang",
     "//third_party/java/commons-collections",

third_party/java/httpcomponents/BUCK

@@ -11,8 +11,8 @@ java_library(name = "httpclient",
 )
 
 prebuilt_jar(name = 'client',
-  binary_jar = 'httpclient-4.4.1.jar',
-  source_jar = 'httpclient-4.4.1-sources.jar',
+  binary_jar = 'httpclient-4.5.jar',
+  source_jar = 'httpclient-4.5-sources.jar',
 )
 
 prebuilt_jar(name = 'core',
@@ -21,6 +21,6 @@ prebuilt_jar(name = 'core',
 )
 
 prebuilt_jar(name = 'mime',
-  binary_jar = 'httpmime-4.4.1.jar',
-  source_jar = 'httpmime-4.4.1-sources.jar',
+  binary_jar = 'httpmime-4.5.jar',
+  source_jar = 'httpmime-4.5-sources.jar',
 )

third_party/java/httpcomponents/build.desc

@@ -1,8 +1,8 @@
 java_library(name = "httpclient",
   deps = [
-    "httpclient-4.4.1.jar",
+    "httpclient-4.5.jar",
     "httpcore-4.4.1.jar",
-    "httpmime-4.4.1.jar",
+    "httpmime-4.5.jar",
     "//third_party/java/apache-mime4j",
     "//third_party/java/commons-codec",
     "//third_party/java/commons-logging"

third_party/java/jetty-websocket/BUCK

@@ -12,21 +12,21 @@ java_library(name = 'jetty-websocket',
 )
 
 prebuilt_jar(name = 'websocket-api',
-  binary_jar = 'websocket-api-9.2.11.v20150529.jar',
+  binary_jar = 'websocket-api-9.2.12.v20150709.jar',
 )
 
 prebuilt_jar(name = 'websocket-client',
-  binary_jar = 'websocket-client-9.2.11.v20150529.jar',
+  binary_jar = 'websocket-client-9.2.12.v20150709.jar',
 )
 
 prebuilt_jar(name = 'websocket-common',
-  binary_jar = 'websocket-common-9.2.11.v20150529.jar',
+  binary_jar = 'websocket-common-9.2.12.v20150709.jar',
 )
 
 prebuilt_jar(name = 'jetty-util',
-  binary_jar = 'jetty-util-9.2.11.v20150529.jar',
+  binary_jar = 'jetty-util-9.2.12.v20150709.jar',
 )
 
 prebuilt_jar(name = 'jetty-io',
-  binary_jar = 'jetty-io-9.2.11.v20150529.jar',
+  binary_jar = 'jetty-io-9.2.12.v20150709.jar',
 )

third_party/java/jetty-websocket/build.desc

@@ -1,8 +1,8 @@
 java_library(name = "jetty-websocket",
   deps = [
-    "websocket-api-9.2.11.v20150529.jar",
-    "websocket-client-9.2.11.v20150529.jar",
-    "websocket-common-9.2.11.v20150529.jar",
-    "jetty-util-9.2.11.v20150529.jar",
-    "jetty-io-9.2.11.v20150529.jar"
+    "websocket-api-9.2.12.v20150709.jar",
+    "websocket-client-9.2.12.v20150709.jar",
+    "websocket-common-9.2.12.v20150709.jar",
+    "jetty-util-9.2.12.v20150709.jar",
+    "jetty-io-9.2.12.v20150709.jar"
   ])