update to htmlunit to 2.16

updating libraries to the following:
  commons-lang 3.4
  cssparser 0.9.15

some more tests are fine in htmlunit

Signed-off-by: Luke Inman-Semerau <[email protected]>

java/client/.classpath

@@ -8,38 +8,42 @@
 	<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.15.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.15-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.15.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.16.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.16-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.16.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-3.4.0.jar" sourcepath="/third-party/java/jna/jna-3.4.0-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-platform-3.4.0.jar" sourcepath="/third-party/java/jna/jna-platform-3.4.0-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-exec/commons-exec-1.3.jar" sourcepath="/third-party/java/commons-exec/commons-exec-1.3-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked-7.6.1.jar" sourcepath="/third-party/java/jetty/jetty-repacked-7.6.1-sources.jar"/>
 	<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/apache-httpclient/httpclient-4.3.6.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.6-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.3.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3.3-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.4.1.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.4.1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.4.1.jar" sourcepath="/third-party/java/apache-httpclient/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.9.jar" sourcepath="/third-party/java/commons-codec/commons-codec-1.9-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/sac/sac-1.3.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/commons-lang/commons-lang3-3.3.2.jar" sourcepath="/third-party/java/commons-lang/commons-lang3-3.3.2-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpmime-4.3.6.jar" sourcepath="/third-party/java/apache-httpclient/httpmime-4.3.6-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/commons-lang/commons-lang3-3.4.jar" sourcepath="/third-party/java/commons-lang/commons-lang3-3.4-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpmime-4.4.1.jar" sourcepath="/third-party/java/apache-httpclient/httpmime-4.4.1-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.14.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.15.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/xml/xercesImpl-2.11.0.jar" sourcepath="/third-party/java/xml/xercesImpl-2.11.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/xml/xalan-2.7.1.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-fileupload/commons-fileupload-1.2.2.jar" sourcepath="/third-party/java/commons-fileupload/commons-fileupload-1.2.2-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.14.jar" sourcepath="/third-party/java/webbit/webbit-0.4.14-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/little_proxy/littleproxy-0.5.3.jar" sourcepath="/third-party/java/little_proxy/littleproxy-0.5.3-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/nekohtml/nekohtml-1.9.21.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/nekohtml/nekohtml-1.9.22.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/netty/netty-3.5.7.Final.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/xml/xml-apis-1.4.01.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/mockito/mockito-core-1.9.5.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/objenesis/objenesis-1.0.jar"/>
 	<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/jetty-websocket-8.1.8.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-api-9.2.10.v20150310.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-client-9.2.10.v20150310.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-common-9.2.10.v20150310.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-io-9.2.10.v20150310.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-util-9.2.10.v20150310.jar"/>
 	<classpathentry kind="output" path="build/production"/>
 </classpath>

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

@@ -239,13 +239,13 @@ static BrowserVersion determineBrowserVersion(Capabilities capabilities) {
       try {
         int version = Integer.parseInt(browserVersion);
         switch (version) {
-          case 17:
-            return BrowserVersion.FIREFOX_17;
-          default:
+          case 24:
             return BrowserVersion.FIREFOX_24;
+          default:
+            return BrowserVersion.FIREFOX_31;
         }
       } catch (NumberFormatException e) {
-        return BrowserVersion.FIREFOX_24;
+        return BrowserVersion.FIREFOX_31;
       }
     }
 
