Skip to content

Commit 9e240b0

Browse files
committed
[java] Removing deprecated HAS_NATIVE_EVENTS cap
1 parent 63a79bd commit 9e240b0

File tree

5 files changed

+9
-19
lines changed

5 files changed

+9
-19
lines changed

java/src/org/openqa/selenium/ie/InternetExplorerDriver.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,11 @@ public class InternetExplorerDriver extends RemoteWebDriver {
3838

3939
/**
4040
* Capability that defines to use whether to use native or javascript events during operations.
41+
*
42+
* @deprecated Non W3C compliant
4143
*/
42-
public static final String NATIVE_EVENTS = CapabilityType.HAS_NATIVE_EVENTS;
44+
@Deprecated
45+
public static final String NATIVE_EVENTS = "nativeEvents";
4346

4447
/**
4548
* Capability that defines the initial URL to be used when IE is launched.

java/src/org/openqa/selenium/remote/CapabilityType.java

-5
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@ public interface CapabilityType {
5757
*/
5858
@Deprecated
5959
String SUPPORTS_WEB_STORAGE = "webStorageEnabled";
60-
/**
61-
* @deprecated Non W3C compliant
62-
*/
63-
@Deprecated
64-
String HAS_NATIVE_EVENTS = "nativeEvents";
6560
/**
6661
* @deprecated Use {@link CapabilityType#UNHANDLED_PROMPT_BEHAVIOUR}
6762
*/

java/test/com/thoughtworks/selenium/corebased/TestClickAt.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
package com.thoughtworks.selenium.corebased;
1919

2020
import com.thoughtworks.selenium.InternalSelenseTestBase;
21+
2122
import org.junit.jupiter.api.Disabled;
2223
import org.junit.jupiter.api.Test;
2324
import org.junit.jupiter.api.Timeout;
2425
import org.openqa.selenium.Capabilities;
2526
import org.openqa.selenium.HasCapabilities;
2627
import org.openqa.selenium.WebDriver;
2728
import org.openqa.selenium.WrapsDriver;
28-
import org.openqa.selenium.remote.CapabilityType;
2929

3030
@Disabled()
3131
public class TestClickAt extends InternalSelenseTestBase {
@@ -118,6 +118,6 @@ private boolean isUsingNativeEvents() {
118118
}
119119

120120
Capabilities capabilities = ((HasCapabilities) driver).getCapabilities();
121-
return capabilities.is(CapabilityType.HAS_NATIVE_EVENTS);
121+
return capabilities.is("nativeEvents");
122122
}
123123
}

java/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
4343
import static org.openqa.selenium.testing.TestUtilities.getIEVersion;
4444
import static org.openqa.selenium.testing.TestUtilities.isInternetExplorer;
45-
import static org.openqa.selenium.testing.TestUtilities.isNativeEventsEnabled;
4645
import static org.openqa.selenium.testing.drivers.Browser.CHROME;
4746
import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
4847
import static org.openqa.selenium.testing.drivers.Browser.HTMLUNIT;
@@ -334,9 +333,9 @@ public void testMouseMovementWorksWhenNavigatingToAnotherPage() {
334333
@NotYetImplemented(CHROME)
335334
public void testChordControlCutAndPaste() {
336335
assumeFalse(getEffectivePlatform(driver).is(Platform.MAC), "FIXME: macs don't have CONTROL key");
337-
assumeFalse(isNativeEventsEnabled(driver) &&
338-
getEffectivePlatform(driver).is(Platform.WINDOWS) &&
339-
isInternetExplorer(driver), "Windows: native events library does not support storing modifiers state yet");
336+
assumeFalse(getEffectivePlatform(driver).is(Platform.WINDOWS) &&
337+
isInternetExplorer(driver),
338+
"Windows: native events library does not support storing modifiers state yet");
340339

341340
driver.get(pages.javascriptPage);
342341

java/test/org/openqa/selenium/testing/TestUtilities.java

-7
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.openqa.selenium.Platform;
2424
import org.openqa.selenium.WebDriver;
2525
import org.openqa.selenium.htmlunit.HtmlUnitDriver;
26-
import org.openqa.selenium.remote.CapabilityType;
2726

2827
import java.io.File;
2928
import java.io.IOException;
@@ -36,12 +35,6 @@
3635

3736
public class TestUtilities {
3837

39-
public static boolean isNativeEventsEnabled(WebDriver driver) {
40-
return driver instanceof HasCapabilities &&
41-
((HasCapabilities) driver).getCapabilities().is(CapabilityType.HAS_NATIVE_EVENTS);
42-
43-
}
44-
4538
public static String getUserAgent(WebDriver driver) {
4639
try {
4740
return (String) ((JavascriptExecutor) driver).executeScript(

0 commit comments

Comments
 (0)