Merge pull request #536 from TikhomirovSergey/master

Partial reversion of changes related to TouchActions/MultitouchActions

Author: TikhomirovSergey

README.md

@@ -99,9 +99,8 @@ You can get it on [WIKI](https://github.com/appium/java-client/wiki)
       - `io.appium.java_client.ios.ShakesDevice`
       - `io.appium.java_client.HasSessionDetails`
        _That was done because Windows automation tools have some features that were considered as Android-specific and iOS-specific._
-      - `io.appium.java_client.CreatesSwipeAction`  
 
-    The list of methods which were marked _deprecated_ and they are going to be removed
+    The list of classes and methods which were marked _deprecated_ and they are going to be removed
       - `AppiumDriver#swipe(int, int, int, int, int)`
       - `AppiumDriver#pinch(WebElement)`
       - `AppiumDriver#pinch(int, int)`
@@ -112,11 +111,14 @@ You can get it on [WIKI](https://github.com/appium/java-client/wiki)
       - `AppiumDriver#swipe(int, int, int, int, int)`
       - `MobileElement#swipe(SwipeElementDirection, int)`
       - `MobileElement#swipe(SwipeElementDirection, int, int, int)`
+      - `MobileElement#zoom()`
+      - `MobileElement#pinch()`
+      - `MobileElement#tap(int, int)`
+      - `io.appium.java_client.SwipeElementDirection` and `io.appium.java_client.TouchebleElement` also were marked deprecated.
 
     redesign of `TouchAction` and `MultiTouchAction`
-      - constructors were redesigned. There is no strict binding of `AppiumDriver` and `TouchAction` /`MultiTouchAction`. They can pass any instance of a class that implements `PerformsTouchActions`.
-      - deprecated methods of `AppiumDriver`/`MobileElement` were moved to `TouchAction`/`MultiTouchAction`.
-      - `io.appium.java_client.android.AndroidTouchAction` and `io.appium.java_client.ios.IOSTouchAction` were added. They create the swiping gesture. Both classes implement the new `io.appium.java_client.CreatesSwipeAction` API.   
+      - constructors were redesigned. There is no strict binding of `AppiumDriver` and `TouchAction` /`MultiTouchAction`. They can consume any instance of a class that implements `PerformsTouchActions`.  
+      - `io.appium.java_client.ios.IOSTouchAction` was added. It extends `io.appium.java_client.TouchAction`.
 
     `JsonToMobileElementConverter` re-design [#532](https://github.com/appium/java-client/pull/532):
        - unused `MobileElementToJsonConverter` was removed

src/main/java/io/appium/java_client/AppiumDriver.java

@@ -29,6 +29,8 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.DeviceRotation;
+import org.openqa.selenium.Dimension;
+import org.openqa.selenium.Point;
 import org.openqa.selenium.ScreenOrientation;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebDriverException;
@@ -43,7 +45,6 @@
 import org.openqa.selenium.remote.Response;
 import org.openqa.selenium.remote.html5.RemoteLocationContext;
 import org.openqa.selenium.remote.http.HttpClient;
-import org.openqa.selenium.remote.internal.JsonToWebElementConverter;
 
 import java.net.URL;
 import java.util.LinkedHashSet;
@@ -56,7 +57,6 @@
  *          Instances of the defined type will be returned via findElement* and findElements*
  *          Warning (!!!). Allowed types:
  *          {@link org.openqa.selenium.WebElement}
- *          {@link io.appium.java_client.TouchableElement}
  *          {@link org.openqa.selenium.remote.RemoteWebElement}
  *          {@link io.appium.java_client.MobileElement} and its subclasses that designed
  *          specifically
@@ -191,36 +191,35 @@ public List<T> findElementsByXPath(String using) {
 
     /**
      * This method is deprecated and it is going to be removed soon.
-     * Please use {@link MultiTouchAction#tap(int, WebElement, int)}.
      */
     @Deprecated
     public void tap(int fingers, WebElement element, int duration) {
         MultiTouchAction multiTouch = new MultiTouchAction(this);
 
         for (int i = 0; i < fingers; i++) {
-            multiTouch.add(createTap(element, duration));
+            TouchAction tap = new TouchAction(this);
+            multiTouch.add(tap.press(element).waitAction(duration).release());
         }
 
         multiTouch.perform();
     }
 
     /**
      * This method is deprecated and it is going to be removed soon.
-     * Please use {@link MultiTouchAction#tap(int, int, int, int)}.
      */
     @Deprecated
     public void tap(int fingers, int x, int y, int duration) {
         MultiTouchAction multiTouch = new MultiTouchAction(this);
 
         for (int i = 0; i < fingers; i++) {
-            multiTouch.add(createTap(x, y, duration));
+            TouchAction tap = new TouchAction(this);
+            multiTouch.add(tap.press(x,y).waitAction(duration).release());
         }
         multiTouch.perform();
     }
 
     /**
-     * This method is deprecated.
-     * It was moved to {@link CreatesSwipeAction#swipe(int, int, int, int, int)}.
+     * This method is deprecated. It is going to be removed
      */
     @Deprecated
     public void swipe(int startx, int starty, int endx, int endy, int duration) {
@@ -229,19 +228,29 @@ public void swipe(int startx, int starty, int endx, int endy, int duration) {
 
     /**
      * This method is deprecated and it is going to be removed soon.
-     * Please use {@link MultiTouchAction#pinch(WebElement)}.
      */
     @Deprecated
     public void pinch(WebElement el) {
         MultiTouchAction multiTouch = new MultiTouchAction(this);
 
-        multiTouch.pinch(el).perform();
+        Dimension dimensions = el.getSize();
+        Point upperLeft = el.getLocation();
+        Point center = new Point(upperLeft.getX() + dimensions.getWidth() / 2,
+                upperLeft.getY() + dimensions.getHeight() / 2);
+        int yOffset = center.getY() - upperLeft.getY();
+
+        TouchAction action0 =
+                new TouchAction(this).press(el, center.getX(), center.getY() - yOffset).moveTo(el)
+                        .release();
+        TouchAction action1 =
+                new TouchAction(this).press(el, center.getX(), center.getY() + yOffset).moveTo(el)
+                        .release();
+
+        multiTouch.add(action0).add(action1).perform();
     }
 
     /**
      * This method is deprecated and it is going to be removed soon.
-     * Please use {@link MultiTouchAction#pinch(int, int, int, int)} or
-     * {@link MultiTouchAction#pinch(int, int, int)}
      */
     @Deprecated
     public void pinch(int x, int y) {
@@ -264,19 +273,27 @@ public void pinch(int x, int y) {
 
     /**
      * This method is deprecated and it is going to be removed soon.
-     * Please use {@link MultiTouchAction#zoom(WebElement)}.
      */
     @Deprecated
     public void zoom(WebElement el) {
         MultiTouchAction multiTouch = new MultiTouchAction(this);
 
-        multiTouch.zoom(el).perform();
+        Dimension dimensions = el.getSize();
+        Point upperLeft = el.getLocation();
+        Point center = new Point(upperLeft.getX() + dimensions.getWidth() / 2,
+                upperLeft.getY() + dimensions.getHeight() / 2);
+        int yOffset = center.getY() - upperLeft.getY();
+
+        TouchAction action0 = new TouchAction(this).press(center.getX(), center.getY())
+                .moveTo(el, center.getX(), center.getY() - yOffset).release();
+        TouchAction action1 = new TouchAction(this).press(center.getX(), center.getY())
+                .moveTo(el, center.getX(), center.getY() + yOffset).release();
+
+        multiTouch.add(action0).add(action1).perform();
     }
 
     /**
      * This method is deprecated and it is going to be removed soon.
-     * Please use {@link MultiTouchAction#zoom(int, int, int, int)} or
-     * {@link MultiTouchAction#zoom(int, int, int)}.
      */
     @Deprecated
     public void zoom(int x, int y) {
@@ -364,18 +381,6 @@ public void zoom(int x, int y) {
         locationContext.setLocation(location);
     }
 
-    @Deprecated
-    private TouchAction createTap(WebElement element, int duration) {
-        TouchAction tap = new TouchAction(this);
-        return tap.press(element).waitAction(duration).release();
-    }
-
-    @Deprecated
-    private TouchAction createTap(int x, int y, int duration) {
-        TouchAction tap = new TouchAction(this);
-        return tap.press(x, y).waitAction(duration).release();
-    }
-
     public URL getRemoteAddress() {
         return remoteAddress;
     }

src/main/java/io/appium/java_client/CreatesSwipeAction.java

@@ -21,6 +21,13 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.internal.FindsByClassName;
+import org.openqa.selenium.internal.FindsByCssSelector;
+import org.openqa.selenium.internal.FindsById;
+import org.openqa.selenium.internal.FindsByLinkText;
+import org.openqa.selenium.internal.FindsByName;
+import org.openqa.selenium.internal.FindsByTagName;
+import org.openqa.selenium.internal.FindsByXPath;
 import org.openqa.selenium.remote.RemoteWebElement;
 import org.openqa.selenium.remote.Response;
 
@@ -29,7 +36,10 @@
 
 @SuppressWarnings({"unchecked", "rawtypes"})
 abstract class DefaultGenericMobileElement<T extends WebElement> extends RemoteWebElement
-    implements TouchableElement<T> {
+    implements FindsByClassName,
+        FindsByCssSelector, FindsById,
+        FindsByLinkText, FindsByName, FindsByTagName, FindsByXPath, FindsByFluentSelector<T>, FindsByAccessibilityId<T>,
+        ExecutesMethod, TouchableElement<T> {
 
     @Override public Response execute(String driverCommand, Map<String, ?> parameters) {
         return super.execute(driverCommand, parameters);

src/main/java/io/appium/java_client/DefaultGenericMobileElement.java

@@ -18,6 +18,8 @@
 
 import static io.appium.java_client.MobileCommand.GET_SESSION;
 
+import com.google.common.collect.ImmutableMap;
+
 import org.openqa.selenium.remote.Response;
 
 import java.util.Map;
@@ -27,9 +29,11 @@ public interface HasSessionDetails extends ExecutesMethod {
      * @return a map with values that hold session details.
      *
      */
+    @SuppressWarnings("unchecked")
     default Map<String, Object> getSessionDetails() {
         Response response = execute(GET_SESSION);
-        return (Map<String, Object>) response.getValue();
+        return  ImmutableMap.<String, Object>builder()
+                .putAll(Map.class.cast(response.getValue())).build();
     }
 
     default Object getSessionDetail(String detail) {

src/main/java/io/appium/java_client/HasSessionDetails.java

@@ -16,16 +16,16 @@
 
 package io.appium.java_client;
 
-@SuppressWarnings("serial")
 public class MissingParameterException
     extends IllegalArgumentException {
 
+    private static final long serialVersionUID = 1L;
+
     public MissingParameterException(String reason) {
         super(reason);
     }
 
     public MissingParameterException(String reason, Throwable cause) {
         super(reason, cause);
     }
-
 }