Merge branch 'master' of https://github.com/appium/java-client into TikhomirovSergey-SrinivasanTarget-TouchActionSplitting

Author: SrinivasanTarget

README.md

@@ -31,9 +31,9 @@ public static <T extends Object> T execute(ExecutesMethod executesMethod, String
  return handleResponse(executesMethod.execute(command));
  }
 
- private static <T extends Object> T handleResponse(Response responce) {
- if (responce != null) {
- return (T) responce.getValue();
+ private static <T extends Object> T handleResponse(Response response) {
+ if (response != null) {
+ return (T) response.getValue();
  }
  return null;
  }

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

@@ -52,6 +52,7 @@ public class MobileCommand {
  protected static final String GET_SESSION = "getSession";
  //iOS
  protected static final String SHAKE = "shake";
+ protected static final String TOUCH_ID = "touchId";
  //Android
  protected static final String CURRENT_ACTIVITY = "currentActivity";
  protected static final String END_TEST_COVERAGE = "endTestCoverage";
@@ -95,6 +96,7 @@ private static Map<String, CommandInfo> createCommandRepository() {
  result.put(GET_SESSION,getC("/session/:sessionId/"));
  //iOS
  result.put(SHAKE, postC("/session/:sessionId/appium/device/shake"));
+ result.put(TOUCH_ID, postC("/session/:sessionId/appium/simulator/touch_id"));
  //Android
  result.put(CURRENT_ACTIVITY,
  getC("/session/:sessionId/appium/device/current_activity"));

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

@@ -51,7 +51,7 @@
 public class IOSDriver<T extends WebElement>
  extends AppiumDriver<T>
  implements HidesKeyboardWithKeyName, ShakesDevice,
- FindsByIosUIAutomation<T>, LocksIOSDevice {
+ FindsByIosUIAutomation<T>, LocksIOSDevice, PerformsTouchID {
 
  private static final String IOS_PLATFORM = MobilePlatform.IOS;
 
@@ -165,7 +165,7 @@ public IOSDriver(Capabilities desiredCapabilities) {
  }
 
  /**
- * @see io.appium.java_client.TouchableElement#swipe(int, int, int, int, int).
+ * @see io.appium.java_client.CreatesSwipeAction#swipe(int, int, int, int, int).
  */
  @Override public void swipe(int startx, int starty, int endx, int endy, int duration) {
  IOSTouchAction touchaction = new IOSTouchAction(this);

src/main/java/io/appium/java_client/ios/IOSDriver.java

@@ -81,4 +81,15 @@ public class IOSMobileCommandHelper extends MobileCommand {
  return new AbstractMap.SimpleEntry<>(
  SHAKE, ImmutableMap.<String, Object>of());
  }
+ 
+ /**
+ * This method forms a {@link java.util.Map} of parameters for the touchId simulator.
+ * 
+ * @param match If true, simulates a successful fingerprint scan. If false, simulates a failed fingerprint scan.
+ * 
+ */
+ public static Map.Entry<String, Map<String, ?>> touchIdCommand(boolean match) {
+ return new AbstractMap.SimpleEntry<>(
+ TOUCH_ID, prepareArguments("match", match));
+ }
 }

src/main/java/io/appium/java_client/ios/IOSMobileCommandHelper.java

@@ -0,0 +1,34 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ * 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.ios;
+
+import static io.appium.java_client.ios.IOSMobileCommandHelper.touchIdCommand;
+
+import io.appium.java_client.CommandExecutionHelper;
+import io.appium.java_client.ExecutesMethod;
+
+public interface PerformsTouchID extends ExecutesMethod {
+
+ /**
+ * Simulate touchId event
+ *
+ * @param match If true, simulates a successful fingerprint scan. If false, simulates a failed fingerprint scan.
+ */
+ default void performTouchID(boolean match) {
+ CommandExecutionHelper.execute(this, touchIdCommand(match));
+ }
+}

src/main/java/io/appium/java_client/ios/PerformsTouchID.java

@@ -91,4 +91,15 @@ public class XCUIAutomationTest {
  driver.rotate(landscapeLeftRotation);
  assertEquals(driver.rotation(), landscapeLeftRotation);
  }
+
+ @Test public void testTouchId() {
+ try {
+ driver.performTouchID(true);
+ driver.performTouchID(false);
+ assertEquals(true, true);
+ } catch (Exception e) {
+ throw e;
+ }
+
+ }
 }