- F ReportNothing

Author: ScottBob

approvaltests-tests/src/test/java/org/approvaltests/ApprovalsTest.java

@@ -1,10 +1,7 @@
 package org.approvaltests;
 
 import org.approvaltests.core.Options;
-import org.approvaltests.reporters.ClipboardReporter;
-import org.approvaltests.reporters.DiffReporter;
-import org.approvaltests.reporters.QuietReporter;
-import org.approvaltests.reporters.UseReporter;
+import org.approvaltests.reporters.*;
 import org.approvaltests.reporters.windows.BeyondCompareReporter;
 import org.junit.jupiter.api.Test;
 
@@ -37,7 +34,7 @@ public void testWrongCall()
     Approvals.verifyException(() -> {
       JButton b = new JButton("Approval Tests Rule");
       b.setPreferredSize(new Dimension(150, 20));
-      Approvals.verify(b, new Options(new QuietReporter()));
+      Approvals.verify(b, new Options(new ReportNothing()));
     });
   }
   @Test

approvaltests-tests/src/test/java/org/approvaltests/OptionsSamplesTest.java

@@ -2,6 +2,7 @@
 
 import org.approvaltests.core.Options;
 import org.approvaltests.reporters.QuietReporter;
+import org.approvaltests.reporters.ReportNothing;
 import org.approvaltests.scrubbers.GuidScrubber;
 import org.junit.jupiter.api.Test;
 
@@ -12,7 +13,7 @@ void showAll()
   {
     Options options =
         // begin-snippet: specify_all_the_options
-        new Options().withReporter(new QuietReporter()).withScrubber(new GuidScrubber()).forFile()
+        new Options().withReporter(new ReportNothing()).withScrubber(new GuidScrubber()).forFile()
             .withExtension(".json");
     // end-snippet
   }

approvaltests-tests/src/test/java/org/approvaltests/approvers/FileApproverTest.java

@@ -1,6 +1,7 @@
 package org.approvaltests.approvers;
 
 import com.spun.util.ObjectUtils;
+import com.spun.util.QuietAutoCloseable;
 import com.spun.util.io.FileUtils;
 import com.spun.util.tests.StackTraceReflectionResult;
 import com.spun.util.tests.TestUtils;
@@ -71,13 +72,12 @@ public void testCustomApprover()
     // end-snippet
   }
   @Test
