Merge pull request #141 from smccarthy/fix_kill_pid

Fix KillPid task and add a test to verify it returns the correct command.

SeleniumGridExtras/src/main/java/com/groupon/seleniumgridextras/tasks/KillPid.java

@@ -38,7 +38,7 @@
 package com.groupon.seleniumgridextras.tasks;
 
 import com.google.gson.JsonObject;
-
+import com.groupon.seleniumgridextras.ExecuteCommand;
 import com.groupon.seleniumgridextras.config.RuntimeConfig;
 import com.groupon.seleniumgridextras.tasks.config.TaskDescriptions;
 import com.groupon.seleniumgridextras.utilities.json.JsonCodec;
@@ -81,8 +81,18 @@ public JsonObject execute(Map<String, String> parameter) {
           JsonCodec.OS.KillCommands.SIGNAL)) {
         pid = "-" + parameter.get(JsonCodec.OS.KillCommands.SIGNAL).toString() + " " + pid;
       }
+
+      String command = "";
+      if (RuntimeConfig.getOS().isWindows()) {
+          command = getWindowsCommand(pid);
+      } else if (RuntimeConfig.getOS().isMac()) {
+          command = getLinuxCommand(pid);
+      } else {
+          command = getLinuxCommand(pid);
+      }
 
-      return execute(pid);
+      JsonObject response = ExecuteCommand.execRuntime(command, waitToFinishTask);
+      return response;
     }
   }
 

SeleniumGridExtras/src/test/java/com/groupon/seleniumgridextras/tasks/KillPidTest.java

@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) 2013, Groupon, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of GROUPON nor the names of its contributors may be
+ * used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ * Created with IntelliJ IDEA.
+ * User: Dima Kovalenko (@dimacus) && Darko Marinov
+ * Date: 5/10/13
+ * Time: 4:06 PM
+ */
+
+package com.groupon.seleniumgridextras.tasks;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.gson.JsonObject;
+import com.groupon.seleniumgridextras.config.RuntimeConfig;
+import com.groupon.seleniumgridextras.utilities.json.JsonCodec;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+
+public class KillPidTest {
+
+  public KillPid task;
+
+  @Before
+  public void setUp() throws Exception {
+    task = new KillPid();
+  }
+
+  @After
+  public void tearDown() throws Exception {
+
+  }
+
+  @Test
+  public void testKillPid() {
+	  Map <String, String> parameter = new HashMap<String, String>();
+	  parameter.put(JsonCodec.OS.KillCommands.ID, "abc");
+	  JsonObject object = task.execute(parameter);
+	  assertNotNull(RuntimeConfig.getOS().getOSName());
+	  if(RuntimeConfig.getOS().isWindows()) {
+		  assertEquals("taskkill -F -IM abc", object.get("command").getAsString());
+	  } else {
+		  assertEquals("kill -9 abc", object.get("command").getAsString());
+	  }
+  }
+
+
+}