Better handling of exceptions in the new HTMLRunner

Tests should fail if the underlying driver throws an exception.
SeleniumHQ · Jun 18, 2016 · bad871b · bad871b
1 parent 3f41a29
commit bad871b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/java/server/src/org/openqa/selenium/server/htmlrunner/CoreTestCase.java b/java/server/src/org/openqa/selenium/server/htmlrunner/CoreTestCase.java
@@ -22,6 +22,7 @@
 import com.google.common.collect.ImmutableList;
 
 import com.thoughtworks.selenium.Selenium;
+import com.thoughtworks.selenium.SeleniumException;
 
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
@@ -44,7 +45,12 @@ public void run(Results results, WebDriver driver, Selenium selenium) {
 
     List<CoreTestStep> steps = findCommands(driver);
     for (CoreTestStep step : steps) {
-      step.run(results, driver, selenium);
+      try {
+        step.run(results, driver, selenium);
+      } catch (SeleniumException e) {
+        results.addTestFailure();
+        return;
+      }
     }
   }
 

diff --git a/java/server/src/org/openqa/selenium/server/htmlrunner/CoreTestStep.java b/java/server/src/org/openqa/selenium/server/htmlrunner/CoreTestStep.java
@@ -89,7 +89,14 @@ private static ImmutableMap<String, SeleneseCommand> buildCommands() {
               throw new RuntimeException("Exceptionally unlikely to get here");
           }
         } catch (ReflectiveOperationException e) {
-          throw new RuntimeException(e);
+          for (Throwable cause = e; cause != null; cause = cause.getCause()) {
+            if (cause instanceof SeleniumException) {
+              throw (SeleniumException) cause;
+            }
+          }
+          throw new SeleniumException(
+            String.format("Unable to emulate %s ('%s', '%s')", method.getName(), locator, value),
+            e);
         }
       };
       commands.put(method.getName(), underlyingCommand);
@@ -180,6 +187,7 @@ private static ImmutableMap<String, SeleneseCommand> buildCommands() {
   }
 
   private interface SeleneseCommand {
-    Object execute(WebDriver driver, Selenium selenium, String locator, String value);
+    Object execute(WebDriver driver, Selenium selenium, String locator, String value)
+      throws SeleniumException;
   }
 }
diff --git a/java/server/src/org/openqa/selenium/server/htmlrunner/Main.java b/java/server/src/org/openqa/selenium/server/htmlrunner/Main.java
@@ -88,6 +88,11 @@ public static void main(String[] args) {
       Results results = new Results();
       CoreTest test = new CoreTest(args[3]);
       test.run(results, driver, new WebDriverBackedSelenium(driver, args[2]));
+      if (results.isSuccessful()) {
+        System.out.println("SUCCESS");
+      } else {
+        System.out.println("FAILED");
+      }
     } finally {
       driver.quit();
     }

diff --git a/java/server/src/org/openqa/selenium/server/htmlrunner/Results.java b/java/server/src/org/openqa/selenium/server/htmlrunner/Results.java
@@ -17,6 +17,17 @@
 
 package org.openqa.selenium.server.htmlrunner;
 
+import com.thoughtworks.selenium.SeleniumException;
+
 public class Results {
 
+  private boolean succeeded = true;
+
+  public boolean isSuccessful() {
+    return succeeded;
+  }
+
+  public void addTestFailure() {
+    succeeded = false;
+  }
 }