Skip to content

Commit 5a554bd

Browse files
authored
[java] Remove Edge USE_CHROMIUM flag. (#9921)
1 parent db30b7f commit 5a554bd

File tree

4 files changed

+3
-44
lines changed

4 files changed

+3
-44
lines changed

java/src/org/openqa/selenium/edge/EdgeDriverInfo.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,9 @@ public Capabilities getCanonicalCapabilities() {
4646

4747
@Override
4848
public boolean isSupporting(Capabilities capabilities) {
49-
return (EDGE.is(capabilities.getBrowserName())
50-
|| capabilities.getCapability("ms:edgeOptions") != null
51-
|| capabilities.getCapability("edgeOptions") != null)
52-
&&
53-
(capabilities.getCapability(EdgeOptions.USE_CHROMIUM) == null
54-
|| Objects.equals(capabilities.getCapability(EdgeOptions.USE_CHROMIUM), true));
49+
return EDGE.is(capabilities.getBrowserName())
50+
|| capabilities.getCapability("ms:edgeOptions") != null
51+
|| capabilities.getCapability("edgeOptions") != null;
5552
}
5653

5754
@Override

java/src/org/openqa/selenium/edge/EdgeDriverService.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,6 @@ public int score(Capabilities capabilities) {
125125
score++;
126126
}
127127

128-
Object useChromium = capabilities.getCapability(EdgeOptions.USE_CHROMIUM);
129-
if (Objects.equals(useChromium, false)) {
130-
score--;
131-
}
132-
133128
if (capabilities.getCapability(EdgeOptions.CAPABILITY) != null) {
134129
score++;
135130
}

java/src/org/openqa/selenium/edge/EdgeOptions.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@
4343
*/
4444
public class EdgeOptions extends ChromiumOptions<EdgeOptions> {
4545

46-
/**
47-
* Key used to indicate whether to use an Edge Chromium or Edge Legacy driver.
48-
*
49-
* @deprecated This will be removed as Chromium based Edge is the only supported one.
50-
*/
51-
public static final String USE_CHROMIUM = "ms:edgeChromium";
52-
5346
/**
5447
* Key used to store a set of ChromeOptions in a {@link Capabilities}
5548
* object.

java/test/org/openqa/selenium/edge/EdgeDriverInfoTest.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,6 @@ public void isSupportingCapabilitiesWithProperBrowserNameOnly() {
4646
new ImmutableCapabilities(CapabilityType.BROWSER_NAME, EDGE.browserName())));
4747
}
4848

49-
@Test
50-
public void isNotSupportingEdgeHtml() {
51-
assertThat(new EdgeDriverInfo()).isNot(supporting(
52-
new ImmutableCapabilities(
53-
CapabilityType.BROWSER_NAME, EDGE.browserName(),
54-
EdgeOptions.USE_CHROMIUM, false)));
55-
}
56-
57-
@Test
58-
public void isSupportingEdgeWithExplicitlySetChromiumFlag() {
59-
assertThat(new EdgeDriverInfo()).is(supporting(
60-
new ImmutableCapabilities(
61-
CapabilityType.BROWSER_NAME, EDGE.browserName(),
62-
EdgeOptions.USE_CHROMIUM, true)));
63-
}
64-
6549
@Test
6650
public void isNotSupportingFirefox() {
6751
assertThat(new EdgeDriverInfo()).isNot(supporting(
@@ -76,16 +60,6 @@ public void canDetectBrowserByVendorSpecificCapability() {
7660
new ImmutableCapabilities("edgeOptions", Collections.emptyMap())));
7761
}
7862

79-
@Test
80-
public void canRejectEdgeHtmlByVendorSpecificCapability() {
81-
assertThat(new EdgeDriverInfo()).isNot(supporting(
82-
new ImmutableCapabilities(EdgeOptions.CAPABILITY, Collections.emptyMap(),
83-
EdgeOptions.USE_CHROMIUM, false)));
84-
assertThat(new EdgeDriverInfo()).isNot(supporting(
85-
new ImmutableCapabilities("edgeOptions", Collections.emptyMap(),
86-
EdgeOptions.USE_CHROMIUM, false)));
87-
}
88-
8963
private Condition<EdgeDriverInfo> supporting(Capabilities capabilities) {
9064
return new Condition<>(info -> info.isSupporting(capabilities), "supporting " + capabilities);
9165
}

0 commit comments

Comments
 (0)