Merge pull request #797 from TikhomirovSergey/master

TikhomirovSergey · web-flow · commit 953b10641a21 · 2017-12-24T13:10:56.000+03:00
Update to Selenium 3.8.1
diff --git a/build.gradle b/build.gradle
@@ -54,7 +54,7 @@ compileJava {
     ]
 }
 
-ext.seleniumVersion = '3.7.1'
+ext.seleniumVersion = '3.8.1'
 
 dependencies {
     compile ("org.seleniumhq.selenium:selenium-java:${seleniumVersion}") {
diff --git a/src/main/java/io/appium/java_client/events/DefaultListener.java b/src/main/java/io/appium/java_client/events/DefaultListener.java
@@ -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;
@@ -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);
diff --git a/src/main/java/io/appium/java_client/events/api/general/AlertEventListener.java b/src/main/java/io/appium/java_client/events/api/general/AlertEventListener.java
@@ -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 {
 
@@ -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);
 }
diff --git a/src/main/java/io/appium/java_client/ios/IOSDriver.java b/src/main/java/io/appium/java_client/ios/IOSDriver.java
@@ -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;
@@ -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);
-        }
-
     }
 }
diff --git a/src/test/java/io/appium/java_client/events/StubAlert.java b/src/test/java/io/appium/java_client/events/StubAlert.java
@@ -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() {
@@ -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
-    }
 }
diff --git a/src/test/java/io/appium/java_client/events/WebDriverEventListenerCompatibilityTest.java b/src/test/java/io/appium/java_client/events/WebDriverEventListenerCompatibilityTest.java
@@ -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 {
@@ -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",
diff --git a/src/test/java/io/appium/java_client/events/listeners/AlertListener.java b/src/test/java/io/appium/java_client/events/listeners/AlertListener.java
@@ -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) {
@@ -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);
     }
diff --git a/src/test/java/io/appium/java_client/events/listeners/AlertListener2.java b/src/test/java/io/appium/java_client/events/listeners/AlertListener2.java
@@ -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) {
@@ -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);
     }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ compileJava {`
`54`	`54`	`]`
`55`	`55`	`}`
`56`	`56`
`57`		`-ext.seleniumVersion = '3.7.1'`
	`57`	`+ext.seleniumVersion = '3.8.1'`
`58`	`58`
`59`	`59`	`dependencies {`
`60`	`60`	`compile ("org.seleniumhq.selenium:selenium-java:${seleniumVersion}") {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@`
`34`	`34`	`import org.openqa.selenium.remote.HttpCommandExecutor;`
`35`	`35`	`import org.openqa.selenium.remote.Response;`
`36`	`36`	`import org.openqa.selenium.remote.http.HttpClient;`
`37`		`-import org.openqa.selenium.security.Credentials;`
`38`	`37`
`39`	`38`	`import java.net.URL;`
`40`	`39`	`import java.time.Duration;`
`@@ -207,13 +206,5 @@ class IOSAlert implements Alert {`
`207`	`206`	`execute(DriverCommand.SET_ALERT_VALUE, prepareArguments("value", keysToSend));`
`208`	`207`	`}`
`209`	`208`
`210`		`- @Override public void setCredentials(Credentials credentials) {`
`211`		`- alert.setCredentials(credentials);`
`212`		`- }`
`213`		`-`
`214`		`- @Override public void authenticateUsing(Credentials credentials) {`
`215`		`- alert.authenticateUsing(credentials);`
`216`		`- }`
`217`		`-`
`218`	`209`	`}`
`219`	`210`	`}`