Skip to content

Commit c579ecd

Browse files
committed
[java] Removing deprecated method in FirefoxProfile
1 parent 9c30b2f commit c579ecd

File tree

3 files changed

+5
-41
lines changed

3 files changed

+5
-41
lines changed

java/src/org/openqa/selenium/firefox/FirefoxProfile.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -310,13 +310,6 @@ public void cleanTemporaryModel() {
310310
clean(model);
311311
}
312312

313-
/**
314-
* @deprecated This method will not be replaced as no default preferences are loaded anymore.
315-
*/
316-
public void checkForChangesInFrozenPreferences() {
317-
additionalPrefs.checkForChangesInFrozenPreferences();
318-
}
319-
320313
/**
321314
* Call this to cause the current profile to be written to disk. The profile directory is
322315
* returned. Note that this profile directory is a temporary one and will be deleted when the JVM

java/src/org/openqa/selenium/firefox/Preferences.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
package org.openqa.selenium.firefox;
1919

20-
import static org.openqa.selenium.json.Json.MAP_TYPE;
21-
2220
import com.google.common.annotations.VisibleForTesting;
2321
import com.google.common.io.CharStreams;
2422
import com.google.common.io.Closeables;
@@ -39,6 +37,8 @@
3937
import java.util.regex.Matcher;
4038
import java.util.regex.Pattern;
4139

40+
import static org.openqa.selenium.json.Json.MAP_TYPE;
41+
4242
class Preferences {
4343

4444
/**
@@ -204,10 +204,6 @@ private boolean isStringified(String value) {
204204
return value.startsWith("\"") && value.endsWith("\"");
205205
}
206206

207-
void checkForChangesInFrozenPreferences() {
208-
allPrefs.forEach((this::checkPreference));
209-
}
210-
211207
private void checkPreference(String key, Object value) {
212208
Require.nonNull("Key", key);
213209
Require.nonNull("Value", value);

java/test/org/openqa/selenium/firefox/PreferencesTest.java

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,15 @@
1717

1818
package org.openqa.selenium.firefox;
1919

20-
import static org.assertj.core.api.Assertions.assertThat;
21-
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
22-
2320
import org.junit.jupiter.api.BeforeEach;
24-
import org.junit.jupiter.api.Test;
2521
import org.junit.jupiter.api.Tag;
22+
import org.junit.jupiter.api.Test;
2623

2724
import java.io.Reader;
2825
import java.io.StringReader;
2926

27+
import static org.assertj.core.api.Assertions.assertThat;
28+
3029
@Tag("UnitTests")
3130
class PreferencesTest {
3231

@@ -105,17 +104,6 @@ void parsePreferences_multiline() {
105104
assertThat(prefs.getPreference("dom.max_script_run_time")).isEqualTo(32);
106105
}
107106

108-
@Test
109-
void cannotOverrideAFrozenPreference() {
110-
StringReader reader = new StringReader("{\"frozen\": {\"frozen.pref\": true }, \"mutable\": {}}");
111-
Preferences preferences = new Preferences(reader);
112-
preferences.setPreference("frozen.pref", false);
113-
114-
assertThatExceptionOfType(IllegalStateException.class)
115-
.isThrownBy(preferences::checkForChangesInFrozenPreferences)
116-
.withMessage("Preference frozen.pref may not be overridden: frozen value=true, requested value=false");
117-
}
118-
119107
@Test
120108
void canOverrideAFrozenPreferenceWithTheFrozenValue() {
121109
StringReader reader = new StringReader("{\"frozen\": {\"frozen.pref\": true }, \"mutable\": {}}");
@@ -126,19 +114,6 @@ void canOverrideAFrozenPreferenceWithTheFrozenValue() {
126114
assertThat(preferences.getPreference("frozen.pref")).isEqualTo(true);
127115
}
128116

129-
@Test
130-
void canOverrideMaxScriptRuntimeIfGreaterThanDefaultValueOrSetToInfinity() {
131-
Preferences preferences = new Preferences(defaults);
132-
preferences.setPreference("dom.max_script_run_time", 29);
133-
134-
assertThatExceptionOfType(IllegalStateException.class)
135-
.isThrownBy(preferences::checkForChangesInFrozenPreferences)
136-
.withMessage("dom.max_script_run_time must be == 0 || >= 30");
137-
138-
preferences.setPreference("dom.max_script_run_time", 31);
139-
preferences.setPreference("dom.max_script_run_time", 0);
140-
}
141-
142117
private boolean canSet(Preferences pref, String value) {
143118
try {
144119
pref.setPreference("key", value);

0 commit comments

Comments
 (0)