8000 Update to Selenium 3.8.1 by TikhomirovSergey · Pull Request #797 · appium/java-client · GitHub
[go: up one dir, main page]
Skip to content

Update to Selenium 3.8.1 #797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TikhomirovSergey merged 1 commit into from
Dec 24, 2017
Merged

Update to Selenium 3.8.1 #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ compileJava {
]
}

ext.seleniumVersion = '3.7.1'
ext.seleniumVersion = '3.8.1'

dependencies {
compile ("org.seleniumhq.selenium:selenium-java:${seleniumVersion}") {
Expand Down
13 changes: 0 additions & 13 deletions src/main/java/io/appium/java_client/events/DefaultListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.openqa.selenium.ScreenOrientation;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.security.Credentials;
import org.openqa.selenium.support.events.WebDriverEventListener;

import java.lang.reflect.Proxy;
Expand Down Expand Up @@ -182,18 +181,6 @@ public void beforeAlertDismiss(WebDriver driver) {
((AlertEventListener) dispatcher).afterAlertSendKeys(driver, alert, keys);
}

@Override
@Deprecated
public void beforeAuthentication(WebDriver driver, Alert alert, Credentials credentials) {
((AlertEventListener) dispatcher).beforeAuthentication(driver, alert, credentials);
}

@Override
@Deprecated
public void afterAuthentication(WebDriver driver, Alert alert, Credentials credentials) {
((AlertEventListener) dispatcher).afterAuthentication(driver, alert, credentials);
}

@Override public void beforeWindowChangeSize(WebDriver driver, WebDriver.Window window,
Dimension targetSize) {
((WindowEventListener) dispatcher).beforeWindowChangeSize(driver, window, targetSize);
Expand Down
33 changes: 0 additions & 33 deletions src/main/java/io/appium/java_client/events/api/general/AlertEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import io.appium.java_client.events.api.Listener;
import org.openqa.selenium.Alert;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.security.Credentials;

public interface AlertEventListener extends Listener {

Expand Down Expand Up @@ -74,36 +73,4 @@ public interface AlertEventListener extends Listener {
* @param keys Keys which have been sent
*/
void afterAlertSendKeys(WebDriver driver, Alert alert, String keys);

/**
* This action will be performed each time before
* {@link org.openqa.selenium.Alert#setCredentials(Credentials)} and
* {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)}
* It is deprecated because methods {@link org.openqa.selenium.Alert#setCredentials(Credentials)} and
* {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)} were removed from selenium java client
* at 3.8.0. This listener method is going to be removed as well.
*
* @param driver WebDriver
* @param alert {@link org.openqa.selenium.Alert} which is receiving user credentials
* @param credentials which are being sent
*/
@Deprecated
void beforeAuthentication(WebDriver driver, Alert alert,
Credentials credentials);

/**
* This action will be performed each time after
* {@link org.openqa.selenium.Alert#setCredentials(Credentials)} and
* {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)}.
* It is deprecated because methods {@link org.openqa.selenium.Alert#setCredentials(Credentials)} and
* {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)} were removed from selenium java client
* at 3.8.0. This listener method is going to be removed as well.
*
* @param driver WebDriver
* @param alert {@link org.openqa.selenium.Alert} which has received user credentials
* @param credentials which have been sent
*/
@Deprecated
void afterAuthentication(WebDriver driver, Alert alert,
Credentials credentials);
}
9 changes: 0 additions & 9 deletions src/main/java/io/appium/java_client/ios/IOSDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.openqa.selenium.remote.HttpCommandExecutor;
import org.openqa.selenium.remote.Response;
import org.openqa.selenium.remote.http.HttpClient;
import org.openqa.selenium.security.Credentials;

import java.net.URL;
import java.time.Duration;
Expand Down Expand Up @@ -207,13 +206,5 @@ class IOSAlert implements Alert {
execute(DriverCommand.SET_ALERT_VALUE, prepareArguments("value", keysToSend));
}

@Override public void setCredentials(Credentials credentials) {
alert.setCredentials(credentials);
}

@Override public void authenticateUsing(Credentials credentials) {
alert.authenticateUsing(credentials);
}

}
}
9 changes: 0 additions & 9 deletions src/test/java/io/appium/java_client/events/StubAlert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import org.apache.commons.lang3.StringUtils;
import org.openqa.selenium.Alert;
import org.openqa.selenium.security.Credentials;

public class StubAlert implements Alert {
@Override public void dismiss() {
Expand All @@ -20,12 +19,4 @@ public class StubAlert implements Alert {
@Override public void sendKeys(String keysToSend) {
//STUB it does nothing
}

@Override public void setCredentials(Credentials credentials) {
//STUB it does nothing
}

@Override public void authenticateUsing(Credentials credentials) {
//STUB it does nothing
}
}
27 changes: 0 additions & 27 deletions src/test/java/io/appium/java_client/events/WebDriverEventListenerCompatibilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.junit.Test;
import org.junit.runners.MethodSorters;
import org.openqa.selenium.Alert;
import org.openqa.selenium.security.Credentials;

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class WebDriverEventListenerCompatibilityTest extends BaseListenerTest {
Expand Down Expand Up @@ -66,32 +65,6 @@ public void alertEventTest() {
alert.accept();
alert.dismiss();
alert.sendKeys("Keys");
Credentials credentials = new Credentials() {
@Override
public int hashCode() {
return super.hashCode();
}

@Override
public String toString() {
return "Test credentials 1";
}
};

Credentials credentials2 = new Credentials() {
@Override
public int hashCode() {
return super.hashCode();
}

@Override
public String toString() {
return "Test credentials 2";
}
};

alert.setCredentials(credentials);
alert.authenticateUsing(credentials2);

assertThat(listener.messages,
hasItems(WEBDRIVER_EVENT_LISTENER + "Attempt to accept alert",
Expand Down
11 changes: 0 additions & 11 deletions src/test/java/io/appium/java_client/events/listeners/AlertListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import io.appium.java_client.events.api.general.AlertEventListener;
import org.openqa.selenium.Alert;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.security.Credentials;

public class AlertListener extends TestListener implements AlertEventListener {
@Override public void beforeAlertAccept(WebDriver driver, Alert alert) {
Expand All @@ -30,16 +29,6 @@ public class AlertListener extends TestListener implements AlertEventListener {
messages.add("Keys were sent to alert");
}

@Override
public void beforeAuthentication(WebDriver driver, Alert alert, Credentials credentials) {
messages.add("Attempt to send credentials " + credentials.toString() + " to alert");
}

@Override
public void afterAuthentication(WebDriver driver, Alert alert, Credentials credentials) {
messages.add("Credentials " + credentials.toString() + " were sent to alert");
}

@Override protected void add() {
SingleListeners.listeners.put(AlertListener.class, this);
}
Expand Down
13 changes: 0 additions & 13 deletions src/test/java/io/appium/java_client/events/listeners/AlertListener2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import io.appium.java_client.events.api.general.AlertEventListener;
import org.openqa.selenium.Alert;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.security.Credentials;

public class AlertListener2 extends TestListener implements AlertEventListener {
@Override public void beforeAlertAccept(WebDriver driver, Alert alert) {
Expand All @@ -30,18 +29,6 @@ public class AlertListener2 extends TestListener implements AlertEventListener {
messages.add("Externally defined listener: Keys were sent to alert");
}

@Override
public void beforeAuthentication(WebDriver driver, Alert alert, Credentials credentials) {
messages.add("Externally defined listener: Attempt to send credentials "
+ credentials.toString() + " to alert");
}

@Override
public void afterAuthentication(WebDriver driver, Alert alert, Credentials credentials) {
messages.add("Externally defined listener: Credentials " + credentials.toString()
+ " were sent to alert");
}

@Override protected void add() {
SingleListeners.listeners.put(AlertListener2.class, this);
}
Expand Down
0