Agent: Fixing unit tests on Windows

git-svn-id: https://svn.openqa.org/svn/selenium-grid/trunk@359 22590ab4-ef3b-0410-9bef-a9f5a1089f47

Author: ph7

agent/src/main/java/com/thoughtworks/selenium/grid/agent/JVMLauncher.java

@@ -20,7 +20,7 @@ public JVMLauncher(Classpath classpath, String mainClass) {
 
     public JVMHandle launchNewJVM() throws IOException, InterruptedException {
         return new JVMHandle(newProcessBuilder().start());
-    }
+       }
 
     protected ProcessBuilder newProcessBuilder() {
         final ProcessBuilder builder;
@@ -50,8 +50,16 @@ protected List<String> command() {
     protected String javaLauncherPath() {
         File javaLauncher;
 
-        javaLauncher = new File(System.getProperty("java.home") + "/bin/java");
+        javaLauncher = new File(System.getProperty("java.home") + "/bin/java" + executableSuffix());
         return javaLauncher.getAbsolutePath();
     }
+
+    protected String executableSuffix() {
+        return onWindows() ? ".exe" : "";
+    }
+    
+    protected boolean onWindows() {
+        return -1 != System.getProperty("os.name").indexOf("Windows");
+    }
 
 }

agent/src/test/unit/java/com/thoughtworks/selenium/grid/agent/JVMLauncherTest.java

@@ -20,15 +20,22 @@ public void classpathIsTheOneProvidedInTheConstructor() {
 
     @Test
     public void javaLauncherPathIsAValidFilePath() {
-        assertTrue(new File(new JVMLauncher(new Classpath(), "").javaLauncherPath()).exists());
+        final String javaLauncherPath;
+
+        javaLauncherPath = new JVMLauncher(new Classpath(), "").javaLauncherPath();
+        assertTrue(javaLauncherPath,  new File(javaLauncherPath).exists());
     }
 
     @Test
-    public void javaLauncherPathEndsWithJava() {
-        final JVMLauncher launcher;
-
-        launcher = new JVMLauncher(new Classpath(), "");
-        assertTrue(launcher.javaLauncherPath().endsWith(File.separator + "java"));
+    public void javaLauncherPathEndsWithJavaExecutable() {
+        final String launcherPath;
+
+        launcherPath = new JVMLauncher(new Classpath(), "").javaLauncherPath();
+        if (-1 != System.getProperty("os.name").indexOf("Windows")) {
+            assertTrue(launcherPath, launcherPath.endsWith(File.separator + "java.exe"));
+        } else {
+            assertTrue(launcherPath, launcherPath.endsWith(File.separator + "java"));
+        }
     }
 
     @Test