[java] Adding userWebView2 to Java

diemol · diemol · commit 38b4acc8ab39 · 2023-05-23T10:12:37.000+02:00
#11978
diff --git a/java/src/org/openqa/selenium/edge/EdgeDriverInfo.java b/java/src/org/openqa/selenium/edge/EdgeDriverInfo.java
@@ -16,6 +16,7 @@
 // under the License.
 package org.openqa.selenium.edge;
 
+import static org.openqa.selenium.edge.EdgeOptions.WEBVIEW2_BROWSER_NAME;
 import static org.openqa.selenium.remote.Browser.EDGE;
 
 import com.google.auto.service.AutoService;
@@ -60,7 +61,7 @@ public Capabilities getCanonicalCapabilities() {
   public boolean isSupporting(Capabilities capabilities) {
     // webview2 - support https://docs.microsoft.com/en-us/microsoft-edge/webview2/how-to/webdriver
     return EDGE.is(capabilities.getBrowserName())
-        || "webview2".equalsIgnoreCase(capabilities.getBrowserName())
+        || WEBVIEW2_BROWSER_NAME.equalsIgnoreCase(capabilities.getBrowserName())
         || capabilities.getCapability("ms:edgeOptions") != null;
   }
 
diff --git a/java/src/org/openqa/selenium/edge/EdgeDriverService.java b/java/src/org/openqa/selenium/edge/EdgeDriverService.java
@@ -19,6 +19,7 @@
 
 import static java.util.Collections.unmodifiableList;
 import static java.util.Collections.unmodifiableMap;
+import static org.openqa.selenium.edge.EdgeOptions.WEBVIEW2_BROWSER_NAME;
 import static org.openqa.selenium.remote.Browser.EDGE;
 
 import com.google.auto.service.AutoService;
@@ -164,7 +165,7 @@ public int score(Capabilities capabilities) {
 
       // webview2 - support
       // https://docs.microsoft.com/en-us/microsoft-edge/webview2/how-to/webdriver
-      if ("webview2".equalsIgnoreCase(capabilities.getBrowserName())) {
+      if (WEBVIEW2_BROWSER_NAME.equalsIgnoreCase(capabilities.getBrowserName())) {
         score++;
       }
 
diff --git a/java/src/org/openqa/selenium/edge/EdgeOptions.java b/java/src/org/openqa/selenium/edge/EdgeOptions.java
@@ -49,10 +49,17 @@ public class EdgeOptions extends ChromiumOptions<EdgeOptions> {
 
   public static final String LOGGING_PREFS = "ms:loggingPrefs";
 
+  public static final String WEBVIEW2_BROWSER_NAME = "webview2";
+
   public EdgeOptions() {
     super(CapabilityType.BROWSER_NAME, EDGE.browserName(), CAPABILITY);
   }
 
+  public void useWebView(boolean webViewEnabled) {
+    String browserName = webViewEnabled ? WEBVIEW2_BROWSER_NAME : EDGE.browserName();
+    setCapability(CapabilityType.BROWSER_NAME, browserName);
+  }
+
   @Override
   public EdgeOptions merge(Capabilities extraCapabilities) {
     Require.nonNull("Capabilities to merge", extraCapabilities);
diff --git a/java/test/org/openqa/selenium/edge/EdgeOptionsTest.java b/java/test/org/openqa/selenium/edge/EdgeOptionsTest.java
@@ -21,6 +21,7 @@
 import static org.assertj.core.api.InstanceOfAssertFactories.LIST;
 import static org.assertj.core.api.InstanceOfAssertFactories.MAP;
 import static org.assertj.core.api.InstanceOfAssertFactories.STRING;
+import static org.openqa.selenium.edge.EdgeOptions.WEBVIEW2_BROWSER_NAME;
 import static org.openqa.selenium.remote.Browser.EDGE;
 import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
 
@@ -92,12 +93,9 @@ void canAddExtensions() throws IOException {
   @Test
   void canMergeWithoutChangingOriginalObject() {
     EdgeOptions options = new EdgeOptions();
-    Map<String, Object> before = options.asMap();
     EdgeOptions merged =
         options.merge(
             new ImmutableCapabilities(CapabilityType.PAGE_LOAD_STRATEGY, PageLoadStrategy.NONE));
-    // TODO: assertThat(merged).isNotSameAs(options);
-    // TODO: assertThat(options.asMap()).isEqualTo(before);
     assertThat(merged.getCapability(CapabilityType.PAGE_LOAD_STRATEGY))
         .isEqualTo(PageLoadStrategy.NONE);
   }
@@ -265,4 +263,14 @@ void mergingOptionsMergesArguments() {
         .asInstanceOf(LIST)
         .containsExactly("verbose", "silent");
   }
+
+  @Test
+  void usingWebView2ChangesBrowserName() {
+    EdgeOptions options = new EdgeOptions();
+    assertThat(options.getBrowserName()).isEqualTo(EDGE.browserName());
+    options.useWebView(true);
+    assertThat(options.getBrowserName()).isEqualTo(WEBVIEW2_BROWSER_NAME);
+    options.useWebView(false);
+    assertThat(options.getBrowserName()).isEqualTo(EDGE.browserName());
+  }
 }
