Skip to content

Commit a660392

Browse files
asashourbarancev
asashour
authored and
barancev
committed
Upgrade HtmlUnit 2.18
Signed-off-by: Alexei Barantsev <[email protected]>
1 parent 5a0bfa6 commit a660392

28 files changed

+41
-46
lines changed

‎.idea/libraries/commons_httpclient.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/htmlunit.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎java/client/.classpath

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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.17.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.17-sources.jar"/>
11+
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.18.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.18-sources.jar"/>
1212
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.17.jar"/>
1313
<classpathentry kind="lib" path="/third-party/java/jna/jna-4.1.0.jar" sourcepath="/third-party/java/jna/jna-4.1.0-src.jar"/>
1414
<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 @@
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/httpcomponents/httpclient-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.4.1-sources.jar"/>
20+
<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5-sources.jar"/>
2121
<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/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.10.jar" sourcepath="/third-party/java/commons-codec/commons-codec-1.10-sources.jar"/>
2525
<classpathentry kind="lib" path="/third-party/java/css/sac-1.3.jar"/>
2626
<classpathentry kind="lib" path="/third-party/java/commons/commons-lang3-3.4.jar" sourcepath="/third-party/java/commons/commons-lang3-3.4-sources.jar"/>
27-
<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpmime-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpmime-4.4.1-sources.jar"/>
27+
<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpmime-4.5.jar" sourcepath="/third-party/java/httpcomponents/httpmime-4.5-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"/>
2929
<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.16.jar"/>
3030
<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 @@
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/websocket-api-9.2.11.v20150529.jar"/>
44-
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-client-9.2.11.v20150529.jar"/>
45-
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-common-9.2.11.v20150529.jar"/>
46-
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-io-9.2.11.v20150529.jar"/>
47-
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-util-9.2.11.v20150529.jar"/>
43+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-api-9.2.12.v20150709.jar"/>
44+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-client-9.2.12.v20150709.jar"/>
45+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-common-9.2.12.v20150709.jar"/>
46+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-io-9.2.12.v20150709.jar"/>
47+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-util-9.2.12.v20150709.jar"/>
4848
<classpathentry kind="output" path="build/production"/>
4949
</classpath>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
import com.gargoylesoftware.htmlunit.BrowserVersion;
8080
import com.gargoylesoftware.htmlunit.CookieManager;
8181
import com.gargoylesoftware.htmlunit.ElementNotFoundException;
82+
import com.gargoylesoftware.htmlunit.InteractivePage;
8283
import com.gargoylesoftware.htmlunit.Page;
8384
import com.gargoylesoftware.htmlunit.ProxyConfig;
8485
import com.gargoylesoftware.htmlunit.ScriptResult;
@@ -1323,7 +1324,7 @@ public WebDriver defaultContent() {
13231324
public WebElement activeElement() {
13241325
Page page = lastPage();
13251326
if (page instanceof HtmlPage) {
1326-
DomElement element = ((HtmlPage) page).getFocusedElement();
1327+
DomElement element = ((InteractivePage) page).getFocusedElement();
13271328
if (element == null || element instanceof HtmlHtml) {
13281329
List<? extends HtmlElement> allBodies =
13291330
((HtmlPage) page).getDocumentElement().getHtmlElementsByTagName("body");

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@ public void testNumericNonShiftKeys() {
354354

355355
@JavascriptEnabled
356356
@Ignore(value = MARIONETTE, reason = "untested user agent")
357-
@NotYetImplemented(HTMLUNIT)
358357
@Test
359358
public void testNumericShiftKeys() {
360359
driver.get(pages.javascriptPage);
@@ -385,7 +384,6 @@ public void testLowerCaseAlphaKeys() {
385384

386385
@JavascriptEnabled
387386
@Ignore(value = MARIONETTE, reason = "untested user agents")
388-
@NotYetImplemented(HTMLUNIT)
389387
@Test
390388
public void testUppercaseAlphaKeys() {
391389
driver.get(pages.javascriptPage);
@@ -402,7 +400,6 @@ public void testUppercaseAlphaKeys() {
402400

403401
@JavascriptEnabled
404402
@Ignore(value = MARIONETTE, reason = "untested user agents")
405-
@NotYetImplemented(HTMLUNIT)
406403
@Test
407404
public void testAllPrintableKeys() {
408405
driver.get(pages.javascriptPage);
@@ -745,10 +742,9 @@ public void testShouldBeAbleToTypeOnANumberInputField() {
745742
assertThat(email.getAttribute("value"), equalTo("33"));
746743
}
747744

748-
@Ignore(value = {SAFARI, MARIONETTE}, reason = "Untested browsers;" +
745+
@Ignore(value = {SAFARI, MARIONETTE, HTMLUNIT}, reason = "Untested browsers;" +
749746
" Safari: cannot type on contentEditable with synthetic events",
750747
issues = {3127})
751-
@NotYetImplemented(HTMLUNIT)
752748
@Test
753749
public void testShouldBeAbleToTypeIntoEmptyContentEditableElement() {
754750
driver.get(pages.readOnlyPage);
@@ -772,11 +768,10 @@ public void testShouldBeAbleToTypeIntoContentEditableElementWithExistingValue()
772768
assertThat(editable.getText(), equalTo(initialText + ", edited"));
773769
}
774770

775-
@Ignore(value = {IE, SAFARI, MARIONETTE},
771+
@Ignore(value = {IE, SAFARI, MARIONETTE, HTMLUNIT},
776772
reason = "Untested browsers;" +
777773
" Safari: cannot type on contentEditable with synthetic events",
778774
issues = {3127})
779-
@NotYetImplemented(HTMLUNIT)
780775
@NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
781776
@Test
782777
public void testShouldBeAbleToTypeIntoTinyMCE() {
@@ -793,7 +788,6 @@ public void testShouldBeAbleToTypeIntoTinyMCE() {
793788

794789
@JavascriptEnabled
795790
@Ignore(value = SAFARI, reason = "Untested")
796-
@NotYetImplemented(HTMLUNIT)
797791
@Test
798792
public void canSafelyTypeOnElementThatIsRemovedFromTheDomOnKeyPress() {
799793
driver.get(appServer.whereIs("key_tests/remove_on_keypress.html"));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void testSendingKeyUp() {
116116
}
117117

118118
@JavascriptEnabled
119-
@Ignore(IE)
119+
@Ignore({IE, HTMLUNIT})
120120
@Test
121121
public void testSendingKeysWithShiftPressed() {
122122
driver.get(pages.javascriptPage);

‎java/server/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/client"/>
77
<classpathentry kind="lib" path="/third-party/java/gson/gson-2.3.1.jar"/>
88
<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"/>
9-
<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.4.1-sources.jar"/>
9+
<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5-sources.jar"/>
1010
<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.1-sources.jar"/>
1111
<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.3.jar"/>
1212
<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>

‎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.17</version>
23+
<version>2.18</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>org.apache.httpcomponents</groupId>

‎maven/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<dependency>
182182
<groupId>org.apache.httpcomponents</groupId>
183183
<artifactId>httpclient</artifactId>
184-
<version>4.4.1</version>
184+
<version>4.5</version>
185185
</dependency>
186186
<dependency>
187187
<groupId>org.apache.httpcomponents</groupId>

‎third_party/java/htmlunit/BUCK

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
prebuilt_jar(name = 'htmlunit',
2-
binary_jar = 'htmlunit-2.17.jar',
3-
source_jar = 'htmlunit-2.17-sources.jar',
2+
binary_jar = 'htmlunit-2.18.jar',
3+
source_jar = 'htmlunit-2.18-sources.jar',
44
deps = [
55
':js-core',
66
'//third_party/java/httpcomponents:httpclient',

0 commit comments

Comments
 (0)