[java] Temporarily restoring DesiredCapabilities.htmlUnit() because H…

…tmlUnitDriver depends on this method
SeleniumHQ · Apr 7, 2019 · 3f5104f · 3f5104f
1 parent 56bd662
commit 3f5104f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 16 deletions.
diff --git a/java/client/src/org/openqa/selenium/remote/DesiredCapabilities.java b/java/client/src/org/openqa/selenium/remote/DesiredCapabilities.java
@@ -23,6 +23,8 @@
 import static org.openqa.selenium.remote.CapabilityType.SUPPORTS_JAVASCRIPT;
 import static org.openqa.selenium.remote.CapabilityType.VERSION;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.MutableCapabilities;
 import org.openqa.selenium.Platform;
@@ -107,4 +109,10 @@ public DesiredCapabilities merge(Capabilities extraCapabilities) {
     super.merge(extraCapabilities);
     return this;
   }
+
+  @Deprecated
+  @VisibleForTesting
+  public static DesiredCapabilities htmlUnit() {
+    return new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY);
+  }
 }
diff --git a/java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java b/java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java
@@ -76,7 +76,7 @@ static void addShutdownAction(Runnable action) {
         return options;
       })
       .put(Browser.EDGE, EdgeOptions::new)
-      .put(Browser.HTMLUNIT, () -> new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY))
+      .put(Browser.HTMLUNIT, DesiredCapabilities::htmlUnit)
       .put(Browser.OPERABLINK, OperaOptions::new)
       .put(Browser.SAFARI, () -> {
         SafariOptions options = new SafariOptions();

diff --git a/java/server/test/org/openqa/grid/e2e/misc/GridDistributionTest.java b/java/server/test/org/openqa/grid/e2e/misc/GridDistributionTest.java
@@ -55,7 +55,7 @@ public void prepare() throws Exception {
       SelfRegisteringRemote remote =
         GridTestHelper.getRemoteWithoutCapabilities(hub, GridRole.NODE);
 
-      remote.addBrowser(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), 3);
+      remote.addBrowser(DesiredCapabilities.htmlUnit(), 3);
       remote.setRemoteServer(new SeleniumServer(remote.getConfiguration()));
       remote.startRemoteServer();
       remote.sendRegistrationRequest();
@@ -67,7 +67,7 @@ public void prepare() throws Exception {
   @Ignore("Times out")
   public void testLoadIsDistributedEvenly() {
     for (int i=0; i < 8; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
     }
 
     ProxySet ps = hub.getRegistry().getAllProxies();
@@ -83,7 +83,7 @@ public void testLoadIsDistributedEvenly() {
     }
 
     for (int i=0; i < 8; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
     }
 
     for (RemoteProxy p : ps) {
@@ -96,7 +96,7 @@ public void testLoadIsDistributedEvenly() {
       Assert.assertEquals("checking proxy free slots, all should have two sessions running", freeslots, 1);
     }
 
-    drivers.add(GridTestHelper.getRemoteWebDriver(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), hub));
+    drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
 
     Boolean foundOneFull = false;
     for (RemoteProxy p : ps) {
@@ -122,7 +122,7 @@ public void testLeastRecentlyUsedNodesPickedFirst() {
     ProxySet ps = hub.getRegistry().getAllProxies();
 
     for (int i=0; i < 4; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
     }
 
     Set<String> chosenNodes = new HashSet<>();
@@ -139,7 +139,7 @@ public void testLeastRecentlyUsedNodesPickedFirst() {
     stopDrivers(drivers);
 
     for (int i=0; i < 4; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
     }
 
     for (RemoteProxy p : ps) {
@@ -166,7 +166,7 @@ public void testLeastRecentlyUsedNodesPickedFirst() {
     stopDrivers(drivers);
 
     for (int i=0; i < 4; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
     }
 
     for (RemoteProxy p : ps) {

diff --git a/java/server/test/org/openqa/grid/e2e/misc/GridListActiveSessionsTest.java b/java/server/test/org/openqa/grid/e2e/misc/GridListActiveSessionsTest.java
@@ -89,7 +89,7 @@ private void runTest(int nodesCount, int howMany,
     Hub hub = null;
     List<RemoteWebDriver> drivers = new ArrayList<>();
     try {
-      hub = GridTestHelper.prepareTestGrid(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), nodesCount);
+      hub = GridTestHelper.prepareTestGrid(DesiredCapabilities.htmlUnit(), nodesCount);
       drivers = createSession(howMany, hub);
       Map<String, Object> sessions = getSessions(hub);
       assertions.accept(sessions);
@@ -114,7 +114,7 @@ private List<RemoteWebDriver> createSession(int howMany, Hub hub) {
       return new ArrayList<>();
     }
     for (int i = 0; i < howMany; i++) {
-      drivers.add(new RemoteWebDriver(url, new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY)));
+      drivers.add(new RemoteWebDriver(url, DesiredCapabilities.htmlUnit()));
     }
     return drivers;
 

diff --git a/java/server/test/org/openqa/grid/e2e/misc/GridViaCommandLineTest.java b/java/server/test/org/openqa/grid/e2e/misc/GridViaCommandLineTest.java
@@ -171,7 +171,7 @@ public void canGetDebugLogFromStandalone() throws Exception {
     assertNotNull(server);
 
     WebDriver driver = new RemoteWebDriver(new URL(String.format("http://localhost:%d/wd/hub", port)),
-                                           new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY));
+                                           DesiredCapabilities.htmlUnit());
     driver.quit();
     assertThat(readAll(tempLog)).contains("DEBUG [WebDriverServlet.handle]");
   }
@@ -186,7 +186,7 @@ public void canSetSessionTimeoutForStandalone() throws Exception {
     assertNotNull(server);
 
     WebDriver driver = new RemoteWebDriver(new URL(String.format("http://localhost:%d/wd/hub", port)),
-                                           new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY));
+                                           DesiredCapabilities.htmlUnit());
     long start = System.currentTimeMillis();
     new FluentWait<>(tempLog).withTimeout(Duration.ofSeconds(100))
         .until(file -> readAll(file).contains("Removing session"));
@@ -375,7 +375,7 @@ private void checkPresenceOfElementOnHubConsole(Integer hubPort, By locator)
       throws MalformedURLException {
     WebDriver driver = new RemoteWebDriver(
         new URL(String.format("http://localhost:%d/wd/hub", hubPort)),
-        new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY));
+        DesiredCapabilities.htmlUnit());
 
     try {
       driver.get(String.format("http://localhost:%d/grid/console", hubPort));

diff --git a/java/server/test/org/openqa/grid/e2e/node/SmokeTest.java b/java/server/test/org/openqa/grid/e2e/node/SmokeTest.java
@@ -36,14 +36,14 @@ public class SmokeTest {
 
   @Before
   public void prepare() {
-    hub = GridTestHelper.prepareTestGrid(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), 1);
+    hub = GridTestHelper.prepareTestGrid(DesiredCapabilities.htmlUnit(), 1);
   }
 
   @Test
   public void browserOnWebDriver() {
     WebDriver driver = null;
     try {
-      DesiredCapabilities caps = new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY);
+      DesiredCapabilities caps = DesiredCapabilities.htmlUnit();
       driver = new RemoteWebDriver(hub.getWebDriverHubRequestURL(), caps);
       driver.get(hub.getConsoleURL().toString());
       assertEquals(driver.getTitle(), "Grid Console");

diff --git a/java/server/test/org/openqa/grid/e2e/utils/GridTestHelper.java b/java/server/test/org/openqa/grid/e2e/utils/GridTestHelper.java
@@ -76,7 +76,7 @@ public static DesiredCapabilities getDefaultBrowserCapability() {
       caps.setBrowserName(browser);
       return caps;
     }
-    return new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY);
+    return DesiredCapabilities.htmlUnit();
   }
 
   public static Hub getHub() {