Fix new unit tests on Windows.

Author: Marcelo Vanzin

launcher/src/test/java/org/apache/spark/launcher/SparkLauncherSuite.java

@@ -33,8 +33,6 @@
 
 /**
  * These tests require the Spark assembly to be built before they can be run.
- *
- * TODO: these tests do not work on Win32.
  */
 public class SparkLauncherSuite {
 
@@ -85,7 +83,8 @@ private void testCmdBuilder(boolean isDriver) throws Exception {
       .setConf(SparkLauncher.DRIVER_EXTRA_LIBRARY_PATH, "/native")
       .setConf("spark.foo", "foo");
 
-    List<String> cmd = launcher.buildShellCommand();
+    Map<String, String> env = new HashMap<String, String>();
+    List<String> cmd = launcher.buildLauncherCommand(env);
 
     // Checks below are different for driver and non-driver mode.
 
@@ -110,18 +109,11 @@ private void testCmdBuilder(boolean isDriver) throws Exception {
       assertFalse("Driver classpath should not be in command.", contains("/driver", cp));
     }
 
-    String[] libPath = null;
-    String envName = launcher.getLibPathEnvName() + "=";
-    for (String arg : cmd) {
-      if (arg.startsWith(envName)) {
-        libPath = arg.substring(envName.length()).split(Pattern.quote(File.pathSeparator));
-        break;
-      }
-    }
+    String libPath = env.get(launcher.getLibPathEnvName());
     if (isDriver) {
       assertNotNull("Native library path should be set.", libPath);
       assertTrue("Native library path should contain provided entry.",
-        contains("/native", libPath));
+        contains("/native", libPath.split(Pattern.quote(File.pathSeparator))));
     } else {
       assertNull("Native library should not be set.", libPath);
     }

launcher/src/test/java/org/apache/spark/launcher/SparkSubmitCliLauncherSuite.java

@@ -18,7 +18,9 @@
 package org.apache.spark.launcher;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -65,11 +67,12 @@ public void testPySparkLauncher() throws Exception {
       "--master=foo",
       "--deploy-mode=bar");
 
+    Map<String, String> env = new HashMap<String, String>();
     List<String> cmd = new SparkSubmitCliLauncher(sparkSubmitArgs)
       .setSparkHome(System.getProperty("spark.test.home"))
-      .buildShellCommand();
+      .buildLauncherCommand(env);
     assertEquals("python", cmd.get(cmd.size() - 1));
-    assertTrue(cmd.contains("PYSPARK_SUBMIT_ARGS=\"--master\" \"foo\" \"--deploy-mode\" \"bar\""));
+    assertEquals("\"--master\" \"foo\" \"--deploy-mode\" \"bar\"", env.get("PYSPARK_SUBMIT_ARGS"));
   }
 
   @Test
@@ -80,9 +83,11 @@ public void testPySparkFallback() throws Exception {
       "script.py",
       "arg1");
 
+    Map<String, String> env = new HashMap<String, String>();
     List<String> cmd = new SparkSubmitCliLauncher(sparkSubmitArgs)
       .setSparkHome(System.getProperty("spark.test.home"))
-      .buildShellCommand();
+      .buildLauncherCommand(env);
+
     assertEquals("foo", findArgValue(cmd, "--master"));
     assertEquals("bar", findArgValue(cmd, "--deploy-mode"));
     assertEquals("script.py", cmd.get(cmd.size() - 2));