B #146 ClipboardReporter can handle filenames with spaces for linux

Author: LarsEckart

approvaltests-tests/src/test/java/org/approvaltests/reporters/ClipboardReporterTest.commandLineMoves.approved.txt

@@ -0,0 +1,8 @@
+[with spaces.txt, with spaces.txt, true] => move /Y "with spaces.txt"  "with spaces.txt" 
+[with spaces.txt, with spaces.txt, false] => mv "with spaces.txt" "with spaces.txt" 
+[with spaces.txt, withoutSpaces.txt, true] => move /Y "with spaces.txt"  "withoutSpaces.txt" 
+[with spaces.txt, withoutSpaces.txt, false] => mv "with spaces.txt" withoutSpaces.txt 
+[withoutSpaces.txt, with spaces.txt, true] => move /Y "withoutSpaces.txt"  "with spaces.txt" 
+[withoutSpaces.txt, with spaces.txt, false] => mv withoutSpaces.txt "with spaces.txt" 
+[withoutSpaces.txt, withoutSpaces.txt, true] => move /Y "withoutSpaces.txt"  "withoutSpaces.txt" 
+[withoutSpaces.txt, withoutSpaces.txt, false] => mv withoutSpaces.txt withoutSpaces.txt 

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

@@ -0,0 +1,15 @@
+package org.approvaltests.reporters;
+
+import org.approvaltests.combinations.CombinationApprovals;
+import org.junit.jupiter.api.Test;
+
+class ClipboardReporterTest
+{
+  @Test
+  void commandLineMoves()
+  {
+    String[] files = {"with spaces.txt", "withoutSpaces.txt"};
+    Boolean[] systems = {true, false};
+    CombinationApprovals.verifyAllCombinations(ClipboardReporter::getAcceptApprovalText, files, files, systems);
+  }
+}

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

@@ -35,13 +35,24 @@ public boolean isWorkingInThisEnvironment(String forFile)
   }
   public static String getAcceptApprovalText(String received, String approved)
   {
-    if (SystemUtils.isWindowsEnviroment())
+    return getAcceptApprovalText(received, approved, SystemUtils.isWindowsEnviroment());
+  }
+  public static String getAcceptApprovalText(String received, String approved, boolean windowsEnviroment)
+  {
+    if (windowsEnviroment)
     {
       return String.format("move /Y \"%s\"  \"%s\"", received, approved);
     }
     else
     {
-      return String.format("mv %s %s", received, approved);
+      return String.format("mv %s %s", formatFilePathForCommandLine(received),
+          formatFilePathForCommandLine(approved));
     }
   }
+  private static String formatFilePathForCommandLine(String filePath)
+  {
+    if (filePath.contains(" "))
+    { return '"' + filePath + '"'; }
+    return filePath;
+  }
 }