WileyLabs · Lao-Ax · Mar 17, 2018 · Mar 17, 2018 · Mar 17, 2018 · Mar 17, 2018
diff --git a/src/main/java/com/wiley/autotest/actions/RepeatableAction.java b/src/main/java/com/wiley/autotest/actions/RepeatableAction.java
@@ -3,6 +3,7 @@
 import com.wiley.autotest.services.StopTestExecutionException;
 import com.wiley.autotest.utils.TestUtils;
 
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**
@@ -11,7 +12,7 @@
  * <p>
  * If the condition does not become true after all attempts - AssertionError is thrown
  */
-public class RepeatableAction {
+public class RepeatableAction<T> {
 
     private Actions action;
     private Conditions condition;
@@ -20,6 +21,8 @@ public class RepeatableAction {
     private final int millisecondsBetweenAttempts;
     private int attemptCounter = 0;
     private String errorMessage;
+    private Supplier<T> output;
+    private Function<T, Boolean> dependedCondition;
 
     /**
      * By default will try 5 types and sleep 3 seconds after each attempt
@@ -53,7 +56,18 @@ public RepeatableAction(Actions action, Conditions condition, int numberOfAttemp
         this.millisecondsBetweenAttempts = millisecondsBetweenAttempts;
     }
 
-    public RepeatableAction message(String errorMessage) {
+    public RepeatableAction(Supplier<T> output, Function<T, Boolean> condition, int millisecondsBetweenAttempts) {
+        this(output, condition, 5, millisecondsBetweenAttempts);
+    }
+
+    public RepeatableAction(Supplier<T> output, Function<T, Boolean> condition, int numberOfAttempts, int millisecondsBetweenAttempts) {
+        this.output = output;
+        this.dependedCondition = condition;
+        this.numberOfAttempts = numberOfAttempts;
+        this.millisecondsBetweenAttempts = millisecondsBetweenAttempts;
+    }
+
+    public RepeatableAction<T> message(String errorMessage) {
         this.errorMessage = errorMessage;
         return this;
     }
@@ -79,6 +93,22 @@ public void perform() {
         }
     }
 
+    public T performAndGet() {
+        T result = null;
+        for (int i = 0; i < numberOfAttempts; i++) {
+            T localResult = output.get();
+            if (dependedCondition.apply(localResult)) {
+                result = localResult;
+                break;
+            } else {
+                TestUtils.waitForSomeTime(millisecondsBetweenAttempts, "Sleeping inside action repeater");
+            }
+        }
+        if (result == null) {
+            throw new StopTestExecutionException(getErrorMessage());
+        } else return result;
+    }
+
     private String getErrorMessage() {
         String baseMessage = "Unable to perform actions after " + numberOfAttempts + " attempts";
         if (errorMessage != null) {

diff --git a/src/main/java/com/wiley/autotest/selenium/elements/upgrade/TeasyWindow.java b/src/main/java/com/wiley/autotest/selenium/elements/upgrade/TeasyWindow.java
@@ -1,13 +1,16 @@
 package com.wiley.autotest.selenium.elements.upgrade;
 
+import com.wiley.autotest.actions.Actions;
 import com.wiley.autotest.selenium.Report;
 import com.wiley.autotest.selenium.elements.upgrade.conditions.PageLoaded;
 import com.wiley.autotest.selenium.elements.upgrade.conditions.window.WindowMatcher;
+import com.wiley.autotest.selenium.elements.upgrade.waitfor.CustomWaitFor;
 import io.appium.java_client.AppiumDriver;
 import org.openqa.selenium.*;
 
 import java.net.URL;
 import java.util.Iterator;
+import java.util.function.Function;
 
 /**
  * Represents browser window
@@ -32,6 +35,36 @@ public void switchToLast() {
         driver.switchTo().window(window);
     }
 
+    /**
+     * To be sure that new window appeared after an action.
+     * For example, after clicking on a link with new
+     * window target.
+     *
+     * Example usage: switchToLastAfter(() -> element.click());
+     *
+     * @param action - an action to do before new window appeared
+     *               and before switching.
+     */
+    @Override
+    public void switchToLastAfter(Actions action) {
+        int windowCount = driver.getWindowHandles().size();
+        action.execute();
+        new CustomWaitFor().condition(newWindowAppeared(), windowCount);
+        switchToLast();
+    }
+
+    /**
+     * To be sure that new window appeared after click on element.
+     * For example, after clicking on a link with new
+     * window target.
+     *
+     * @param element - an element to click to new window switch.
+     */
+    @Override
+    public void switchToLastAfter(TeasyElement element) {
+        switchToLastAfter(element::click);
+    }
+
     @Override
     public void switchTo(WindowMatcher matcher) {
         fluentWait.waitFor(matcher.get().findAndSwitch());
@@ -106,4 +139,11 @@ public void maximize() {
     public void scrollTo(TeasyElement element) {
         ((JavascriptExecutor) driver).executeScript("arguments[0].scrollIntoView(true);", element);
     }
+
+    private Function<Integer, Boolean> newWindowAppeared() {
+        return count -> {
+            int currentWindowsCount = driver.getWindowHandles().size();
+            return count != currentWindowsCount;
+        };
+    }
 }
diff --git a/src/main/java/com/wiley/autotest/selenium/elements/upgrade/Window.java b/src/main/java/com/wiley/autotest/selenium/elements/upgrade/Window.java
@@ -1,5 +1,6 @@
 package com.wiley.autotest.selenium.elements.upgrade;
 
+import com.wiley.autotest.actions.Actions;
 import com.wiley.autotest.selenium.elements.upgrade.conditions.window.WindowMatcher;
 
 import java.net.URL;
@@ -11,6 +12,9 @@ public interface Window {
 
     void switchToLast();
 
+    void switchToLastAfter(Actions action);
+    void switchToLastAfter(TeasyElement element);
+
     void switchTo(WindowMatcher matcher);
 
     void close();

diff --git a/src/test/java/com/wiley/autotest/framework/pages/RepeaterPage.java b/src/test/java/com/wiley/autotest/framework/pages/RepeaterPage.java
@@ -3,6 +3,8 @@
 import com.wiley.autotest.actions.RepeatableAction;
 import com.wiley.autotest.selenium.context.AbstractPage;
 import com.wiley.autotest.selenium.context.SearchStrategy;
+import com.wiley.autotest.selenium.elements.upgrade.TeasyElement;
+import org.assertj.core.api.Assertions;
 import org.openqa.selenium.By;
 import org.springframework.stereotype.Component;
 
@@ -13,7 +15,9 @@
 public class RepeaterPage extends AbstractPage {
 
     public RepeaterPage negativeCheck() {
-        new RepeatableAction(this::clickOnFailure).perform();
+        new RepeatableAction(this::clickOnFailure)
+                .message("The Div3 isn't displayed.")
+                .perform();
         return this;
     }
 
@@ -22,6 +26,26 @@ public RepeaterPage positiveCheck() {
         return this;
     }
 
+    public RepeaterPage outputCheck() {
+        String string = new RepeatableAction<>(
+                () -> {
+                    element(By.cssSelector("[id='testDiv2']")).click();
+                    TeasyElement element = element(By.cssSelector("[id='testDiv3']"), new SearchStrategy(1).nullOnFailure());
+                    if (element != null) {
+                        return element.getText();
+                    } else {
+                        return "No text";
+                    }
+                },
+                (text) -> text.equals("Div3"),
+                10,
+                1000)
+                .message("No text for element.")
+                .performAndGet();
+        Assertions.assertThat(string).isEqualTo("Div3");
+        return this;
+    }
+
     private boolean clickOnFailure() {
         clickElement("[id='testDiv1']");
         return isElementDisplayed();

diff --git a/src/test/java/com/wiley/autotest/framework/tests/repeater/RepeaterTest.java b/src/test/java/com/wiley/autotest/framework/tests/repeater/RepeaterTest.java
@@ -13,9 +13,16 @@ public void performAction() {
                 .positiveCheck();
     }
 
+    @Test()
+    public void performActionWithOutput() {
+        openPage("repeater.html", RepeaterPage.class)
+                .outputCheck();
+    }
+
     @Test(expectedExceptions = StopTestExecutionException.class)
     public void unableToPerformAction() {
         openPage("repeater.html", RepeaterPage.class)
                 .negativeCheck();
     }
+
 }