F no checked exception when using SourceDirectoryFinder

Author: LarsEckart

approvaltests-util/src/main/java/com/spun/util/tests/TestUtils.java

@@ -28,13 +28,26 @@ public class TestUtils
 {
   private static Random                         random;
   private static Function2<Class, String, File> getSourceDirectory = ClassUtils::getSourceDirectory;
-  public static AutoCloseable registerSourceDirectoryFinder(Function2<Class, String, File> sourceDirectoryFinder)
+  public static SourceDirectoryRestorer registerSourceDirectoryFinder(
+      Function2<Class, String, File> sourceDirectoryFinder)
   {
-    Function2<Class, String, File> original = getSourceDirectory;
-    AutoCloseable c = () -> TestUtils.getSourceDirectory = original;
+    SourceDirectoryRestorer c = new SourceDirectoryRestorer();
     TestUtils.getSourceDirectory = sourceDirectoryFinder;
     return c;
   }
+  public static class SourceDirectoryRestorer implements AutoCloseable
+  {
+    private final Function2<Class, String, File> original;
+    public SourceDirectoryRestorer()
+    {
+      this.original = TestUtils.getSourceDirectory;
+    }
+    @Override
+    public void close()
+    {
+      TestUtils.getSourceDirectory = original;
+    }
+  }
   public static File getFile(String startingDir)
   {
     JFrame frame = new JFrame();

approvaltests/src/test/java/org/approvaltests/namer/JUnit5StackTraceNamerTest.java

@@ -2,7 +2,6 @@
 
 import java.io.File;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -15,6 +14,7 @@
 import com.spun.util.LambdaThreadLauncher;
 import com.spun.util.ObjectUtils;
 import com.spun.util.tests.TestUtils;
+import com.spun.util.tests.TestUtils.SourceDirectoryRestorer;
 
 public class JUnit5StackTraceNamerTest
 {
@@ -69,9 +69,9 @@ void approvalFromInsideLambda() throws Exception
     { throw ObjectUtils.throwAsError(caught[0]); }
   }
   @Test
-  void testOverridingDirectoryFinder() throws Exception
+  void testOverridingDirectoryFinder()
   {
-    try (AutoCloseable autoCloseable = TestUtils
+    try (SourceDirectoryRestorer sdr = TestUtils
         .registerSourceDirectoryFinder((c, s) -> new File("does not exist")))
     {
       StackTraceNamer name = new StackTraceNamer();