Handle the case where a proxied element from PageFactory causes a FluentWait to timeout.

It's common for an ExpectedCondition to include a message containing the output
of "element.toString" in the friendly error message. In the case of a proxied
element created by the PageFactory, this will cause a NoSuchElementException to
be thrown, whereas we expect some string or another to be returned.

Handle this case.

Author: shs96c

java/client/src/org/openqa/selenium/support/pagefactory/internal/LocatingElementHandler.java

@@ -16,6 +16,7 @@
 
 package org.openqa.selenium.support.pagefactory.internal;
 
+import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.pagefactory.ElementLocator;
 
@@ -31,7 +32,15 @@ public LocatingElementHandler(ElementLocator locator) {
   }
 
   public Object invoke(Object object, Method method, Object[] objects) throws Throwable {
-    WebElement element = locator.findElement();
+    WebElement element;
+    try {
+      element = locator.findElement();
+    } catch (NoSuchElementException e) {
+      if ("toString".equals(method.getName())) {
+        return "Proxy element for: " + locator.toString();
+      }
+      else throw e;
+    }
 
     if ("getWrappedElement".equals(method.getName())) {
       return element;

java/client/src/org/openqa/selenium/support/ui/WebDriverWait.java

@@ -65,7 +65,7 @@ public WebDriverWait(WebDriver driver, long timeOutInSeconds, long sleepInMillis
    * @param timeOutInSeconds The timeout in seconds when an expectation is
    * @param sleepTimeOut The timeout used whilst sleeping. Defaults to 500ms called.
    */
-  protected WebDriverWait(WebDriver driver, Clock clock, Sleeper sleeper, long timeOutInSeconds,
+  public WebDriverWait(WebDriver driver, Clock clock, Sleeper sleeper, long timeOutInSeconds,
       long sleepTimeOut) {
     super(driver, clock, sleeper);
     withTimeout(timeOutInSeconds, TimeUnit.SECONDS);

java/client/test/org/openqa/selenium/support/PageFactoryTest.java

@@ -23,18 +23,27 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.junit.Test;
+import org.mockito.Mockito;
+import org.openqa.selenium.By;
+import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.pagefactory.FieldDecorator;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.TickingClock;
+import org.openqa.selenium.support.ui.Wait;
+import org.openqa.selenium.support.ui.WebDriverWait;
 
 import java.lang.reflect.Field;
 import java.util.List;
 
 public class PageFactoryTest {
 
-  private WebDriver driver = null;
+  private WebDriver driver;
 
   @Test
   public void shouldProxyElementsInAnInstantiatedPage() {
@@ -175,6 +184,21 @@ public void shouldComplainWhenMoreThanOneFindByShortFormAttributeIsSet() {
     }
   }
 
+  @Test(expected = TimeoutException.class)
+  public void shouldNotThrowANoSuchElementExceptionWhenUsedWithAFluentWait() {
+    driver = mock(WebDriver.class);
+    when(driver.findElement(Mockito.<By>any())).thenThrow(new NoSuchElementException("because"));
+
+    TickingClock clock = new TickingClock(10);
+    Wait<WebDriver> wait = new WebDriverWait(driver, clock, clock, 1, 1001);
+
+    PublicPage page = new PublicPage();
+    PageFactory.initElements(driver, page);
+    WebElement element = page.q;
+
+    wait.until(ExpectedConditions.visibilityOf(element));
+  }
+
   public static class PublicPage {
 
     @FindBy(name = "q")