B!! Files launch on linux

Co-Authored-By: Llewellyn Falco <[email protected]>
Co-Authored-By: brianberzins <[email protected]>

Author: 3 people

approvaltests-util/src/main/java/com/spun/util/SystemUtils.java

@@ -8,7 +8,7 @@
 public class SystemUtils
 {
   /**
-   * @deprecated Use {@link #isWindowsEnvironment} instead.
+   * @deprecated Use {@link #isWindowsEnvironment()} instead.
    * For example inline your usage of this method.
    */
   @Deprecated
@@ -66,7 +66,16 @@ else if (windowsOs)
       return fileName.replace(" ", "\\ ");
     }
   }
+  /**
+   * @deprecated Use {@link #isMacEnvironment()} instead.
+   * For example inline your usage of this method.
+   */
+  @Deprecated
   public static boolean isMacEnviroment()
+  {
+    return isMacEnvironment();
+  }
+  public static boolean isMacEnvironment()
   {
     String osName = System.getProperty("os.name").toLowerCase();
     boolean isMacOs = osName.startsWith("mac os x");

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

@@ -0,0 +1,36 @@
+package com.spun.util.tests;
+
+import com.spun.util.io.FileUtils;
+
+public class LinuxOpener implements Opener
+{
+  @Override
+  public boolean open(String fileName)
+  {
+    return executeOnLinux(fileName, "xdg-open");
+  }
+  public static boolean executeOnLinux(String fileName, String program)
+  {
+    if (which(program) == null)
+    { return false; }
+    String cmd = String.format(program + " %s", fileName);
+    Opener.execute(cmd);
+    return true;
+  }
+  public static String which(String command)
+  {
+    try
+    {
+      String command1 = "which " + command;
+      Process p = Runtime.getRuntime().exec(command1);
+      String output = FileUtils.readStream(p.getInputStream()).trim();
+      p.waitFor();
+      int exitValue = p.exitValue();
+      return exitValue == 0 ? output : null;
+    }
+    catch (Exception e)
+    {
+      return null;
+    }
+  }
+}

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

@@ -0,0 +1,12 @@
+package com.spun.util.tests;
+
+import static com.spun.util.tests.LinuxOpener.executeOnLinux;
+
+public class MacOpener implements Opener
+{
+  @Override
+  public boolean open(String fileName)
+  {
+    return executeOnLinux(fileName, "open");
+  }
+}

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

@@ -0,0 +1,20 @@
+package com.spun.util.tests;
+
+import com.spun.util.ObjectUtils;
+
+public interface Opener
+{
+  public boolean open(String fileName);
+  public static void execute(String cmd)
+  {
+    try
+    {
+      Runtime.getRuntime().exec(cmd);
+      Thread.sleep(2000);
+    }
+    catch (Exception e)
+    {
+      throw ObjectUtils.throwAsError(e);
+    }
+  }
+}

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

@@ -1,6 +1,7 @@
 package com.spun.util.tests;
 
 import com.spun.util.ClassUtils;
+import com.spun.util.FormattedException;
 import com.spun.util.ObjectUtils;
 import com.spun.util.ThreadUtils;
 import com.spun.util.WindowUtils;
@@ -17,6 +18,7 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.util.List;
 import java.util.Random;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -143,27 +145,22 @@ public static void displayEmail(Message email)
       throw ObjectUtils.throwAsError(e);
     }
   }
+  private static final List<Opener> openers = Queryable.as(new MacOpener(), new WindowsOpener(),
+      new LinuxOpener());
+  public static void registerOpener(Opener opener)
+  {
+    openers.add(0, opener);
+  }
   public static void displayFile(String fileName)
   {
-    String cmd = "";
-    if (File.separatorChar == '\\')
-    {
-      cmd = "cmd /C start \"Needed Title\" \"%s\" /B";
-    }
-    else
+    for (Opener opener : openers)
     {
-      cmd = "open %s";
-    }
-    try
-    {
-      cmd = String.format(cmd, fileName);
-      Runtime.getRuntime().exec(cmd);
-      Thread.sleep(2000);
-    }
-    catch (Exception e)
-    {
-      throw ObjectUtils.throwAsError(e);
+      if (opener.open(fileName))
+      { return; }
     }
+    throw new FormattedException("No match found for your OS.\n"
+        + "Please add your details at https://github.com/approvals/ApprovalTests.Java/issues/251\n"
+        + "In the meantime, call TestUtils.registerOpener(yourCustomOpener).");
   }
   public static double getTimerMultiplier()
   {

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

@@ -0,0 +1,16 @@
+package com.spun.util.tests;
+
+import com.spun.util.SystemUtils;
+
+public class WindowsOpener implements Opener
+{
+  @Override
+  public boolean open(String fileName)
+  {
+    if (!SystemUtils.isWindowsEnvironment())
+    { return false; }
+    String cmd = String.format("cmd /C start \"Needed Title\" \"%s\" /B", fileName);
+    Opener.execute(cmd);
+    return true;
+  }
+}

approvaltests/src/main/java/org/approvaltests/reporters/intellij/IntelliJPathResolver.java

@@ -72,7 +72,7 @@ private Path getPath(Version version)
   private String runtimeSuffix()
   {
     String runtimeSuffix;
-    if (SystemUtils.isWindowsEnviroment())
+    if (SystemUtils.isWindowsEnvironment())
     {
       runtimeSuffix = "/bin/idea64.exe";
     }