[java] Remove deprecated "unexpectedAlertBehaviour" JWP capability

SeleniumHQ · Apr 26, 2023 · 940b183 · 940b183
1 parent 41bbc5f
commit 940b183
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/java/src/org/openqa/selenium/SharedCapabilitiesMethods.java b/java/src/org/openqa/selenium/SharedCapabilitiesMethods.java
@@ -64,12 +64,6 @@ static void setCapability(Map<String, Object> caps, String key, Object value) {
  return;
  }
 
- if ("unexpectedAlertBehaviour".equals(key)) {
- caps.put("unexpectedAlertBehaviour", value);
- caps.put("unhandledPromptBehavior", value);
- return;
- }
-
  caps.put(key, value);
  }
 

diff --git a/java/src/org/openqa/selenium/ie/InternetExplorerDriver.java b/java/src/org/openqa/selenium/ie/InternetExplorerDriver.java
@@ -58,8 +58,9 @@ public class InternetExplorerDriver extends RemoteWebDriver {
 
  /**
  * Capability that defines which behaviour will be used if an unexpected Alert is found.
+ * @deprecated Use {@link CapabilityType#UNHANDLED_PROMPT_BEHAVIOUR}
  */
- public static final String UNEXPECTED_ALERT_BEHAVIOR = CapabilityType.UNEXPECTED_ALERT_BEHAVIOUR;
+ public static final String UNEXPECTED_ALERT_BEHAVIOR = "unexpectedAlertBehaviour";
 
  /**
  * Capability that defines to use or not cleanup of element cache on document loading.

diff --git a/java/src/org/openqa/selenium/remote/CapabilityType.java b/java/src/org/openqa/selenium/remote/CapabilityType.java
@@ -32,11 +32,6 @@ public interface CapabilityType {
  */
  @Deprecated
  String SUPPORTS_WEB_STORAGE = "webStorageEnabled";
- /**
- * @deprecated Use {@link CapabilityType#UNHANDLED_PROMPT_BEHAVIOUR}
- */
- @Deprecated
- String UNEXPECTED_ALERT_BEHAVIOUR = "unexpectedAlertBehaviour";
 
  String BROWSER_NAME = "browserName";
  String PLATFORM_NAME = "platformName";

diff --git a/java/test/com/thoughtworks/selenium/InternalSelenseTestBase.java b/java/test/com/thoughtworks/selenium/InternalSelenseTestBase.java
@@ -55,7 +55,7 @@
 import java.util.logging.Logger;
 
 import static org.openqa.selenium.UnexpectedAlertBehaviour.IGNORE;
-import static org.openqa.selenium.remote.CapabilityType.UNEXPECTED_ALERT_BEHAVIOUR;
+import static org.openqa.selenium.remote.CapabilityType.UNHANDLED_PROMPT_BEHAVIOUR;
 
 public class InternalSelenseTestBase extends SeleneseTestBase {
  private static final Logger log = Logger.getLogger(InternalSelenseTestBase.class.getName());
@@ -98,7 +98,7 @@ public void setup(TestInfo testInfo) {
  }
 
  MutableCapabilities caps = new MutableCapabilities(createCapabilities());
- caps.setCapability(UNEXPECTED_ALERT_BEHAVIOUR, IGNORE);
+ caps.setCapability(UNHANDLED_PROMPT_BEHAVIOUR, IGNORE);
 
  String baseUrl = whereIs("/common/rc/tests/html/");