[java] Fixing compilation errors caused by deleting methods from Desi…

…redCapabilities

java/client/test/com/thoughtworks/selenium/InternalSelenseTestBase.java

@@ -46,10 +46,16 @@
 import org.openqa.selenium.MutableCapabilities;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WrapsDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.edge.EdgeOptions;
 import org.openqa.selenium.environment.GlobalTestEnvironment;
+import org.openqa.selenium.firefox.FirefoxOptions;
+import org.openqa.selenium.ie.InternetExplorerOptions;
+import org.openqa.selenium.opera.OperaOptions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.build.DevMode;
 import org.openqa.selenium.build.InProject;
+import org.openqa.selenium.safari.SafariOptions;
 import org.openqa.selenium.testing.drivers.Browser;
 import org.openqa.selenium.testing.drivers.WebDriverBuilder;
 
@@ -162,24 +168,24 @@ private Capabilities createCapabilities() {
     Browser browser = Browser.valueOf(property);
     switch (browser) {
       case CHROME:
-        return DesiredCapabilities.chrome();
+        return new ChromeOptions();
 
       case EDGE:
-        return DesiredCapabilities.edge();
+        return new EdgeOptions();
 
       case IE:
-        return DesiredCapabilities.internetExplorer();
+        return new InternetExplorerOptions();
 
       case FIREFOX:
       case MARIONETTE:
-        return DesiredCapabilities.firefox();
+        return new FirefoxOptions();
 
       case OPERA:
       case OPERABLINK:
-        return DesiredCapabilities.operaBlink();
+        return new OperaOptions();
 
       case SAFARI:
-        return DesiredCapabilities.safari();
+        return new SafariOptions();
 
       default:
         fail("Attempt to use an unsupported browser: " + property);

java/client/test/com/thoughtworks/selenium/StartTest.java

@@ -28,6 +28,7 @@
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.HasCapabilities;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
@@ -80,7 +81,7 @@ public void shouldBeAbleToPassCapabilitiesWithoutDetonating() {
   @Test
   public void shouldBeAbleToCreateAWebDriverBackedSeleniumInstance() throws MalformedURLException {
     URL wdServer = new URL(String.format("http://%s:%d/wd/hub", url.getHost(), url.getPort()));
-    WebDriver driver = new RemoteWebDriver(wdServer, DesiredCapabilities.firefox());
+    WebDriver driver = new RemoteWebDriver(wdServer, new FirefoxOptions());
     Capabilities capabilities = ((HasCapabilities) driver).getCapabilities();
 
     DefaultSelenium selenium = new DefaultSelenium(

java/client/test/org/openqa/selenium/ie/InternetExplorerOptionsTest.java

@@ -102,7 +102,7 @@ public void shouldSetIeOptionsCapabilityWhenConstructedFromExistingCapabilities(
     InternetExplorerOptions expected = new InternetExplorerOptions();
     expected.setCapability("requireWindowFocus", true);
 
-    DesiredCapabilities desiredCapabilities = new DesiredCapabilities().internetExplorer();
+    DesiredCapabilities desiredCapabilities = new DesiredCapabilities();
     desiredCapabilities.setPlatform(Platform.WINDOWS);
     InternetExplorerOptions seen = new InternetExplorerOptions(desiredCapabilities);
     seen.setCapability("requireWindowFocus", true);

java/client/test/org/openqa/selenium/remote/BaseAugmenterTest.java

@@ -33,6 +33,7 @@
 import org.openqa.selenium.TakesScreenshot;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.firefox.FirefoxOptions;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -304,7 +305,7 @@ public static class ChildRemoteDriver extends RemoteWebDriver implements MagicNu
 
     @Override
     public Capabilities getCapabilities() {
-      return DesiredCapabilities.firefox();
+      return new FirefoxOptions();
     }
 
     @Override

java/client/test/org/openqa/selenium/remote/DesiredCapabilitiesTest.java

@@ -25,6 +25,7 @@
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.logging.LoggingPreferences;
 
 import java.util.Map;
@@ -38,8 +39,8 @@ public void testAddingTheSameCapabilityToAMapTwiceShouldResultInOneEntry() {
     Map<org.openqa.selenium.Capabilities, Class<? extends WebDriver>> capabilitiesToDriver =
         new ConcurrentHashMap<>();
 
-    capabilitiesToDriver.put(DesiredCapabilities.firefox(), WebDriver.class);
-    capabilitiesToDriver.put(DesiredCapabilities.firefox(), WebDriver.class);
+    capabilitiesToDriver.put(new FirefoxOptions(), WebDriver.class);
+    capabilitiesToDriver.put(new FirefoxOptions(), WebDriver.class);
 
     assertThat(capabilitiesToDriver).hasSize(1);
   }

java/client/test/org/openqa/selenium/testing/drivers/GridSupplier.java

@@ -19,6 +19,7 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.LocalFileDetector;
@@ -105,7 +106,7 @@ private synchronized void startServers() {
 
   public static void main(String[] args) {
     System.setProperty("selenium.browser.grid", "true");
-    WebDriver driver = new GridSupplier(DesiredCapabilities.firefox()).get();
+    WebDriver driver = new GridSupplier(new FirefoxOptions()).get();
     driver.get("http://www.google.com");
   }
 }

java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java

@@ -21,12 +21,14 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ImmutableCapabilities;
+import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.edge.EdgeOptions;
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.ie.InternetExplorerOptions;
 import org.openqa.selenium.opera.OperaOptions;
+import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.safari.SafariOptions;
 
@@ -74,7 +76,7 @@ static void addShutdownAction(Runnable action) {
         return options;
       })
       .put(Browser.EDGE, EdgeOptions::new)
-      .put(Browser.HTMLUNIT, DesiredCapabilities::htmlUnit)
+      .put(Browser.HTMLUNIT, () -> new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY))
       .put(Browser.OPERABLINK, OperaOptions::new)
       .put(Browser.SAFARI, () -> {
         SafariOptions options = new SafariOptions();

java/server/src/com/thoughtworks/selenium/webdriven/WebDriverBackedSeleniumServlet.java

@@ -25,7 +25,13 @@
 import com.thoughtworks.selenium.CommandProcessor;
 import com.thoughtworks.selenium.SeleniumException;
 
+import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.edge.EdgeOptions;
+import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.grid.session.ActiveSession;
+import org.openqa.selenium.ie.InternetExplorerOptions;
+import org.openqa.selenium.opera.OperaOptions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.NewSessionPayload;
 import org.openqa.selenium.remote.SessionId;
@@ -34,6 +40,7 @@
 import org.openqa.selenium.remote.server.ActiveSessions;
 import org.openqa.selenium.remote.server.NewSessionPipeline;
 import org.openqa.selenium.remote.server.WebDriverServlet;
+import org.openqa.selenium.safari.SafariOptions;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -175,7 +182,7 @@ private void startNewSession(
 
     if (sessionId == null) {
       // Let's see if the user chose "webdriver" or something specific.
-      DesiredCapabilities caps;
+      Capabilities caps;
       switch (browserString) {
         case "*webdriver":
           caps = new DesiredCapabilities();
@@ -186,32 +193,32 @@ private void startNewSession(
         case "*firefoxproxy":
         case "*firefoxchrome":
         case "*pifirefox":
-          caps = DesiredCapabilities.firefox();
+          caps = new FirefoxOptions();
           break;
 
         case "*iehta":
         case "*iexplore":
         case "*iexploreproxy":
         case "*piiexplore":
-          caps = DesiredCapabilities.internetExplorer();
+          caps = new InternetExplorerOptions();
           break;
 
         case "*googlechrome":
-          caps = DesiredCapabilities.chrome();
+          caps = new ChromeOptions();
           break;
 
         case "*MicrosoftEdge":
-          caps = DesiredCapabilities.edge();
+          caps = new EdgeOptions();
           break;
 
         case "*opera":
         case "*operablink":
-          caps = DesiredCapabilities.operaBlink();
+          caps = new OperaOptions();
           break;
 
         case "*safari":
         case "*safariproxy":
-          caps = DesiredCapabilities.safari();
+          caps = new SafariOptions();
           break;
 
         default:

java/server/test/org/openqa/grid/common/RegistrationRequestTest.java

@@ -161,7 +161,7 @@ public void testBuildWithConfiguration() {
     actualConfig.timeout = 10;
     actualConfig.host = "dummyhost";
     actualConfig.port = 1234;
-    actualConfig.capabilities.set(0, DesiredCapabilities.operaBlink());
+    actualConfig.capabilities.set(0, new DesiredCapabilities(BrowserType.FIREFOX, "10", Platform.ANY));
     actualConfig.nodeConfigFile = GridNodeConfiguration.DEFAULT_NODE_CONFIG_FILE;
 
     RegistrationRequest req = RegistrationRequest.build(actualConfig);
@@ -176,7 +176,7 @@ public void testBuildWithConfiguration() {
     assertNull(actualConfig.nodeConfigFile);
 
     // make sure the first capability is for operaBlink
-    assertEquals(DesiredCapabilities.operaBlink().getBrowserName(),
+    assertEquals(BrowserType.FIREFOX,
                  actualConfig.capabilities.get(0).getBrowserName());
 
     // make sure this merge protected value was preserved, then reset it for the final assert

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

@@ -30,7 +30,9 @@
 import org.openqa.grid.internal.TestSlot;
 import org.openqa.grid.internal.utils.SelfRegisteringRemote;
 import org.openqa.grid.web.Hub;
+import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.server.SeleniumServer;
 
@@ -53,7 +55,7 @@ public void prepare() throws Exception {
       SelfRegisteringRemote remote =
         GridTestHelper.getRemoteWithoutCapabilities(hub, GridRole.NODE);
 
-      remote.addBrowser(DesiredCapabilities.htmlUnit(), 3);
+      remote.addBrowser(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), 3);
       remote.setRemoteServer(new SeleniumServer(remote.getConfiguration()));
       remote.startRemoteServer();
       remote.sendRegistrationRequest();
@@ -65,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(DesiredCapabilities.htmlUnit(), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), hub));
     }
 
     ProxySet ps = hub.getRegistry().getAllProxies();
@@ -81,7 +83,7 @@ public void testLoadIsDistributedEvenly() {
     }
 
     for (int i=0; i < 8; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), hub));
     }
 
     for (RemoteProxy p : ps) {
@@ -94,7 +96,7 @@ public void testLoadIsDistributedEvenly() {
       Assert.assertEquals("checking proxy free slots, all should have two sessions running", freeslots, 1);
     }
 
-    drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
+    drivers.add(GridTestHelper.getRemoteWebDriver(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), hub));
 
     Boolean foundOneFull = false;
     for (RemoteProxy p : ps) {
@@ -120,7 +122,7 @@ public void testLeastRecentlyUsedNodesPickedFirst() {
     ProxySet ps = hub.getRegistry().getAllProxies();
 
     for (int i=0; i < 4; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), hub));
     }
 
     Set<String> chosenNodes = new HashSet<>();
@@ -137,7 +139,7 @@ public void testLeastRecentlyUsedNodesPickedFirst() {
     stopDrivers(drivers);
 
     for (int i=0; i < 4; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), hub));
     }
 
     for (RemoteProxy p : ps) {
@@ -164,7 +166,7 @@ public void testLeastRecentlyUsedNodesPickedFirst() {
     stopDrivers(drivers);
 
     for (int i=0; i < 4; i++) {
-      drivers.add(GridTestHelper.getRemoteWebDriver(DesiredCapabilities.htmlUnit(), hub));
+      drivers.add(GridTestHelper.getRemoteWebDriver(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), hub));
     }
 
     for (RemoteProxy p : ps) {

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

@@ -23,8 +23,10 @@
 import org.junit.Test;
 import org.openqa.grid.e2e.utils.GridTestHelper;
 import org.openqa.grid.web.Hub;
+import org.openqa.selenium.Platform;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.json.JsonInput;
+import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
@@ -87,7 +89,7 @@ private void runTest(int nodesCount, int howMany,
     Hub hub = null;
     List<RemoteWebDriver> drivers = new ArrayList<>();
     try {
-      hub = GridTestHelper.prepareTestGrid(DesiredCapabilities.htmlUnit(), nodesCount);
+      hub = GridTestHelper.prepareTestGrid(new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY), nodesCount);
       drivers = createSession(howMany, hub);
       Map<String, Object> sessions = getSessions(hub);
       assertions.accept(sessions);
@@ -112,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, DesiredCapabilities.htmlUnit()));
+      drivers.add(new RemoteWebDriver(url, new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY)));
     }
     return drivers;
 

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

@@ -32,10 +32,12 @@
 import org.openqa.grid.shared.Stoppable;
 import org.openqa.grid.web.Hub;
 import org.openqa.selenium.By;
+import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.net.PortProber;
 import org.openqa.selenium.net.UrlChecker;
+import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.remote.http.HttpClient;
@@ -169,7 +171,7 @@ public void canGetDebugLogFromStandalone() throws Exception {
     assertNotNull(server);
 
     WebDriver driver = new RemoteWebDriver(new URL(String.format("http://localhost:%d/wd/hub", port)),
-                                           DesiredCapabilities.htmlUnit());
+                                           new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY));
     driver.quit();
     assertThat(readAll(tempLog)).contains("DEBUG [WebDriverServlet.handle]");
   }
@@ -184,7 +186,7 @@ public void canSetSessionTimeoutForStandalone() throws Exception {
     assertNotNull(server);
 
     WebDriver driver = new RemoteWebDriver(new URL(String.format("http://localhost:%d/wd/hub", port)),
-                                           DesiredCapabilities.htmlUnit());
+                                           new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY));
     long start = System.currentTimeMillis();
     new FluentWait<>(tempLog).withTimeout(Duration.ofSeconds(100))
         .until(file -> readAll(file).contains("Removing session"));
@@ -373,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)),
-        DesiredCapabilities.htmlUnit());
+        new DesiredCapabilities(BrowserType.HTMLUNIT, "", Platform.ANY));
 
     try {
       driver.get(String.format("http://localhost:%d/grid/console", hubPort));

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

@@ -63,7 +63,7 @@ public void prepareANodePointingToANonExistingFirefox() throws Exception {
 
     remote = GridTestHelper.getRemoteWithoutCapabilities(hub.getUrl(), GridRole.NODE);
 
-    remote.addBrowser(DesiredCapabilities.firefox(), 1);
+    remote.addBrowser(new DesiredCapabilities(new FirefoxOptions()), 1);
 
     remote.setRemoteServer(new SeleniumServer(remote.getConfiguration()));
     remote.startRemoteServer();