B!! DiffMergeReporter is no longer tricky when used on linux or mac

Author: LarsEckart

approvaltests-tests/src/test/java/org/approvaltests/demos/LoaderTest.java

@@ -3,12 +3,11 @@
 import com.spun.util.persistence.Loader;
 import com.spun.util.persistence.Saver;
 import com.spun.util.persistence.test.MockSaver;
+import org.approvaltests.reporters.DiffMergeReporter;
 import org.approvaltests.reporters.UseReporter;
-import org.approvaltests.reporters.macosx.DiffMergeReporter;
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 

approvaltests-tests/src/test/java/org/approvaltests/machine_specific_tests/reporters/GenericDiffReporterTest.testGetWorkingReportersForEnvironment.llewelllcosmbp2.lan.approved.txt

@@ -1,4 +1,4 @@
-reporters[0] = org.approvaltests.reporters.macosx.DiffMergeReporter
+reporters[0] = org.approvaltests.reporters.macosx.DiffMergeMacOsReporter
 reporters[1] = org.approvaltests.reporters.macosx.P4MergeReporter
 reporters[2] = org.approvaltests.reporters.macosx.KDiff3Reporter
 reporters[3] = org.approvaltests.reporters.macosx.TkDiffReporter

approvaltests-tests/src/test/java/org/approvaltests/reporters/GenericDiffReporterTest.java

@@ -4,7 +4,7 @@
 import com.spun.util.SystemUtils;
 import org.approvaltests.Approvals;
 import org.approvaltests.combinations.CombinationApprovals;
-import org.approvaltests.reporters.macosx.DiffMergeReporter;
+import org.approvaltests.reporters.macosx.DiffMergeMacOsReporter;
 import org.approvaltests.reporters.macosx.P4MergeReporter;
 import org.approvaltests.reporters.macosx.TkDiffReporter;
 import org.approvaltests.reporters.macosx.VisualStudioCodeReporter;

approvaltests-util-tests/src/test/java/com/spun/util/persistence/LoaderTest.java

@@ -4,8 +4,9 @@
 import com.spun.util.persistence.test.MockLoader;
 import org.approvaltests.Approvals;
 import org.approvaltests.core.Options;
+import org.approvaltests.reporters.DiffMergeReporter;
 import org.approvaltests.reporters.UseReporter;
-import org.approvaltests.reporters.macosx.DiffMergeReporter;
+import org.approvaltests.reporters.macosx.DiffMergeMacOsReporter;
 import org.approvaltests.scrubbers.NormalizeSpacesScrubber;
 import org.approvaltests.utils.WithTimeZone;
 import org.junit.jupiter.api.Test;

approvaltests/src/main/java/org/approvaltests/reporters/DiffMergeReporter.java

@@ -0,0 +1,13 @@
+package org.approvaltests.reporters;
+
+import org.approvaltests.reporters.linux.DiffMergeLinuxReporter;
+import org.approvaltests.reporters.macosx.DiffMergeMacOsReporter;
+
+public class DiffMergeReporter extends FirstWorkingReporter
+{
+  public static final DiffMergeReporter INSTANCE = new DiffMergeReporter();
+  public DiffMergeReporter()
+  {
+    super(DiffMergeMacOsReporter.INSTANCE, DiffMergeLinuxReporter.INSTANCE);
+  }
+}

approvaltests/src/main/java/org/approvaltests/reporters/linux/DiffMergeReporter.java renamed to approvaltests/src/main/java/org/approvaltests/reporters/linux/DiffMergeLinuxReporter.java

@@ -3,11 +3,11 @@
 import org.approvaltests.reporters.DiffPrograms.Linux;
 import org.approvaltests.reporters.GenericDiffReporter;
 
-public class DiffMergeReporter extends GenericDiffReporter
+public class DiffMergeLinuxReporter extends GenericDiffReporter
 {
-  public static final DiffMergeReporter INSTANCE = new DiffMergeReporter();
-  public DiffMergeReporter()
+  public static final DiffMergeLinuxReporter INSTANCE = new DiffMergeLinuxReporter();
+  public DiffMergeLinuxReporter()
   {
     super(Linux.DIFF_MERGE);
   }
-}
+}

approvaltests/src/main/java/org/approvaltests/reporters/linux/LinuxDiffReporter.java

@@ -11,7 +11,7 @@ public LinuxDiffReporter()
     super(
     // @formatter:off
         // begin-snippet: linux_diff_reporters
-        DiffMergeReporter.INSTANCE,
+        DiffMergeLinuxReporter.INSTANCE,
         MeldMergeReporter.INSTANCE,
         IntelliJReporter.INSTANCE
         // end-snippet

approvaltests/src/main/java/org/approvaltests/reporters/macosx/DiffMergeReporter.java renamed to approvaltests/src/main/java/org/approvaltests/reporters/macosx/DiffMergeMacOsReporter.java

@@ -3,10 +3,10 @@
 import org.approvaltests.reporters.DiffPrograms.Mac;
 import org.approvaltests.reporters.GenericDiffReporter;
 
-public class DiffMergeReporter extends GenericDiffReporter
+public class DiffMergeMacOsReporter extends GenericDiffReporter
 {
-  public static final DiffMergeReporter INSTANCE = new DiffMergeReporter();
-  public DiffMergeReporter()
+  public static final DiffMergeMacOsReporter INSTANCE = new DiffMergeMacOsReporter();
+  public DiffMergeMacOsReporter()
   {
     super(Mac.DIFF_MERGE);
   }

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

@@ -12,7 +12,7 @@ public MacDiffReporter()
     // @formatter:off
         // begin-snippet: mac_diff_reporters
         BeyondCompareMacReporter.INSTANCE,
-        DiffMergeReporter.INSTANCE,
+        DiffMergeMacOsReporter.INSTANCE,
         KaleidoscopeDiffReporter.INSTANCE,
         P4MergeReporter.INSTANCE,
         KDiff3Reporter.INSTANCE,