MultiGesture falls back to a regular single touch /perform when only one TouchAction is added to it. Fixes #33

Author: Jonahss

README.md

@@ -60,6 +60,9 @@ Locators:
 - findElementsByAndroidUIAutomator()
 
 ##Changelog##
+*github HEAD*
+- MultiGesture with a single TouchAction fixed for Android
+
 *1.2.1*
 - fix dependency issue
 

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

@@ -0,0 +1,13 @@
+package io.appium.java_client;
+
+public class MissingParameterException extends IllegalArgumentException {
+
+  public MissingParameterException(String reason) {
+    super(reason);
+  }
+
+  public MissingParameterException(String reason, Throwable cause) {
+    super(reason, cause);
+  }
+
+}

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

@@ -66,7 +66,16 @@ public MultiTouchAction add(TouchAction action) {
    * Perform the multi-touch action on the mobile driver.
    */
   public void perform() {
-    driver.performMultiTouchAction(this);
+    int size = actions.build().size();
+    if (size > 1) {
+      driver.performMultiTouchAction(this);
+    } else if (size == 1) {
+      //android doesn't like having multi-touch actions with only a single TouchAction...
+      driver.performTouchAction((TouchAction)actions.build().get(0));
+    } else {
+      throw new MissingParameterException("MultiTouch action must have at least one TouchAction added before it can be performed");
+    }
+
   }
 
   protected ImmutableMap getParameters() {

src/test/java/io/appium/java_client/AndroidGestureTest.java

@@ -0,0 +1,65 @@
+/*
+ +Copyright 2014 Appium contributors
+ +Copyright 2014 Software Freedom Conservancy
+ +
+ +Licensed under the Apache License, Version 2.0 (the "License");
+ +you may not use this file except in compliance with the License.
+ +You may obtain a copy of the License at
+ +
+ +     http://www.apache.org/licenses/LICENSE-2.0
+ +
+ +Unless required by applicable law or agreed to in writing, software
+ +distributed under the License is distributed on an "AS IS" BASIS,
+ +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ +See the License for the specific language governing permissions and
+ +limitations under the License.
+ + */
+
+package io.appium.java_client;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.openqa.selenium.remote.CapabilityType;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import java.io.File;
+import java.net.URL;
+
+/**
+ * Test Mobile Driver features
+ */
+public class AndroidGestureTest {
+  private AppiumDriver driver;
+
+  @Before
+  public void setup() throws Exception {
+    File appDir = new File("src/test/java/io/appium/java_client");
+    File app = new File(appDir, "ApiDemos-debug.apk");
+    DesiredCapabilities capabilities = new DesiredCapabilities();
+    capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
+    capabilities.setCapability("device", "Android");
+    capabilities.setCapability("app", app.getAbsolutePath());
+    driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    driver.quit();
+  }
+
+  @Test
+  public void MultiGestureSingleActionTest() throws InterruptedException {
+    //the underlying java library for Appium doesn't like multi-gestures with only a single action.
+    //but java-client should handle it, silently falling back to just performing a single action.
+
+    MultiTouchAction multiTouch = new MultiTouchAction(driver);
+    TouchAction action0 = new TouchAction(driver).tap(100,300);
+    multiTouch.add(action0).perform();
+  }
+
+  @Test
+  public void TapSingleFingerTest() {
+    driver.tap(1,100,200,1000);
+  }
+}

src/test/java/io/appium/java_client/MobileDriverGestureTest.java renamed to src/test/java/io/appium/java_client/iOSGestureTest.java

@@ -33,7 +33,7 @@
 /**
  * Test Mobile Driver features
  */
-public class MobileDriverGestureTest {
+public class iOSGestureTest {
 
   private AppiumDriver driver;
 
@@ -119,4 +119,9 @@ public void ZoomTest() throws InterruptedException {
     driver.zoom(mapview);
     Thread.sleep(2000);
   }
+
+  @Test
+  public void TapSingleFingerTest() {
+    driver.tap(1,100,200,1000);
+  }
 }