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);
@@ -46,9 +49,9 @@ protected void starting(Description description) throws Throwable {}
 
     protected void succeeded(Description description) throws Throwable {}
 
-    protected void failed(Throwable e, Description description) {}
+    protected void failed(Throwable e, Description description) throws Throwable {}
 
-    protected void finished(Description description, List<Throwable> errors) {}
+    protected void finished(Description description) throws Throwable {}
 
     private void notifySucceeded(Description description, List<Throwable> errors) {
         try {
@@ -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);
+            finished(description);
         } catch (Throwable e) {
-            errors.add(e);
+            failure.ifPresent(f -> f.addSuppressed(e)); // ifPresentOrElse() requires Java 9
+            if (!failure.isPresent()) {
+                errors.add(e);
+            }
         }
     }
 

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

@@ -5,6 +5,7 @@
 import org.junit.platform.commons.support.ModifierSupport;
 import org.junit.platform.commons.support.ReflectionSupport;
 import org.junit.runner.Description;
+import org.junit.runners.model.MultipleFailureException;
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.lifecycle.TestDescription;
 import org.testcontainers.lifecycle.TestLifecycleAware;
@@ -97,7 +98,9 @@ protected void failed(Throwable e, Description description) {
     }
 
     @Override
-    protected void finished(Description description, List<Throwable> errors) {
+    protected void finished(Description description) throws Exception {
+        List<Throwable> errors = new ArrayList<Throwable>();
+
         forEachReversed(
             startedContainers,
             startable -> {
@@ -108,6 +111,8 @@ protected void finished(Description description, List<Throwable> errors) {
                 }
             }
         );
+
+        MultipleFailureException.assertEmpty(errors);
     }
 
     private List<Startable> findContainers(Description description) {