! F Separating Email opener and removing deprecated function

Author: ScottBob

approvaltests-util-tests/pom.xml

@@ -35,11 +35,6 @@
             <artifactId>velocity-engine-core</artifactId>
                  <version>2.3</version>
         </dependency>
-        <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>1.6.2</version>
-        </dependency>
         <dependency>
             <groupId>quartz</groupId>
             <artifactId>quartz</artifactId>

approvaltests-util/pom.xml

@@ -34,6 +34,7 @@
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
             <version>1.6.2</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>quartz</groupId>

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

@@ -0,0 +1,29 @@
+package com.spun.util.tests;
+
+import com.spun.util.ObjectUtils;
+
+import javax.mail.Message;
+import java.io.File;
+import java.io.FileOutputStream;
+
+public class EmailOpener
+{
+  public static void displayEmail(Message email)
+  {
+    if (email == null)
+    { return; }
+    try
+    {
+      File f = File.createTempFile("email", ".eml");
+      f.deleteOnExit();
+      FileOutputStream out = new FileOutputStream(f);
+      email.writeTo(out);
+      out.close();
+      TestUtils.displayFile(f.getAbsolutePath());
+    }
+    catch (Exception e)
+    {
+      throw ObjectUtils.throwAsError(e);
+    }
+  }
+}

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

@@ -12,7 +12,6 @@
 import org.lambda.functions.Function2;
 import org.lambda.query.Queryable;
 
-import javax.mail.Message;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import java.awt.image.BufferedImage;
@@ -127,24 +126,6 @@ public static void displayExcel(String output)
     displayHtml(null, ".csv", output, 3);
     //    Runtime.getRuntime().exec("notepad.exe " + outputFile);
   }
-  public static void displayEmail(Message email)
-  {
-    if (email == null)
-    { return; }
-    try
-    {
-      File f = File.createTempFile("email", ".eml");
-      f.deleteOnExit();
-      FileOutputStream out = new FileOutputStream(f);
-      email.writeTo(out);
-      out.close();
-      displayFile(f.getAbsolutePath());
-    }
-    catch (Exception e)
-    {
-      throw ObjectUtils.throwAsError(e);
-    }
-  }
   private static final List<Opener> openers = Queryable.as(new MacOpener(), new WindowsOpener(),
       new LinuxOpener());
   public static void registerOpener(Opener opener)

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

@@ -11,20 +11,6 @@
 
 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, () -> {
-      try (NamedEnvironment en = NamerFactory.withParameters(convertToLegalFileName(displayName)))
-      {
-        action0.call();
-      }
-    });
-  }
   @Experimental
   public static DynamicTest dynamicTest(String displayName, Action1<Options> action1)
   {