Skip to content

Commit 763bbcb

Browse files
rbrilukeis
rbri
authored and
lukeis
committed
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]>
1 parent 5308198 commit 763bbcb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+83
-51
lines changed

‎java/client/.classpath

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,42 @@
88
<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>
99
<classpathentry kind="lib" path="/third-party/java/testng/testng-6.8.5.jar" sourcepath="/third-party/java/testng/testng-6.8.5-sources.jar"/>
1010
<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-18.0.jar" sourcepath="/third-party/java/guava-libraries/guava-18.0-sources.jar"/>
11-
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.15.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.15-sources.jar"/>
12-
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.15.jar"/>
11+
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.16.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.16-sources.jar"/>
12+
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.16.jar"/>
1313
<classpathentry kind="lib" path="/third-party/java/jna/jna-3.4.0.jar" sourcepath="/third-party/java/jna/jna-3.4.0-src.jar"/>
1414
<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"/>
1515
<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"/>
1616
<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"/>
1717
<classpathentry kind="lib" path="/third-party/java/cglib/cglib-nodep-2.1_3.jar"/>
1818
<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"/>
1919
<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"/>
20-
<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"/>
21-
<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"/>
20+
<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"/>
21+
<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"/>
2222
<classpathentry kind="lib" path="/third-party/java/commons-logging/commons-logging-1.1.3.jar"/>
2323
<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"/>
2424
<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"/>
2525
<classpathentry kind="lib" path="/third-party/java/sac/sac-1.3.jar"/>
26-
<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"/>
27-
<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"/>
26+
<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"/>
27+
<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"/>
2828
<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"/>
29-
<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.14.jar"/>
29+
<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.15.jar"/>
3030
<classpathentry kind="lib" path="/third-party/java/xml/xercesImpl-2.11.0.jar" sourcepath="/third-party/java/xml/xercesImpl-2.11.0-sources.jar"/>
3131
<classpathentry kind="lib" path="/third-party/java/xml/xalan-2.7.1.jar"/>
3232
<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"/>
3333
<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.14.jar" sourcepath="/third-party/java/webbit/webbit-0.4.14-src.jar"/>
3434
<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"/>
35-
<classpathentry kind="lib" path="/third-party/java/nekohtml/nekohtml-1.9.21.jar"/>
35+
<classpathentry kind="lib" path="/third-party/java/nekohtml/nekohtml-1.9.22.jar"/>
3636
<classpathentry kind="lib" path="/third-party/java/netty/netty-3.5.7.Final.jar"/>
3737
<classpathentry kind="lib" path="/third-party/java/xml/xml-apis-1.4.01.jar"/>
3838
<classpathentry kind="lib" path="/third-party/java/mockito/mockito-core-1.9.5.jar"/>
3939
<classpathentry kind="lib" path="/third-party/java/objenesis/objenesis-1.0.jar"/>
4040
<classpathentry kind="lib" path="/third-party/java/slf4j/slf4j-api-1.6.6.jar"/>
4141
<classpathentry kind="lib" path="/third-party/java/slf4j/slf4j-jdk14-1.6.6.jar"/>
4242
<classpathentry kind="lib" path="/third-party/java/gson/gson-2.3.1.jar"/>
43-
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-websocket-8.1.8.jar"/>
43+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-api-9.2.10.v20150310.jar"/>
44+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-client-9.2.10.v20150310.jar"/>
45+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-common-9.2.10.v20150310.jar"/>
46+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-io-9.2.10.v20150310.jar"/>
47+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-util-9.2.10.v20150310.jar"/>
4448
<classpathentry kind="output" path="build/production"/>
4549
</classpath>

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,13 @@ static BrowserVersion determineBrowserVersion(Capabilities capabilities) {
239239
try {
240240
int version = Integer.parseInt(browserVersion);
241241
switch (version) {
242-
case 17:
243-
return BrowserVersion.FIREFOX_17;
244-
default:
242+
case 24:
245243
return BrowserVersion.FIREFOX_24;
244+
default:
245+
return BrowserVersion.FIREFOX_31;
246246
}
247247
} catch (NumberFormatException e) {
248-
return BrowserVersion.FIREFOX_24;
248+
return BrowserVersion.FIREFOX_31;
249249
}
250250
}
251251

