appium#846: finished

Author: TikhomirovSergey

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

@@ -16,18 +16,19 @@
 
 package io.appium.java_client;
 
+import static java.time.Duration.ofMillis;
+
 import com.google.common.base.Throwables;
 
 import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.support.ui.Clock;
-import org.openqa.selenium.support.ui.Duration;
 import org.openqa.selenium.support.ui.FluentWait;
 import org.openqa.selenium.support.ui.Sleeper;
 
 import java.lang.reflect.Field;
+import java.time.Duration;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -167,7 +168,7 @@ protected T getInput() {
  /**
  * Sets the strategy for polling. The default strategy is null,
  * which means, that polling interval is always a constant value and is
- * set by {@link #pollingEvery(long, TimeUnit)} method. Otherwise the value set by that
+ * set by {@link #pollingEvery(Duration)} method. Otherwise the value set by that
  * method might be just a helper to calculate the actual interval.
  * Although, by setting an alternative polling strategy you may flexibly control
  * the duration of this interval for each polling round.
@@ -228,7 +229,7 @@ public AppiumFluentWait<T> withPollingStrategy(Function<IterationInfo, Duration>
  @Override
  public <V> V until(Function<? super T, V> isTrue) {
  final long start = getClock().now();
- final long end = getClock().laterBy(getTimeout().in(TimeUnit.MILLISECONDS));
+ final long end = getClock().laterBy(getTimeout().toMillis());
  long iterationNumber = 1;
  Throwable lastException;
  while (true) {
@@ -254,15 +255,15 @@ public <V> V until(Function<? super T, V> isTrue) {
  String timeoutMessage = String.format(
  "Expected condition failed: %s (tried for %d second(s) with %s interval)",
  message == null ? "waiting for " + isTrue : message,
- getTimeout().in(TimeUnit.SECONDS), getInterval());
+ getTimeout().getSeconds(), getInterval());
  throw timeoutException(timeoutMessage, lastException);
  }
 
  try {
  Duration interval = getInterval();
  if (pollingStrategy != null) {
  final IterationInfo info = new IterationInfo(iterationNumber,
- new Duration(getClock().now() - start, TimeUnit.MILLISECONDS), getTimeout(),
+ ofMillis(getClock().now() - start), getTimeout(),
  interval);
  interval = pollingStrategy.apply(info);
  }

src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java

@@ -44,7 +44,7 @@ public class AppiumElementLocatorFactory implements CacheableElementLocatorFacto
  * @param duration is a POJO which contains timeout parameters for the elements to be found
  * @param builder is handler of Appium-specific page object annotations
  * @deprecated This constructor is going to be
- * removed. Use {@link #AppiumElementLocatorFactory(SearchContext, Duration, AppiumByBuilder)} instead.
+ *  removed. Use {@link #AppiumElementLocatorFactory(SearchContext, Duration, AppiumByBuilder)} instead.
  */
  @Deprecated
  public AppiumElementLocatorFactory(SearchContext searchContext, TimeOutDuration duration,

src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java

@@ -93,7 +93,7 @@ public AppiumFieldDecorator(SearchContext context, long timeout,
  * {@link Widget} or some other user's extension/implementation.
  * @param duration is a desired duration of the waiting for an element presence.
  * @deprecated This constructor is going to be removed. Use {@link #AppiumFieldDecorator(SearchContext, Duration)}
- * instead.
+ *  instead.
  */
  @Deprecated
  public AppiumFieldDecorator(SearchContext context, TimeOutDuration duration) {

src/main/java/io/appium/java_client/pagefactory/TimeOutDuration.java

@@ -25,7 +25,7 @@
  * Represents an duration of waiting for element rendering.
  *
  * @deprecated this class is going to be removed in favour of {@link java.time.Duration}
- * usage.
+ *  usage.
  */
 @Deprecated
 public class TimeOutDuration {

src/main/java/io/appium/java_client/pagefactory/WithTimeout.java

@@ -16,6 +16,11 @@
 
 package io.appium.java_client.pagefactory;
 
+import static java.time.temporal.ChronoUnit.FOREVER;
+import static java.time.temporal.ChronoUnit.MILLIS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -24,11 +29,6 @@
 import java.time.temporal.ChronoUnit;
 import java.util.concurrent.TimeUnit;
 
-import static java.time.temporal.ChronoUnit.FOREVER;
-import static java.time.temporal.ChronoUnit.MILLIS;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
-
 /**
  * This annotation is used when some element waits for time
  * that differs from defined by default.
@@ -45,8 +45,7 @@
  /**
  * Desired time unit.
  *
- * @deprecated use {@link #chronoUnit()} instead.
- * This property is going to be removed.
+ * @deprecated use {@link #chronoUnit()} instead. This property is going to be removed.
  * @return time unit
  */
  @Deprecated
@@ -56,7 +55,7 @@
  * Desired time unit.
  *
  * @return time unit. Default value {@link java.time.temporal.ChronoUnit#FOREVER} was added
- * for backward compatibility temporary.
+ *  for backward compatibility temporary.
  */
  ChronoUnit chronoUnit() default FOREVER;
 

src/test/java/io/appium/java_client/android/AndroidFunctionTest.java

@@ -1,5 +1,7 @@
 package io.appium.java_client.android;
 
+import static java.time.Duration.ofMillis;
+import static java.time.Duration.ofSeconds;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertThat;
@@ -20,7 +22,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -80,7 +81,7 @@ public class AndroidFunctionTest extends BaseAndroidTest {
  searchingFunction.compose(contextFunction);
 
  Wait<Pattern> wait = new FluentWait<>(Pattern.compile("WEBVIEW"))
- .withTimeout(30, TimeUnit.SECONDS);
+ .withTimeout(ofSeconds(30));
  List<WebElement> elements = wait.until(compositeFunction);
 
  assertThat("Element size should be 1", elements.size(), is(1));
@@ -115,7 +116,7 @@ public class AndroidFunctionTest extends BaseAndroidTest {
  });
 
  Wait<Pattern> wait = new FluentWait<>(Pattern.compile("WEBVIEW"))
- .withTimeout(30, TimeUnit.SECONDS);
+ .withTimeout(ofSeconds(30));
  List<WebElement> elements = wait.until(compositeFunction);
  assertThat("Element size should be 1", elements.size(), is(1));
  assertThat("WebView is expected", driver.getContext(), containsString("WEBVIEW"));
@@ -124,13 +125,13 @@ public class AndroidFunctionTest extends BaseAndroidTest {
 
  @Test(expected = TimeoutException.class) public void nullPointerExceptionSafetyTestWithPrecondition() {
  Wait<Pattern> wait = new FluentWait<>(Pattern.compile("Fake_context"))
- .withTimeout(30, TimeUnit.SECONDS).pollingEvery(500, TimeUnit.MILLISECONDS);
+ .withTimeout(ofSeconds(30)).pollingEvery(ofMillis(500));
  assertTrue(wait.until(searchingFunction.compose(contextFunction)).size() > 0);
  }
 
  @Test(expected = TimeoutException.class) public void nullPointerExceptionSafetyTestWithPostConditions() {
  Wait<Pattern> wait = new FluentWait<>(Pattern.compile("Fake_context"))
- .withTimeout(30, TimeUnit.SECONDS).pollingEvery(500, TimeUnit.MILLISECONDS);
+ .withTimeout(ofSeconds(30)).pollingEvery(ofMillis(500));
  assertTrue(wait.until(contextFunction.andThen(searchingFunction).andThen(filteringFunction)).size() > 0);
  }
 }

src/test/java/io/appium/java_client/android/BaseAndroidTest.java

@@ -48,7 +48,7 @@ public class BaseAndroidTest {
  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(MobileCapabilityType.AUTOMATION_NAME, AutomationName.ANDROID_UIAUTOMATOR2);
+ capabilities.setCapability(MobileCapabilityType.AUTOMATION_NAME, AutomationName.APPIUM);
  capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
  capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
  driver = new AndroidDriver<>(service.getUrl(), capabilities);

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

@@ -16,6 +16,7 @@
 
 package io.appium.java_client.appium;
 
+import static java.time.Duration.ofSeconds;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
@@ -25,17 +26,14 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.TimeoutException;
-import org.openqa.selenium.support.ui.Duration;
 import org.openqa.selenium.support.ui.SystemClock;
 import org.openqa.selenium.support.ui.Wait;
 
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 
 public class AppiumFluentWaitTest {
-
- /*
+ 
  private static class FakeElement {
  public boolean isDisplayed() {
  return false;
@@ -46,11 +44,11 @@ public boolean isDisplayed() {
  public void testDefaultStrategy() {
  final FakeElement el = new FakeElement();
  final Wait<FakeElement> wait = new AppiumFluentWait<>(el, new SystemClock(), duration -> {
- assertThat(duration.in(TimeUnit.SECONDS), is(equalTo(1L)));
- Thread.sleep(duration.in(TimeUnit.MILLISECONDS));
+ assertThat(duration.getSeconds(), is(equalTo(1L)));
+ Thread.sleep(duration.toMillis());
  }).withPollingStrategy(AppiumFluentWait.IterationInfo::getInterval)
- .withTimeout(3, TimeUnit.SECONDS)
- .pollingEvery(1, TimeUnit.SECONDS);
+ .withTimeout(ofSeconds(3))
+ .pollingEvery(ofSeconds(1));
  wait.until(FakeElement::isDisplayed);
  Assert.fail("TimeoutException is expected");
  }
@@ -61,11 +59,11 @@ public void testCustomStrategyOverridesDefaultInterval() {
  final AtomicInteger callsCounter = new AtomicInteger(0);
  final Wait<FakeElement> wait = new AppiumFluentWait<>(el, new SystemClock(), duration -> {
  callsCounter.incrementAndGet();
- assertThat(duration.in(TimeUnit.SECONDS), is(equalTo(2L)));
- Thread.sleep(duration.in(TimeUnit.MILLISECONDS));
- }).withPollingStrategy(info -> new Duration(2, TimeUnit.SECONDS))
- .withTimeout(3, TimeUnit.SECONDS)
- .pollingEvery(1, TimeUnit.SECONDS);
+ assertThat(duration.getSeconds(), is(equalTo(2L)));
+ Thread.sleep(duration.toMillis());
+ }).withPollingStrategy(info -> ofSeconds(2))
+ .withTimeout(ofSeconds(3))
+ .pollingEvery(ofSeconds(1));
  try {
  wait.until(FakeElement::isDisplayed);
  Assert.fail("TimeoutException is expected");
@@ -83,11 +81,11 @@ public void testIntervalCalculationForCustomStrategy() {
  final Function<Long, Long> pollingStrategy = x -> x * 2;
  final Wait<FakeElement> wait = new AppiumFluentWait<>(el, new SystemClock(), duration -> {
  int callNumber = callsCounter.incrementAndGet();
- assertThat(duration.in(TimeUnit.SECONDS), is(equalTo(pollingStrategy.apply((long) callNumber))));
- Thread.sleep(duration.in(TimeUnit.MILLISECONDS));
- }).withPollingStrategy(info -> new Duration(pollingStrategy.apply(info.getNumber()), TimeUnit.SECONDS))
- .withTimeout(4, TimeUnit.SECONDS)
- .pollingEvery(1, TimeUnit.SECONDS);
+ assertThat(duration.getSeconds(), is(equalTo(pollingStrategy.apply((long) callNumber))));
+ Thread.sleep(duration.toMillis());
+ }).withPollingStrategy(info -> ofSeconds(pollingStrategy.apply(info.getNumber())))
+ .withTimeout(ofSeconds(4))
+ .pollingEvery(ofSeconds(1));
  try {
  wait.until(FakeElement::isDisplayed);
  Assert.fail("TimeoutException is expected");
@@ -96,5 +94,4 @@ public void testIntervalCalculationForCustomStrategy() {
  assertThat(callsCounter.get(), is(equalTo(2)));
  }
  }
- */
 }

src/test/java/io/appium/java_client/pagefactory_tests/IOSMobileBrowserCompatibilityTest.java

@@ -16,6 +16,8 @@
 
 package io.appium.java_client.pagefactory_tests;
 
+import static java.time.Duration.ofSeconds;
+
 import io.appium.java_client.ios.IOSDriver;
 import io.appium.java_client.pagefactory.AndroidFindBy;
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
@@ -37,8 +39,6 @@
 
 import java.util.List;
 
-import static java.time.Duration.ofSeconds;
-
 public class IOSMobileBrowserCompatibilityTest {
 
  private WebDriver driver;

src/test/java/io/appium/java_client/pagefactory_tests/MobileBrowserCompatibilityTest.java

@@ -16,6 +16,8 @@
 
 package io.appium.java_client.pagefactory_tests;
 
+import static java.time.Duration.ofSeconds;
+
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.pagefactory.AndroidFindBy;
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
@@ -34,11 +36,7 @@
 import org.openqa.selenium.support.FindBys;
 import org.openqa.selenium.support.PageFactory;
 
-import java.time.Duration;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static java.time.Duration.ofSeconds;
 
 public class MobileBrowserCompatibilityTest {