[java] Adding more unit tests for RemoteWebDriver throwing an exception

Author: barancev

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

@@ -533,9 +533,7 @@ protected Response execute(CommandPayload payload) {
       WebDriverException toThrow;
       if (command.getName().equals(DriverCommand.NEW_SESSION)) {
         toThrow = new SessionNotCreatedException(
-          "Could not start a new session. Possible causes are invalid address"
-          + " of the remote server or browser start-up failure.",
-          e);
+          "Possible causes are invalid address of the remote server or browser start-up failure.", e);
       } else if (e instanceof WebDriverException) {
         toThrow = (WebDriverException) e;
       } else {

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

@@ -85,7 +85,10 @@ public void constructorShouldThrowIfExecutorIsNull() {
   public void constructorShouldThrowIfExecutorThrowsOnAnAttemptToStartASession() {
     CommandExecutor executor = prepareExecutorMock(exceptionResponder);
     assertThatExceptionOfType(SessionNotCreatedException.class)
-      .isThrownBy(() -> new RemoteWebDriver(executor, new ImmutableCapabilities()));
+      .isThrownBy(() -> new RemoteWebDriver(executor, new ImmutableCapabilities()))
+      .withMessageContaining("Build info: ")
+      .withMessageContaining("Driver info: org.openqa.selenium.remote.RemoteWebDriver")
+      .withMessageContaining("Command: [null, newSession {desiredCapabilities=Capabilities {}}]");
 
     verifyCommands(executor, null); // no commands
   }
@@ -978,6 +981,72 @@ public void canHandleGeneralExceptionThrownByCommandExecutor() {
       new CommandPayload(DriverCommand.CLICK_ELEMENT, ImmutableMap.of("id", element.getId())));
   }
 
+  @Test
+  public void canHandleWebDriverExceptionReturnedByCommandExecutor() {
+    CommandExecutor executor = prepareExecutorMock(
+      echoCapabilities, errorResponder("element click intercepted", new WebDriverException("BOOM!!!")));
+
+    RemoteWebDriver driver = new RemoteWebDriver(executor, new ImmutableCapabilities(
+      "browserName", "cheese"));
+    RemoteWebElement element = new RemoteWebElement();
+    element.setParent(driver);
+    String elementId = UUID.randomUUID().toString();
+    element.setId(elementId);
+    element.setFoundBy(driver, "id", "test");
+
+    assertThatExceptionOfType(WebDriverException.class)
+      .isThrownBy(element::click)
+      .withMessageStartingWith("BOOM!!!")
+      .withMessageContaining("Build info: ")
+      .withMessageContaining(
+        "Driver info: org.openqa.selenium.remote.RemoteWebDriver")
+      .withMessageContaining(String.format(
+        "Session ID: %s", driver.getSessionId()))
+      .withMessageContaining(String.format(
+        "%s", driver.getCapabilities()))
+      .withMessageContaining(String.format(
+        "Command: [%s, clickElement {id=%s}]", driver.getSessionId(), elementId))
+      .withMessageContaining(String.format(
+        "Element: [[RemoteWebDriver: cheese on ANY (%s)] -> id: test]", driver.getSessionId()));
+
+    verifyCommands(
+      executor, driver.getSessionId(),
+      new CommandPayload(DriverCommand.CLICK_ELEMENT, ImmutableMap.of("id", element.getId())));
+  }
+
+  @Test
+  public void canHandleResponseWithErrorCodeButNoExceptionReturnedByCommandExecutor() {
+    CommandExecutor executor = prepareExecutorMock(
+      echoCapabilities, errorResponder("element click intercepted", "BOOM!!!"));
+
+    RemoteWebDriver driver = new RemoteWebDriver(executor, new ImmutableCapabilities(
+      "browserName", "cheese"));
+    RemoteWebElement element = new RemoteWebElement();
+    element.setParent(driver);
+    String elementId = UUID.randomUUID().toString();
+    element.setId(elementId);
+    element.setFoundBy(driver, "id", "test");
+
+    assertThatExceptionOfType(WebDriverException.class)
+      .isThrownBy(element::click)
+      .withMessageStartingWith("BOOM!!!")
+      .withMessageContaining("Build info: ")
+      .withMessageContaining(
+        "Driver info: org.openqa.selenium.remote.RemoteWebDriver")
+      .withMessageContaining(String.format(
+        "Session ID: %s", driver.getSessionId()))
+      .withMessageContaining(String.format(
+        "%s", driver.getCapabilities()))
+      .withMessageContaining(String.format(
+        "Command: [%s, clickElement {id=%s}]", driver.getSessionId(), elementId))
+      .withMessageContaining(String.format(
+        "Element: [[RemoteWebDriver: cheese on ANY (%s)] -> id: test]", driver.getSessionId()));
+
+    verifyCommands(
+      executor, driver.getSessionId(),
+      new CommandPayload(DriverCommand.CLICK_ELEMENT, ImmutableMap.of("id", element.getId())));
+  }
+
   @Test
   public void canHandleElementClearCommand() {
     CommandExecutor executor = prepareExecutorMock(echoCapabilities, nullValueResponder);
@@ -1300,6 +1369,17 @@ private Function<Command, Response> valueResponder(Object value) {
     };
   }
 
+  private Function<Command, Response> errorResponder(String state, Object value) {
+    return cmd -> {
+      Response response = new Response();
+      response.setState(state);
+      response.setStatus(new ErrorCodes().toStatus(state, Optional.of(400)));
+      response.setValue(value);
+      response.setSessionId(cmd.getSessionId() != null ? cmd.getSessionId().toString() : null);
+      return response;
+    };
+  }
+
   private final Function<Command, Response> echoCapabilities = cmd -> {
     Response response = new Response();
     response.setValue(