Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TouchID Implementation [iOS Sim Only] #509

Merged
merged 21 commits into from
Nov 18, 2016
Merged

TouchID Implementation [iOS Sim Only] #509

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
934d819
Fixed broken tests
dpgraham Nov 7, 2016
7ec088f
Added 'touch_id' endpoint
dpgraham Nov 7, 2016
9f214cd
removed obselete gson-2.6.2 dependency. (#507)
drapostolos Nov 8, 2016
897330c
Fix documentation
dpgraham Nov 8, 2016
39823da
Fix documentation
dpgraham Nov 8, 2016
e5a500b
Don't commit 'touchID()'
dpgraham Nov 8, 2016
6880006
Added touchId test
dpgraham Nov 8, 2016
7ee13c9
Merge branch 'touch-id' of github.com:appium/java-client into touch-id
dpgraham Nov 8, 2016
1e395ff
Added assertion to keep codacy happy
dpgraham Nov 10, 2016
56dc2f0
Fixed broken tests
dpgraham Nov 7, 2016
fd9543c
Added 'touch_id' endpoint
dpgraham Nov 7, 2016
5b561e9
Fix documentation
dpgraham Nov 8, 2016
8071a8b
Fix documentation
dpgraham Nov 8, 2016
605eb3e
Don't commit 'touchID()'
dpgraham Nov 8, 2016
a9e580b
Added touchId test
dpgraham Nov 8, 2016
d6a93c8
Added assertion to keep codacy happy
dpgraham Nov 10, 2016
2f6f8ab
Moved touchID into new file
dpgraham Nov 11, 2016
309862d
Fixed conflicts
dpgraham Nov 11, 2016
fec5168
Fixed conflicts
dpgraham Nov 11, 2016
847dd63
Update IOSMobileCommandHelper.java
dpgraham Nov 13, 2016
4233982
Throws exception instead of bogus assertion
dpgraham Nov 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
623 changes: 312 additions & 311 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/main/java/io/appium/java_client/MobileCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,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";
Expand Down Expand Up @@ -94,6 +95,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"));
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/io/appium/java_client/ios/IOSDeviceActionShortcuts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import static io.appium.java_client.ios.IOSMobileCommandHelper.hideKeyboardCommand;
import static io.appium.java_client.ios.IOSMobileCommandHelper.shakeCommand;
import static io.appium.java_client.ios.IOSMobileCommandHelper.touchIdCommand;

import io.appium.java_client.CommandExecutionHelper;
import io.appium.java_client.DeviceActionShortcuts;
Expand Down Expand Up @@ -56,5 +57,14 @@ default void hideKeyboard(String strategy, String keyName) {
default void shake() {
CommandExecutionHelper.execute(this, shakeCommand());
}

Copy link
Contributor

@TikhomirovSergey TikhomirovSergey Nov 10, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dpgraham

I am against the adding to the IOSDeviceActionShortcuts. This interface is going to be deprecated. Please take a look at this working branch. IOSDeviceActionShortcuts is going to be deprecated.

It is better to add such interface:

package io.appium.java_client.ios;

public interface ChecksTouchId extends ExecutesMethod {

    /**
    * Simulate touchId event
    *
    * @param match If true, simulates a successful fingerprint scan. If false, simulates a failed fingerprint scan
    */     
    default void touchId(boolean match) {
        CommandExecutionHelper.execute(this, touchIdCommand(match));
    }
}

and make IOSDriver implement it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the input Sergey. I made the change.

/**
* Simulate touchId event
*
* @param match Are we simulating a successful fingerprint scan?
*/
default void touchId(boolean match) {
Copy link
Member

@SrinivasanTarget SrinivasanTarget Nov 8, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add in doc as it is Simulator only?

CommandExecutionHelper.execute(this, touchIdCommand(match));
}

}
11 changes: 11 additions & 0 deletions src/main/java/io/appium/java_client/ios/IOSMobileCommandHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 Are we simulating a successful fingerprint scan?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is it a question here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's how I've documented boolean parameters in the past. I'll change it to be more in line with how it's normally documented.

*
*/
public static Map.Entry<String, Map<String, ?>> touchIdCommand(boolean match) {
return new AbstractMap.SimpleEntry<>(
TOUCH_ID, prepareArguments("match", match));
}
}
4 changes: 2 additions & 2 deletions src/test/java/io/appium/java_client/ios/IOSGesturesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public class IOSGesturesTest extends BaseIOSTest {


@Test public void tapTest() {
driver.findElementById("IntegerA").sendKeys("2");
driver.findElementById("IntegerB").sendKeys("4");
driver.findElementById("IntegerA").sendKeys("2");
driver.findElementById("IntegerB").sendKeys("4");

MobileElement e = driver.findElementByAccessibilityId("ComputeSumButton");
driver.tap(2, e, 2000);
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/io/appium/java_client/ios/XCUIAutomationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package io.appium.java_client.ios;


import static org.junit.Assert.assertEquals;

import io.appium.java_client.MobileElement;
import io.appium.java_client.remote.AutomationName;
import io.appium.java_client.remote.IOSMobileCapabilityType;
Expand All @@ -31,8 +34,6 @@

import java.io.File;

import static org.junit.Assert.assertEquals;

public class XCUIAutomationTest {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dpgraham Can you add some tests here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added the test. It doesn't do any assertions because there isn't anything to check, it just calls the methods to verify that there aren't any exceptions.


protected static IOSDriver<MobileElement> driver;
Expand Down