Merge pull request #469 from TikhomirovSergey/truebit-timeout

Addition to #467

Author: TikhomirovSergey

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

@@ -42,6 +42,7 @@ class AppiumElementLocator implements CacheableLocator {
     final boolean shouldCache;
     final By by;
     final TimeOutDuration timeOutDuration;
+    private final TimeOutDuration originalTimeOutDuration;
     final WebDriver originalWebDriver;
     private final SearchContext searchContext;
     private final WaitingFunction waitingFunction;
@@ -56,16 +57,18 @@ class AppiumElementLocator implements CacheableLocator {
      * @param by                a By locator strategy
      * @param shouldCache       is the flag that signalizes that elements which
      *                          are found once should be cached
-     * @param duration          is a POJO which contains timeout parameters
+     * @param duration          is a POJO which contains timeout parameters for the element to be searched
+     * @param originalDuration  is a POJO which contains timeout parameters from page object which contains the element
      * @param originalWebDriver is an instance of WebDriver that is going to be
      *                          used by a proxied element
      */
 
     public AppiumElementLocator(SearchContext searchContext, By by, boolean shouldCache,
-        TimeOutDuration duration, WebDriver originalWebDriver) {
+        TimeOutDuration duration, TimeOutDuration originalDuration, WebDriver originalWebDriver) {
         this.searchContext = searchContext;
         this.shouldCache = shouldCache;
         this.timeOutDuration = duration;
+        this.originalTimeOutDuration = originalDuration;
         this.by = by;
         this.originalWebDriver = originalWebDriver;
         waitingFunction = new WaitingFunction(this.searchContext);
@@ -89,7 +92,7 @@ private List<WebElement> waitFor() {
         } catch (TimeoutException e) {
             return new ArrayList<>();
         } finally {
-            changeImplicitlyWaitTimeOut(timeOutDuration.getTime(), timeOutDuration.getTimeUnit());
+            changeImplicitlyWaitTimeOut(originalTimeOutDuration.getTime(), originalTimeOutDuration.getTimeUnit());
         }
     }
 

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

@@ -57,7 +57,7 @@ public CacheableLocator createLocator(Field field) {
         By by = builder.buildBy();
         if (by != null) {
             return new AppiumElementLocator(searchContext, by, builder.isLookupCached(),
-                    customDuration, originalWebDriver);
+                    customDuration, timeOutDuration, originalWebDriver);
         }
         return null;
     }

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

@@ -23,6 +23,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.openqa.selenium.By;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -136,7 +137,16 @@ private long getBenchMark(List<WebElement> stubElements) {
 
         checkTimeDifference(5, TimeUnit.SECONDS, getBenchMark(stubElements2));
         System.out.println(String.valueOf(5) + " " + TimeUnit.SECONDS.toString() + ": Fine");
+    }
+
+    @Test public void checkThatCustomizedTimeOutDoesNotChangeGeneralValue() {
+        stubElements2.size(); //time out differs from the general value there
 
+        long startMark = Calendar.getInstance().getTimeInMillis();
+        driver.findElements(By.id("FakeId"));
+        long endMark = Calendar.getInstance().getTimeInMillis();
+        checkTimeDifference(AppiumFieldDecorator.DEFAULT_IMPLICITLY_WAIT_TIMEOUT,
+                AppiumFieldDecorator.DEFAULT_TIMEUNIT, endMark - startMark);
     }
 
 }