Adding experimental tolerant interaction for select boxes with a locator

instead of a webelement

Author: stevewalton28

src/main/java/uk/co/evoco/webdriver/utils/SelectBoxUtils.java

@@ -1,6 +1,8 @@
 package uk.co.evoco.webdriver.utils;
 
 import com.codahale.metrics.Timer;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.Select;
 import uk.co.evoco.metrics.MetricRegistryHelper;
@@ -24,6 +26,10 @@ public final class SelectBoxUtils extends TolerantInteraction {
     private static final Timer tolerantItemByVisibleTextAction = MetricRegistryHelper.get().timer(name("SelectBoxUtils.tolerantItemByVisibleText"));
     private static final Timer tolerantItemByIndexAction = MetricRegistryHelper.get().timer(name("SelectBoxUtils.tolerantItemByIndex"));
 
+    public SelectBoxUtils(WebDriver webDriver) {
+        super(webDriver);
+    }
+
     /**
      * Selects an option that has a matching value attribute in the Options tag markup
      * @param selectBox active WebElement, already located
@@ -65,85 +71,106 @@ public static void itemByVisibleText(WebElement selectBox, String visibleText) {
     }
 
     /**
+     * @param webDriver
      * @param webElement active WebElement, already located
      * @param htmlValue  HTML value attribute
      * @param timeout    time in seconds to keep trying
      * @throws Throwable any unhandled or un-tolerated exception
      */
-    public static void tolerantItemByHtmlValueAttribute(WebElement webElement, String htmlValue, int timeout)
+    public static void tolerantItemByHtmlValueAttribute(WebDriver webDriver, WebElement webElement, String htmlValue, int timeout)
             throws Throwable {
         try(final Timer.Context ignored = tolerantItemByHtmlValueAttributeAction.time()) {
-            new SelectBoxUtils().tolerantInteraction(
+            new SelectBoxUtils(webDriver).tolerantInteraction(
                     webElement, SelectBoxInteractionType.BY_VALUE, Optional.of(htmlValue), Optional.empty(), timeout);
         }
     }
 
     /**
+     * @param webDriver
      * @param webElement active WebElement, already located
      * @param htmlValue  HTML value attribute
      * @throws Throwable any unhandled or un-tolerated exception
      */
-    public static void tolerantItemByHtmlValueAttribute(WebElement webElement, String htmlValue)
+    public static void tolerantItemByHtmlValueAttribute(WebDriver webDriver, WebElement webElement, String htmlValue)
             throws Throwable {
         try(final Timer.Context ignored = tolerantItemByHtmlValueAttributeAction.time()) {
-            new SelectBoxUtils().tolerantInteraction(
+            new SelectBoxUtils(webDriver).tolerantInteraction(
                     webElement, SelectBoxInteractionType.BY_VALUE, Optional.of(htmlValue), Optional.empty(),
                     TestConfigHelper.get().getTolerantActionWaitTimeoutInSeconds());
         }
     }
 
     /**
+     * @param webDriver
      * @param webElement  active WebElement, already located
      * @param visibleText visible text in the select box (NOT the HTML value attribute)
      * @param timeout     time in seconds to keep trying
      * @throws Throwable any unhandled or un-tolerated exception
      */
-    public static void tolerantItemByVisibleText(WebElement webElement, String visibleText, int timeout)
+    public static void tolerantItemByVisibleText(WebDriver webDriver, WebElement webElement, String visibleText, int timeout)
             throws Throwable {
         try(final Timer.Context ignored = tolerantItemByVisibleTextAction.time()) {
-            new SelectBoxUtils().tolerantInteraction(
+            new SelectBoxUtils(webDriver).tolerantInteraction(
                     webElement, SelectBoxInteractionType.BY_VISIBLE_TEXT,
                     Optional.of(visibleText), Optional.empty(), timeout);
         }
     }
 
     /**
-     *
+     * @param webDriver
      * @param webElement active WebElement, already located
      * @param visibleText visible text in the select box (NOT the HTML value attribute)
      * @throws Throwable any unhandled or un-tolerated exception
      */
-    public static void tolerantItemByVisibleText(WebElement webElement, String visibleText)
+    public static void tolerantItemByVisibleText(WebDriver webDriver, WebElement webElement, String visibleText)
             throws Throwable {
         try(final Timer.Context ignored = tolerantItemByVisibleTextAction.time()) {
-            new SelectBoxUtils().tolerantInteraction(
+            new SelectBoxUtils(webDriver).tolerantInteraction(
                     webElement, SelectBoxInteractionType.BY_VISIBLE_TEXT,
                     Optional.of(visibleText), Optional.empty(),
                     TestConfigHelper.get().getTolerantActionWaitTimeoutInSeconds());
         }
     }
 
     /**
+     * @param webDriver
+     * @param locator
+     * @param visibleText
+     * @throws Throwable
+     */
+    public static void tolerantItemByVisibleText(WebDriver webDriver, By locator, String visibleText)
+            throws Throwable {
+        try(final Timer.Context ignored = tolerantItemByVisibleTextAction.time()) {
+            new SelectBoxUtils(webDriver).tolerantInteraction(
+                    locator, SelectBoxInteractionType.BY_VISIBLE_TEXT,
+                    Optional.of(visibleText), Optional.empty(),
+                    TestConfigHelper.get().getTolerantActionWaitTimeoutInSeconds());
+        }
+    }
+
+    /**
+     * @param webDriver
      * @param webElement active WebElement, already located
      * @param index      index in order of display
      * @param timeout    time in seconds to keep trying
      * @throws Throwable any unhandled or un-tolerated exception
      */
-    public static void tolerantItemByIndex(WebElement webElement, int index, int timeout) throws Throwable {
+    public static void tolerantItemByIndex(WebDriver webDriver, WebElement webElement, int index, int timeout) throws Throwable {
         try(final Timer.Context ignored = tolerantItemByIndexAction.time()) {
-            new SelectBoxUtils().tolerantInteraction(
+            new SelectBoxUtils(webDriver).tolerantInteraction(
                     webElement, SelectBoxInteractionType.BY_INDEX, Optional.empty(), Optional.of(index), timeout);
         }
     }
 
     /**
+     * @param webDriver
      * @param webElement active WebElement, already located
      * @param index      index in order of display
      * @throws Throwable any unhandled or un-tolerated exception
      */
-    public static void tolerantItemByIndex(WebElement webElement, int index) throws Throwable {
+    public static void tolerantItemByIndex(WebDriver webDriver, WebElement webElement, int index) throws Throwable {
         try(final Timer.Context ignored = tolerantItemByIndexAction.time()) {
-            new SelectBoxUtils().tolerantInteraction(
+            new SelectBoxUtils(webDriver).tolerantInteraction(
                     webElement, SelectBoxInteractionType.BY_INDEX, Optional.empty(), Optional.of(index),
                     TestConfigHelper.get().getTolerantActionWaitTimeoutInSeconds());
         }