[java] Add preferences when retrieving from a file

Fixes #10775
SeleniumHQ · Jun 17, 2022 · 9fac7d5 · 9fac7d5
1 parent 5713de4
commit 9fac7d5
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/java/src/org/openqa/selenium/firefox/FirefoxProfile.java b/java/src/org/openqa/selenium/firefox/FirefoxProfile.java
@@ -64,6 +64,7 @@ public FirefoxProfile(File profileDir) {
     if (prefsInModel.exists()) {
       StringReader reader = new StringReader("{\"frozen\": {}, \"mutable\": {}}");
       Preferences existingPrefs = new Preferences(reader, prefsInModel);
+      existingPrefs.addTo(this.additionalPrefs);
       acceptUntrustedCerts = getBooleanPreference(existingPrefs, ACCEPT_UNTRUSTED_CERTS_PREF, true);
       untrustedCertIssuer = getBooleanPreference(existingPrefs, ASSUME_UNTRUSTED_ISSUER_PREF, true);
     } else {

diff --git a/java/test/org/openqa/selenium/firefox/FirefoxOptionsTest.java b/java/test/org/openqa/selenium/firefox/FirefoxOptionsTest.java
@@ -201,6 +201,57 @@ public void shouldThrowAnExceptionIfSystemPropertyProfileDoesNotExist() {
     }
   }
 
+  @Test
+  public void shouldGetStringPreferencesFromGetProfile() {
+    String key = "browser.startup.homepage";
+    String value = "about:robots";
+
+    FirefoxProfile profile = new FirefoxProfile();
+    profile.setPreference(key, value);
+
+    FirefoxOptions options = new FirefoxOptions();
+    options.setProfile(profile);
+
+    assertThat(profile.getStringPreference(key, "-")).isEqualTo(value);
+
+    FirefoxProfile extractedProfile = options.getProfile();
+    assertThat(extractedProfile.getStringPreference(key, "-")).isEqualTo(value);
+  }
+
+  @Test
+  public void shouldGetIntegerPreferencesFromGetProfile() {
+    String key = "key";
+    int value = 5;
+
+    FirefoxProfile profile = new FirefoxProfile();
+    profile.setPreference(key, value);
+
+    FirefoxOptions options = new FirefoxOptions();
+    options.setProfile(profile);
+
+    assertThat(profile.getIntegerPreference(key, 0)).isEqualTo(value);
+
+    FirefoxProfile extractedProfile = options.getProfile();
+    assertThat(extractedProfile.getIntegerPreference(key, 0)).isEqualTo(value);
+  }
+
+  @Test
+  public void shouldGetBooleanPreferencesFromGetProfile() {
+    String key = "key";
+    boolean value = true;
+
+    FirefoxProfile profile = new FirefoxProfile();
+    profile.setPreference(key, value);
+
+    FirefoxOptions options = new FirefoxOptions();
+    options.setProfile(profile);
+
+    assertThat(profile.getBooleanPreference(key, false)).isEqualTo(value);
+
+    FirefoxProfile extractedProfile = options.getProfile();
+    assertThat(extractedProfile.getBooleanPreference(key, false)).isEqualTo(value);
+  }
+
   @Test
   public void callingToStringWhenTheBinaryDoesNotExistShouldNotCauseAnException() {
     FirefoxOptions options =