- B FirstWorkingReporter does not swallow reporters with approval power

#446

Author: ScottBob

approvaltests-tests/src/test/java/org/approvaltests/reporters/FirstWorkingReporterTest.java

@@ -0,0 +1,26 @@
+package org.approvaltests.reporters;
+
+import org.approvaltests.Approvals;
+import org.approvaltests.core.Options;
+import org.approvaltests.core.VerifyResult;
+import org.junit.jupiter.api.Test;
+
+class FirstWorkingReporterTest {
+
+    @Test
+    void testReporterWithApprovalPower() {
+        var t = new ReporterWithApprovalPower() {
+
+            @Override
+            public boolean report(String received, String approved) {
+                return true;
+            }
+
+            @Override
+            public VerifyResult approveWhenReported() {
+                return VerifyResult.SUCCESS;
+            }
+        };
+        Approvals.verify("test", new Options(new FirstWorkingReporter(t)));
+    }
+}

approvaltests/src/main/java/org/approvaltests/reporters/FirstWorkingReporter.java

@@ -1,10 +1,13 @@
 package org.approvaltests.reporters;
 
 import org.approvaltests.core.ApprovalFailureReporter;
+import org.approvaltests.core.VerifyResult;
 
-public class FirstWorkingReporter implements ApprovalFailureReporter
+public class FirstWorkingReporter implements ReporterWithApprovalPower
 {
   private final ApprovalFailureReporter[] reporters;
+  private VerifyResult approvalOutcome = VerifyResult.FAILURE;
+
   public FirstWorkingReporter(ApprovalFailureReporter... reporters)
   {
     this.reporters = reporters;
@@ -19,10 +22,20 @@ public boolean report(String received, String approved)
     for (ApprovalFailureReporter reporter : reporters)
     {
       if (reporter.report(received, approved))
-      { return true; }
+      {
+        checkApprovalPower(reporter);
+        return true;
+      }
     }
     return false;
   }
+
+  private void checkApprovalPower(ApprovalFailureReporter reporter) {
+    if (reporter instanceof ReporterWithApprovalPower) {
+      approvalOutcome = ((ReporterWithApprovalPower) reporter).approveWhenReported();
+    }
+  }
+
   public ApprovalFailureReporter[] getReporters()
   {
     return reporters;
@@ -32,4 +45,9 @@ public String toString()
   {
     return getClass().getName();
   }
+
+  @Override
+  public VerifyResult approveWhenReported() {
+    return approvalOutcome;
+  }
 }