Make TableNavigationPageDownTest not rely on page down/up scrolling amounts.

Change-Id: I31f4eafcc78b8734c9a0651526790f5e1623ec93

diff --git a/uitest/src/com/vaadin/tests/components/table/TableNavigationPageDownTest.java b/uitest/src/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
index 866c033692b9f0eb24a5cf6799550a9af320abfe..fc3fd2610c21644eb9508b16b8ae813b45277e5c 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
@@ -44,11 +44,20 @@ public class TableNavigationPageDownTest extends MultiBrowserTest {
     private int lowerWrapperY = -1;
     private int pageHeight = -1;
     private int rowHeight = -1;
-    private int lastRowNumber = -1;
 
-    private WebElement lastRow;
     private WebElement wrapper;
 
+
+    @Override
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        // Sending PageDown has no effect on PhantomJS. On IE focus
+        // in Table is often lost, so default scrolling happens on PageDown.
+        List<DesiredCapabilities> browsers = new ArrayList<DesiredCapabilities>(
+                getBrowsersExcludingIE());
+        browsers.remove(Browser.PHANTOMJS.getDesiredCapabilities());
+        return browsers;
+    }
+
     @Override
     public void setup() throws Exception {
         super.setup();
@@ -63,51 +72,80 @@ public class TableNavigationPageDownTest extends MultiBrowserTest {
         lowerWrapperY = wrapper.getLocation().getY() + pageHeight;
     }
 
+    private void sendKeyUntilEndIsReached(Keys key) {
+        while(true) {
+            int lastVisibleRowNumber = getLastVisibleRowNumber();
+            sendKey(key);
+
+            if (!waitUntilLastRowHasChanged(lastVisibleRowNumber)) {
+                break;
+            }
+        }
+    }
+
+    private void sendKey(Keys key) {
+        new Actions(driver).sendKeys(key).build().perform();
+    }
+
+    private boolean waitUntilLastRowHasChanged(final int row) {
+        try {
+            waitUntil(new ExpectedCondition<Boolean>() {
+                @Override
+                public Boolean apply(WebDriver input) {
+                    return row != getLastVisibleRowNumber();
+                }
+            }, 1);
+
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    private int getLastVisibleRowNumber() {
+        return getRowNumber(getLastVisibleRow());
+    }
+
+    private void sendPageDownUntilBottomIsReached() {
+        sendKeyUntilEndIsReached(Keys.PAGE_DOWN);
+    }
+
+    private void sendPageUpUntilTopIsReached() {
+        sendKeyUntilEndIsReached(Keys.PAGE_UP);
+    }
+
     @Test
     public void navigatePageDown() {
-        // Scroll to a point where you can reach the bottom with 3 PageDowns.
+        // Scroll to a point where you can reach the bottom with a couple of page downs.
         // Can't use v-table-body height because lower rows haven't been
         // fetched yet.
         testBenchElement(wrapper).scroll(
                 ROW_NUMBER * rowHeight - (int) (2.8 * pageHeight));
         waitForScrollToFinish();
 
-        lastRow = getLastVisibleRow();
-        lastRow.click();
+        getLastVisibleRow().click();
+        sendPageDownUntilBottomIsReached();
 
-        // Press PageDown 3 times, we should reach the last row
-        for (int j = 0; j < 3; j++) {
-            lastRowNumber = getRowNumber(lastRow);
-            new Actions(driver).sendKeys(Keys.PAGE_DOWN).build().perform();
-            waitForRowsToUpdate();
-        }
         assertEquals("Last table row should be visible", ROW_NUMBER - 1,
-                lastRowNumber);
+                getLastVisibleRowNumber());
     }
 
     @Test
     public void navigatePageUp() {
-        // Scroll to a point where you can reach the top with 3 PageUps.
+        // Scroll to a point where you can reach the top with a couple of page ups.
         testBenchElement(wrapper).scroll((int) (2.8 * pageHeight));
         waitForScrollToFinish();
 
-        lastRow = getLastVisibleRow();
         getFirstVisibleRow().click();
+        sendPageUpUntilTopIsReached();
 
-        // Press PageUp 3 times, we should reach the first row
-        for (int j = 0; j < 3; j++) {
-            lastRowNumber = getRowNumber(lastRow);
-            new Actions(driver).sendKeys(Keys.PAGE_UP).build().perform();
-            waitForRowsToUpdate();
-        }
         assertEquals("First table row should be visible", 0,
                 getRowNumber(getFirstVisibleRow()));
     }
 
     @Test
     public void navigateEndAndHome() {
-        lastRow = getLastVisibleRow();
-        lastRow.click();
+        getLastVisibleRow().click();
 
         new Actions(driver).sendKeys(Keys.END).build().perform();
         waitForScrollToFinish();
@@ -143,31 +181,6 @@ public class TableNavigationPageDownTest extends MultiBrowserTest {
         });
     }
 
-    /**
-     * Waits until the visible rows have been updated to some other set of rows.
-     * Fails if there is no change.
-     */
-    private void waitForRowsToUpdate() {
-        waitUntil(new ExpectedCondition<Boolean>() {
-            @Override
-            public Boolean apply(WebDriver input) {
-                lastRow = getLastVisibleRow();
-                int rowNumber = getRowNumber(lastRow);
-                if (lastRowNumber != rowNumber) {
-                    lastRowNumber = rowNumber;
-                    return true;
-                }
-                return false;
-            }
-
-            @Override
-            public String toString() {
-                // Timed out after 10 seconds waiting for ...
-                return "visible rows to be updated";
-            }
-        });
-    }
-
     /**
      * Returns row number from its first cell
      */
@@ -209,15 +222,4 @@ public class TableNavigationPageDownTest extends MultiBrowserTest {
         fail("Could not find last visible row");
         return null;
     }
-
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        // Sending PageDown has no effect on PhantomJS. On IE focus
-        // in Table is often lost, so default scrolling happens on PageDown.
-        List<DesiredCapabilities> browsers = new ArrayList<DesiredCapabilities>(
-                getBrowsersExcludingIE());
-        browsers.remove(Browser.PHANTOMJS.getDesiredCapabilities());
-        return browsers;
-    }
-
 }