F!! Adding options to VelocityApprovals

Author: ScottBob

approvaltests-tests/src/test/java/org/approvaltests/DocumentHelpersTest.listAllVerifyFunctions.approved.md

@@ -53,4 +53,3 @@
  * JsonApprovals. [verifyAsJson ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java#L29-L32) (Object,Function1)  
  * JsonApprovals. [verifyJson ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java#L17-L20) (String)  
  * VelocityApprovals. [verify ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/velocity/VelocityApprovals.java#L16-L19) (ContextAware)  
- * VelocityApprovals. [verify ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/velocity/VelocityApprovals.java#L24-L27) (ContextAware,String)  

approvaltests/src/main/java/org/approvaltests/velocity/VelocityApprovals.java

@@ -15,19 +15,28 @@ public static void verify(ContextAware context)
   }
   public static void verify(ContextAware context, Options options)
   {
-    verify(context, ".txt", options);
+    ApprovalNamer namer = Approvals.createApprovalNamer();
+    String fileExtentsionWithDot = options.forFile().getFileExtension();
+    String file = namer.getSourceFilePath() + namer.getApprovalName() + ".template" + fileExtentsionWithDot;
+    FileUtils.createIfNeeded(file);
+    String text = VelocityParser.parseFile(file, context);
+    Approvals.verify(text, options);
   }
+  /**
+   * @deprecated use {@code Options.forFile().withExtension(fileExtensionWithDot) }
+   */
+  @Deprecated
   public static void verify(ContextAware context, String fileExtentsionWithDot)
   {
     verify(context, fileExtentsionWithDot, new Options());
   }
+  /**
+   * @deprecated use {@code Options.forFile().withExtension(fileExtensionWithDot) }
+   */
+  @Deprecated
   public static void verify(ContextAware context, String fileExtentsionWithDot, Options options)
   {
-    ApprovalNamer namer = Approvals.createApprovalNamer();
-    String file = namer.getSourceFilePath() + namer.getApprovalName() + ".template" + fileExtentsionWithDot;
-    FileUtils.createIfNeeded(file);
-    String text = VelocityParser.parseFile(file, context);
     options = options.forFile().withExtension(fileExtentsionWithDot);
-    Approvals.verify(text, options);
+    verify(context, options);
   }
 }

todo.md

@@ -1,12 +1,12 @@
 # Code
+* Clean up duplication in CheckedExceptionsTest and TestFileNamesTest
 * Approvals.options.forName.asMachineNameSpecificTest().onlyForEnvironments("Larss-Air.lan", "macbook13").run(this::extracted);
 * better default FrontloadedReporter to handle CI
 * NamedEnvironment with execute around pattern?
 
 * easier API for custom file name & location?! (issue 2, 51)
 ** Options for file path
 ** update mrunit and fix tests
-** VelocityApprovals doesn't know about Options yet
 
 * Think about removing MethodExcecutionPath
 * remove all warnings