R Cleaned up how we use Namers

Author: ScottBob

approvaltests-tests/src/test/java/org/approvaltests/namer/NamerFactoryTest.java

@@ -20,7 +20,7 @@ public void testMultipleFiles()
   @Test
   public void testMultipleFilesViaOptions()
   {
-    NamerFactoryForOptions.FileCounter labeller = Approvals.NAMES.useMultipleFiles();
+    FileCounter labeller = Approvals.NAMES.useMultipleFiles();
     Approvals.verify("one", labeller.next());
     Approvals.verify("two", labeller.next());
   }

approvaltests/src/main/java/org/approvaltests/awt/AwtApprovals.java

@@ -43,10 +43,7 @@ public static void verify(BufferedImage bufferedImage)
   }
   public static void verify(BufferedImage bufferedImage, Options options)
   {
-    try (NamedEnvironment env = ImageApprovalWriter.asJreAware())
-    {
-      Approvals.verify(new ImageApprovalWriter(bufferedImage), options);
-    }
+    Approvals.verify(new ImageApprovalWriter(bufferedImage), options.and(ImageApprovalWriter::asJreAware));
   }
   public static void verify(Component c)
   {
@@ -62,10 +59,7 @@ public static void verify(Paintable c)
   }
   public static void verify(Paintable c, Options options)
   {
-    try (NamedEnvironment env = ImageApprovalWriter.asJreAware())
-    {
-      Approvals.verify(options.createWriter(c), options);
-    }
+    Approvals.verify(options.createWriter(c), options.and(ImageApprovalWriter::asJreAware));
   }
   public static void verifySequence(int numberOfFrames, Function1<Integer, Paintable> sequenceRenderer)
   {

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

@@ -0,0 +1,11 @@
+package org.approvaltests.namer;
+
+import org.approvaltests.core.Options;
+
+public class FileCounter {
+    int counter;
+
+    public Options next() {
+        return new Options().forFile().withAdditionalInformation("" + ++counter);
+    }
+}

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

@@ -37,16 +37,9 @@ public Options withParameters(Options options, String... parameters)
     }
     return options;
   }
-  public FileCounter useMultipleFiles()
-  {
+
+  public FileCounter useMultipleFiles() {
     return new FileCounter();
   }
-  public static class FileCounter
-  {
-    int counter;
-    public Options next()
-    {
-      return new Options().forFile().withAdditionalInformation("" + ++counter);
-    }
-  }
+
 }

approvaltests/src/main/java/org/approvaltests/writers/ImageApprovalWriter.java

@@ -3,6 +3,7 @@
 import com.spun.util.NumberUtils;
 import com.spun.util.ObjectUtils;
 import org.approvaltests.core.ApprovalWriter;
+import org.approvaltests.core.Options;
 import org.approvaltests.namer.NamedEnvironment;
 
 import javax.imageio.ImageIO;
@@ -41,4 +42,8 @@ public String getFileExtensionWithDot()
   {
     return ".png";
   }
+
+  public static Options asJreAware(Options options) {
+    return options.forFile().withAdditionalInformation(getJreInformation());
+  }
 }