fix serialization of UnhandledAlertException

fix java warnings

Author: lukeis

java/client/src/org/openqa/selenium/UnhandledAlertException.java

@@ -17,6 +17,9 @@
 
 package org.openqa.selenium;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+
 public class UnhandledAlertException extends WebDriverException {
 
   private final String alertText;
@@ -36,4 +39,12 @@ public UnhandledAlertException(String message, String alertText) {
   public String getAlertText() {
     return alertText;
   }
+
+  public JsonObject toJson() {
+    JsonObject text = new JsonObject();
+    text.add("text", new JsonPrimitive(alertText));
+    JsonObject alert = new JsonObject();
+    alert.add("alert", text);
+    return alert;
+  }
 }

java/client/test/org/openqa/selenium/remote/BeanToJsonConverterTest.java

@@ -32,6 +32,7 @@
 import org.openqa.selenium.Cookie;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.Proxy;
+import org.openqa.selenium.UnhandledAlertException;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.logging.LogEntries;
 import org.openqa.selenium.logging.LogEntry;
@@ -327,6 +328,12 @@ public void testShouldBeAbleToConvertAWebDriverException() {
     verifyStackTraceInJson(raw, stackTrace);
   }
 
+  @Test
+  public void testShouldConverUnhandledAlertException() {
+    RuntimeException clientError = new UnhandledAlertException("unhandled alert", "cheese!");
+    assertEquals("{\"alert\":{\"text\":\"cheese!\"}}", new BeanToJsonConverter().convert(clientError));
+  }
+
   @Test
   public void testShouldConvertDatesToMillisecondsInUtcTime() {
     String jsonStr = new BeanToJsonConverter().convert(new Date(0));

java/client/test/org/openqa/selenium/remote/ErrorHandlerTest.java

@@ -439,32 +439,32 @@ public void testShouldStillIncludeScreenshotEvenIfServerSideExceptionsAreDisable
   @Test
   public void testStatusCodesRaisedBackToStatusMatches() {
     List<Pair<Integer, Class>> exceptions = Arrays.asList(
-      new Pair(ErrorCodes.NO_SUCH_SESSION, NoSuchSessionException.class),
-      new Pair(ErrorCodes.NO_SUCH_ELEMENT, NoSuchElementException.class),
-      new Pair(ErrorCodes.NO_SUCH_FRAME, NoSuchFrameException.class),
-      new Pair(ErrorCodes.UNKNOWN_COMMAND, UnsupportedCommandException.class),
-      new Pair(ErrorCodes.STALE_ELEMENT_REFERENCE, StaleElementReferenceException.class),
-      new Pair(ErrorCodes.ELEMENT_NOT_VISIBLE, ElementNotVisibleException.class),
-      new Pair(ErrorCodes.INVALID_ELEMENT_STATE, InvalidElementStateException.class),
-      new Pair(ErrorCodes.UNHANDLED_ERROR, WebDriverException.class),
-      new Pair(ErrorCodes.ELEMENT_NOT_SELECTABLE, ElementNotSelectableException.class),
-      new Pair(ErrorCodes.JAVASCRIPT_ERROR, WebDriverException.class),
-      new Pair(ErrorCodes.XPATH_LOOKUP_ERROR, InvalidSelectorException.class),
-      new Pair(ErrorCodes.TIMEOUT, TimeoutException.class),
-      new Pair(ErrorCodes.NO_SUCH_WINDOW, NoSuchWindowException.class),
-      new Pair(ErrorCodes.INVALID_COOKIE_DOMAIN, InvalidCookieDomainException.class),
-      new Pair(ErrorCodes.UNABLE_TO_SET_COOKIE, UnableToSetCookieException.class),
-      new Pair(ErrorCodes.UNEXPECTED_ALERT_PRESENT, UnhandledAlertException.class),
-      new Pair(ErrorCodes.NO_ALERT_PRESENT, NoAlertPresentException.class),
-      new Pair(ErrorCodes.ASYNC_SCRIPT_TIMEOUT, ScriptTimeoutException.class),
-      new Pair(ErrorCodes.INVALID_ELEMENT_COORDINATES, InvalidCoordinatesException.class),
-      new Pair(ErrorCodes.IME_NOT_AVAILABLE, ImeNotAvailableException.class),
-      new Pair(ErrorCodes.IME_ENGINE_ACTIVATION_FAILED, ImeActivationFailedException.class),
-      new Pair(ErrorCodes.INVALID_SELECTOR_ERROR, InvalidSelectorException.class),
-      new Pair(ErrorCodes.SESSION_NOT_CREATED, SessionNotCreatedException.class),
-      new Pair(ErrorCodes.MOVE_TARGET_OUT_OF_BOUNDS, MoveTargetOutOfBoundsException.class),
-      new Pair(ErrorCodes.INVALID_XPATH_SELECTOR, InvalidSelectorException.class),
-      new Pair(ErrorCodes.INVALID_XPATH_SELECTOR_RETURN_TYPER, InvalidSelectorException.class)
+      new Pair<Integer, Class>(ErrorCodes.NO_SUCH_SESSION, NoSuchSessionException.class),
+      new Pair<Integer, Class>(ErrorCodes.NO_SUCH_ELEMENT, NoSuchElementException.class),
+      new Pair<Integer, Class>(ErrorCodes.NO_SUCH_FRAME, NoSuchFrameException.class),
+      new Pair<Integer, Class>(ErrorCodes.UNKNOWN_COMMAND, UnsupportedCommandException.class),
+      new Pair<Integer, Class>(ErrorCodes.STALE_ELEMENT_REFERENCE, StaleElementReferenceException.class),
+      new Pair<Integer, Class>(ErrorCodes.ELEMENT_NOT_VISIBLE, ElementNotVisibleException.class),
+      new Pair<Integer, Class>(ErrorCodes.INVALID_ELEMENT_STATE, InvalidElementStateException.class),
+      new Pair<Integer, Class>(ErrorCodes.UNHANDLED_ERROR, WebDriverException.class),
+      new Pair<Integer, Class>(ErrorCodes.ELEMENT_NOT_SELECTABLE, ElementNotSelectableException.class),
+      new Pair<Integer, Class>(ErrorCodes.JAVASCRIPT_ERROR, WebDriverException.class),
+      new Pair<Integer, Class>(ErrorCodes.XPATH_LOOKUP_ERROR, InvalidSelectorException.class),
+      new Pair<Integer, Class>(ErrorCodes.TIMEOUT, TimeoutException.class),
+      new Pair<Integer, Class>(ErrorCodes.NO_SUCH_WINDOW, NoSuchWindowException.class),
+      new Pair<Integer, Class>(ErrorCodes.INVALID_COOKIE_DOMAIN, InvalidCookieDomainException.class),
+      new Pair<Integer, Class>(ErrorCodes.UNABLE_TO_SET_COOKIE, UnableToSetCookieException.class),
+      new Pair<Integer, Class>(ErrorCodes.UNEXPECTED_ALERT_PRESENT, UnhandledAlertException.class),
+      new Pair<Integer, Class>(ErrorCodes.NO_ALERT_PRESENT, NoAlertPresentException.class),
+      new Pair<Integer, Class>(ErrorCodes.ASYNC_SCRIPT_TIMEOUT, ScriptTimeoutException.class),
+      new Pair<Integer, Class>(ErrorCodes.INVALID_ELEMENT_COORDINATES, InvalidCoordinatesException.class),
+      new Pair<Integer, Class>(ErrorCodes.IME_NOT_AVAILABLE, ImeNotAvailableException.class),
+      new Pair<Integer, Class>(ErrorCodes.IME_ENGINE_ACTIVATION_FAILED, ImeActivationFailedException.class),
+      new Pair<Integer, Class>(ErrorCodes.INVALID_SELECTOR_ERROR, InvalidSelectorException.class),
+      new Pair<Integer, Class>(ErrorCodes.SESSION_NOT_CREATED, SessionNotCreatedException.class),
+      new Pair<Integer, Class>(ErrorCodes.MOVE_TARGET_OUT_OF_BOUNDS, MoveTargetOutOfBoundsException.class),
+      new Pair<Integer, Class>(ErrorCodes.INVALID_XPATH_SELECTOR, InvalidSelectorException.class),
+      new Pair<Integer, Class>(ErrorCodes.INVALID_XPATH_SELECTOR_RETURN_TYPER, InvalidSelectorException.class)
     );
 
     for (Pair<Integer, Class> exception : exceptions) {