[java] Adding more tests for merging ChromeOptions

Author: barancev

java/client/src/org/openqa/selenium/chromium/ChromiumOptions.java

@@ -32,7 +32,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -60,7 +59,7 @@
  *
  * @since Since chromedriver v17.0.963.0
  */
-public class ChromiumOptions<T extends ChromiumOptions> extends AbstractDriverOptions<ChromiumOptions> {
+public class ChromiumOptions<T extends ChromiumOptions<?>> extends AbstractDriverOptions<ChromiumOptions<?>> {
 
   private String binary;
   private final List<String> args = new ArrayList<>();

java/client/test/org/openqa/selenium/chrome/ChromeOptionsTest.java

@@ -24,10 +24,13 @@
 import static org.openqa.selenium.chrome.ChromeDriverLogLevel.OFF;
 import static org.openqa.selenium.chrome.ChromeDriverLogLevel.SEVERE;
 
+import java.io.File;
+import java.util.Base64;
 import java.util.List;
 import java.util.Map;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.openqa.selenium.testing.TestUtilities;
 import org.openqa.selenium.testing.UnitTests;
 
 @Category(UnitTests.class)
@@ -37,19 +40,19 @@ public class ChromeOptionsTest {
   public void optionsAsMapShouldBeImmutable() {
     Map<String, Object> options = new ChromeOptions().asMap();
     assertThatExceptionOfType(UnsupportedOperationException.class)
-        .isThrownBy(() -> options.put("browserType", "firefox"));
+      .isThrownBy(() -> options.put("browserType", "firefox"));
 
     Map<String, Object> googOptions = (Map<String, Object>) options.get(ChromeOptions.CAPABILITY);
     assertThatExceptionOfType(UnsupportedOperationException.class)
-        .isThrownBy(() -> googOptions.put("binary", ""));
+      .isThrownBy(() -> googOptions.put("binary", ""));
 
     List<String> extensions = (List<String>) googOptions.get("extensions");
     assertThatExceptionOfType(UnsupportedOperationException.class)
-        .isThrownBy(() -> extensions.add("x"));
+      .isThrownBy(() -> extensions.add("x"));
 
     List<String> args = (List<String>) googOptions.get("args");
     assertThatExceptionOfType(UnsupportedOperationException.class)
-        .isThrownBy(() -> args.add("-help"));
+      .isThrownBy(() -> args.add("-help"));
   }
 
   @Test
@@ -69,4 +72,69 @@ public void mergingOptionsMergesArguments() {
       .extractingByKey("args").asInstanceOf(LIST)
       .containsExactly("verbose", "silent");
   }
+
+  @Test
+  public void mergingOptionsMergesEncodedExtensions() {
+    String ext1 = Base64.getEncoder().encodeToString("ext1".getBytes());
+    String ext2 = Base64.getEncoder().encodeToString("ext2".getBytes());
+
+    ChromeOptions one = new ChromeOptions().addEncodedExtensions(ext1);
+    ChromeOptions two = new ChromeOptions().addEncodedExtensions(ext2);
+    ChromeOptions merged = one.merge(two);
+
+    assertThat(merged.asMap()).asInstanceOf(MAP)
+      .extractingByKey(ChromeOptions.CAPABILITY).asInstanceOf(MAP)
+      .extractingByKey("extensions").asInstanceOf(LIST)
+      .containsExactly(ext1, ext2);
+  }
+
+  @Test
+  public void mergingOptionsMergesExtensions() {
+    File ext1 = TestUtilities.createTmpFile("ext1");
+    String ext1Encoded = Base64.getEncoder().encodeToString("ext1".getBytes());
+    File ext2 = TestUtilities.createTmpFile("ext2");
+    String ext2Encoded = Base64.getEncoder().encodeToString("ext2".getBytes());
+
+    ChromeOptions one = new ChromeOptions().addExtensions(ext1);
+    ChromeOptions two = new ChromeOptions().addExtensions(ext2);
+    ChromeOptions merged = one.merge(two);
+
+    assertThat(merged.asMap()).asInstanceOf(MAP)
+      .extractingByKey(ChromeOptions.CAPABILITY).asInstanceOf(MAP)
+      .extractingByKey("extensions").asInstanceOf(LIST)
+      .containsExactly(ext1Encoded, ext2Encoded);
+  }
+
+  @Test
+  public void mergingOptionsMergesEncodedExtensionsAndFileExtensions() {
+    File ext1 = TestUtilities.createTmpFile("ext1");
+    String ext1Encoded = Base64.getEncoder().encodeToString("ext1".getBytes());
+    String ext2 = Base64.getEncoder().encodeToString("ext2".getBytes());
+
+    ChromeOptions one = new ChromeOptions().addExtensions(ext1);
+    ChromeOptions two = new ChromeOptions().addEncodedExtensions(ext2);
+    ChromeOptions merged = one.merge(two);
+
+    assertThat(merged.asMap()).asInstanceOf(MAP)
+      .extractingByKey(ChromeOptions.CAPABILITY).asInstanceOf(MAP)
+      .extractingByKey("extensions").asInstanceOf(LIST)
+      .containsExactly(ext1Encoded, ext2);
+  }
+
+  @Test
+  public void mergingOptionsMergesExperimentalOptions() {
+    ChromeOptions one = new ChromeOptions()
+      .setExperimentalOption("opt1", "val1")
+      .setExperimentalOption("opt2", "val2");
+    ChromeOptions two = new ChromeOptions()
+      .setExperimentalOption("opt2", "val4")
+      .setExperimentalOption("opt3", "val3");
+    ChromeOptions merged = one.merge(two);
+
+    assertThat(merged.asMap()).asInstanceOf(MAP)
+      .extractingByKey(ChromeOptions.CAPABILITY).asInstanceOf(MAP)
+      .containsEntry("opt1", "val1")
+      .containsEntry("opt2", "val4")
+      .containsEntry("opt3", "val3");
+  }
 }

java/client/test/org/openqa/selenium/testing/TestUtilities.java

@@ -25,6 +25,11 @@
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 import org.openqa.selenium.remote.CapabilityType;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -178,4 +183,15 @@ public static boolean isOnTravis() {
   public static boolean isOnGitHubActions() {
     return Boolean.parseBoolean(System.getenv("GITHUB_ACTIONS"));
   }
+
+  public static File createTmpFile(String content) {
+    try {
+      File f = File.createTempFile("webdriver", "tmp");
+      f.deleteOnExit();
+      Files.write(f.toPath(), content.getBytes(StandardCharsets.UTF_8));
+      return f;
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
+    }
+  }
 }