- r Replaced all calls to getAbsolutePath() with FileUtils.getResolvedPath(file)

Co-authored-by: Jay Bazuzi <[email protected]>
Co-authored-by: Llewellyn Falco <[email protected]>

Author: 3 people

approvaltests-tests/src/test/java/org/approvaltests/ApprovedFileLogTest.java

@@ -22,10 +22,10 @@ void testLogging()
     ApprovalNamer approvalNamer = Approvals.createApprovalNamer();
     File approvedFile = approvalNamer.getApprovedFile(".txt");
     String prelog = FileUtils.readFile(file);
-    assertFalse(prelog.contains(approvedFile.getAbsolutePath()));
+    assertFalse(prelog.contains(FileUtils.getResolvedPath(approvedFile)));
     Approvals.verify("anything");
     String postlog = FileUtils.readFile(file);
-    assertTrue(postlog.contains(approvedFile.getAbsolutePath()));
+    assertTrue(postlog.contains(FileUtils.getResolvedPath(approvedFile)));
   }
   @Test
   void testTempDirectoryGetsGitIgnore()

approvaltests-tests/src/test/java/org/approvaltests/DirectoryOutputTest.java

@@ -21,8 +21,7 @@ private void createFilesFor(File directory, int numberOfFiles)
   {
     for (int i = 1; i < numberOfFiles + 1; i++)
     {
-      String fileName = directory.getAbsolutePath() + File.separator + "File" + i + ".txt";
-      File file = new File(fileName);
+      File file = new File(directory, "File" + i + ".txt");
       FileUtils.writeFile(file, "Text" + i);
     }
   }

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

@@ -1,6 +1,7 @@
 package org.approvaltests.machine_specific_tests.reporters;
 
 import com.spun.util.ClassUtils;
+import com.spun.util.io.FileUtils;
 import org.approvaltests.Approvals;
 import org.approvaltests.machine_specific_tests.MachineSpecificTest;
 import org.approvaltests.reporters.GenericDiffReporter;
@@ -30,8 +31,8 @@ public void testWinMerge()
   private void approveGenericReporter(String a, String b, GenericDiffReporter reporter)
   {
     File directory = ClassUtils.getSourceDirectory(getClass());
-    String aPath = directory.getAbsolutePath() + File.separator + a;
-    String bPath = directory.getAbsolutePath() + File.separator + b;
+    String aPath = FileUtils.getResolvedPath(new File(directory, a));
+    String bPath = FileUtils.getResolvedPath(new File(directory, b));
     Approvals.verify(new QueryableDiffReporterHarness(reporter, aPath, bPath));
   }
 }

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

@@ -2,6 +2,7 @@
 
 import com.spun.util.ClassUtils;
 import com.spun.util.SystemUtils;
+import com.spun.util.io.FileUtils;
 import org.approvaltests.Approvals;
 import org.approvaltests.combinations.CombinationApprovals;
 import org.approvaltests.reporters.macosx.P4MergeReporter;
@@ -66,8 +67,8 @@ public String getFileName(String name, Boolean isWindows)
   private void approveGenericReporter(String a, String b, GenericDiffReporter reporter)
   {
     File directory = ClassUtils.getSourceDirectory(getClass());
-    String aPath = directory.getAbsolutePath() + File.separator + a;
-    String bPath = directory.getAbsolutePath() + File.separator + b;
+    String aPath = FileUtils.getResolvedPath(new File(directory, a));
+    String bPath = FileUtils.getResolvedPath(new File(directory, b));
     Approvals.verify(new QueryableDiffReporterHarness(reporter, aPath, bPath));
   }
   @Test

approvaltests-util/src/main/java/com/spun/util/Asserts.java

@@ -1,5 +1,6 @@
 package com.spun.util;
 
+import com.spun.util.io.FileUtils;
 import java.io.File;
 
 public class Asserts
@@ -19,13 +20,13 @@ public static void assertFileDoesNotExist(String label, String fileName)
   {
     File file = new File(fileName);
     if (file.exists())
-    { throw new IllegalStateException(label + " file " + file.getAbsolutePath() + " already exists"); }
+    { throw new IllegalStateException(label + " file " + FileUtils.getResolvedPath(file) + " already exists"); }
   }
   public static void assertFileExists(String label, String fileName)
   {
     File file = new File(fileName);
     if (!file.exists())
-    { throw new IllegalStateException(label + " file " + file.getAbsolutePath() + " does not exist"); }
+    { throw new IllegalStateException(label + " file " + FileUtils.getResolvedPath(file) + " does not exist"); }
   }
   public static void equals(String label, double expected, double actual, double percission)
   {

approvaltests-util/src/main/java/com/spun/util/io/FileUtils.java

@@ -238,7 +238,7 @@ public static String readFile(File file, boolean ensureTrailingNewline)
     try
     {
       if (!file.exists())
-      { throw new RuntimeException("Invalid file '" + file.getAbsolutePath() + "'"); }
+      { throw new RuntimeException("Invalid file '" + getResolvedPath(file) + "'"); }
       CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder();
       decoder.onMalformedInput(CodingErrorAction.IGNORE);
       Reader reader = new InputStreamReader(Files.newInputStream(file.toPath()), decoder);
@@ -460,12 +460,15 @@ public static Stream<Path> walkPath(String channelsPath, int maxDepth)
       throw ObjectUtils.throwAsError(e);
     }
   }
