[java] Fixing exception message conversion in CDP javascript exception listener

Author: barancev

java/client/src/org/openqa/selenium/devtools/v86/V86Events.java

@@ -82,8 +82,14 @@ protected ConsoleEvent toConsoleEvent(ConsoleAPICalled event) {
   protected JavascriptException toJsException(ExceptionThrown event) {
     ExceptionDetails details = event.getExceptionDetails();
     Optional<StackTrace> maybeTrace = details.getStackTrace();
+    Optional<org.openqa.selenium.devtools.v86.runtime.model.RemoteObject>
+      maybeException = details.getException();
 
-    JavascriptException exception = new JavascriptException(event.getExceptionDetails().getText());
+    String message = maybeException
+      .flatMap(obj -> obj.getDescription().map(String::toString))
+      .orElseGet(details::getText);
+
+    JavascriptException exception = new JavascriptException(message);
 
     if (!maybeTrace.isPresent()) {
       StackTraceElement element = new StackTraceElement(

java/client/src/org/openqa/selenium/devtools/v87/V87Events.java

@@ -82,8 +82,14 @@ protected ConsoleEvent toConsoleEvent(ConsoleAPICalled event) {
   protected JavascriptException toJsException(ExceptionThrown event) {
     ExceptionDetails details = event.getExceptionDetails();
     Optional<StackTrace> maybeTrace = details.getStackTrace();
+    Optional<org.openqa.selenium.devtools.v87.runtime.model.RemoteObject>
+      maybeException = details.getException();
 
-    JavascriptException exception = new JavascriptException(event.getExceptionDetails().getText());
+    String message = maybeException
+      .flatMap(obj -> obj.getDescription().map(String::toString))
+      .orElseGet(details::getText);
+
+    JavascriptException exception = new JavascriptException(message);
 
     if (!maybeTrace.isPresent()) {
       StackTraceElement element = new StackTraceElement(

java/client/src/org/openqa/selenium/devtools/v88/V88Events.java

@@ -82,8 +82,14 @@ protected ConsoleEvent toConsoleEvent(ConsoleAPICalled event) {
   protected JavascriptException toJsException(ExceptionThrown event) {
     ExceptionDetails details = event.getExceptionDetails();
     Optional<StackTrace> maybeTrace = details.getStackTrace();
+    Optional<org.openqa.selenium.devtools.v88.runtime.model.RemoteObject>
+      maybeException = details.getException();
 
-    JavascriptException exception = new JavascriptException(event.getExceptionDetails().getText());
+    String message = maybeException
+      .flatMap(obj -> obj.getDescription().map(String::toString))
+      .orElseGet(details::getText);
+
+    JavascriptException exception = new JavascriptException(message);
 
     if (!maybeTrace.isPresent()) {
       StackTraceElement element = new StackTraceElement(

java/client/src/org/openqa/selenium/devtools/v89/V89Events.java

@@ -82,8 +82,14 @@ protected ConsoleEvent toConsoleEvent(ConsoleAPICalled event) {
   protected JavascriptException toJsException(ExceptionThrown event) {
     ExceptionDetails details = event.getExceptionDetails();
     Optional<StackTrace> maybeTrace = details.getStackTrace();
+    Optional<org.openqa.selenium.devtools.v89.runtime.model.RemoteObject>
+      maybeException = details.getException();
 
-    JavascriptException exception = new JavascriptException(event.getExceptionDetails().getText());
+    String message = maybeException
+      .flatMap(obj -> obj.getDescription().map(String::toString))
+      .orElseGet(details::getText);
+
+    JavascriptException exception = new JavascriptException(message);
 
     if (!maybeTrace.isPresent()) {
       StackTraceElement element = new StackTraceElement(

java/client/test/org/openqa/selenium/devtools/JavascriptExceptionsTest.java

@@ -0,0 +1,50 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.devtools;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.JavascriptException;
+import org.openqa.selenium.environment.webserver.Page;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class JavascriptExceptionsTest extends DevToolsTestBase {
+
+  @Test
+  public void canWatchJavascriptExceptions() throws InterruptedException, ExecutionException, TimeoutException {
+    String page = appServer.create(
+      new Page()
+        .withBody("<div id='button' onclick='helloWorld()'>click me</div>")
+        .withScripts("function helloWorld() { throw new Error('Hello, world!') }"));
+    driver.get(page);
+
+    CompletableFuture<JavascriptException> future = new CompletableFuture<>();
+    devTools.getDomains().events().addJavascriptExceptionListener(future::complete);
+    driver.findElement(By.id("button")).click();
+    JavascriptException exception = future.get(5, TimeUnit.SECONDS);
+
+    assertThat(exception.getRawMessage()).startsWith("Error: Hello, world!\n");
+  }
+
+}