F return autoclosable from overriding method to use with try with resources

Author: LarsEckart

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

@@ -28,9 +28,12 @@ public class TestUtils
 {
   private static Random                         random;
   private static Function2<Class, String, File> getSourceDirectory = ClassUtils::getSourceDirectory;
-  public static void registerSourceDirectoryFinder(Function2<Class, String, File> getSourceDirectory)
+  public static AutoCloseable registerSourceDirectoryFinder(Function2<Class, String, File> sourceDirectoryFinder)
   {
-    TestUtils.getSourceDirectory = getSourceDirectory;
+    Function2<Class, String, File> original = getSourceDirectory;
+    AutoCloseable c = () -> TestUtils.getSourceDirectory = original;
+    TestUtils.getSourceDirectory = sourceDirectoryFinder;
+    return c;
   }
   public static File getFile(String startingDir)
   {

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

@@ -1,5 +1,9 @@
 package org.approvaltests.namer;
 
+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;
 import org.junit.jupiter.api.RepeatedTest;
@@ -10,6 +14,7 @@
 
 import com.spun.util.LambdaThreadLauncher;
 import com.spun.util.ObjectUtils;
+import com.spun.util.tests.TestUtils;
 
 public class JUnit5StackTraceNamerTest
 {
@@ -61,8 +66,18 @@ void approvalFromInsideLambda() throws Exception
     }));
     lambda.getThread().join(1000);
     if (caught[0] != null)
+    { throw ObjectUtils.throwAsError(caught[0]); }
+  }
+  @Test
+  void testOverridingDirectoryFinder() throws Exception
+  {
+    try (AutoCloseable autoCloseable = TestUtils
+        .registerSourceDirectoryFinder((c, s) -> new File("does not exist")))
     {
-      throw ObjectUtils.throwAsError(caught[0]);
+      StackTraceNamer name = new StackTraceNamer();
+      File file = new File(name.getSourceFilePath() + this.getClass().getSimpleName() + ".java");
+      Assertions.assertFalse(file.exists());
     }
+    StackTraceNamerUtils.assertSourceFilePath(this.getClass().getSimpleName());
   }
 }