Switching grid tests from chrome to htmlunit

Author: barancev

java/server/test/org/openqa/grid/e2e/misc/GridDistributionTest.java

@@ -54,7 +54,7 @@ public void prepare() throws Exception {
       SelfRegisteringRemote remote =
         GridTestHelper.getRemoteWithoutCapabilities(hub, GridRole.NODE);
 
-      remote.addBrowser(DesiredCapabilities.chrome(), 3);
+      remote.addBrowser(DesiredCapabilities.htmlUnit(), 3);
       remote.setRemoteServer(new SeleniumServer(remote.getConfiguration()));
       remote.startRemoteServer();
       remote.sendRegistrationRequest();
@@ -66,7 +66,7 @@ public void prepare() throws Exception {
   @Ignore("Times out")
   public void testLoadIsDistributedEvenly() throws MalformedURLException {
     for (int i=0; i < 8; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.chrome(), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
     }
 
     ProxySet ps = hub.getRegistry().getAllProxies();
@@ -82,7 +82,7 @@ public void testLoadIsDistributedEvenly() throws MalformedURLException {
     }
 
     for (int i=0; i < 8; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.chrome(), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
     }
 
     for (RemoteProxy p : ps) {
@@ -95,7 +95,7 @@ public void testLoadIsDistributedEvenly() throws MalformedURLException {
       Assert.assertEquals("checking proxy free slots, all should have two sessions running", freeslots, 1);
     }
 
-    drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.chrome(), hub));
+    drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
 
     Boolean foundOneFull = false;
     for (RemoteProxy p : ps) {
@@ -121,7 +121,7 @@ public void testLeastRecentlyUsedNodesPickedFirst() throws Throwable {
     ProxySet ps = hub.getRegistry().getAllProxies();
 
     for (int i=0; i < 4; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.chrome(), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
     }
 
     Set<String> chosenNodes = new HashSet<>();
@@ -138,7 +138,7 @@ public void testLeastRecentlyUsedNodesPickedFirst() throws Throwable {
     stopDrivers(drivers);
 
     for (int i=0; i < 4; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.chrome(), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
     }
 
     for (RemoteProxy p : ps) {
@@ -165,7 +165,7 @@ public void testLeastRecentlyUsedNodesPickedFirst() throws Throwable {
     stopDrivers(drivers);
 
     for (int i=0; i < 4; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.chrome(), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
     }
 
     for (RemoteProxy p : ps) {

java/server/test/org/openqa/grid/e2e/misc/GridViaCommandLineTest.java

@@ -54,7 +54,7 @@ public void testRegisterNodeToHub() throws Exception {
 
     Integer nodePort = PortProber.findFreePort();
 
-    String[] nodeArgs = {"-role", "node", "-hub", "http://localhost:" + hubPort, "-browser", "browserName=chrome,maxInstances=1", "-port", nodePort.toString()};
+    String[] nodeArgs = {"-role", "node", "-hub", "http://localhost:" + hubPort, "-browser", "browserName=htmlunit,maxInstances=1", "-port", nodePort.toString()};
     GridLauncherV3.main(nodeArgs);
     urlChecker.waitUntilAvailable(100, TimeUnit.SECONDS, new URL(String.format("http://localhost:%d/wd/hub/status", nodePort)));
 
@@ -65,19 +65,19 @@ public Boolean apply(URL u) {
           try (InputStream is = u.openConnection().getInputStream();
                InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8);
                BufferedReader reader = new BufferedReader(isr)) {
-            return reader.lines().anyMatch(l -> l.contains("chrome"));
+            return reader.lines().anyMatch(l -> l.contains("htmlunit"));
           } catch (IOException ioe) {
             return false;
           }
         }
       });
 
     WebDriver driver = new RemoteWebDriver(new URL(String.format("http://localhost:%d/wd/hub", hubPort)),
-                                                   DesiredCapabilities.chrome());
+                                                   DesiredCapabilities.htmlUnit());
 
     try {
       driver.get(String.format("http://localhost:%d/grid/console", hubPort));
-      Assert.assertEquals("Should only have one chrome registered to the hub", 1, driver.findElements(By.cssSelector("img[src$='chrome.png']")).size());
+      Assert.assertEquals("Should only have one htmlunit registered to the hub", 1, driver.findElements(By.cssSelector("img[src$='htmlunit.png']")).size());
     } finally {
       try {
         driver.quit();

java/server/test/org/openqa/grid/e2e/node/SmokeTest.java

@@ -49,10 +49,10 @@ public void prepare() throws Exception {
         GridTestHelper.getRemoteWithoutCapabilities(hub.getUrl(), GridRole.NODE);
     remote.addBrowser(GridTestHelper.getDefaultBrowserCapability(), 1);
 
-    DesiredCapabilities chromeOnSeleniumCapability = DesiredCapabilities.chrome();
-    chromeOnSeleniumCapability.setCapability(RegistrationRequest.SELENIUM_PROTOCOL,SeleniumProtocol.WebDriver);
+    DesiredCapabilities capabilities = DesiredCapabilities.htmlUnit();
+    capabilities.setCapability(RegistrationRequest.SELENIUM_PROTOCOL,SeleniumProtocol.WebDriver);
 
-    remote.addBrowser(chromeOnSeleniumCapability, 1);
+    remote.addBrowser(capabilities, 1);
 
     remote.setRemoteServer(new SeleniumServer(remote.getConfiguration()));
     remote.startRemoteServer();
@@ -63,10 +63,10 @@ public void prepare() throws Exception {
   }
 
   @Test
-  public void chromeOnWebDriver() throws MalformedURLException {
+  public void browserOnWebDriver() throws MalformedURLException {
     WebDriver driver = null;
     try {
-      DesiredCapabilities caps = DesiredCapabilities.chrome();
+      DesiredCapabilities caps = DesiredCapabilities.htmlUnit();
       driver = new RemoteWebDriver(hub.getWebDriverHubRequestURL(), caps);
       driver.get(hub.getConsoleURL().toString());
       assertEquals(driver.getTitle(), "Grid Console");

java/server/test/org/openqa/grid/e2e/utils/GridTestHelper.java

@@ -57,18 +57,14 @@ public static DesiredCapabilities getSelenium1FirefoxCapability() {
     return firefoxOnSeleniumCapability;
   }
 
-  public static DesiredCapabilities getFirefoxCapability() {
-    return DesiredCapabilities.firefox();
-  }
-
   public static DesiredCapabilities getDefaultBrowserCapability() {
     String browser = System.getProperty("webdriver.gridtest.browser");
     if (browser != null) {
       DesiredCapabilities caps = new DesiredCapabilities();
       caps.setBrowserName(browser);
       return caps;
     }
-    return DesiredCapabilities.chrome();
+    return DesiredCapabilities.htmlUnit();
   }
 
   public static Hub getHub() throws Exception {