Skip to content

Commit 373f764

Browse files
JonahssJonahss
committed
Merge pull request #38 from Jonahss/master
updated to selenium 2.42.1, and refactored ErrorCodes to utilize new sel...
2 parents 8522bb7 + 89ec0db commit 373f764

File tree

5 files changed

+28
-116
lines changed

5 files changed

+28
-116
lines changed

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@ Locators:
6060
- findElementsByAndroidUIAutomator()
6161

6262
##Changelog##
63-
*github HEAD*
63+
*1.3.0*
6464
- MultiGesture with a single TouchAction fixed for Android
65+
- Now depends upon Selenium java client 2.42.1
66+
- Cleanup of Errorcode handling, due to merging a change into Selenium
6567

6668
*1.2.1*
6769
- fix dependency issue

‎java-client.iml‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
</content>
1313
<orderEntry type="inheritedJdk" />
1414
<orderEntry type="sourceFolder" forTests="false" />
15-
<orderEntry type="library" name="selenium-java-2.41.0" level="project" />
16-
<orderEntry type="library" name="selenium-2.41" level="project" />
1715
<orderEntry type="library" name="guava-16.0.1" level="project" />
1816
<orderEntry type="library" name="hamcrest-core-1.3" level="project" />
1917
<orderEntry type="library" name="httpcore-4.3.2" level="project" />
@@ -25,12 +23,12 @@
2523
<orderEntry type="library" name="commons-codec-1.9" level="project" />
2624
<orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
2725
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
28-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.41.0" level="project" />
29-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:2.41.0" level="project" />
30-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:2.41.0" level="project" />
26+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.42.1" level="project" />
27+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:2.42.1" level="project" />
28+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:2.42.1" level="project" />
3129
<orderEntry type="library" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
3230
<orderEntry type="library" name="Maven: org.json:json:20080701" level="project" />
33-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.41.0" level="project" />
31+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.42.1" level="project" />
3432
<orderEntry type="library" name="Maven: com.google.guava:guava:15.0" level="project" />
3533
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" level="project" />
3634
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
@@ -39,30 +37,30 @@
3937
<orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.1" level="project" />
4038
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:3.4.0" level="project" />
4139
<orderEntry type="library" name="Maven: net.java.dev.jna:platform:3.4.0" level="project" />
42-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-htmlunit-driver:2.41.0" level="project" />
43-
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.13" level="project" />
40+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-htmlunit-driver:2.42.1" level="project" />
41+
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.14" level="project" />
4442
<orderEntry type="library" name="Maven: xalan:xalan:2.7.1" level="project" />
4543
<orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
4644
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
4745
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
48-
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
49-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.1" level="project" />
50-
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.13" level="project" />
46+
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.2.1" level="project" />
47+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.2" level="project" />
48+
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.14" level="project" />
5149
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
52-
<orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.19" level="project" />
53-
<orderEntry type="library" name="Maven: net.sourceforge.cssparser:cssparser:0.9.11" level="project" />
50+
<orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.20" level="project" />
51+
<orderEntry type="library" name="Maven: net.sourceforge.cssparser:cssparser:0.9.13" level="project" />
5452
<orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
55-
<orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
56-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-websocket:8.1.12.v20130726" level="project" />
57-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:8.1.12.v20130726" level="project" />
58-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:8.1.12.v20130726" level="project" />
59-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:8.1.12.v20130726" level="project" />
60-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.41.0" level="project" />
61-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:2.41.0" level="project" />
62-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-safari-driver:2.41.0" level="project" />
53+
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
54+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-websocket:8.1.14.v20131031" level="project" />
55+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:8.1.14.v20131031" level="project" />
56+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:8.1.14.v20131031" level="project" />
57+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:8.1.14.v20131031" level="project" />
58+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.42.1" level="project" />
59+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:2.42.1" level="project" />
60+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-safari-driver:2.42.1" level="project" />
6361
<orderEntry type="library" name="Maven: org.webbitserver:webbit:0.4.14" level="project" />
6462
<orderEntry type="library" name="Maven: io.netty:netty:3.5.2.Final" level="project" />
65-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.41.0" level="project" />
63+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.42.1" level="project" />
6664
<orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
6765
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
6866
</component>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.appium</groupId>
88
<artifactId>java-client</artifactId>
9-
<version>1.2.1</version>
9+
<version>1.3.0</version>
1010
<dependencies>
1111
<dependency>
1212
<groupId>com.google.collections</groupId>
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>org.seleniumhq.selenium</groupId>
2323
<artifactId>selenium-java</artifactId>
24-
<version>2.41.0</version>
24+
<version>2.42.1</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>junit</groupId>

‎src/main/java/io/appium/java_client/AppiumDriver.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
public class AppiumDriver extends RemoteWebDriver implements MobileDriver, ContextAware, Rotatable, FindsByIosUIAutomation,
3535
FindsByAndroidUIAutomator, FindsByAccessibilityId {
3636

37-
private final static MobileErrorHandler errorHandler = new MobileErrorHandler();
37+
private final static ErrorHandler errorHandler = new ErrorHandler(new ErrorCodesMobile(), true);
3838
private URL remoteAddress;
3939
private ComplexFind complexFind;
4040

@@ -73,18 +73,13 @@ public AppiumDriver(URL remoteAddress, Capabilities desiredCapabilities){
7373
HttpCommandExecutor mobileExecutor = new HttpCommandExecutor(mobileCommands, remoteAddress);
7474
super.setCommandExecutor(mobileExecutor);
7575

76+
super.setErrorHandler(errorHandler);
7677
}
7778

7879
@Override
7980
public Response execute(String driverCommand, Map<String, ?> parameters) {
80-
try {
81-
return super.execute(driverCommand, parameters);
82-
} catch (WebDriverException ex) {
83-
errorHandler.throwIfMobileError(ex);
84-
}
8581

86-
throw new RuntimeException("An WebDriver error should have been thrown, if you're reading this, the problem is " +
87-
"definitely in the Appium Driver");
82+
return super.execute(driverCommand, parameters);
8883
}
8984

9085
@Override

‎src/main/java/io/appium/java_client/MobileErrorHandler.java‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)