-  void testCustomError() throws Exception
+  void testCustomError()
   {
     var expected = """
         java.lang.AssertionError: Custom message
         """;
-    try (AutoCloseable old = Approvals.settings()
-        .registerErrorGenerator((received, approved) -> new AssertionError("Custom message")))
+    try (var old = ApprovalSettings.registerErrorGenerator((r, a) -> new AssertionError("Custom message")))
     {
       FileApprover fileApprover = new FileApprover(new File("a.txt"), new File("b.txt"), null, null);
       Approvals.verifyException(fileApprover::fail, new Options().inline(expected));

approvaltests-util-tests/src/test/java/com/spun/util/persistence/LoadersAndSaversExamplesTest.java

@@ -2,6 +2,7 @@
 
 import com.spun.util.Tuple;
 import org.approvaltests.Approvals;
+import org.approvaltests.utils.ConsoleOutput;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
@@ -40,12 +41,15 @@ class Step0_5
     @Test
     void test_dump_data()
     {
-      MyDatabase database = new MyDatabase();
-      // begin-snippet: step_capture_data
-      List<Customer> seniorCustomers = database.getSeniorCustomers();
-      seniorCustomers.stream().forEach(System.out::println);
-      // end-snippet
-      Approvals.verifyAll("", seniorCustomers, c -> c.toString());
+      try (var __ = new ConsoleOutput())
+      {
+        MyDatabase database = new MyDatabase();
+        // begin-snippet: step_capture_data
+        List<Customer> seniorCustomers = database.getSeniorCustomers();
+        seniorCustomers.stream().forEach(System.out::println);
+        // end-snippet
+        Approvals.verifyAll("", seniorCustomers, c -> c.toString());
+      }
     }
     public class MyDatabase
     {

approvaltests/src/main/java/org/approvaltests/ApprovalSettings.java

@@ -1,5 +1,6 @@
 package org.approvaltests;
 
+import com.spun.util.QuietAutoCloseable;
 import com.spun.util.introspection.Caller;
 import org.approvaltests.approvers.FileApprover;
 import org.lambda.functions.Function2;
@@ -23,7 +24,7 @@ public void allowMultipleVerifyCallsForThisClass()
     String className = caller.getClassName().replace('.', File.separatorChar);
     FileApprover.tracker.addAllowedDuplicates(f -> f.contains(className));
   }
-  public static AutoCloseable registerErrorGenerator(Function2<String, String, Error> errorGenerator)
+  public static QuietAutoCloseable registerErrorGenerator(Function2<String, String, Error> errorGenerator)
   {
     return FileApprover.registerErrorGenerator(errorGenerator);
   }

approvaltests/src/main/java/org/approvaltests/approvers/FileApprover.java

@@ -1,6 +1,7 @@
 package org.approvaltests.approvers;
 
 import com.spun.util.ObjectUtils;
+import com.spun.util.QuietAutoCloseable;
 import com.spun.util.io.FileUtils;
 import org.approvaltests.internal.logs.ApprovedFileLog;
 import org.approvaltests.internal.logs.FailedFileLog;
@@ -39,7 +40,7 @@ public FileApprover(File received, File approved, ApprovalWriter writer,
     this.writer = writer;
     this.approver = approver;
   }
-  public static AutoCloseable registerErrorGenerator(Function2<String, String, Error> errorGenerator)
+  public static QuietAutoCloseable registerErrorGenerator(Function2<String, String, Error> errorGenerator)
   {
     Function2<String, String, Error> old = FileApprover.errorGenerator;
     FileApprover.errorGenerator = errorGenerator;

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

@@ -2,6 +2,7 @@
 
 import com.spun.util.SystemUtils;
 import com.spun.util.WindowUtils;
+import com.spun.util.logger.SimpleLogger;
 import org.approvaltests.core.ApprovalFailureReporter;
 
 import java.awt.*;

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

@@ -0,0 +1,13 @@
+package org.approvaltests.reporters;
+
+import org.approvaltests.core.ApprovalFailureReporter;
+
+public class ReportNothing implements ApprovalFailureReporter
+{
+  public static final ReportNothing INSTANCE = new ReportNothing();
+  @Override
+  public boolean report(String received, String approved)
+  {
+    return true;
+  }
+}

approvaltests/src/test/java/org/approvaltests/reporters/JUnitReporterTest.java

@@ -1,7 +1,9 @@
 package org.approvaltests.reporters;
 
 import com.spun.util.ClassUtils;
+import com.spun.util.QuietAutoCloseable;
 import com.spun.util.io.FileUtils;
+import com.spun.util.logger.SimpleLogger;
 import org.approvaltests.Approvals;
 import org.approvaltests.core.ApprovalFailureReporter;
 import org.junit.jupiter.api.Test;
@@ -25,10 +27,13 @@ void testJUnit5()
   }
   private void verifyReporter(ApprovalFailureReporter reporter)
   {
-    String a = FileUtils.getResolvedPath(ClassUtils.getAdjacentFile(this.getClass(), "a.txt"));
-    String b = FileUtils.getResolvedPath(ClassUtils.getAdjacentFile(this.getClass(), "b.txt"));
-    Approvals.verifyException(() -> {
-      reporter.report(b, a);
-    });
+    try (QuietAutoCloseable l = SimpleLogger.quiet())
+    {
+      String a = FileUtils.getResolvedPath(ClassUtils.getAdjacentFile(this.getClass(), "a.txt"));
+      String b = FileUtils.getResolvedPath(ClassUtils.getAdjacentFile(this.getClass(), "b.txt"));
+      Approvals.verifyException(() -> {
+        reporter.report(b, a);
+      });
+    }
   }
 }