F!! DynamicTests now use new naming system

B!! properly detect if dynamic tests are used

Author: LarsEckart

approvaltests/src/main/java/org/approvaltests/integrations/junit5/JupiterApprovals.java

@@ -1,14 +1,21 @@
 package org.approvaltests.integrations.junit5;
 
+import org.approvaltests.Approvals;
 import org.approvaltests.core.Experimental;
+import org.approvaltests.core.Options;
 import org.approvaltests.namer.NamedEnvironment;
 import org.approvaltests.namer.NamerFactory;
 import org.junit.jupiter.api.DynamicTest;
 import org.lambda.actions.Action0;
+import org.lambda.actions.Action1;
 
 public class JupiterApprovals
 {
+  /**
+   * @deprecated Use {@link #dynamicTest(String, Action1<Options>) } instead.
+   */
   @Experimental
+  @Deprecated
   public static DynamicTest dynamicTest(String displayName, Action0 action0)
   {
     return DynamicTest.dynamicTest(displayName, () -> {
@@ -18,6 +25,14 @@ public static DynamicTest dynamicTest(String displayName, Action0 action0)
       }
     });
   }
+  @Experimental
+  public static DynamicTest dynamicTest(String displayName, Action1<Options> action1)
+  {
+    Options options = Approvals.NAMES.withParameters(convertToLegalFileName(displayName));
+    return DynamicTest.dynamicTest(displayName, () -> {
+      action1.call(options);
+    });
+  }
   public static String convertToLegalFileName(String uri)
   {
     return uri.replaceAll("[^a-zA-Z0-9\\.\\-]", "_");

approvaltests/src/main/java/org/approvaltests/namer/AttributeStackSelector.java

@@ -2,6 +2,7 @@
 
 import com.spun.util.FormattedException;
 import com.spun.util.ObjectUtils;
+import com.spun.util.ThreadUtils;
 import com.spun.util.io.StackElementSelector;
 import com.spun.util.tests.TestUtils;
 import org.approvaltests.integrations.junit5.JUnitUtils;
@@ -129,13 +130,23 @@ private static void checkConditionsForAttribute(Class<? extends Annotation> attr
   {
     if ("org.junit.jupiter.api.TestFactory".equals(attribute.getName()))
     {
-      if (NamerFactory.isEmpty())
+      if (!isDynamicWrapperPresent())
       {
         throw new FormattedException("When using dynamic tests and Approvals, you need to use %s instead.",
             "org.approvaltests.integrations.junit5.JupiterApprovals.dynamicTest(String, Executable)");
       }
     }
   }
+  private static boolean isDynamicWrapperPresent()
+  {
+    StackTraceElement[] stackTrace = ThreadUtils.getStackTrace();
+    for (StackTraceElement stackTraceElement : stackTrace)
+    {
+      if ("org.approvaltests.integrations.junit5.JupiterApprovals".equals(stackTraceElement.getClassName()))
+      { return true; }
+    }
+    return false;
+  }
   public static List<Method> getMethodsByName(Class<?> clazz, String methodName)
   {
     try

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

@@ -99,6 +99,9 @@ Collection<DynamicTest> testFactory()
         JupiterApprovals.dynamicTest("test 3",
             () -> StackTraceNamerUtils.assertNamerForFramework(this.getClass().getSimpleName(),
                 "testFactory.test_3")),
+        JupiterApprovals.dynamicTest("test 3",
+            (o) -> StackTraceNamerUtils.assertNamerForFramework(this.getClass().getSimpleName(),
+                "testFactory.test_3", o.forFile().getNamer())),
         JupiterApprovals.dynamicTest("test 2", () -> StackTraceNamerUtils
             .assertNamerForFramework(this.getClass().getSimpleName(), "testFactory.test_2")));
   }

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

@@ -9,15 +9,19 @@ public class StackTraceNamerUtils
 {
   public static void assertNamerForFramework(String className, String methodName)
   {
-    final StackTraceNamer namer = new StackTraceNamer();
+    final ApprovalNamer namer = new StackTraceNamer();
+    assertNamerForFramework(className, methodName, namer);
+  }
+  public static void assertNamerForFramework(String className, String methodName, ApprovalNamer namer)
+  {
     StackTraceNamerUtils.assertApprovalName(className, methodName, namer);
     StackTraceNamerUtils.assertSourceFilePath(className, namer);
   }
-  public static void assertApprovalName(String className, String methodName, StackTraceNamer namer)
+  public static void assertApprovalName(String className, String methodName, ApprovalNamer namer)
   {
     Assert.assertEquals(className + "." + methodName, namer.getApprovalName());
   }
-  public static void assertSourceFilePath(String className, StackTraceNamer name)
+  public static void assertSourceFilePath(String className, ApprovalNamer name)
   {
     File file = new File(name.getSourceFilePath() + className + ".java");
     Assert.assertTrue(file.exists());