Update FailureDetectingExternalResource to suppress post-test failures if the test fails

Author: kcooney

modules/junit-vintage/src/main/java/org/testcontainers/junit/vintage/FailureDetectingExternalResource.java

@@ -8,6 +8,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * {@link TestRule} which is called before and after each test, and also is notified on success/failure.
@@ -23,18 +24,20 @@ public final Statement apply(Statement base, Description description) {
             @Override
             public void evaluate() throws Throwable {
                 List<Throwable> errors = new ArrayList<Throwable>();
+                Optional<Throwable> failure = Optional.empty();
 
                 try {
                     starting(description);
                     base.evaluate();
                     notifySucceeded(description, errors);
                 } catch (org.junit.internal.AssumptionViolatedException e) {
-                    // Do nothing.
+                    failure = Optional.of(e);
                 } catch (Throwable e) {
+                    failure = Optional.of(e);
                     errors.add(e);
-                    notifyFailed(e, description, errors);
+                    notifyFailed(e, description);
                 } finally {
-                    notifyFinished(description, errors);
+                    notifyFinished(failure, description, errors);
                 }
 
                 MultipleFailureException.assertEmpty(errors);
@@ -58,19 +61,22 @@ private void notifySucceeded(Description description, List<Throwable> errors) {
         }
     }
 
-    private void notifyFailed(Throwable failure, Description description, List<Throwable> errors) {
+    private void notifyFailed(Throwable failure, Description description) {
         try {
             failed(failure, description);
         } catch (Throwable e) {
-            errors.add(e);
+            failure.addSuppressed(e);
         }
     }
 
-    private void notifyFinished(Description description, List<Throwable> errors) {
+    private void notifyFinished(Optional<Throwable> failure, Description description, List<Throwable> errors) {
         try {
             finished(description, errors);
         } catch (Throwable e) {
-            errors.add(e);
+            failure.ifPresent(f -> f.addSuppressed(e)); // ifPresentOrElse() requires Java 9
+            if (!failure.isPresent()) {
+                errors.add(e);
+            }
         }
     }