-
-    public static String getResolvedPath(File file) {
-      try {
-        return file.getCanonicalFile().getAbsolutePath();
-      } catch (IOException e) {
-        throw ObjectUtils.throwAsError(e);
-      }
+  public static String getResolvedPath(File file)
+  {
+    try
+    {
+      return file.getCanonicalFile().getAbsolutePath();
     }
+    catch (IOException e)
+    {
+      throw ObjectUtils.throwAsError(e);
+    }
+  }
 }

approvaltests-util/src/main/java/com/spun/util/io/XMLUtils.java

@@ -30,10 +30,10 @@ public static String locateFile(String fileLocation, String[] backupPaths)
       String tfileLocation = backupPaths[i] + File.separator + fileLocation;
       File file = new File(tfileLocation);
       if (file.exists())
-      { return file.getAbsolutePath(); }
+      { return FileUtils.getResolvedPath(file); }
     }
     throw new Error(String.format("Couldn't find '%s' from locations %s with current directory '%s'", fileLocation,
-        Arrays.asList(backupPaths), new File(".").getAbsolutePath()));
+        Arrays.asList(backupPaths), FileUtils.getResolvedPath(new File("."))));
   }
   public static HashMap<String, Object> parseProperties(String absoluteFileLocation, XMLNodeExtractor extractor)
   {

approvaltests-util/src/main/java/com/spun/util/parser/FileLocator.java

@@ -1,5 +1,6 @@
 package com.spun.util.parser;
 
+import com.spun.util.io.FileUtils;
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashMap;

approvaltests/src/main/java/org/approvaltests/approvers/FileApprover.java

@@ -47,7 +47,7 @@ public static AutoCloseable registerErrorGenerator(Function2<String, String, Err
   }
   public VerifyResult approve()
   {
-    tracker.assertUnique(approved.getAbsolutePath());
+    tracker.assertUnique(FileUtils.getResolvedPath(approved));
     ApprovedFileLog.log(approved);
     FailedFileLog.touch();
     received = writer.writeReceivedFile(received);
@@ -58,13 +58,14 @@ public void cleanUpAfterSuccess(ApprovalFailureReporter reporter)
     received.delete();
     if (reporter instanceof ApprovalReporterWithCleanUp)
     {
-      ((ApprovalReporterWithCleanUp) reporter).cleanUp(received.getAbsolutePath(), approved.getAbsolutePath());
+      ((ApprovalReporterWithCleanUp) reporter).cleanUp(FileUtils.getResolvedPath(received),
+          FileUtils.getResolvedPath(approved));
     }
   }
   public VerifyResult reportFailure(ApprovalFailureReporter reporter)
   {
     FailedFileLog.log(received, approved);
-    reporter.report(received.getAbsolutePath(), approved.getAbsolutePath());
+    reporter.report(FileUtils.getResolvedPath(received), FileUtils.getResolvedPath(approved));
     if (reporter instanceof ReporterWithApprovalPower)
     {
       ReporterWithApprovalPower reporterWithApprovalPower = (ReporterWithApprovalPower) reporter;
@@ -74,7 +75,7 @@ public VerifyResult reportFailure(ApprovalFailureReporter reporter)
   }
   public void fail()
   {
-    throw errorGenerator.call(received.getAbsolutePath(), approved.getAbsolutePath());
+    throw errorGenerator.call(FileUtils.getResolvedPath(received), FileUtils.getResolvedPath(approved));
   }
   private static Error createError(String received, String approved)
   {

approvaltests/src/main/java/org/approvaltests/internal/logs/ApprovedFileLog.java

@@ -15,12 +15,12 @@ public class ApprovedFileLog
   public static File get()
   {
     File file = new File(LoggingUtils.getTempDirectory() + "/.approved_files.log");
-    FileUtils.createIfNeeded(file.getAbsolutePath());
+    FileUtils.createIfNeeded(FileUtils.getResolvedPath(file));
     return file;
   }
   public static void log(File file)
   {
     File log = get();
-    FileUtils.appendToFile(log, file.getAbsolutePath() + "\n");
+    FileUtils.appendToFile(log, FileUtils.getResolvedPath(file) + "\n");
   }
 }