Extend Browser enum to provide some useful information

SeleniumHQ · May 19, 2020 · 4a42ca6 · 4a42ca6
1 parent beaf9a9
commit 4a42ca6
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 16 deletions.
diff --git a/java/client/test/org/openqa/selenium/devtools/BUILD.bazel b/java/client/test/org/openqa/selenium/devtools/BUILD.bazel
@@ -14,7 +14,6 @@ java_selenium_test_suite(
         "//java/client/src/org/openqa/selenium/devtools",
         "//java/client/src/org/openqa/selenium/remote",
         "//java/client/test/org/openqa/selenium/testing:annotations",
-        "//java/client/test/org/openqa/selenium/testing/drivers:browser",
         artifact("com.google.guava:guava"),
         artifact("junit:junit"),
         artifact("org.assertj:assertj-core"),

diff --git a/java/client/test/org/openqa/selenium/mobile/BUILD.bazel b/java/client/test/org/openqa/selenium/mobile/BUILD.bazel
@@ -10,7 +10,6 @@ java_selenium_test_suite(
         "//java/client/src/org/openqa/selenium/remote",
         "//java/client/test/org/openqa/selenium/testing:annotations",
         "//java/client/test/org/openqa/selenium/testing:test-base",
-        "//java/client/test/org/openqa/selenium/testing/drivers:browser",
         artifact("junit:junit"),
         artifact("org.assertj:assertj-core"),
     ],

diff --git a/java/client/test/org/openqa/selenium/testing/BUILD.bazel b/java/client/test/org/openqa/selenium/testing/BUILD.bazel
@@ -14,6 +14,9 @@ java_library(
         "NotYetImplementedList.java",
         "SwitchToTopAfterTest.java",
     ],
+    exports = [
+        "//java/client/test/org/openqa/selenium/testing/drivers:browser",
+    ],
     visibility = [
         "//java/client/test:__subpackages__",
     ],

diff --git a/java/client/test/org/openqa/selenium/testing/drivers/BUILD.bazel b/java/client/test/org/openqa/selenium/testing/drivers/BUILD.bazel
@@ -6,8 +6,17 @@ java_library(
         "Browser.java",
     ],
     visibility = [
-        "//java/client/test:__subpackages__",
-        "//java/server/test:__subpackages__",
+        "//java/client/test/org/openqa/selenium/testing:__pkg__",
+    ],
+    deps = [
+        "//java/client/src/org/openqa/selenium:core",
+        "//java/client/src/org/openqa/selenium/chrome",
+        "//java/client/src/org/openqa/selenium/edge",
+        "//java/client/src/org/openqa/selenium/firefox",
+        "//java/client/src/org/openqa/selenium/ie",
+        "//java/client/src/org/openqa/selenium/opera",
+        "//java/client/src/org/openqa/selenium/remote",
+        "//java/client/src/org/openqa/selenium/safari",
     ],
 )
 
@@ -17,14 +26,16 @@ java_library(
         "*Driver.java",
         "*Supplier.java",
     ]) + [
-        "Browser.java",
         "OutOfProcessSeleniumServer.java",
         "WebDriverBuilder.java",
     ],
     visibility = [
         "//java/client/test:__subpackages__",
         "//java/server/test:__subpackages__",
     ],
+    exports = [
+        ":browser",
+    ],
     deps = [
         ":browser",
         "//java/client/src/org/openqa/selenium:core",

diff --git a/java/client/test/org/openqa/selenium/testing/drivers/Browser.java b/java/client/test/org/openqa/selenium/testing/drivers/Browser.java
@@ -17,22 +17,41 @@
 
 package org.openqa.selenium.testing.drivers;
 
+import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.ImmutableCapabilities;
+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.safari.SafariOptions;
+
 import java.util.logging.Logger;
 
+import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
+
 public enum Browser {
-  ALL,
-  CHROME,
-  EDGE,
-  CHROMIUMEDGE,
-  HTMLUNIT,
-  FIREFOX,
-  IE,
-  MARIONETTE,
-  OPERA,
-  OPERABLINK,
-  SAFARI;
+  ALL(new ImmutableCapabilities(), false),
+  CHROME(new ChromeOptions(), true),
+  EDGE(new EdgeOptions(), false),
+  CHROMIUMEDGE(new EdgeOptions(), true),
+  HTMLUNIT(new ImmutableCapabilities(BROWSER_NAME, BrowserType.HTMLUNIT), false),
+  FIREFOX(new FirefoxOptions(), false),
+  IE(new InternetExplorerOptions(), false),
+  MARIONETTE(new FirefoxOptions(), false),
+  OPERA(new OperaOptions(), false),
+  OPERABLINK(new OperaOptions(), false),
+  SAFARI(new SafariOptions(), false);
 
   private static final Logger log = Logger.getLogger(Browser.class.getName());
+  private final Capabilities canonicalCapabilities;
+  private final boolean supportsCdp;
+
+  private Browser(Capabilities canonicalCapabilities, boolean supportsCdp) {
+    this.canonicalCapabilities = ImmutableCapabilities.copyOf(canonicalCapabilities);
+    this.supportsCdp = supportsCdp;
+  }
 
   public static Browser detect() {
     String browserName = System.getProperty("selenium.browser");
@@ -64,4 +83,12 @@ public static Browser detect() {
 
     throw new RuntimeException(String.format("Cannot determine driver from name %s", browserName));
   }
+
+  public boolean supportsCdp() {
+    return supportsCdp;
+  }
+
+  public Capabilities getCapabilities() {
+    return canonicalCapabilities;
+  }
 }