[java] fixed the ScreenshotException message

Author: joerg1985

java/src/org/openqa/selenium/remote/ScreenshotException.java

@@ -21,19 +21,20 @@
 
 public class ScreenshotException extends WebDriverException {
 
-  private final String screenshot;
+  public ScreenshotException(String message) {
+    super(message);
+  }
 
-  public ScreenshotException(String screenGrab) {
-    super("Screen shot has been taken");
-    this.screenshot = screenGrab;
+  public ScreenshotException(Throwable cause) {
+    super(cause);
   }
 
-  public ScreenshotException(String screenGrab, Throwable cause) {
-    super("Screen shot has been taken", cause);
-    this.screenshot = screenGrab;
+  public ScreenshotException(String message, Throwable cause) {
+    super(message, cause);
   }
 
+  @Deprecated(forRemoval = true)
   public String getBase64EncodedScreenshot() {
-    return screenshot;
+    return null;
   }
 }

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

@@ -201,36 +201,6 @@ void testShouldBeAbleToRebuildASerializedException() {
             });
   }
 
-  @Test
-  void testShouldIncludeScreenshotIfProvided() {
-    RuntimeException serverError = new RuntimeException("foo bar baz!");
-    Map<String, Object> data = toMap(serverError);
-    data.put("screen", "screenGrabText");
-
-    assertThatExceptionOfType(WebDriverException.class)
-        .isThrownBy(
-            () ->
-                handler.throwIfResponseFailed(
-                    createResponse(ErrorCodes.UNHANDLED_ERROR, data), 123))
-        .withMessage(
-            new WebDriverException(
-                    serverError.getMessage() + "\nCommand duration or timeout: 123 milliseconds",
-                    new WebDriverException())
-                .getMessage())
-        .withCauseInstanceOf(ScreenshotException.class)
-        .satisfies(
-            expected -> {
-              Throwable cause = expected.getCause();
-              assertThat(((ScreenshotException) cause).getBase64EncodedScreenshot())
-                  .isEqualTo("screenGrabText");
-              Throwable realCause = cause.getCause();
-              assertThat(realCause).isNotNull();
-              assertThat(realCause.getClass()).isEqualTo(serverError.getClass());
-              assertThat(realCause.getMessage()).isEqualTo(serverError.getMessage());
-              assertStackTracesEqual(serverError.getStackTrace(), realCause.getStackTrace());
-            });
-  }
-
   @Test
   void testShouldDefaultToWebDriverExceptionIfClassIsNotSpecified() {
     RuntimeException serverError = new RuntimeException("foo bar baz!");
@@ -459,29 +429,6 @@ void testShouldIndicateWhenTheServerReturnedAnExceptionThatWasSuppressed() {
         .withMessageContaining(new WebDriverException().getMessage());
   }
 
-  @Test
-  void testShouldStillIncludeScreenshotEvenIfServerSideExceptionsAreDisabled() {
-    RuntimeException serverError = new RuntimeException("foo bar baz!");
-    Map<String, Object> data = toMap(serverError);
-    data.put("screen", "screenGrabText");
-
-    handler.setIncludeServerErrors(false);
-
-    assertThatExceptionOfType(WebDriverException.class)
-        .isThrownBy(
-            () ->
-                handler.throwIfResponseFailed(
-                    createResponse(ErrorCodes.UNHANDLED_ERROR, data), 123))
-        .withMessageStartingWith("foo bar baz!")
-        .withCauseInstanceOf(ScreenshotException.class)
-        .satisfies(
-            expected -> {
-              ScreenshotException screenshot = (ScreenshotException) expected.getCause();
-              assertThat(screenshot.getBase64EncodedScreenshot()).isEqualTo("screenGrabText");
-              assertThat(screenshot).hasNoCause();
-            });
-  }
-
   @Test
   void testStatusCodesRaisedBackToStatusMatches() {
     Map<Integer, Class<?>> exceptions = new HashMap<>();

java/test/org/openqa/selenium/remote/RemoteWebDriverScreenshotTest.java

@@ -18,38 +18,15 @@
 package org.openqa.selenium.remote;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.openqa.selenium.OutputType.BASE64;
 
 import org.junit.jupiter.api.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.TakesScreenshot;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JupiterTestBase;
 
 class RemoteWebDriverScreenshotTest extends JupiterTestBase {
 
-  @Test
-  @Ignore
-  public void testShouldBeAbleToGrabASnapshotOnException() {
-    if (!(driver instanceof RemoteWebDriver)) {
-      System.out.println("Skipping test: driver is not a remote webdriver");
-      return;
-    }
-
-    driver.get(pages.simpleTestPage);
-
-    assertThatExceptionOfType(NoSuchElementException.class)
-        .isThrownBy(() -> driver.findElement(By.id("doesnayexist")))
-        .satisfies(
-            e ->
-                assertThat(
-                        ((ScreenshotException) e.getCause()).getBase64EncodedScreenshot().length())
-                    .isPositive());
-  }
-
   @Test
   void testCanAugmentWebDriverInstanceIfNecessary() {
     if (!(driver instanceof RemoteWebDriver)) {