- B clearing SafetyChecks for DynamicTests

Co-authored-by: Jay Bazuzi <[email protected]>
Co-authored-by: Llewellyn Falco <[email protected]>

Author: 3 people

approvaltests/src/main/java/org/approvaltests/SafetyCheckBeforeVerify.java

@@ -19,4 +19,8 @@ public static void add(Action2<ApprovalApprover, Options> newCheck)
     Action2<ApprovalApprover, Options> oldCheck = guardRailCheck.get();
     guardRailCheck.set(newCheck);
   }
-}
+  public static void clear()
+  {
+    guardRailCheck.remove();
+  }
+}

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

@@ -16,8 +16,15 @@ public static DynamicTest dynamicTest(String displayName, Action1<Options> actio
   {
     Options options = Approvals.NAMES.withParameters(convertToLegalFileName(displayName));
     return DynamicTest.dynamicTest(displayName, () -> {
-      SafetyCheckBeforeVerify.add((__, o) -> checkOptionsWasUsed(o, options));
-      action1.call(options);
+      try
+      {
+        SafetyCheckBeforeVerify.add((__, o) -> checkOptionsWasUsed(o, options));
+        action1.call(options);
+      }
+      finally
+      {
+        SafetyCheckBeforeVerify.clear();
+      }
     });
   }
   private static void checkOptionsWasUsed(Options actual, Options expected)