Deleting deprecated XPathLookupException

Zitrax · Apr 19, 2013 · 3c264ec · 3c264ec
1 parent 34e54b6
commit 3c264ec
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 43 deletions.
diff --git a/java/client/src/org/openqa/selenium/XPathLookupException.java b/java/client/src/org/openqa/selenium/XPathLookupException.java
diff --git a/java/client/src/org/openqa/selenium/build.desc b/java/client/src/org/openqa/selenium/build.desc
@@ -66,7 +66,6 @@ java_library(name = "webdriver-api",
     "UnsupportedCommandException.java",
     "WebDriver.java",
     "WebElement.java",
-    "XPathLookupException.java",
     "html5/*.java",
     "internal/FindsByClassName.java",
     "internal/FindsByCssSelector.java",

diff --git a/java/client/src/org/openqa/selenium/remote/ErrorCodes.java b/java/client/src/org/openqa/selenium/remote/ErrorCodes.java
@@ -37,7 +37,6 @@
 import org.openqa.selenium.UnhandledAlertException;
 import org.openqa.selenium.UnsupportedCommandException;
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.XPathLookupException;
 import org.openqa.selenium.interactions.InvalidCoordinatesException;
 import org.openqa.selenium.interactions.MoveTargetOutOfBoundsException;
 
@@ -80,7 +79,6 @@ public class ErrorCodes {
   public static final int INVALID_SELECTOR_ERROR = 32;
   public static final int SESSION_NOT_CREATED = 33;
   public static final int MOVE_TARGET_OUT_OF_BOUNDS = 34;
-  public static final int SQL_DATABASE_ERROR = 35;
   public static final int INVALID_XPATH_SELECTOR = 51;
   public static final int INVALID_XPATH_SELECTOR_RETURN_TYPER = 52;
   // The following error codes are derived straight from HTTP return codes.
@@ -143,6 +141,7 @@ public Class<? extends WebDriverException> getExceptionType(int statusCode) {
       case INVALID_SELECTOR_ERROR:
       case INVALID_XPATH_SELECTOR:
       case INVALID_XPATH_SELECTOR_RETURN_TYPER:
+      case XPATH_LOOKUP_ERROR:
         return InvalidSelectorException.class;
       case MOVE_TARGET_OUT_OF_BOUNDS:
         return MoveTargetOutOfBoundsException.class;
@@ -158,8 +157,6 @@ public Class<? extends WebDriverException> getExceptionType(int statusCode) {
       case ELEMENT_NOT_SELECTABLE:
       case INVALID_ELEMENT_STATE:
         return InvalidElementStateException.class;
-      case XPATH_LOOKUP_ERROR:
-        return XPathLookupException.class;
       case ASYNC_SCRIPT_TIMEOUT:
       case TIMEOUT:
         return TimeoutException.class;
@@ -223,8 +220,6 @@ public int toStatusCode(Throwable thrown) {
       return UNABLE_TO_SET_COOKIE;
     } else if (thrown instanceof UnhandledAlertException) {
       return UNEXPECTED_ALERT_PRESENT;
-    } else if (thrown instanceof XPathLookupException) {
-      return XPATH_LOOKUP_ERROR;
     } else {
       return UNHANDLED_ERROR;
     }

diff --git a/java/client/test/org/openqa/selenium/remote/ErrorHandlerTest.java b/java/client/test/org/openqa/selenium/remote/ErrorHandlerTest.java
@@ -32,13 +32,13 @@
 import org.junit.Test;
 import org.openqa.selenium.ElementNotVisibleException;
 import org.openqa.selenium.InvalidElementStateException;
+import org.openqa.selenium.InvalidSelectorException;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.NoSuchFrameException;
 import org.openqa.selenium.NoSuchWindowException;
 import org.openqa.selenium.StaleElementReferenceException;
 import org.openqa.selenium.UnsupportedCommandException;
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.XPathLookupException;
 import org.openqa.selenium.interactions.InvalidCoordinatesException;
 
 import java.util.Map;
@@ -79,7 +79,7 @@ public void testThrowsCorrectExceptionTypes() {
     assertThrowsCorrectExceptionType(
         ErrorCodes.INVALID_ELEMENT_STATE, InvalidElementStateException.class);
     assertThrowsCorrectExceptionType(
-        ErrorCodes.XPATH_LOOKUP_ERROR, XPathLookupException.class);
+        ErrorCodes.XPATH_LOOKUP_ERROR, InvalidSelectorException.class);
     assertThrowsCorrectExceptionType(ErrorCodes.INVALID_ELEMENT_COORDINATES,
         InvalidCoordinatesException.class);
   }