Mac Reporters

Author: isidore

java/org/approvaltests/reporters/FirstWorkingReporter.java

@@ -1,5 +1,9 @@
 package org.approvaltests.reporters;
 
+import java.util.List;
+
+import org.lambda.query.Query;
+
 public class FirstWorkingReporter implements EnvironmentAwareReporter
 {
   private final EnvironmentAwareReporter[] reporters;
@@ -28,4 +32,8 @@ public boolean isWorkingInThisEnvironment(String forFile)
     }
     return false;
   }
+  public List<EnvironmentAwareReporter> getWorkingReportersForEnviroment()
+  {
+    return Query.where(reporters, r -> r.isWorkingInThisEnvironment("a.txt"));
+  }
 }

java/org/approvaltests/reporters/GenericDiffReporter.java

@@ -5,6 +5,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import com.spun.util.SystemUtils;
 import com.spun.util.ThreadUtils;
 import com.spun.util.io.FileUtils;
 
@@ -46,8 +47,17 @@ public void report(String received, String approved) throws Exception
   private void launch(String received, String approved) throws IOException
   {
     ProcessBuilder builder = new ProcessBuilder(getCommandLine(received, approved));
+    preventProcessFromClosing(builder);
     Process process = builder.start();
-    ThreadUtils.sleep(500); //Give program time to start
+    ThreadUtils.sleep(800); //Give program time to start
+  }
+  private void preventProcessFromClosing(ProcessBuilder builder)
+  {
+    if (!SystemUtils.isWindowsEnviroment())
+    {
+      File output = new File("/dev/null");
+      builder.redirectError(output).redirectOutput(output);
+    }
   }
   public String[] getCommandLine(String received, String approved)
   {

java/org/approvaltests/reporters/macosx/KDiff3Reporter.java

@@ -0,0 +1,17 @@
+package org.approvaltests.reporters.macosx;
+
+import java.text.MessageFormat;
+
+import org.approvaltests.reporters.GenericDiffReporter;
+
+public class KDiff3Reporter extends GenericDiffReporter
+{
+  private static final String        DIFF_PROGRAM = "/Applications/kdiff3.app/Contents/MacOS/kdiff3";
+  static final String                MESSAGE      = MessageFormat.format("Unable to find KDiff3 at {0}",
+                                                      DIFF_PROGRAM);
+  public static final KDiff3Reporter INSTANCE     = new KDiff3Reporter();
+  public KDiff3Reporter()
+  {
+    super(DIFF_PROGRAM, "%s %s -m", MESSAGE, GenericDiffReporter.TEXT_FILE_EXTENSIONS);
+  }
+}

java/org/approvaltests/reporters/macosx/MacDiffReporter.java

@@ -7,6 +7,7 @@ public class MacDiffReporter extends FirstWorkingReporter
   public static final MacDiffReporter INSTANCE = new MacDiffReporter();
   public MacDiffReporter()
   {
-    super(DiffMergeReporter.INSTANCE, KaleidoscopeDiffReporter.INSTANCE,  P4MergeReporter.INSTANCE, TkDiffReporter.INSTANCE);
+    super(DiffMergeReporter.INSTANCE, KaleidoscopeDiffReporter.INSTANCE, P4MergeReporter.INSTANCE,
+        KDiff3Reporter.INSTANCE, TkDiffReporter.INSTANCE);
   }
 }