[java] Adding more information about executed command and target element to WebDriverException

Author: barancev

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

@@ -21,6 +21,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -58,26 +59,25 @@ public String getMessage() {
   }
 
   private String createMessage(String originalMessageString) {
-    String supportMessage = getSupportUrl() == null ?
-        "" : "For documentation on this error, please visit: " + getSupportUrl();
+    String supportMessage = Optional.ofNullable(getSupportUrl())
+      .map(url -> String.format("For documentation on this error, please visit: %s", url))
+      .orElse("");
 
     return Stream.of(
-        originalMessageString == null ? "" : originalMessageString,
-        supportMessage,
-        getBuildInformation().toString(),
-        getSystemInformation(),
-        getAdditionalInformation()
+      originalMessageString == null ? "" : originalMessageString,
+      supportMessage,
+      getBuildInformation().toString(),
+      getSystemInformation(),
+      getAdditionalInformation()
     ).filter(s -> !(s == null || s.equals(""))).collect(Collectors.joining("\n"));
   }
 
   public String getSystemInformation() {
-    return String.format("System info: host: '%s', ip: '%s', os.name: '%s', os.arch: '%s', os.version: '%s', java.version: '%s'",
-        HOST_NAME,
-        HOST_ADDRESS,
-        System.getProperty("os.name"),
-        System.getProperty("os.arch"),
-        System.getProperty("os.version"),
-        System.getProperty("java.version"));
+    return String.format(
+      "System info: host: '%s', ip: '%s', os.name: '%s', os.arch: '%s', os.version: '%s', java.version: '%s'",
+      HOST_NAME, HOST_ADDRESS,
+      System.getProperty("os.name"), System.getProperty("os.arch"),
+      System.getProperty("os.version"), System.getProperty("java.version"));
   }
 
   public String getSupportUrl() {
@@ -90,13 +90,13 @@ public BuildInfo getBuildInformation() {
 
   public static String getDriverName(StackTraceElement[] stackTraceElements) {
     return Stream.of(stackTraceElements)
-        .filter(e -> e.getClassName().endsWith("Driver"))
-        .map(e -> {
-          String[] bits = e.getClassName().split("\\.");
-          return bits[bits.length - 1];
-        })
-        .reduce((first, last) -> last)
-        .orElse("unknown");
+      .filter(e -> e.getClassName().endsWith("Driver"))
+      .map(e -> {
+        String[] bits = e.getClassName().split("\\.");
+        return bits[bits.length - 1];
+      })
+      .reduce((first, last) -> last)
+      .orElse("unknown");
   }
 
   public void addInfo(String key, String value) {
@@ -105,12 +105,12 @@ public void addInfo(String key, String value) {
 
   public String getAdditionalInformation() {
     extraInfo.computeIfAbsent(
-        DRIVER_INFO, key -> "driver.version: " + getDriverName(getStackTrace()));
+      DRIVER_INFO, key -> "driver.version: " + getDriverName(getStackTrace()));
 
     return extraInfo.entrySet().stream()
-        .map(entry -> entry.getValue() != null && entry.getValue().startsWith(entry.getKey())
-                      ? entry.getValue()
-                      : entry.getKey() + ": " + entry.getValue())
-        .collect(Collectors.joining("\n"));
+      .map(entry -> entry.getValue() != null && entry.getValue().startsWith(entry.getKey())
+                    ? entry.getValue()
+                    : entry.getKey() + ": " + entry.getValue())
+      .collect(Collectors.joining("\n"));
   }
 }

java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java

@@ -508,8 +508,12 @@ protected Response execute(CommandPayload payload) {
       // Unwrap the response value by converting any JSON objects of the form
       // {"ELEMENT": id} to RemoteWebElements.
       Object value = getElementConverter().apply(response.getValue());
+      if (value instanceof WebDriverException) {
+        ((WebDriverException) value).addInfo("Command", command.toString());
+      }
       response.setValue(value);
     } catch (WebDriverException e) {
+      e.addInfo("Command", command.toString());
       throw e;
     } catch (Exception e) {
       log(sessionId, command.getName(), command, When.EXCEPTION);

java/client/src/org/openqa/selenium/remote/RemoteWebElement.java

@@ -235,11 +235,21 @@ protected List<WebElement> findElements(String using, String value) {
   }
 
   protected Response execute(CommandPayload payload) {
-    return parent.execute(payload);
+    try {
+      return parent.execute(payload);
+    } catch (WebDriverException ex) {
+      ex.addInfo("Element", this.toString());
+      throw ex;
+    }
   }
 
   protected Response execute(String command, Map<String, ?> parameters) {
-    return parent.execute(command, parameters);
+    try {
+      return parent.execute(command, parameters);
+    } catch (WebDriverException ex) {
+      ex.addInfo("Element", this.toString());
+      throw ex;
+    }
   }
 
   @Override