Add a public serialisation field to the UnhandledAlertException

How this exception is serialised isn't documented, but some
local end bindings (such as python and .Net) expect it to be
serialised as a JSON Object. By adding this accessor, the
BeanToJsonConverter will add the right property.

Author: shs96c

java/client/src/org/openqa/selenium/BUCK

@@ -113,16 +113,16 @@ java_library(name = 'exceptions',
     'WebDriverException.java',
     'internal/BuildInfo.java',
   ],
+  deps = [
+    ':beta',
+  ],
   visibility = [
     '//java/client/src/org/openqa/selenium/interactions:exceptions',
     '//java/client/src/org/openqa/selenium/io:io',
     '//java/client/src/org/openqa/selenium/net:net',
     '//java/client/src/org/openqa/selenium/os:os',
     '//java/client/test/org/openqa/selenium/testing:helpers',
   ],
-  deps = [
-    '//third_party/java/gson:gson',
-  ],
 )
 
 java_library(

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

@@ -17,6 +17,10 @@
 
 package org.openqa.selenium;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 public class UnhandledAlertException extends WebDriverException {
 
   private final String alertText;
@@ -36,4 +40,12 @@ public UnhandledAlertException(String message, String alertText) {
   public String getAlertText() {
     return alertText;
   }
+
+  // Used for serialising. Some of the drivers return the alert text like this.
+  @Beta
+  public Map<String, String> getAlert() {
+    HashMap<String, String> toReturn = new HashMap<>();
+    toReturn.put("text", getAlertText());
+    return Collections.unmodifiableMap(toReturn);
+  }
 }

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

@@ -30,6 +30,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -41,13 +43,15 @@
 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;
 import org.openqa.selenium.logging.LogType;
 import org.openqa.selenium.logging.LoggingPreferences;
 
 import java.awt.*;
+import java.io.StringReader;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -327,6 +331,16 @@ public void testShouldBeAbleToConvertAWebDriverException() {
     verifyStackTraceInJson(raw, stackTrace);
   }
 
+  @Test
+  public void testShouldConverUnhandledAlertException() {
+    RuntimeException clientError = new UnhandledAlertException("unhandled alert", "cheese!");
+    Map<?, ?> obj = new Gson()
+        .fromJson(new StringReader(new BeanToJsonConverter().convert(clientError)), Map.class);
+    assertTrue(obj.containsKey("alert"));
+    assertEquals(ImmutableMap.of("text", "cheese!"), obj.get("alert"));
+  }
+
+
   @Test
   public void testShouldConvertDatesToMillisecondsInUtcTime() {
     String jsonStr = new BeanToJsonConverter().convert(new Date(0));