- R peeled and tested IntelliJMacResolver

Author: LarsEckart

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

@@ -0,0 +1,19 @@
+package org.approvaltests.reporters;
+
+import org.approvaltests.Approvals;
+import org.junit.jupiter.api.Test;
+import org.lambda.query.Queryable;
+
+class IntelliJMacResolverTest
+{
+  @Test
+  void testFindIt()
+  {
+    Queryable<String> q = new Queryable<>(String.class);
+    IntelliJMacResolver.getDiffInfo("user/lars", f -> {
+      q.add(f);
+      return false;
+    });
+    Approvals.verifyAll("Files", q);
+  }
+}

approvaltests-tests/src/test/java/org/approvaltests/reporters/IntelliJMacResolverTest.testFindIt.approved.txt

@@ -0,0 +1,8 @@
+Files[0] = /Applications/IntelliJ IDEA Ultimate.app/Contents/MacOS/idea
+Files[1] = /Applications/IntelliJ IDEA.app/Contents/MacOS/idea
+Files[2] = /Applications/IntelliJ IDEA Community.app/Contents/MacOS/idea
+Files[3] = /Applications/IntelliJ IDEA Community Edition.app/Contents/MacOS/idea
+Files[4] = user/lars/Applications/IntelliJ IDEA Ultimate.app/Contents/MacOS/idea
+Files[5] = user/lars/Applications/IntelliJ IDEA.app/Contents/MacOS/idea
+Files[6] = user/lars/Applications/IntelliJ IDEA Community.app/Contents/MacOS/idea
+Files[7] = user/lars/Applications/IntelliJ IDEA Community Edition.app/Contents/MacOS/idea

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

@@ -20,6 +20,7 @@ public DiffInfo(String diffProgram, String parameters, List<String> fileExtensio
   }
   private static String resolveWindowsPath(String diffProgram)
   {
+    diffProgram = diffProgram == null ? "" : diffProgram;
     String tag = "{ProgramFiles}";
     if (diffProgram.startsWith(tag))
     {

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

@@ -1,19 +1,23 @@
 package org.approvaltests.reporters;
 
+import org.lambda.functions.Function1;
 import org.lambda.query.Queryable;
 
 import java.io.File;
 
 public class IntelliJMacResolver
 {
   public static DiffInfo findIt()
+  {
+    return getDiffInfo(System.getProperty("user.home"), f -> new File(f).exists());
+  }
+  public static DiffInfo getDiffInfo(String userHome, Function1<String, Boolean> fileExists)
   {
     Queryable<String> list = Queryable.as("IntelliJ IDEA Ultimate", "IntelliJ IDEA", "IntelliJ IDEA Community",
         "IntelliJ IDEA Community Edition");
-    Queryable<String> applications = Queryable.as("/Applications",
-        System.getProperty("user.home") + "/Applications");
+    Queryable<String> applications = Queryable.as("/Applications", userHome + "/Applications");
     String matching = applications.selectMany(a -> list.select(l -> a + "/" + l + ".app/Contents/MacOS/idea"))
-            .first(f -> new File(f).exists());
+        .first(fileExists);
     return new DiffInfo(matching, "diff %s %s", GenericDiffReporter.TEXT_FILE_EXTENSIONS);
   }
 }