fixed errors

Author: isidore

java/com/spun/util/SystemUtils.java

@@ -8,4 +8,23 @@ public static boolean isWindowsEnviroment()
   {
     return "\\".equals(File.separator);
   }
+  public static String convertFileForCommandLine(String fileName)
+  {
+    return convertFileForCommandLine(fileName, SystemUtils.isWindowsEnviroment());
+  }
+  public static String convertFileForCommandLine(String fileName, boolean windowsOs)
+  {
+    if (!fileName.contains(" "))
+    {
+      return fileName;
+    }
+    else if (windowsOs)
+    {
+      return String.format("\"%s\"", fileName);
+    }
+    else
+    {
+      return fileName.replace(" ", "\\ ");
+    }
+  }
 }

java/org/approvaltests/reporters/GenericDiffReporter.java

@@ -5,7 +5,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import com.spun.util.SystemUtils;
 import com.spun.util.ThreadUtils;
 import com.spun.util.io.FileUtils;
 
@@ -59,25 +58,6 @@ public String[] getCommandLine(String received, String approved)
     System.out.println(Arrays.toString(commands));
     return commands;
   }
-  public static String convertFileForCommandLine(String fileName)
-  {
-    return convertFileForCommandLine(fileName, SystemUtils.isWindowsEnviroment());
-  }
-  public static String convertFileForCommandLine(String fileName, boolean windowsOs)
-  {
-    if (!fileName.contains(" "))
-    {
-      return fileName;
-    }
-    else if (windowsOs)
-    {
-      return String.format("\"%s\"", fileName);
-    }
-    else
-    {
-      return fileName.replace(" ", "\\ ");
-    }
-  }
   @Override
   public boolean isWorkingInThisEnvironment(String forFile)
   {

java/org/approvaltests/reporters/tests/GenericDiffReporterTest.java

@@ -14,6 +14,7 @@
 import org.approvaltests.strings.Printer;
 
 import com.spun.util.ClassUtils;
+import com.spun.util.SystemUtils;
 
 public class GenericDiffReporterTest extends TestCase
 {
@@ -49,7 +50,7 @@ public void testCommandLineFileNames() throws Exception
   }
   public String getFileName(String name, Boolean osType)
   {
-    return GenericDiffReporter.convertFileForCommandLine(name, osType);
+    return SystemUtils.convertFileForCommandLine(name, osType);
   }
   private void approveGenericReporter(String a, String b, GenericDiffReporter reporter) throws Exception
   {

java/org/approvaltests/reporters/tests/QueryableDiffReporterHarness.java

@@ -1,5 +1,6 @@
 package org.approvaltests.reporters.tests;
 
+import org.apache.hadoop.util.StringUtils;
 import org.approvaltests.reporters.GenericDiffReporter;
 
 import com.spun.util.persistence.ExecutableQuery;
@@ -18,7 +19,8 @@ public QueryableDiffReporterHarness(GenericDiffReporter reporter, String file1,
   @Override
   public String getQuery() throws Exception
   {
-    return reporter.getCommandLine("%s", "%s");
+    String[] commandLine = reporter.getCommandLine("%s", "%s");
+    return StringUtils.join(" ", commandLine);
   }
   @Override
   public String executeQuery(String query) throws Exception