GEODE-10251: Make DescribedExternalResource report all exceptions (ap…

…ache#7609) * GEODE-10251: Make DescribedExternalResource report all exceptions Co-authored-by: Dale Emery <[email protected]> Co-authored-by: Kirk Lund <[email protected]> * Fix test name Co-authored-by: Dale Emery <[email protected]> Co-authored-by: Kirk Lund <[email protected]> * Spotless Co-authored-by: Dale Emery <[email protected]> Co-authored-by: Kirk Lund <[email protected]> Co-authored-by: Kirk Lund <[email protected]>
ringles · Apr 20, 2022 · e362324 · e362324
1 parent 89a6112
commit e362324
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 1 deletion.
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/DescribedExternalResource.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/DescribedExternalResource.java
@@ -14,8 +14,12 @@
  */
 package org.apache.geode.test.junit.rules;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
+import org.junit.runners.model.MultipleFailureException;
 import org.junit.runners.model.Statement;
 
 /**
@@ -36,11 +40,19 @@ public Statement apply(Statement base, Description description) {
       @Override
       public void evaluate() throws Throwable {
         before(description);
+        List<Throwable> errors = new ArrayList<Throwable>();
         try {
           base.evaluate();
+        } catch (Throwable e) {
+          errors.add(e);
         } finally {
-          after(description);
+          try {
+            after(description);
+          } catch (Throwable e) {
+            errors.add(e);
+          }
         }
+        MultipleFailureException.assertEmpty(errors);
       }
     };
   }

diff --git a/...-junit/src/test/java/org/apache/geode/test/junit/rules/DescribedExternalResourceTest.java b/...-junit/src/test/java/org/apache/geode/test/junit/rules/DescribedExternalResourceTest.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
+
+package org.apache.geode.test.junit.rules;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
+
+import org.junit.jupiter.api.Test;
+import org.junit.runner.Description;
+import org.junit.runners.model.MultipleFailureException;
+import org.junit.runners.model.Statement;
+
+public class DescribedExternalResourceTest {
+  @Test
+  void reportsErrorsFromBaseAndAfter() {
+    Throwable thrownByBase = new RuntimeException("thrown by base");
+    Throwable thrownByAfter = new RuntimeException("thrown by after");
+
+    DescribedExternalResource rule = new DescribedExternalResource() {
+      @Override
+      protected void after(Description description) throws Throwable {
+        throw thrownByAfter;
+      }
+    };
+    Statement base = new Statement() {
+      @Override
+      public void evaluate() throws Throwable {
+        throw thrownByBase;
+      }
+    };
+
+    Statement ruleStatement = rule.apply(base, null);
+
+    Throwable thrownByRule = catchThrowable(ruleStatement::evaluate);
+
+    assertThat(thrownByRule)
+        .isInstanceOf(MultipleFailureException.class);
+    assertThat(((MultipleFailureException) thrownByRule).getFailures())
+        .containsExactlyInAnyOrder(thrownByBase, thrownByAfter);
+  }
+
+
+}