. t rename a/b.txt for granularity

Author: JayBazuzi

approvaltests-tests/src/test/java/org/approvaltests/approvers/FileApproverTest.java

@@ -79,7 +79,7 @@ void testCustomError()
         """;
     try (var old = ApprovalSettings.registerErrorGenerator((r, a) -> new AssertionError("Custom message")))
     {
-      FileApprover fileApprover = new FileApprover(new File("a.txt"), new File("b.txt"), null, null);
+      FileApprover fileApprover = new FileApprover(new File("a20.txt"), new File("b20.txt"), null, null);
       Approvals.verifyException(fileApprover::fail, new Options().inline(expected));
     }
   }

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

@@ -20,13 +20,13 @@ public class GenericDiffReporterTest extends MachineSpecificTest
   @Test
   public void testTortoiseDiff()
   {
-    approveGenericReporter("a.txt", "b.txt", new TortoiseTextDiffReporter());
+    approveGenericReporter("a12.txt", "b12.txt", new TortoiseTextDiffReporter());
   }
   @Disabled("requires windows and WinMerge installed")
   @Test
   public void testWinMerge()
   {
-    approveGenericReporter("a.txt", "b.txt", new WinMergeReporter());
+    approveGenericReporter("a3.txt", "b13.txt", new WinMergeReporter());
   }
   private void approveGenericReporter(String a, String b, GenericDiffReporter reporter)
   {

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

@@ -5,6 +5,7 @@
 import com.spun.util.io.FileUtils;
 import org.approvaltests.Approvals;
 import org.approvaltests.combinations.CombinationApprovals;
+import org.approvaltests.core.Options;
 import org.approvaltests.reporters.macosx.P4MergeReporter;
 import org.approvaltests.reporters.macosx.TkDiffReporter;
 import org.approvaltests.reporters.macosx.VisualStudioCodeReporter;
@@ -30,22 +31,28 @@ public void testArgumentParsing()
   @Test
   public void testFileExtensions()
   {
-    assertTrue(new GenericDiffReporter("", "").isFileExtensionHandled("a.txt"));
+    assertTrue(new GenericDiffReporter("", "").isFileExtensionHandled("a5.txt"));
   }
   @Test
   public void testProgramsExist()
   {
-    assertFalse(new GenericDiffReporter("this_should_never_exist", "").isWorkingInThisEnvironment("a.txt"));
+    assertFalse(new GenericDiffReporter("this_should_never_exist", "").isWorkingInThisEnvironment("a6.txt"));
   }
   @Test
   public void testTkDiff()
   {
-    approveGenericReporter("a.txt", "b.txt", new TkDiffReporter());
+    var expected = """
+        /Applications/TkDiff.app/Contents/MacOS/tkdiff %s %s
+        """;
+    approveGenericReporter("a1.txt", "b1.txt", new TkDiffReporter(), expected);
   }
   @Test
   public void testP4Merge()
   {
-    approveGenericReporter("a.png", "b.png", new P4MergeReporter());
+    var expected = """
+        /Applications/p4merge.app/Contents/MacOS/p4merge %s %s
+        """;
+    approveGenericReporter("a1.png", "b1.png", new P4MergeReporter(), expected);
   }
   @Test
   public void testSpacesInFileNames()
@@ -65,12 +72,12 @@ public String getFileName(String name, Boolean isWindows)
   {
     return SystemUtils.convertFileForCommandLine(name, isWindows);
   }
-  private void approveGenericReporter(String a, String b, GenericDiffReporter reporter)
+  private void approveGenericReporter(String a, String b, GenericDiffReporter reporter, String expected)
   {
     File directory = ClassUtils.getSourceDirectory(getClass());
     String aPath = FileUtils.getResolvedPath(new File(directory, a));
     String bPath = FileUtils.getResolvedPath(new File(directory, b));
-    Approvals.verify(new QueryableDiffReporterHarness(reporter, aPath, bPath));
+    Approvals.verify(new QueryableDiffReporterHarness(reporter, aPath, bPath), new Options().inline(expected));
   }
   @Test
   public void testIsImage()

approvaltests/src/test/java/org/approvaltests/reporters/JUnitReporterTest.java

@@ -30,9 +30,9 @@ private void verifyReporter(ApprovalFailureReporter reporter)
     try (QuietAutoCloseable l = SimpleLogger.quiet())
     {
       String a = FileUtils.getResolvedPath(ClassUtils.getAdjacentFile(this.getClass(), "a.txt"));
-      String b = FileUtils.getResolvedPath(ClassUtils.getAdjacentFile(this.getClass(), "b.txt"));
+      String r = FileUtils.getResolvedPath(ClassUtils.getAdjacentFile(this.getClass(), "r.txt"));
       Approvals.verifyException(() -> {
-        reporter.report(b, a);
+        reporter.report(r, a);
       });
     }
   }

approvaltests/src/test/java/org/approvaltests/reporters/JUnitReporterTest.testJUnit3.approved.txt

@@ -2,6 +2,6 @@ junit.framework.AssertionFailedError: expected:<1
 a
 I
 > but was:<1
-b
+r
 I
 >

approvaltests/src/test/java/org/approvaltests/reporters/JUnitReporterTest.testJUnit4.approved.txt

@@ -2,6 +2,6 @@ org.junit.ComparisonFailure: expected:<1
 [a]
 I
 > but was:<1
-[b]
+[r]
 I
 >

approvaltests/src/test/java/org/approvaltests/reporters/JUnitReporterTest.testJUnit5.approved.txt

@@ -2,6 +2,6 @@ org.opentest4j.AssertionFailedError: expected: <1
 a
 I
 > but was: <1
-b
+r
 I
 >

approvaltests/src/test/java/org/approvaltests/reporters/b.txt renamed to approvaltests/src/test/java/org/approvaltests/reporters/r.txt

@@ -1,3 +1,3 @@
 1
-b
+r
 I