Skip to content

Commit bec1d6e

Browse files
author
Mykola Mokhnach
committed
Use toMillis method to get duration in milliseconds
1 parent f8a2dbe commit bec1d6e

File tree

3 files changed

+9
-37
lines changed

3 files changed

+9
-37
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
import java.time.Duration;
2626

27-
import static io.appium.java_client.internal.DurationUtils.durationToMillis;
28-
2927
/**
3028
* Used for Webdriver 3 touch actions
3129
* See the Webriver 3 spec
@@ -219,7 +217,7 @@ public TouchAction waitAction(int ms) {
219217
*/
220218
public TouchAction waitAction(Duration duration) {
221219
ActionParameter action = new ActionParameter("wait");
222-
action.addParameter("ms", durationToMillis(duration));
220+
action.addParameter("ms", duration.toMillis());
223221
parameterBuilder.add(action);
224222
return this;
225223
}
@@ -258,7 +256,7 @@ public TouchAction longPress(WebElement el, int duration) {
258256
*/
259257
public TouchAction longPress(WebElement el, Duration duration) {
260258
ActionParameter action = new ActionParameter("longPress", (HasIdentity) el);
261-
action.addParameter("duration", durationToMillis(duration));
259+
action.addParameter("duration", duration.toMillis());
262260
parameterBuilder.add(action);
263261
return this;
264262
}
@@ -307,7 +305,7 @@ public TouchAction longPress(int x, int y, Duration duration) {
307305
ActionParameter action = new ActionParameter("longPress");
308306
action.addParameter("x", x);
309307
action.addParameter("y", y);
310-
action.addParameter("duration", durationToMillis(duration));
308+
action.addParameter("duration", duration.toMillis());
311309
parameterBuilder.add(action);
312310
return this;
313311
}
@@ -360,7 +358,7 @@ public TouchAction longPress(WebElement el, int x, int y, Duration duration) {
360358
ActionParameter action = new ActionParameter("longPress", (HasIdentity) el);
361359
action.addParameter("x", x);
362360
action.addParameter("y", y);
363-
action.addParameter("duration", durationToMillis(duration));
361+
action.addParameter("duration", duration.toMillis());
364362
parameterBuilder.add(action);
365363
return this;
366364
}

src/main/java/io/appium/java_client/android/HasSettings.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import static io.appium.java_client.android.AndroidMobileCommandHelper.getSettingsCommand;
2020
import static io.appium.java_client.android.AndroidMobileCommandHelper.setSettingsCommand;
21-
import static io.appium.java_client.internal.DurationUtils.durationToMillis;
2221

2322
import com.google.common.collect.ImmutableMap;
2423

@@ -90,7 +89,7 @@ default void configuratorSetWaitForIdleTimeout(int timeout) {
9089
* resolution is one millisecond
9190
*/
9291
default void configuratorSetWaitForIdleTimeout(Duration timeout) {
93-
setSetting(Setting.WAIT_FOR_IDLE_TIMEOUT, durationToMillis(timeout));
92+
setSetting(Setting.WAIT_FOR_IDLE_TIMEOUT, timeout.toMillis());
9493
}
9594

9695
/**
@@ -111,7 +110,7 @@ default void configuratorSetWaitForSelectorTimeout(int timeout) {
111110
* resolution is one millisecond
112111
*/
113112
default void configuratorSetWaitForSelectorTimeout(Duration timeout) {
114-
setSetting(Setting.WAIT_FOR_SELECTOR_TIMEOUT, durationToMillis(timeout));
113+
setSetting(Setting.WAIT_FOR_SELECTOR_TIMEOUT, timeout.toMillis());
115114
}
116115

117116
/**
@@ -132,7 +131,7 @@ default void configuratorSetScrollAcknowledgmentTimeout(int timeout) {
132131
* resolution is one millisecond
133132
*/
134133
default void configuratorSetScrollAcknowledgmentTimeout(Duration timeout) {
135-
setSetting(Setting.WAIT_SCROLL_ACKNOWLEDGMENT_TIMEOUT, durationToMillis(timeout));
134+
setSetting(Setting.WAIT_SCROLL_ACKNOWLEDGMENT_TIMEOUT, timeout.toMillis());
136135
}
137136

138137
/**
@@ -153,7 +152,7 @@ default void configuratorSetKeyInjectionDelay(int delay) {
153152
* resolution is one millisecond
154153
*/
155154
default void configuratorSetKeyInjectionDelay(Duration delay) {
156-
setSetting(Setting.KEY_INJECTION_DELAY, durationToMillis(delay));
155+
setSetting(Setting.KEY_INJECTION_DELAY, delay.toMillis());
157156
}
158157

159158
/**
@@ -174,6 +173,6 @@ default void configuratorSetActionAcknowledgmentTimeout(int timeout) {
174173
* resolution is one millisecond
175174
*/
176175
default void configuratorSetActionAcknowledgmentTimeout(Duration timeout) {
177-
setSetting(Setting.WAIT_ACTION_ACKNOWLEDGMENT_TIMEOUT, durationToMillis(timeout));
176+
setSetting(Setting.WAIT_ACTION_ACKNOWLEDGMENT_TIMEOUT, timeout.toMillis());
178177
}
179178
}

src/main/java/io/appium/java_client/internal/DurationUtils.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)