#588 FIX

- update to Selenium 3.2.0
- excessive dependency on guava was removed
- source code synchronization

Author: TikhomirovSergey

build.gradle

@@ -54,13 +54,12 @@ compileJava {
 }
 
 dependencies {
-    compile('org.seleniumhq.selenium:selenium-java:3.0.1'){
+    compile('org.seleniumhq.selenium:selenium-java:3.2.0'){
         exclude module: 'cglib'
         exclude group: 'com.google.code.gson'
     }
     compile 'com.google.code.gson:gson:2.8.0'
     compile 'org.apache.httpcomponents:httpclient:4.5.2'
-    compile 'com.google.guava:guava:20.0'
     compile 'cglib:cglib:3.2.4'
     compile 'commons-validator:commons-validator:1.5.1'
     compile 'org.apache.commons:commons-lang3:3.5'

src/main/java/io/appium/java_client/events/DefaultAspect.java

@@ -352,6 +352,7 @@ public void afterScript(JoinPoint joinPoint) throws Throwable {
     public void beforeAlertAccept(JoinPoint joinPoint) throws Throwable {
         try {
             listener.beforeAlertAccept(driver, castTarget(joinPoint));
+            listener.beforeAlertAccept(driver);
         } catch (Throwable t) {
             throw getRootCause(t);
         }
@@ -361,6 +362,7 @@ public void beforeAlertAccept(JoinPoint joinPoint) throws Throwable {
     public void afterAlertAccept(JoinPoint joinPoint) throws Throwable {
         try {
             listener.afterAlertAccept(driver, castTarget(joinPoint));
+            listener.afterAlertAccept(driver);
         } catch (Throwable t) {
             throw getRootCause(t);
         }
@@ -370,6 +372,7 @@ public void afterAlertAccept(JoinPoint joinPoint) throws Throwable {
     public void beforeAlertDismiss(JoinPoint joinPoint) throws Throwable {
         try {
             listener.beforeAlertDismiss(driver, castTarget(joinPoint));
+            listener.beforeAlertDismiss(driver);
         } catch (Throwable t) {
             throw getRootCause(t);
         }
@@ -379,6 +382,7 @@ public void beforeAlertDismiss(JoinPoint joinPoint) throws Throwable {
     public void afterAlertDismiss(JoinPoint joinPoint) throws Throwable {
         try {
             listener.afterAlertDismiss(driver, castTarget(joinPoint));
+            listener.afterAlertDismiss(driver);
         } catch (Throwable t) {
             throw getRootCause(t);
         }

src/main/java/io/appium/java_client/events/DefaultListener.java

@@ -142,18 +142,38 @@ public void add(Collection<Listener> listeners) {
         ((AlertEventListener) dispatcher).beforeAlertAccept(driver, alert);
     }
 
+    @Override
+    public void beforeAlertAccept(WebDriver driver) {
+        ((WebDriverEventListener) dispatcher).beforeAlertAccept(driver);
+    }
+
     @Override public void afterAlertAccept(WebDriver driver, Alert alert) {
         ((AlertEventListener) dispatcher).afterAlertAccept(driver, alert);
     }
 
+    @Override
+    public void afterAlertAccept(WebDriver driver) {
+        ((WebDriverEventListener) dispatcher).afterAlertAccept(driver);
+    }
+
     @Override public void afterAlertDismiss(WebDriver driver, Alert alert) {
         ((AlertEventListener) dispatcher).afterAlertDismiss(driver, alert);
     }
 
+    @Override
+    public void afterAlertDismiss(WebDriver driver) {
+        ((WebDriverEventListener) dispatcher).afterAlertDismiss(driver);
+    }
+
     @Override public void beforeAlertDismiss(WebDriver driver, Alert alert) {
         ((AlertEventListener) dispatcher).beforeAlertDismiss(driver, alert);
     }
 
+    @Override
+    public void beforeAlertDismiss(WebDriver driver) {
+        ((WebDriverEventListener) dispatcher).beforeAlertDismiss(driver);
+    }
+
     @Override public void beforeAlertSendKeys(WebDriver driver, Alert alert, String keys) {
         ((AlertEventListener) dispatcher).beforeAlertSendKeys(driver, alert, keys);
     }

src/test/java/io/appium/java_client/events/WebDriverEventListenerCompatibilityTest.java

@@ -1,6 +1,7 @@
 package io.appium.java_client.events;
 
 import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsCollectionContaining.hasItems;
 import static org.junit.Assert.assertThat;
 
 import io.appium.java_client.events.listeners.AppiumListener;
@@ -9,6 +10,8 @@
 import org.junit.FixMethodOrder;
 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 {
@@ -56,6 +59,51 @@ public void javaScriptEventTest() {
             is(true));
     }
 
+    @Test
+    public void alertEventTest() {
+        try {
+            Alert alert = driver.switchTo().alert();
+            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",
+                            WEBDRIVER_EVENT_LISTENER + "The alert was accepted",
+                            WEBDRIVER_EVENT_LISTENER + "Attempt to dismiss alert",
+                            WEBDRIVER_EVENT_LISTENER + "The alert was dismissed"));
+            assertThat(listener.messages.size(), is(4));
+        } finally {
+            listener.messages.clear();
+        }
+    }
+
     @Test
     public void exceptionEventTest() {
         assertThat(super.assertThatExceptionListenerWorks(driver, listener, WEBDRIVER_EVENT_LISTENER),

src/test/java/io/appium/java_client/events/listeners/AppiumListener.java

@@ -10,6 +10,26 @@ public class AppiumListener extends TestListener implements AppiumWebDriverEvent
         SingleListeners.listeners.put(AppiumListener.class, this);
     }
 
+    @Override
+    public void beforeAlertAccept(WebDriver driver) {
+        messages.add("WebDriverEventListener: Attempt to accept alert");
+    }
+
+    @Override
+    public void afterAlertAccept(WebDriver driver) {
+        messages.add("WebDriverEventListener: The alert was accepted");
+    }
+
+    @Override
+    public void afterAlertDismiss(WebDriver driver) {
+        messages.add("WebDriverEventListener: Attempt to dismiss alert");
+    }
+
+    @Override
+    public void beforeAlertDismiss(WebDriver driver) {
+        messages.add("WebDriverEventListener: The alert was dismissed");
+    }
+
     @Override public void beforeNavigateTo(String url, WebDriver driver) {
         messages.add("WebDriverEventListener: Attempt to navigate to " + url);
     }