Merge pull request #26 from DedMaroz/master

building support on windows

Author: dimacus

SeleniumGridExtras/src/main/java/com/groupon/seleniumgridextras/config/DefaultConfig.java

@@ -97,9 +97,7 @@ private static void loadTeardownConfig() {
   private static void loadWebDriverInfo() {
     String tmpDir = RuntimeConfig.getOS().getFileSeparator();
 
-    if (!RuntimeConfig.getOS().isWindows()) {
-      tmpDir = tmpDir + "tmp" + RuntimeConfig.getOS().getFileSeparator();
-    }
+    tmpDir = tmpDir + "tmp" + RuntimeConfig.getOS().getFileSeparator();
 
     config.getWebdriver().setDirectory(tmpDir + "webdriver");
     config.getWebdriver().setVersion(DefaultConfig.getWebDriverDefaultVersion());

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

@@ -37,6 +37,8 @@
 
 package com.groupon.seleniumgridextras;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
 import com.groupon.seleniumgridextras.config.Config;
 import com.groupon.seleniumgridextras.config.RuntimeConfig;
 import com.groupon.seleniumgridextras.tasks.DownloadWebdriver;
@@ -81,11 +83,11 @@ public void testGetDescription() throws Exception {
 
   @Test
   public void testGetJsonResponse() throws Exception {
-    assertEquals(
-        "{\"exit_code\":0,\"out\":[],\"error\":[],\"root_dir\":[\"/tmp/webdriver\"],\"file\":[\"\"],\"file_full_path\":[\"" +
-          RuntimeConfig.getConfig().getWebdriver().getExecutablePath()
-        + "\"],\"source_url\":[\"\"]}",
-        task.getJsonResponse().toString());
+      final JsonElement rootDir = new JsonPrimitive(RuntimeConfig.getConfig().getWebdriver().getDirectory());
+      final JsonElement fileFullPath = new JsonPrimitive(RuntimeConfig.getConfig().getWebdriver().getExecutablePath());
+      final String expectedResponse = "{\"exit_code\":0,\"out\":[],\"error\":[],\"root_dir\":[" + rootDir + "],"
+          + "\"file\":[\"\"],\"file_full_path\":[" + fileFullPath + "],\"source_url\":[\"\"]}";
+      assertEquals(expectedResponse, task.getJsonResponse().toString());
   }
 
   @Test

SeleniumGridExtras/src/test/java/com/groupon/seleniumgridextras/config/RuntimeConfigTest.java

@@ -9,6 +9,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Paths;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -42,7 +43,7 @@ public void testLoadDefaultsOnly() throws Exception {
 
     assertNotNull(RuntimeConfig.getConfig());
     assertNotNull(RuntimeConfig.getConfig().getWebdriver().getVersion());
-    assertEquals("/tmp/webdriver", RuntimeConfig.getConfig().getWebdriver().getDirectory());
+    assertEquals(File.separator + "tmp" + File.separator + "webdriver", RuntimeConfig.getConfig().getWebdriver().getDirectory());
 
     List<String> expectedSetup = new LinkedList<String>();
     expectedSetup.add("com.groupon.seleniumgridextras.tasks.MoveMouse");

SeleniumGridExtras/src/test/java/com/groupon/seleniumgridextras/os/MacSystemInfoTest.java

@@ -36,6 +36,8 @@
  */
 package com.groupon.seleniumgridextras.os;
 
+import com.groupon.seleniumgridextras.config.RuntimeConfig;
+import org.junit.Assume;
 import org.junit.Test;
 
 import org.junit.Before;
@@ -52,7 +54,8 @@ public class MacSystemInfoTest {
 
   @Before
   public void setUp() throws Exception {
-    info = new MacSystemInfo();
+      Assume.assumeTrue(RuntimeConfig.getOS().isMac());
+      info = new MacSystemInfo();
   }
 
   @Test

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

@@ -119,13 +119,13 @@ public void testExecute() throws Exception {
     String os = getOS();
     // default setting from configuration
     String bit = "32";
-    String version = "2.5";
+    String version = "2.6";
 
     Map firstExec = new Gson().fromJson(task.execute(version), HashMap.class);
 
     File expectedFile = new File(RuntimeConfig.getConfig().getChromeDriver().getExecutablePath());
 
-    assertEquals(new Double(0.0), firstExec.get("exit_code"));
+    assertEquals(0.0, firstExec.get("exit_code"));
     assertEquals(expectedFile.getName(), ((ArrayList) firstExec.get("file")).get(0));
     assertEquals(0, ((ArrayList) firstExec.get("error")).size());
     assertEquals(0, ((ArrayList) firstExec.get("out")).size());
@@ -135,9 +135,9 @@ public void testExecute() throws Exception {
     assertEquals("http://chromedriver.storage.googleapis.com/" + version + "/chromedriver_" + os + bit + ".zip",
                  ((ArrayList) firstExec.get("source_url")).get(0));
 
-    Map secondExec = new Gson().fromJson(task.execute("2.5"), HashMap.class);
+    Map secondExec = new Gson().fromJson(task.execute(version), HashMap.class);
 
-    assertEquals(new Double(0.0), secondExec.get("exit_code"));
+    assertEquals(0.0, secondExec.get("exit_code"));
     assertEquals(0, ((ArrayList) secondExec.get("error")).size());
     assertEquals("File already downloaded, will not download again",
                  ((ArrayList) secondExec.get("out")).get(0));

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

@@ -37,6 +37,10 @@
 
 package com.groupon.seleniumgridextras.tasks;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
 import com.groupon.seleniumgridextras.config.Config;
 import com.groupon.seleniumgridextras.config.RuntimeConfig;
 
@@ -81,10 +85,11 @@ public void testGetDescription() throws Exception {
 
   @Test
   public void testGetJsonResponse() throws Exception {
-    assertEquals(
-        "{\"exit_code\":0,\"out\":[],\"error\":[],\"root_dir\":[\"/tmp/webdriver/iedriver\"],\"file\":[\"\"],\"file_full_path\":[\""
-        + "\"],\"source_url\":[\"\"]}",
-        task.getJsonResponse().toString());
+      final JsonElement rootDir = new JsonPrimitive(RuntimeConfig.getConfig().getIEdriver().getDirectory());
+      final String expectedResponse = "{\"exit_code\":0,\"out\":[],\"error\":[],\"root_dir\":["
+              + rootDir.toString() + "],\"file\":[\"\"],\"file_full_path\":[\""
+              + "\"],\"source_url\":[\"\"]}";
+    assertEquals(expectedResponse , task.getJsonResponse().toString());
   }
 
   @Test