8000 The addition to #477 by TikhomirovSergey · Pull Request #480 · appium/java-client · GitHub
[go: up one dir, main page]
Skip to content

The addition to #477 #480

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

Merged
TikhomirovSergey merged 2 commits into from
Sep 30, 2016
Merged

The addition to #477 #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Sele 8000 ct commit Hold shift + click to select a range
a880c0e
The addition to #477
TikhomirovSergey Sep 28, 2016
adb97ee
Work on remarks. Addition to #477
TikhomirovSergey Sep 29, 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
35 changes: 0 additions & 35 deletions src/main/java/io/appium/java_client/android/ConfiguratorParameters.java
View file
Open in desktop

This file was deleted.

25 changes: 10 additions & 15 deletions src/main/java/io/appium/java_client/android/HasSettings.java
View file
Open in desktop
< 8000 tr data-hunk="252d0d5557bc3b0638eaf03547e83a6f82b2f2874f3fc1486e109bff3b3e49e7" class="show-top-border">
Original file line number Diff line number Diff line change
Expand Up @@ -73,50 +73,45 @@ default void ignoreUnimportantViews(Boolean compress) {
/**
* invoke {@code setWaitForIdleTimeout} in {@code com.android.uiautomator.core.Configurator}
*
* @param timeout in milliseconds, 0 would reset to its default value
* @param timeout in milliseconds. A negative value would reset to its default value
*/
default void configuratorSetWaitForIdleTimeout(int timeout) {
setSetting(Setting.CONFIGURATOR,
ConfiguratorParameters.WAIT_FOR_IDLE_TIMEOUT.format(timeout));
setSetting(Setting.WAIT_FOR_IDLE_TIMEOUT, timeout);
}

/**
* invoke {@code setWaitForSelectorTimeout} in {@code com.android.uiautomator.core.Configurator}
*
* @param timeout in milliseconds, 0 would reset to its default value
* @param timeout in milliseconds. A negative value would reset to its default value
*/
default void configuratorSetWaitForSelectorTimeout(int timeout) {
setSetting(Setting.CONFIGURATOR,
ConfiguratorParameters.WAIT_FOR_SELECTOR_TIMEOUT.format(timeout));
setSetting(Setting.WAIT_FOR_SELECTOR_TIMEOUT, timeout);
}

/**
* invoke {@code setScrollAcknowledgmentTimeout} in {@code com.android.uiautomator.core.Configurator}
*
* @param timeout in milliseconds, 0 would reset to its default value
* @param timeout in milliseconds. A negative value would reset to its default value
*/
default void configuratorSetScrollAcknowledgmentTimeout(int timeout) {
setSetting(Setting.CONFIGURATOR,
ConfiguratorParameters.WAIT_SCROLL_ACKNOWLEDGMENT_TIMEOUT.format(timeout));
setSetting(Setting.WAIT_SCROLL_ACKNOWLEDGMENT_TIMEOUT, timeout);
}

/**
* invoke {@code configuratorSetKeyInjectionDelay} in {@code com.android.uiautomator.core.Configurator}
*
* @param delay in milliseconds, 0 would reset to its default value
* @param delay in milliseconds. A negative value would reset to its default value
*/
default void configuratorSetKeyInjectionDelay(int delay) {
setSetting(Setting.CONFIGURATOR,
ConfiguratorParameters.KEY_INJECTION_DELAY.format(delay));
setSetting(Setting.KEY_INJECTION_DELAY, delay);
}

/**
* invoke {@code setActionAcknowledgmentTimeout} in {@code com.android.uiautomator.core.Configurator}
*
* @param timeout in milliseconds, 0 would reset to its default value
* @param timeout in milliseconds. A negative value would reset to its default value
*/
default void configuratorSetActionAcknowledgmentTimeout(int timeout) {
setSetting(Setting.CONFIGURATOR,
ConfiguratorParameters.WAIT_ACTION_ACKNOWLEDGMENT_TIMEOUT.format(timeout));
setSetting(Setting.WAIT_ACTION_ACKNOWLEDGMENT_TIMEOUT, timeout);
}
}
6 changes: 5 additions & 1 deletion src/main/java/io/appium/java_client/android/Setting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@
public enum Setting {

IGNORE_UNIMPORTANT_VIEWS("ignoreUnimportantViews"),
CONFIGURATOR("configurator");
WAIT_FOR_IDLE_TIMEOUT("setWaitForIdleTimeout"),
WAIT_FOR_SELECTOR_TIMEOUT("setWaitForSelectorTimeout"),
WAIT_SCROLL_ACKNOWLEDGMENT_TIMEOUT("setScrollAcknowledgmentTimeout"),
WAIT_ACTION_ACKNOWLEDGMENT_TIMEOUT("setActionAcknowledgmentTimeout"),
KEY_INJECTION_DELAY("setKeyInjectionDelay");

private String name;

Expand Down
29 changes: 13 additions & 16 deletions src/test/java/io/appium/java_client/android/SettingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,24 @@ public class SettingTest extends BaseAndroidTest {
}

@Test public void configuratorTest() {
driver.configuratorSetActionAcknowledgmentTimeout(5);
assertJSONElementContains("setActionAcknowledgmentTimeout", 5);
driver.configuratorSetActionAcknowledgmentTimeout(500);
assertJSONElementContains(Setting.WAIT_ACTION_ACKNOWLEDGMENT_TIMEOUT, 500);

driver.configuratorSetKeyInjectionDelay(4);
assertJSONElementContains("setKeyInjectionDelay", 4);
driver.configuratorSetKeyInjectionDelay(400);
assertJSONElementContains(Setting.KEY_INJECTION_DELAY, 400);

driver.configuratorSetScrollAcknowledgmentTimeout(3);
assertJSONElementContains("setScrollAcknowledgmentTimeout", 3);
driver.configuratorSetScrollAcknowledgmentTimeout(300);
assertJSONElementContains(Setting.WAIT_SCROLL_ACKNOWLEDGMENT_TIMEOUT, 300);

driver.configuratorSetWaitForIdleTimeout(6);
assertJSONElementContains("setWaitForIdleTimeout", 6);
driver.configuratorSetWaitForIdleTimeout(600);
assertJSONElementContains(Setting.WAIT_FOR_IDLE_TIMEOUT, 600);

driver.configuratorSetWaitForSelectorTimeout(1);
assertJSONElementContains("setWaitForSelectorTimeout", 1);
driver.configuratorSetWaitForSelectorTimeout(1000);
assertJSONElementContains(Setting.WAIT_FOR_SELECTOR_TIMEOUT, 1000);
}

private void assertJSONElementContains(String method, int value) {
driver.getSettings().get(Setting.CONFIGURATOR.toString());
assertEquals(driver.getSettings().get(Setting.CONFIGURATOR.toString())
.getAsJsonObject().get("method").getAsString(), method);
assertEquals(driver.getSettings().get(Setting.CONFIGURATOR.toString())
.getAsJsonObject().get("value").getAsInt(), value);
private void assertJSONElementContains(Setting setting, int value) {
assertEquals(driver.getSettings().get(setting.toString())
.getAsInt(), value);
}
}
0