! F AraxisMerge Reporter on Mac - closes #172

approvals · Sep 30, 2024 · 33c54e3 · 33c54e3
1 parent 14d0047
commit 33c54e3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/approvaltests/src/main/java/org/approvaltests/reporters/DiffPrograms.java b/approvaltests/src/main/java/org/approvaltests/reporters/DiffPrograms.java
@@ -32,6 +32,8 @@ public static class Mac
         TEXT);
     public static DiffInfo VISUAL_STUDIO_CODE = new DiffInfo(
         "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code", "-d %s %s", TEXT);
+    public static DiffInfo ARAXIS_MERGE       = new DiffInfo(
+        "/Applications/Araxis Merge.app/Contents/Utilities/compare", TEXT_AND_IMAGE);
   }
   public static class Windows
   {

diff --git a/approvaltests/src/main/java/org/approvaltests/reporters/macosx/AraxisMergeReporter.java b/approvaltests/src/main/java/org/approvaltests/reporters/macosx/AraxisMergeReporter.java
@@ -0,0 +1,13 @@
+package org.approvaltests.reporters.macosx;
+
+import org.approvaltests.reporters.DiffPrograms;
+import org.approvaltests.reporters.GenericDiffReporter;
+
+public class AraxisMergeReporter extends GenericDiffReporter
+{
+  public static final AraxisMergeReporter INSTANCE = new AraxisMergeReporter();
+  public AraxisMergeReporter()
+  {
+    super(DiffPrograms.Mac.ARAXIS_MERGE);
+  }
+}
diff --git a/approvaltests/src/main/java/org/approvaltests/reporters/macosx/MacDiffReporter.java b/approvaltests/src/main/java/org/approvaltests/reporters/macosx/MacDiffReporter.java
@@ -6,21 +6,22 @@
 public class MacDiffReporter extends FirstWorkingReporter
 {
   public static final MacDiffReporter INSTANCE = new MacDiffReporter();
+  // @formatter:off
   public MacDiffReporter()
   {
     super(
-    // @formatter:off
         // begin-snippet: mac_diff_reporters
         BeyondCompareMacReporter.INSTANCE,
         DiffMergeMacOsReporter.INSTANCE,
         KaleidoscopeDiffReporter.INSTANCE,
         P4MergeReporter.INSTANCE,
+        AraxisMergeReporter.INSTANCE,
         KDiff3MacReporter.INSTANCE,
         TkDiffReporter.INSTANCE,
         IntelliJReporter.INSTANCE,
         VisualStudioCodeReporter.INSTANCE
         // end-snippet
-        // @formatter:on
     );
   }
+  // @formatter:on
 }