@@ -260,8 +260,6 @@ static BrowserVersion determineBrowserVersion(Capabilities capabilities) {
260260
switch (version) {
261261
case 8:
262262
return BrowserVersion.INTERNET_EXPLORER_8;
263-
case 9:
264-
return BrowserVersion.INTERNET_EXPLORER_9;
265263
default:
266264
return BrowserVersion.INTERNET_EXPLORER_11;
267265
}
@@ -590,7 +588,7 @@ public void close() {
590588
@Override
591589
public void quit() {
592590
if (webClient != null) {
593-
webClient.closeAllWindows();
591+
webClient.close();
594592
webClient = null;
595593
}
596594
currentWindow = null;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public void testShouldNotGetCookieOnDifferentDomain() {
245245
assertCookieIsNotPresentWithName(cookieName);
246246
}
247247

248-
@Ignore(value = {CHROME, HTMLUNIT, IE}, reason = "Untested browsers.")
248+
@Ignore(value = {CHROME, IE}, reason = "Untested browsers.")
249249
@Test
250250
public void testShouldBeAbleToAddToADomainWhichIsRelatedToTheCurrentDomain() {
251251
String cookieName = "name";
@@ -403,7 +403,7 @@ public void testRetainsCookieSecure() {
403403
assertTrue(retrieved.isSecure());
404404
}
405405

406-
@Ignore(value = {CHROME, FIREFOX, HTMLUNIT, IE, PHANTOMJS, SAFARI})
406+
@Ignore(value = {CHROME, FIREFOX, IE, PHANTOMJS, SAFARI})
407407
@Test
408408
public void testRetainsHttpOnlyFlag() {
409409
Cookie addedCookie =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public void testShouldEmitOnChangeEventsWhenSelectingElements() {
210210
}
211211

212212
@JavascriptEnabled
213-
@Ignore(value = {HTMLUNIT, MARIONETTE})
213+
@Ignore(MARIONETTE)
214214
@Test
215215
public void testShouldEmitOnClickEventsWhenSelectingElements() {
216216
driver.get(pages.javascriptPage);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ public void testCanClickOnASubmitButton() {
283283
checkSubmitButton("internal_explicit_submit");
284284
}
285285

286-
@Ignore(value = {HTMLUNIT, SAFARI}, reason = "untested")
286+
@Ignore(value = {SAFARI}, reason = "untested")
287287
@Test
288288
public void testCanClickOnAnImplicitSubmitButton() {
289289
assumeFalse(isIe6(driver) || isIe7(driver) );

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void configurationViaDirectCapabilities() {
4545
new DesiredCapabilities(BrowserType.FIREFOX, "", Platform.ANY);
4646

4747
assertEquals(HtmlUnitDriver.determineBrowserVersion(firefoxCapabilities),
48-
BrowserVersion.FIREFOX_24);
48+
BrowserVersion.FIREFOX_31);
4949
}
5050

5151
@Test
@@ -54,7 +54,7 @@ public void configurationOfFirefoxViaRemote() {
5454
new DesiredCapabilities(BrowserType.HTMLUNIT, "firefox", Platform.ANY);
5555

5656
assertEquals(HtmlUnitDriver.determineBrowserVersion(firefoxCapabilities),
57-
BrowserVersion.FIREFOX_24);
57+
BrowserVersion.FIREFOX_31);
5858
}
5959

6060
@Test

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public HtmlUnitDriverForTest(Capabilities capabilities) {
3939
private static Capabilities tweak(Capabilities capabilities) {
4040
DesiredCapabilities caps = new DesiredCapabilities(capabilities);
4141
caps.setJavascriptEnabled(true);
42-
caps.setVersion("3.6");
42+
caps.setVersion("31");
4343
return caps;
4444
}
4545
}

‎maven/htmlunit-driver/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>net.sourceforge.htmlunit</groupId>
2222
<artifactId>htmlunit</artifactId>
23-
<version>2.15</version>
23+
<version>2.16</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>org.apache.httpcomponents</groupId>

‎maven/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,12 @@
180180
<dependency>
181181
<groupId>org.apache.httpcomponents</groupId>
182182
<artifactId>httpclient</artifactId>
183-
<version>4.3.6</version>
183+
<version>4.4.1</version>
184184
</dependency>
185185
<dependency>
186186
<groupId>org.apache.httpcomponents</groupId>
187187
<artifactId>httpcore</artifactId>
188-
<version>4.3.3</version>
188+
<version>4.4.1</version>
189189
</dependency>
190190
<dependency>
191191
<groupId>org.hamcrest</groupId>

‎third_party/java/apache-httpclient/BUCK

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ java_library(name = "apache-httpclient",
1111
)
1212

1313
prebuilt_jar(name = 'client',
14-
binary_jar = 'httpclient-4.3.6.jar',
15-
source_jar = 'httpclient-4.3.6-sources.jar',
14+
binary_jar = 'httpclient-4.4.1.jar',
15+
source_jar = 'httpclient-4.4.1-sources.jar',
1616
)
1717

1818
prebuilt_jar(name = 'core',
19-
binary_jar = 'httpcore-4.3.3.jar',
20-
source_jar = 'httpcore-4.3.3-sources.jar',
19+
binary_jar = 'httpcore-4.4.1.jar',
20+
source_jar = 'httpcore-4.4.1-sources.jar',
2121
)
2222

2323
prebuilt_jar(name = 'mime',
24-
binary_jar = 'httpmime-4.3.6.jar',
25-
source_jar = 'httpmime-4.3.6-sources.jar',
24+
binary_jar = 'httpmime-4.4.1.jar',
25+
source_jar = 'httpmime-4.4.1-sources.jar',
2626
)

0 commit comments

Comments
 (0)