F!! support for Kaleidoscope Command-Line Tool (ksdiff)

approvals · May 9, 2022 · 976edf5 · 976edf5
1 parent 6caa81f
commit 976edf5
Show file tree

Hide file tree

Showing 6 changed files with 45 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
@@ -23,6 +23,7 @@ public static class Mac
         "/Applications/Beyond Compare.app/Contents/MacOS/bcomp", TEXT);
     public static DiffInfo KALEIDOSCOPE       = new DiffInfo(
         "/Applications/Kaleidoscope.app/Contents/MacOS/ksdiff", TEXT_AND_IMAGE);
+    public static DiffInfo KALEIDOSCOPE3      = new DiffInfo("/usr/local/bin/ksdiff", TEXT_AND_IMAGE);
     public static DiffInfo KDIFF3             = new DiffInfo("/Applications/kdiff3.app/Contents/MacOS/kdiff3",
         "%s %s -m", TEXT);
     public static DiffInfo P4MERGE            = new DiffInfo("/Applications/p4merge.app/Contents/MacOS/p4merge",

diff --git a/...ovaltests/src/main/java/org/approvaltests/reporters/macosx/Kaleidoscope3DiffReporter.java b/...ovaltests/src/main/java/org/approvaltests/reporters/macosx/Kaleidoscope3DiffReporter.java
@@ -0,0 +1,13 @@
+package org.approvaltests.reporters.macosx;
+
+import org.approvaltests.reporters.DiffPrograms.Mac;
+import org.approvaltests.reporters.GenericDiffReporter;
+
+public class Kaleidoscope3DiffReporter extends GenericDiffReporter
+{
+  public static final Kaleidoscope3DiffReporter INSTANCE = new Kaleidoscope3DiffReporter();
+  public Kaleidoscope3DiffReporter()
+  {
+    super(Mac.KALEIDOSCOPE3);
+  }
+}
diff --git a/approvaltests/src/main/java/org/approvaltests/reporters/macosx/KaleidoscopeDiffReporter.java b/approvaltests/src/main/java/org/approvaltests/reporters/macosx/KaleidoscopeDiffReporter.java
@@ -1,13 +1,14 @@
 package org.approvaltests.reporters.macosx;
 
 import org.approvaltests.reporters.DiffPrograms.Mac;
+import org.approvaltests.reporters.FirstWorkingReporter;
 import org.approvaltests.reporters.GenericDiffReporter;
 
-public class KaleidoscopeDiffReporter extends GenericDiffReporter
+public class KaleidoscopeDiffReporter extends FirstWorkingReporter
 {
   public static final KaleidoscopeDiffReporter INSTANCE = new KaleidoscopeDiffReporter();
   public KaleidoscopeDiffReporter()
   {
-    super(Mac.KALEIDOSCOPE);
+    super(LegacyKaleidoscopeDiffReporter.INSTANCE, Kaleidoscope3DiffReporter.INSTANCE);
   }
 }
diff --git a/...ests/src/main/java/org/approvaltests/reporters/macosx/LegacyKaleidoscopeDiffReporter.java b/...ests/src/main/java/org/approvaltests/reporters/macosx/LegacyKaleidoscopeDiffReporter.java
@@ -0,0 +1,13 @@
+package org.approvaltests.reporters.macosx;
+
+import org.approvaltests.reporters.DiffPrograms.Mac;
+import org.approvaltests.reporters.GenericDiffReporter;
+
+public class LegacyKaleidoscopeDiffReporter extends GenericDiffReporter
+{
+  public static final LegacyKaleidoscopeDiffReporter INSTANCE = new LegacyKaleidoscopeDiffReporter();
+  public LegacyKaleidoscopeDiffReporter()
+  {
+    super(Mac.KALEIDOSCOPE);
+  }
+}
diff --git a/...ltests/src/test/java/org/approvaltests/reporters/macosx/KaleidoscopeDiffReporterTest.java b/...ltests/src/test/java/org/approvaltests/reporters/macosx/KaleidoscopeDiffReporterTest.java
@@ -0,0 +1,14 @@
+package org.approvaltests.reporters.macosx;
+
+import org.approvaltests.Approvals;
+import org.approvaltests.core.Options;
+import org.junit.jupiter.api.Test;
+
+class KaleidoscopeDiffReporterTest
+{
+  @Test
+  void kaleidoscope()
+  {
+    Approvals.verify("Hello, world!", new Options(new KaleidoscopeDiffReporter()));
+  }
+}
diff --git a/...org/approvaltests/reporters/macosx/KaleidoscopeDiffReporterTest.kaleidoscope.approved.txt b/...org/approvaltests/reporters/macosx/KaleidoscopeDiffReporterTest.kaleidoscope.approved.txt
@@ -0,0 +1 @@
+Hello, world!