mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-02-14 05:50:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1145 from bootstraponline/catch_exception

Browse Source 
Catch exception
This commit is contained in:
Jonathan Lipps
2013-09-12 05:18:56 -07:00
parent 868a3202bf 935e12bf6f
commit 2057d6a7d9
11 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/bootstrap/src/io/appium/android/bootstrap/handler/Clear.java
View File

@@ -43,8 +43,10 @@ public class Clear extends CommandHandler {
} catch (final ElementNotInHashException e) {
return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT,
e.getMessage());
} catch (final Exception e) { // handle NullPointerException
return getErrorResult("Unknown error clearing text");
}
}
return getErrorResult("Unknown error clearing text");
return getErrorResult("Unknown error");
}
}

2
android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java
View File

@@ -47,6 +47,8 @@ public class Click extends CommandHandler {
} catch (final ElementNotInHashException e) {
return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT,
e.getMessage());
} catch (final Exception e) { // handle NullPointerException
return getErrorResult("Unknown error");
}
} else {
final Hashtable<String, Object> params = command.params();

3
android/bootstrap/src/io/appium/android/bootstrap/handler/Drag.java
View File

@@ -50,9 +50,10 @@ public class Drag extends CommandHandler {
if (params.get("elementId") != JSONObject.NULL) {
el = command.getElement();
}
} catch (final ElementNotInHashException e) {
} catch (final Exception e) {
el = null;
}
try {
if (params.get("destElId") != JSONObject.NULL) {
destEl = command.getDestElement();

8
android/bootstrap/src/io/appium/android/bootstrap/handler/Flick.java
View File

@@ -5,7 +5,6 @@ import io.appium.android.bootstrap.AndroidCommandResult;
import io.appium.android.bootstrap.AndroidElement;
import io.appium.android.bootstrap.CommandHandler;
import io.appium.android.bootstrap.Logger;
import io.appium.android.bootstrap.exceptions.ElementNotInHashException;
import io.appium.android.bootstrap.exceptions.InvalidCoordinatesException;
import io.appium.android.bootstrap.utils.Point;
@@ -14,7 +13,6 @@ import java.util.Hashtable;
import org.json.JSONException;
import com.android.uiautomator.core.UiDevice;
import com.android.uiautomator.core.UiObjectNotFoundException;
/**
* This handler is used to flick elements in the Android UI.
@@ -83,11 +81,7 @@ public class Flick extends CommandHandler {
end.x = start.x + xoffset;
end.y = start.y + yoffset;
} catch (final ElementNotInHashException e) {
return getErrorResult(e.getMessage());
} catch (final UiObjectNotFoundException e) {
return getErrorResult(e.getMessage());
} catch (final InvalidCoordinatesException e) {
} catch (final Exception e) {
return getErrorResult(e.getMessage());
}
} else {

2
android/bootstrap/src/io/appium/android/bootstrap/handler/GetAttribute.java
View File

@@ -54,7 +54,7 @@ public class GetAttribute extends CommandHandler {
} catch (final ElementNotInHashException e) {
return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT,
e.getMessage());
} catch (final NullPointerException e) { // el is null
} catch (final Exception e) { // el is null
return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT,
e.getMessage());
}

2
android/bootstrap/src/io/appium/android/bootstrap/handler/GetName.java
View File

@@ -41,6 +41,8 @@ public class GetName extends CommandHandler {
return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage());
} catch (final ElementNotInHashException e) {
return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage());
} catch (final Exception e) { // handle NullPointerException
return getErrorResult("Unknown error");
}
}
}

2
android/bootstrap/src/io/appium/android/bootstrap/handler/GetSize.java
View File

@@ -48,6 +48,8 @@ public class GetSize extends CommandHandler {
} catch (final ElementNotInHashException e) {
return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT,
e.getMessage());
} catch (final Exception e) { // handle NullPointerException
return getErrorResult("Unknown error");
}
return getSuccessResult(res);
} else {

2
android/bootstrap/src/io/appium/android/bootstrap/handler/GetText.java
View File

@@ -41,6 +41,8 @@ public class GetText extends CommandHandler {
} catch (final ElementNotInHashException e) {
return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT,
e.getMessage());
} catch (final Exception e) { // handle NullPointerException
return getErrorResult("Unknown error");
}
} else {
return getErrorResult("Unable to get text without an element.");

3
android/bootstrap/src/io/appium/android/bootstrap/handler/SetAttribute.java
View File

@@ -46,7 +46,10 @@ public class SetAttribute extends CommandHandler {
} catch (final ElementNotInHashException e) {
return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT,
e.getMessage());
} catch (final Exception e) { // handle NullPointerException
return getErrorResult("Unknown error");
}
} else {
final Hashtable<String, Object> params = command.params();

2
android/bootstrap/src/io/appium/android/bootstrap/handler/SetText.java
View File

@@ -58,6 +58,8 @@ public class SetText extends CommandHandler {
} catch (final ElementNotInHashException e) {
return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT,
e.getMessage());
} catch (final Exception e) { // handle NullPointerException
return getErrorResult("Unknown error");
}
} else {
return getErrorResult("Unable to set text without an element.");

2
android/bootstrap/src/io/appium/android/bootstrap/handler/Swipe.java
View File

@@ -55,6 +55,8 @@ public class Swipe extends CommandHandler {
return getErrorResult(e.getMessage());
} catch (final InvalidCoordinatesException e) {
return getErrorResult(e.getMessage());
} catch (final Exception e) { // handle NullPointerException
return getErrorResult("Unknown error");
}
} else {
try {