appium#242 fix: The general test and bug fixes

Author: TikhomirovSergey

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

@@ -113,22 +113,24 @@ void add(Collection<Listener> listeners) {
     }
 
     @Before("execution(* org.openqa.selenium.WebDriver.Navigation.get(..))  || "
-        + "execution(* org.openqa.selenium.WebDriver.Navigation.to(..))")
+        + "execution(* org.openqa.selenium.WebDriver.Navigation.to(..)) || "
+        + "execution(* org.openqa.selenium.WebDriver.get(..))")
     public void beforeNavigateTo(JoinPoint joinPoint) throws Throwable {
         try {
-            String url = String.valueOf(joinPoint.getArgs()[0]);
-            listener.beforeNavigateTo(url, driver);
+            Object url = String.valueOf(joinPoint.getArgs()[0]);
+            listener.beforeNavigateTo(String.valueOf(url), driver);
         } catch (Throwable t) {
             throw getRootCause(t);
         }
     }
 
     @After("execution(* org.openqa.selenium.WebDriver.Navigation.get(..))  || "
-        + "execution(* org.openqa.selenium.WebDriver.Navigation.to(..))")
+        + "execution(* org.openqa.selenium.WebDriver.Navigation.to(..)) || "
+        + "execution(* org.openqa.selenium.WebDriver.get(..))")
     public void afterNavigateTo(JoinPoint joinPoint)  throws Throwable {
         try {
-            String url = String.valueOf(joinPoint.getArgs()[0]);
-            listener.afterNavigateTo(url, driver);
+            Object url = String.valueOf(joinPoint.getArgs()[0]);
+            listener.afterNavigateTo(String.valueOf(url), driver);
         } catch (Throwable t) {
             throw getRootCause(t);
         }
@@ -418,6 +420,26 @@ public void afterWindowIsMoved(JoinPoint joinPoint) throws Throwable {
         }
     }
 
+    @Before("execution(* org.openqa.selenium.WebDriver.Window.maximize(..))")
+    public void beforeMaximization(JoinPoint joinPoint) throws Throwable {
+        try {
+            WebDriver.Window window = (WebDriver.Window) joinPoint.getTarget();
+            listener.beforeWindowIsMaximized(driver, window);
+        } catch (Throwable t) {
+            throw getRootCause(t);
+        }
+    }
+
+    @After("execution(* org.openqa.selenium.WebDriver.Window.maximize(..))")
+    public void afterMaximization(JoinPoint joinPoint) throws Throwable {
+        try {
+            WebDriver.Window window = (WebDriver.Window) joinPoint.getTarget();
+            listener.afterWindowIsMaximized(driver, window);
+        } catch (Throwable t) {
+            throw getRootCause(t);
+        }
+    }
+
     @Before("execution(* org.openqa.selenium.Rotatable.rotate(..))")
     public void beforeRotation(JoinPoint joinPoint) throws Throwable {
         try {
@@ -439,6 +461,27 @@ public void afterRotation(JoinPoint joinPoint) throws Throwable {
         }
     }
 
+    @Before("execution(* org.openqa.selenium.ContextAware.context(..))")
+    public void beforeSwitchingToContext(JoinPoint joinPoint) throws Throwable {
+        try {
+            String context = (String) joinPoint.getArgs()[0];
+            listener.beforeSwitchingToContext(driver, context);
+        } catch (Throwable t) {
+            throw getRootCause(t);
+        }
+
+    }
+
+    @After("execution(* org.openqa.selenium.ContextAware.context(..))")
+    public void afterSwitchingToContextn(JoinPoint joinPoint) throws Throwable {
+        try {
+            String context = (String) joinPoint.getArgs()[0];
+            listener.afterSwitchingToContext(driver, context);
+        } catch (Throwable t) {
+            throw getRootCause(t);
+        }
+    }
+
     @Around("execution(* org.openqa.selenium.WebDriver.*(..)) || "
         + "execution(* org.openqa.selenium.WebElement.*(..)) || "
         + "execution(* org.openqa.selenium.WebDriver.Navigation.*(..)) || "

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

@@ -51,15 +51,15 @@ <T extends WebDriver> T getListenableWebdriver(T driver, List<Listener> listener
     }
 
     @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    @Bean(name = "webdriverAspect", destroyMethod = "quit")
+    @Bean(name = "webdriverAspect")
     DefaultAspect getAspect() {
         DefaultAspect aspect = new DefaultAspect(context, driver);
         aspect.add(listeners);
         return aspect;
     }
 
     @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    @Bean(name = COMPONENT_BEAN, destroyMethod = "quit")
+    @Bean(name = COMPONENT_BEAN)
     Object  getComponent(Object component) {
         return component;
     }

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

@@ -35,22 +35,26 @@
 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;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-public class DefaultListener implements AppiumWebDriverEventListener, AlertEventListener,
+public class DefaultListener implements Listener, AppiumWebDriverEventListener, ListensToException,
+    SearchingEventListener, NavigationEventListener,
+    JavaScriptEventListener, ElementEventListener, AlertEventListener,
     WindowEventListener, ContextEventListener, RotationEventListener {
 
     private final List<Listener> listeners = new ArrayList<>();
 
     Object dispatcher  = Proxy.newProxyInstance(Listener.class.getClassLoader(),
-        new Class[] {AlertEventListener.class, AppiumWebDriverEventListener.class,
+        new Class[] {AlertEventListener.class,
             ContextEventListener.class, ElementEventListener.class, JavaScriptEventListener.class,
             ListensToException.class, NavigationEventListener.class, RotationEventListener.class,
-            SearchingEventListener.class, WindowEventListener.class},
+            SearchingEventListener.class, WindowEventListener.class,
+            WebDriverEventListener.class},
         new ListenerInvocationHandler(listeners));
 
     @Override public void beforeNavigateTo(String url, WebDriver driver) {
@@ -86,11 +90,11 @@ public class DefaultListener implements AppiumWebDriverEventListener, AlertEvent
     }
 
     @Override public void beforeFindBy(By by, WebElement element, WebDriver driver) {
-        ((SearchingEventListener) driver).beforeFindBy(by, element, driver);
+        ((SearchingEventListener) dispatcher).beforeFindBy(by, element, driver);
     }
 
     @Override public void afterFindBy(By by, WebElement element, WebDriver driver) {
-        ((SearchingEventListener) driver).afterFindBy(by, element, driver);
+        ((SearchingEventListener) dispatcher).afterFindBy(by, element, driver);
     }
 
     @Override public void beforeClickOn(WebElement element, WebDriver driver) {

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

@@ -17,6 +17,7 @@
 package io.appium.java_client.events;
 
 import io.appium.java_client.events.api.Listener;
+import org.openqa.selenium.support.events.WebDriverEventListener;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -30,10 +31,26 @@ public class ListenerInvocationHandler implements InvocationHandler {
         this.listeners = listeners;
     }
 
+    private Method findElementInWebDriverEventListener(Method m) {
+        try {
+            return WebDriverEventListener.class.getMethod(m.getName(), m.getParameterTypes());
+        } catch (NoSuchMethodException e) {
+            return null;
+        }
+    }
+
     @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         for (Listener l: listeners) {
             if (method.getDeclaringClass().isAssignableFrom(l.getClass())) {
                 method.invoke(l, args);
+                return null;
+            }
+
+            Method webDriverEventListenerMethod = findElementInWebDriverEventListener(method);
+            if (webDriverEventListenerMethod != null
+                && WebDriverEventListener.class.isAssignableFrom(l.getClass())) {
+                webDriverEventListenerMethod.invoke(l, args);
+                return null;
             }
         }
         return null;