[java] Remove deprecated "version" JWP capability

SeleniumHQ · Apr 26, 2023 · 2930461 · 2930461
1 parent dfe0784
commit 2930461
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 22 deletions.
diff --git a/java/src/org/openqa/selenium/Capabilities.java b/java/src/org/openqa/selenium/Capabilities.java
@@ -55,8 +55,7 @@ default Platform getPlatformName() {
   }
 
   default String getBrowserVersion() {
-    return String.valueOf(Optional.ofNullable(getCapability("browserVersion")).orElse(
-      Optional.ofNullable(getCapability("version")).orElse("")));
+    return String.valueOf(Optional.ofNullable(getCapability("browserVersion")).orElse(""));
   }
 
   /**

diff --git a/java/src/org/openqa/selenium/remote/CapabilityType.java b/java/src/org/openqa/selenium/remote/CapabilityType.java
@@ -37,11 +37,6 @@ public interface CapabilityType {
    */
   @Deprecated
   String TAKES_SCREENSHOT = "takesScreenshot";
-  /**
-   * @deprecated Use {@link CapabilityType#BROWSER_VERSION}
-   */
-  @Deprecated
-  String VERSION = "version";
   /**
    * @deprecated Non W3C compliant
    */

diff --git a/java/test/org/openqa/selenium/grid/data/DefaultSlotMatcherTest.java b/java/test/org/openqa/selenium/grid/data/DefaultSlotMatcherTest.java
@@ -262,21 +262,6 @@ void shouldNotMatchIfRequestedBrowserVersionIsMissingFromStereotype() {
     assertThat(slotMatcher.matches(stereotype, capabilities)).isFalse();
   }
 
-  @Test
-  void matchesWithJsonWireProtocolCaps() {
-    Capabilities stereotype = new ImmutableCapabilities(
-      CapabilityType.BROWSER_NAME, "chrome",
-      CapabilityType.BROWSER_VERSION, "80",
-      CapabilityType.PLATFORM_NAME, Platform.WINDOWS
-    );
-    Capabilities capabilities = new ImmutableCapabilities(
-      CapabilityType.BROWSER_NAME, "chrome",
-      CapabilityType.VERSION, "80",
-      CapabilityType.PLATFORM, Platform.WINDOWS
-    );
-    assertThat(slotMatcher.matches(stereotype, capabilities)).isTrue();
-  }
-
   @Test
   void shouldNotMatchCapabilitiesThatAreDifferentButDoNotContainCommonCapabilityNames() {
     Capabilities stereotype = new ImmutableCapabilities("acceptInsecureCerts", "true");