@@ -260,8 +260,6 @@ static BrowserVersion determineBrowserVersion(Capabilities capabilities) {
         switch (version) {
           case 8:
             return BrowserVersion.INTERNET_EXPLORER_8;
-          case 9:
-            return BrowserVersion.INTERNET_EXPLORER_9;
           default:
             return BrowserVersion.INTERNET_EXPLORER_11;
         }
@@ -590,7 +588,7 @@ public void close() {
   @Override
   public void quit() {
     if (webClient != null) {
-      webClient.closeAllWindows();
+      webClient.close();
       webClient = null;
     }
     currentWindow = null;

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

@@ -245,7 +245,7 @@ public void testShouldNotGetCookieOnDifferentDomain() {
     assertCookieIsNotPresentWithName(cookieName);
   }
 
-  @Ignore(value = {CHROME, HTMLUNIT, IE}, reason = "Untested browsers.")
+  @Ignore(value = {CHROME, IE}, reason = "Untested browsers.")
   @Test
   public void testShouldBeAbleToAddToADomainWhichIsRelatedToTheCurrentDomain() {
     String cookieName = "name";
@@ -403,7 +403,7 @@ public void testRetainsCookieSecure() {
     assertTrue(retrieved.isSecure());
   }
 
-  @Ignore(value = {CHROME, FIREFOX, HTMLUNIT, IE, PHANTOMJS, SAFARI})
+  @Ignore(value = {CHROME, FIREFOX, IE, PHANTOMJS, SAFARI})
   @Test
   public void testRetainsHttpOnlyFlag() {
     Cookie addedCookie =

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

@@ -210,7 +210,7 @@ public void testShouldEmitOnChangeEventsWhenSelectingElements() {
   }
 
   @JavascriptEnabled
-  @Ignore(value = {HTMLUNIT, MARIONETTE})
+  @Ignore(MARIONETTE)
   @Test
   public void testShouldEmitOnClickEventsWhenSelectingElements() {
     driver.get(pages.javascriptPage);

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

@@ -283,7 +283,7 @@ public void testCanClickOnASubmitButton() {
     checkSubmitButton("internal_explicit_submit");
   }
 
-  @Ignore(value = {HTMLUNIT, SAFARI}, reason = "untested")
+  @Ignore(value = {SAFARI}, reason = "untested")
   @Test
   public void testCanClickOnAnImplicitSubmitButton() {
     assumeFalse(isIe6(driver) || isIe7(driver) );

java/client/test/org/openqa/selenium/htmlunit/HtmlUnitCapabilitiesTest.java

@@ -45,7 +45,7 @@ public void configurationViaDirectCapabilities() {
         new DesiredCapabilities(BrowserType.FIREFOX, "", Platform.ANY);
 
     assertEquals(HtmlUnitDriver.determineBrowserVersion(firefoxCapabilities),
-        BrowserVersion.FIREFOX_24);
+        BrowserVersion.FIREFOX_31);
   }
 
   @Test
@@ -54,7 +54,7 @@ public void configurationOfFirefoxViaRemote() {
         new DesiredCapabilities(BrowserType.HTMLUNIT, "firefox", Platform.ANY);
 
     assertEquals(HtmlUnitDriver.determineBrowserVersion(firefoxCapabilities),
-        BrowserVersion.FIREFOX_24);
+        BrowserVersion.FIREFOX_31);
   }
 
   @Test

java/client/test/org/openqa/selenium/htmlunit/JavascriptEnabledHtmlUnitDriverTests.java

@@ -39,7 +39,7 @@ public HtmlUnitDriverForTest(Capabilities capabilities) {
     private static Capabilities tweak(Capabilities capabilities) {
       DesiredCapabilities caps = new DesiredCapabilities(capabilities);
       caps.setJavascriptEnabled(true);
-      caps.setVersion("3.6");
+      caps.setVersion("31");
       return caps;
     }
   }

maven/htmlunit-driver/pom.xml

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

maven/pom.xml

@@ -180,12 +180,12 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.3.6</version>
+                <version>4.4.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.3.3</version>
+                <version>4.4.1</version>
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>

third_party/java/apache-httpclient/BUCK

@@ -11,16 +11,16 @@ java_library(name = "apache-httpclient",
 )
 
 prebuilt_jar(name = 'client',
-  binary_jar = 'httpclient-4.3.6.jar',
-  source_jar = 'httpclient-4.3.6-sources.jar',
+  binary_jar = 'httpclient-4.4.1.jar',
+  source_jar = 'httpclient-4.4.1-sources.jar',
 )
 
 prebuilt_jar(name = 'core',
-  binary_jar = 'httpcore-4.3.3.jar',
-  source_jar = 'httpcore-4.3.3-sources.jar',
+  binary_jar = 'httpcore-4.4.1.jar',
+  source_jar = 'httpcore-4.4.1-sources.jar',
 )
 
 prebuilt_jar(name = 'mime',
-  binary_jar = 'httpmime-4.3.6.jar',
-  source_jar = 'httpmime-4.3.6-sources.jar',
+  binary_jar = 'httpmime-4.4.1.jar',
+  source_jar = 'httpmime-4.4.1-sources.jar',
 )

third_party/java/apache-httpclient/build.desc

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

third_party/java/commons-lang/BUCK

@@ -1,6 +1,6 @@
 prebuilt_jar(name = 'commons-lang',
-  binary_jar = 'commons-lang3-3.3.2.jar',
-  source_jar = 'commons-lang3-3.3.2-sources.jar',
+  binary_jar = 'commons-lang3-3.4.jar',
+  source_jar = 'commons-lang3-3.4-sources.jar',
   visibility = [
     '//third_party/java/...',
   ],

third_party/java/commons-lang/build.desc

@@ -1,4 +1,4 @@
 java_library(name = "commons-lang",
   deps = [
-    "commons-lang3-3.3.2.jar"
+    "commons-lang3-3.4.jar"
   ])

third_party/java/cssparser/BUCK

@@ -1,5 +1,5 @@
 prebuilt_jar(name = 'cssparser',
-  binary_jar = 'cssparser-0.9.14.jar',
+  binary_jar = 'cssparser-0.9.15.jar',
   deps = [
     '//third_party/java/sac:sac',
   ],

third_party/java/cssparser/build.desc

@@ -1,5 +1,5 @@
 java_library(name = "cssparser",
   deps = [
-    "cssparser-0.9.14.jar",
+    "cssparser-0.9.15.jar",
     "//third_party/java/sac"
   ])

third_party/java/htmlunit/BUCK

@@ -1,6 +1,6 @@
 prebuilt_jar(name = 'htmlunit',
-  binary_jar = 'htmlunit-2.15.jar',
-  source_jar = 'htmlunit-2.15-sources.jar',
+  binary_jar = 'htmlunit-2.16.jar',
+  source_jar = 'htmlunit-2.16-sources.jar',
   deps = [
     ':js-core',
     '//third_party/java/apache-httpclient:apache-httpclient',
@@ -17,7 +17,7 @@ prebuilt_jar(name = 'htmlunit',
 )
 
 prebuilt_jar(name = 'js-core',
-  binary_jar = 'htmlunit-core-js-2.15.jar',
+  binary_jar = 'htmlunit-core-js-2.16.jar',
   visibility = [
     '//java/client/src/org/openqa/selenium/htmlunit:htmlunit',
   ],

third_party/java/htmlunit/build.desc

@@ -1,7 +1,7 @@
 java_library(name = "htmlunit",
   deps = [
-    "htmlunit-2.15.jar",
-    "htmlunit-core-js-2.15.jar",
+    "htmlunit-2.16.jar",
+    "htmlunit-core-js-2.16.jar",
     "//third_party/java/apache-httpclient",
     "//third_party/java/commons-collections",
     "//third_party/java/commons-io",

third_party/java/jetty-websocket/BUCK

@@ -1,6 +1,32 @@
-prebuilt_jar(name = 'jetty-websocket',
-  binary_jar = 'jetty-websocket-8.1.8.jar',
+java_library(name = 'jetty-websocket',
+  exported_deps = [
+    ':websocket-api',
+    ':websocket-client',
+    ':websocket-common',
+    ':jetty-util',
+    ':jetty-io',
+  ],
   visibility = [
     '//third_party/java/...',
   ],
 )
+
+prebuilt_jar(name = 'websocket-api',
+  binary_jar = 'websocket-api-9.2.10.v20150310.jar',
+)
+
+prebuilt_jar(name = 'websocket-client',
+  binary_jar = 'websocket-client-9.2.10.v20150310.jar',
+)
+
+prebuilt_jar(name = 'websocket-common',
+  binary_jar = 'websocket-common-9.2.10.v20150310.jar',
+)
+
+prebuilt_jar(name = 'jetty-util',
+  binary_jar = 'jetty-util-9.2.10.v20150310.jar',
+)
+
+prebuilt_jar(name = 'jetty-io',
+  binary_jar = 'jetty-io-9.2.10.v20150310.jar',
+)

third_party/java/jetty-websocket/build.desc

@@ -1,4 +1,8 @@
 java_library(name = "jetty-websocket",
   deps = [
-    "jetty-websocket-8.1.8.jar",
+    "websocket-api-9.2.10.v20150310.jar",
+    "websocket-client-9.2.10.v20150310.jar",
+    "websocket-common-9.2.10.v20150310.jar",
+    "jetty-util-9.2.10.v20150310.jar",
+    "jetty-io-9.2.10.v20150310.jar"
   ])

third_party/java/nekohtml/BUCK

@@ -1,6 +1,6 @@
 prebuilt_jar(name = 'nekohtml',
-  binary_jar = 'nekohtml-1.9.21.jar',
-  source_jar = 'nekohtml-1.9.21-sources.jar',
+  binary_jar = 'nekohtml-1.9.22.jar',
+  source_jar = 'nekohtml-1.9.22-sources.jar',
   visibility = [
     '//third_party/java/...',
   ],

third_party/java/nekohtml/build.desc

@@ -1,4 +1,4 @@
 java_library(name = "nekohtml",
   deps = [
-    "nekohtml-1.9.21.jar"
+    "nekohtml-1.9.22.jar"
   ])