Merge pull request #47 from groupon/kill_firefox_fix

Fixing a bug where firefox was not being killed on windows, also refacto...

Author: dimacus

CHANGELOG.txt

@@ -1,3 +1,4 @@
+1.5.1 - [BUG] Firefox on windows was not getting terminated with /kill_firefox command
 1.5.0 - Automatically record video of a running test
       - Daily rolling logs for grid extras
       - Adding /kill_safari end point to kill instance of Safari Browser

SeleniumGridExtras/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.groupon.selenium-grid-extras</groupId>
     <artifactId>SeleniumGridExtras</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
 
     <repositories>
         <repository>

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

@@ -41,6 +41,7 @@
 
 import com.google.gson.JsonObject;
 
+import com.groupon.seleniumgridextras.ExecuteCommand;
 import com.groupon.seleniumgridextras.config.RuntimeConfig;
 
 public class KillAllByName extends ExecuteOSTask {
@@ -80,14 +81,22 @@ public String getLinuxCommand(String parameter) {
   }
 
   @Override
-  public JsonObject execute() {
-    String command;
+  public JsonObject execute(String parameter) {
+    String command = "";
     if (RuntimeConfig.getOS().isWindows()){
       command = getWindowsCommand();
     } else {
       command = getMacCommand();
     }
-    return execute(command);
+
+    String finalCommand = command + parameter;
+
+    JsonObject response = ExecuteCommand.execRuntime(finalCommand, waitToFinishTask);
+
+    response.addProperty("command", finalCommand);
+    response.addProperty("wait_to_finish", waitToFinishTask);
+
+    return response;
   }
 
   @Override

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

@@ -37,11 +37,7 @@
 
 package com.groupon.seleniumgridextras.tasks;
 
-import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import com.groupon.seleniumgridextras.ExecuteCommand;
-import com.groupon.seleniumgridextras.OS;
-import com.groupon.seleniumgridextras.config.RuntimeConfig;
 
 public class KillAllChrome extends KillAllByName {
 
@@ -58,49 +54,18 @@ public KillAllChrome() {
     setEnabledInGui(true);
   }
 
-
   @Override
-  public JsonObject execute(String param) {
-    //TODO: Make this work like killAllSafari and KillAllFirefox works
-    if (RuntimeConfig.getOS().isWindows()) {
-      return killChromeOnWindows();
-    } else if (RuntimeConfig.getOS().isMac()) {
-      return killChromeOnMac();
-    } else {
-      return killChromeOnLinux();
-    }
-  }
-
-
-  private JsonObject killChromeOnLinux() {
-    return ExecuteCommand.execRuntime(getLinuxCommand("[Cc]hrome"));
+  public String getWindowsCommand() {
+    return super.getWindowsCommand("chrome.exe");
   }
 
-  private JsonObject killChromeOnMac() {
-    return ExecuteCommand.execRuntime(getMacCommand("[Cc]hrome"));
+  @Override
+  public String getLinuxCommand() {
+    return super.getLinuxCommand("[Cc]hrome");
   }
 
-  private JsonObject killChromeOnWindows() {
-
-    JsonObject killBrowserResult = ExecuteCommand.execRuntime(getWindowsKillCommand("chrome.exe"));
-
-    JsonObject
-        killDriverResult =
-        ExecuteCommand.execRuntime(
-            getWindowsKillCommand(RuntimeConfig.getConfig().getChromeDriver().getExecutableName()));
-
-    JsonArray response = new JsonArray();
-    response.add(killBrowserResult);
-    response.add(killDriverResult);
-
-    if (killBrowserResult.get("exit_code").equals("0") && killDriverResult.get("exit_code")
-        .equals("0")) {
-      getJsonResponse().addKeyValues("out", response);
-    } else {
-      getJsonResponse().addKeyValues("error", response);
-    }
-
-    return getJsonResponse().getJson();
-
+  @Override
+  public String getMacCommand() {
+    return super.getMacCommand("[Cc]hrome");
   }
 }

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

@@ -63,7 +63,7 @@ public String getWindowsCommand() {
   public String getLinuxCommand() {
     return super.getLinuxCommand("[Ff]irefox");
   }
-  
+
   @Override
   public String getMacCommand() {
     return super.getMacCommand("[Ff]irefox");

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

@@ -37,12 +37,8 @@
 
 package com.groupon.seleniumgridextras.tasks;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
 
-import com.groupon.seleniumgridextras.ExecuteCommand;
-import com.groupon.seleniumgridextras.OS;
-import com.groupon.seleniumgridextras.config.RuntimeConfig;
+import com.google.gson.JsonObject;
 
 public class KillAllIE extends KillAllByName {
 
@@ -59,53 +55,19 @@ public KillAllIE() {
     setEnabledInGui(true);
   }
 
-  @Override
-  public String getEndpoint() {
-    return "/kill_ie";
-  }
 
   @Override
-  public String getDescription() {
-    return "Executes os level kill command on all instance of Internet Explorer";
+  public String getWindowsCommand() {
+    return super.getWindowsCommand("iexplore.exe");
   }
 
   @Override
-  public JsonObject execute(String param) {
-    //TODO: Make this work like killAllSafari and KillAllFirefox works
-    if (RuntimeConfig.getOS().isWindows()) {
-      return killIEAndIEDriver();
-    } else {
-      getJsonResponse().addKeyValues("error", "Kill IE command is only implemented in Windows");
-      return getJsonResponse().getJson();
-    }
+  public String getLinuxCommand() {
+    return super.getLinuxCommand("iexplore.exe");
   }
 
-
-  private JsonObject killIEAndIEDriver() {
-
-    JsonObject
-        killBrowserResult =
-        ExecuteCommand.execRuntime(getWindowsKillCommand("iexplore.exe"));
-
-    JsonObject
-        killDriverResult =
-        ExecuteCommand.execRuntime(
-            getWindowsKillCommand(RuntimeConfig.getConfig().getIEdriver().getExecutableName()));
-
-    JsonArray response = new JsonArray();
-    response.add(killBrowserResult);
-    response.add(killDriverResult);
-
-    if (killBrowserResult.get("exit_code").equals("0") && killDriverResult.get("exit_code")
-        .equals("0")) {
-      getJsonResponse().addKeyValues("out", response);
-    } else {
-      getJsonResponse().addKeyValues("error", response);
-    }
-
-    return getJsonResponse().getJson();
-
+  @Override
+  public String getMacCommand() {
+    return super.getMacCommand("iexplore.exe");
   }
-
-
 }

SeleniumGridExtras/src/test/java/com/groupon/seleniumgridextras/KillAllIETest.java

@@ -37,9 +37,7 @@
 
 package com.groupon.seleniumgridextras;
 
-import com.google.gson.JsonParser;
 
-import com.groupon.seleniumgridextras.config.RuntimeConfig;
 import com.groupon.seleniumgridextras.tasks.ExecuteOSTask;
 import com.groupon.seleniumgridextras.tasks.KillAllIE;
 import org.junit.Before;
@@ -70,14 +68,4 @@ public void testGetEndpoint() throws Exception {
     assertEquals("/kill_ie", task.getEndpoint());
   }
 
-  @Test
-  public void testOnlyWindowsSupported() throws Exception {
-
-    if (!RuntimeConfig.getOS().isWindows()) {
-      assertEquals(
-          new JsonParser().parse("{\"exit_code\":1,\"error\":[\"Kill IE command is only implemented in Windows\"],\"out\":[]}"),
-          task.execute());
-    }
-  }
-
 }