From 349d8dd0950b38f8b4c51eb602e22d2d7cf44c62 Mon Sep 17 00:00:00 2001 From: Scott Wierschem Date: Thu, 5 Oct 2023 16:35:13 -0500 Subject: [PATCH] ! B Fixing missing approval file --- .../io/FileUtilsTest.testSaveToFile.approved.tmp | 1 + .../org/approvaltests/reporters/DiffPrograms.java | 2 +- .../org/approvaltests/reporters/KDiff3Reporter.java | 12 +++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 approvaltests-util-tests/src/test/java/com/spun/util/io/FileUtilsTest.testSaveToFile.approved.tmp diff --git a/approvaltests-util-tests/src/test/java/com/spun/util/io/FileUtilsTest.testSaveToFile.approved.tmp b/approvaltests-util-tests/src/test/java/com/spun/util/io/FileUtilsTest.testSaveToFile.approved.tmp new file mode 100644 index 00000000..e1d96e28 --- /dev/null +++ b/approvaltests-util-tests/src/test/java/com/spun/util/io/FileUtilsTest.testSaveToFile.approved.tmp @@ -0,0 +1 @@ +hello Approvals diff --git a/approvaltests/src/main/java/org/approvaltests/reporters/DiffPrograms.java b/approvaltests/src/main/java/org/approvaltests/reporters/DiffPrograms.java index 273ff158..a0153000 100644 --- a/approvaltests/src/main/java/org/approvaltests/reporters/DiffPrograms.java +++ b/approvaltests/src/main/java/org/approvaltests/reporters/DiffPrograms.java @@ -71,6 +71,6 @@ public static class Linux public static DiffInfo DIFF_MERGE = new DiffInfo("/usr/bin/diffmerge", "--nosplash %s %s ", TEXT); public static DiffInfo MELD_MERGE = new DiffInfo(One.of("/usr/bin/meld", "/usr/local/bin/meld"), "%s %s ", TEXT); - public static DiffInfo KDIFF3 = new DiffInfo("/usr/bin/kdiff3", "%s %s -m", TEXT); + public static DiffInfo KDIFF3 = new DiffInfo("/usr/bin/kdiff3", "%s %s -m", TEXT); } } diff --git a/approvaltests/src/main/java/org/approvaltests/reporters/KDiff3Reporter.java b/approvaltests/src/main/java/org/approvaltests/reporters/KDiff3Reporter.java index 5bccc56c..7d09e96d 100644 --- a/approvaltests/src/main/java/org/approvaltests/reporters/KDiff3Reporter.java +++ b/approvaltests/src/main/java/org/approvaltests/reporters/KDiff3Reporter.java @@ -4,9 +4,11 @@ import org.approvaltests.reporters.macosx.KDiff3MacReporter; import org.approvaltests.reporters.windows.KDiff3WindowsReporter; -public class KDiff3Reporter extends FirstWorkingReporter { - public static final KDiff3Reporter INSTANCE = new KDiff3Reporter(); - public KDiff3Reporter() { - super(KDiff3MacReporter.INSTANCE, KDiff3WindowsReporter.INSTANCE, KDiff3LinuxReporter.INSTANCE); - } +public class KDiff3Reporter extends FirstWorkingReporter +{ + public static final KDiff3Reporter INSTANCE = new KDiff3Reporter(); + public KDiff3Reporter() + { + super(KDiff3MacReporter.INSTANCE, KDiff3WindowsReporter.INSTANCE, KDiff3LinuxReporter.INSTANCE); + } }