[MCLEAN-127] Use Files.createSymbolicLink instead of shelling out

src/it/dangling-symlinks/setup.bsh → src/it/dangling-symlinks/setup.groovy

@@ -18,6 +18,7 @@
  */
 
 import java.io.*;
+import java.nio.file.*;
 import java.util.*;
 import java.util.jar.*;
 import java.util.regex.*;
@@ -30,17 +31,18 @@ try
     File target = new File( targetDir, "link-target.txt" );
 
     System.out.println( "Creating symlink " + link + " -> " + target );
-    if ( !Utils.createSymlink( target, link ) || !link.exists() )
+    Files.createSymbolicLink( link.toPath(), target.toPath() );
+    if ( !link.exists() )
     {
-        System.out.println( "FAILURE, platform does not support symlinks, skipping test." );
+        System.out.println( "Platform does not support symlinks, skipping test." );
     }
 
     System.out.println( "Deleting symlink target " + target );
     target.delete();
 }
-catch( Throwable t )
+catch( Exception ex )
 {
-    t.printStackTrace();
+    ex.printStackTrace();
     return false;
 }
 

src/it/symlink-dont-follow/setup.bsh → src/it/symlink-dont-follow/setup.groovy

@@ -18,27 +18,31 @@
  */
 
 import java.io.*;
+import java.nio.file.*;
 import java.util.*;
 import java.util.jar.*;
 import java.util.regex.*;
 import org.apache.maven.plugins.clean.*;
 
-String[][] pairs =
-{
-    { "ext/file.txt", "target/link.txt" },
-    { "ext/dir", "target/link" },
-    { "ext/file.txt", "target2/link.txt" },
-    { "ext/dir", "target2/link" },
-};
+def pairs =
+[
+    [ "ext/file.txt", "target/link.txt" ],
+    [ "ext/dir", "target/link" ],
+    [ "ext/file.txt", "target2/link.txt" ],
+    [ "ext/dir", "target2/link" ],
+];
 
-for ( String[] pair : pairs )
+for ( pair : pairs )
 {
     File target = new File( basedir, pair[0] );
     File link = new File( basedir, pair[1] );
-    System.out.println( "Creating symlink " + link + " -> " + target );
-    if ( !Utils.createSymlink( target, link ) || !link.exists() )
+    println "Creating symlink " + link + " -> " + target;
+    Path targetPath = target.toPath();
+    Path linkPath = link.toPath();
+    Files.createSymbolicLink( linkPath, targetPath );
+    if ( !link.exists() )
     {
-        System.out.println( "FAILURE, platform does not support symlinks, skipping test." );
+        println "Platform does not support symlinks, skipping test.";
         return;
     }
 }

src/it/symlink-dont-follow/verify.bsh → src/it/symlink-dont-follow/verify.groovy

@@ -18,43 +18,40 @@
  */
 
 import java.io.*;
-import java.util.*;
-import java.util.jar.*;
-import java.util.regex.*;
 
-String[] expected = {
+def expected = [
     "ext",
     "ext/file.txt",
     "ext/dir/file.txt",
-};
+];
 
 for ( String path : expected )
 {
     File file = new File( basedir, path );
-    System.out.println( "Checking for existence of " + file );
+    println "Checking for existence of " + file;
     if ( !file.exists() )
     {
-        System.out.println( "FAILURE!" );
+        println "FAILURE!";
         return false;
     }
 }
 
-String[] unexpected = {
+def unexpected = [
     "target/link.txt",
     "target/link",
     "target",
     "target2/link.txt",
     "target2/link",
     "target2",
-};
+];
 
 for ( String path : unexpected )
 {
     File file = new File( basedir, path );
-    System.out.println( "Checking for absence of " + file );
+    println "Checking for absence of " + file;
     if ( file.exists() )
     {
-        System.out.println( "FAILURE!" );
+        println "FAILURE!";
         return false;
     }
 }