Trying a better error handler for JUnit

Author: rjrudin

src/test/java/com/marklogic/spark/IOExceptionTestExecutionListener.java

@@ -8,25 +8,41 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.InterruptedIOException;
-import java.net.SocketException;
+import java.io.IOException;
 
 public class IOExceptionTestExecutionListener implements TestExecutionExceptionHandler {
 
     private static final Logger logger = LoggerFactory.getLogger(IOExceptionTestExecutionListener.class);
 
-    // Telling Sonar not to complain about the intentional sleep.
-    @SuppressWarnings("java:S2925")
     @Override
     public void handleTestExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
-        logger.error("Handling error; class: {}; message: {}", throwable.getClass(), throwable.getMessage());
-        Throwable cause = throwable.getCause();
-        if (cause instanceof InterruptedIOException || cause instanceof SocketException) {
-            logger.error("Cause class: {}; message: {}; assuming MarkLogic is being restarted on Docker and not throwing this error.",
-                cause.getClass(), cause.getMessage());
-            Thread.sleep(1000);
-        } else {
-            logger.error("Unexpected error, swallowing for now");
+        // Valid test failures should still be thrown. We're just looking to catch intermittent IO exceptions.
+        if (throwable instanceof AssertionError) {
+            throw throwable;
+        }
+
+        if (!logIfIOException(throwable)) {
+            throw throwable;
+        }
+    }
+
+    // Telling Sonar not to complain about the intentional sleep.
+    @SuppressWarnings("java:S2925")
+    private boolean logIfIOException(Throwable throwable) {
+        if (throwable instanceof IOException) {
+            logger.error("Cause is IOException: {}; assuming this is due to a temporary and intermittent connection " +
+                "issue due to MarkLogic running on Docker, so will not fail test.", throwable.getMessage());
+
+            // Sleep for a short duration in case MarkLogic was in fact restarted by Docker.
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                // Ignore.
+            }
+            return true;
+        } else if (throwable.getCause() != null) {
+            return logIfIOException(throwable.getCause());
         }
+        return false;
     }
 }